diff --git a/asm/battle_anim_80A5C6C.s b/asm/battle_anim_80A5C6C.s index a0fb859d4..320bbef20 100644 --- a/asm/battle_anim_80A5C6C.s +++ b/asm/battle_anim_80A5C6C.s @@ -4077,8 +4077,8 @@ _080A7B90: bx r0 thumb_func_end sub_80A7AFC - thumb_func_start sub_80A7B98 -sub_80A7B98: @ 80A7B98 + thumb_func_start AnimTask_BlendMonInAndOut +AnimTask_BlendMonInAndOut: @ 80A7B98 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -4117,7 +4117,7 @@ _080A7BE2: pop {r0} bx r0 .pool - thumb_func_end sub_80A7B98 + thumb_func_end AnimTask_BlendMonInAndOut thumb_func_start sub_80A7BF4 sub_80A7BF4: @ 80A7BF4 @@ -4802,8 +4802,8 @@ _080A8136: .pool thumb_func_end sub_80A80C8 - thumb_func_start AnimTask_GetHappinessPowerLevel -AnimTask_GetHappinessPowerLevel: @ 80A8140 + thumb_func_start AnimTask_GetFrustrationPowerLevel +AnimTask_GetFrustrationPowerLevel: @ 80A8140 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -4827,7 +4827,7 @@ _080A815E: pop {r0} bx r0 .pool - thumb_func_end AnimTask_GetHappinessPowerLevel + thumb_func_end AnimTask_GetFrustrationPowerLevel thumb_func_start sub_80A8174 sub_80A8174: @ 80A8174 diff --git a/asm/battle_anim_80A9C70.s b/asm/battle_anim_80A9C70.s index 3515b973e..f43b36452 100644 --- a/asm/battle_anim_80A9C70.s +++ b/asm/battle_anim_80A9C70.s @@ -867,7 +867,7 @@ LaunchStatusAnimation: @ 80AA364 strb r4, [r0] ldr r0, =gBattleAnimTarget strb r4, [r0] - ldr r0, =gBattleAnims_Statuses + ldr r0, =gBattleAnims_StatusConditions movs r2, 0 bl LaunchBattleAnimation ldr r0, =task0A_80788BC diff --git a/asm/battle_anim_80D51AC.s b/asm/battle_anim_80D51AC.s index 3f36bb4a2..0b0378a99 100644 --- a/asm/battle_anim_80D51AC.s +++ b/asm/battle_anim_80D51AC.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80D51AC -sub_80D51AC: @ 80D51AC + thumb_func_start AnimTask_ShakeMon +AnimTask_ShakeMon: @ 80D51AC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -56,7 +56,7 @@ _080D520C: pop {r0} bx r0 .pool - thumb_func_end sub_80D51AC + thumb_func_end AnimTask_ShakeMon thumb_func_start sub_80D5220 sub_80D5220: @ 80D5220 @@ -151,8 +151,8 @@ _080D52CA: bx r0 thumb_func_end sub_80D5220 - thumb_func_start sub_80D52D0 -sub_80D52D0: @ 80D52D0 + thumb_func_start AnimTask_ShakeMon2 +AnimTask_ShakeMon2: @ 80D52D0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -265,7 +265,7 @@ _080D53A6: pop {r0} bx r0 .pool - thumb_func_end sub_80D52D0 + thumb_func_end AnimTask_ShakeMon2 thumb_func_start sub_80D53BC sub_80D53BC: @ 80D53BC @@ -372,8 +372,8 @@ _080D5478: bx r0 thumb_func_end sub_80D53BC - thumb_func_start sub_80D5484 -sub_80D5484: @ 80D5484 + thumb_func_start AnimTask_ShakeMonInPlace +AnimTask_ShakeMonInPlace: @ 80D5484 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -432,7 +432,7 @@ _080D54F6: pop {r0} bx r0 .pool - thumb_func_end sub_80D5484 + thumb_func_end AnimTask_ShakeMonInPlace thumb_func_start sub_80D5508 sub_80D5508: @ 80D5508 @@ -595,8 +595,8 @@ _080D563C: bx r0 thumb_func_end sub_80D5508 - thumb_func_start sub_80D5644 -sub_80D5644: @ 80D5644 + thumb_func_start AnimTask_ShakeAndSinkMon +AnimTask_ShakeAndSinkMon: @ 80D5644 push {r4,r5,lr} adds r4, r0, 0 lsls r4, 24 @@ -635,7 +635,7 @@ sub_80D5644: @ 80D5644 pop {r0} bx r0 .pool - thumb_func_end sub_80D5644 + thumb_func_end AnimTask_ShakeAndSinkMon thumb_func_start sub_80D56A4 sub_80D56A4: @ 80D56A4 @@ -837,8 +837,8 @@ _080D5822: .pool thumb_func_end sub_80D57B8 - thumb_func_start sub_80D5830 -sub_80D5830: @ 80D5830 + thumb_func_start AnimTask_TranslateMonEllipticalRespectSide +AnimTask_TranslateMonEllipticalRespectSide: @ 80D5830 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -859,7 +859,7 @@ _080D584C: pop {r0} bx r0 .pool - thumb_func_end sub_80D5830 + thumb_func_end AnimTask_TranslateMonEllipticalRespectSide thumb_func_start sub_80D5860 sub_80D5860: @ 80D5860 @@ -1325,8 +1325,8 @@ sub_80D5C20: @ 80D5C20 .pool thumb_func_end sub_80D5C20 - thumb_func_start sub_80D5C50 -sub_80D5C50: @ 80D5C50 + thumb_func_start AnimTask_WindUpLunge +AnimTask_WindUpLunge: @ 80D5C50 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -1390,7 +1390,7 @@ _080D5C82: pop {r0} bx r0 .pool - thumb_func_end sub_80D5C50 + thumb_func_end AnimTask_WindUpLunge thumb_func_start sub_80D5CE4 sub_80D5CE4: @ 80D5CE4 @@ -1617,8 +1617,8 @@ _080D5EAA: .pool thumb_func_end sub_80D5E6C - thumb_func_start sub_80D5EB8 -sub_80D5EB8: @ 80D5EB8 + thumb_func_start AnimTask_SwayMon +AnimTask_SwayMon: @ 80D5EB8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -1676,7 +1676,7 @@ _080D5F18: pop {r0} bx r0 .pool - thumb_func_end sub_80D5EB8 + thumb_func_end AnimTask_SwayMon thumb_func_start sub_80D5F3C sub_80D5F3C: @ 80D5F3C @@ -1828,8 +1828,8 @@ _080D6050: .pool thumb_func_end sub_80D5F3C - thumb_func_start sub_80D6064 -sub_80D6064: @ 80D6064 + thumb_func_start AnimTask_ScaleMonAndRestore +AnimTask_ScaleMonAndRestore: @ 80D6064 push {r4-r6,lr} adds r4, r0, 0 lsls r4, 24 @@ -1867,7 +1867,7 @@ sub_80D6064: @ 80D6064 pop {r0} bx r0 .pool - thumb_func_end sub_80D6064 + thumb_func_end AnimTask_ScaleMonAndRestore thumb_func_start sub_80D60BC sub_80D60BC: @ 80D60BC diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index cfeb8d8d4..4766efd69 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -7975,7 +7975,7 @@ _08102794: mov r12, r5 ldr r7, =gUnknown_08592EBC mov r8, r7 - ldr r6, =gUnknown_08592EEC + ldr r6, =gBattleAnimSpriteTemplate_8592EEC movs r5, 0x1 _081027B2: lsls r0, r2, 4 @@ -17083,8 +17083,8 @@ AnimTask_GetFuryCutterHitCount: @ 8107168 .pool thumb_func_end AnimTask_GetFuryCutterHitCount - thumb_func_start sub_8107188 -sub_8107188: @ 8107188 + thumb_func_start AnimTask_CreateRaindrops +AnimTask_CreateRaindrops: @ 8107188 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -17150,7 +17150,7 @@ _0810720A: pop {r0} bx r0 .pool - thumb_func_end sub_8107188 + thumb_func_end AnimTask_CreateRaindrops thumb_func_start sub_810721C sub_810721C: @ 810721C @@ -28796,7 +28796,7 @@ _0810D028: mov r1, r9 ldrh r0, [r1, 0x2] strh r0, [r5, 0x2E] - ldr r0, =gUnknown_08597358 + ldr r0, =gBasicHitSplatSpriteTemplate movs r2, 0x20 ldrsh r1, [r5, r2] movs r3, 0x22 @@ -37293,8 +37293,8 @@ _081114E6: bx r0 thumb_func_end sub_811149C - thumb_func_start sub_81114EC -sub_81114EC: @ 81114EC + thumb_func_start AnimTask_GetSeismicTossDamageLevel +AnimTask_GetSeismicTossDamageLevel: @ 81114EC push {lr} lsls r0, 24 lsrs r3, r0, 24 @@ -37326,7 +37326,7 @@ _0811151A: pop {r0} bx r0 .pool - thumb_func_end sub_81114EC + thumb_func_end AnimTask_GetSeismicTossDamageLevel thumb_func_start sub_811152C sub_811152C: @ 811152C @@ -49753,8 +49753,8 @@ _08117C0C: .pool thumb_func_end sub_8117A60 - thumb_func_start sub_8117C24 -sub_8117C24: @ 8117C24 + thumb_func_start AnimTask_GetBattleTerrain +AnimTask_GetBattleTerrain: @ 8117C24 push {lr} lsls r0, 24 lsrs r0, 24 @@ -49766,7 +49766,7 @@ sub_8117C24: @ 8117C24 pop {r0} bx r0 .pool - thumb_func_end sub_8117C24 + thumb_func_end AnimTask_GetBattleTerrain thumb_func_start sub_8117C44 sub_8117C44: @ 8117C44 @@ -50078,8 +50078,8 @@ sub_8117E94: @ 8117E94 .pool thumb_func_end sub_8117E94 - thumb_func_start sub_8117EC4 -sub_8117EC4: @ 8117EC4 + thumb_func_start AnimTask_IsTargetSameSide +AnimTask_IsTargetSameSide: @ 8117EC4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -50109,7 +50109,7 @@ _08117EFC: pop {r0} bx r0 .pool - thumb_func_end sub_8117EC4 + thumb_func_end AnimTask_IsTargetSameSide thumb_func_start sub_8117F10 sub_8117F10: @ 8117F10 diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s index b49a591bb..8ad478052 100644 --- a/asm/battle_anim_815A0D4.s +++ b/asm/battle_anim_815A0D4.s @@ -10861,8 +10861,8 @@ _0815F896: .pool thumb_func_end sub_815F7C4 - thumb_func_start AnimTask_GetHappinessPowerLevel2 -AnimTask_GetHappinessPowerLevel2: @ 815F8A0 + thumb_func_start AnimTask_GetReturnPowerLevel +AnimTask_GetReturnPowerLevel: @ 815F8A0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -10904,7 +10904,7 @@ _0815F8E0: pop {r0} bx r0 .pool - thumb_func_end AnimTask_GetHappinessPowerLevel2 + thumb_func_end AnimTask_GetReturnPowerLevel thumb_func_start sub_815F8F4 sub_815F8F4: @ 815F8F4 diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s index 4288d4eb8..e08568eba 100644 --- a/asm/battle_anim_8170478.s +++ b/asm/battle_anim_8170478.s @@ -5757,8 +5757,8 @@ _081734A0: .pool thumb_func_end sub_817345C - thumb_func_start sub_81734B4 -sub_81734B4: @ 81734B4 + thumb_func_start AnimTask_GetTrappedMoveAnimId +AnimTask_GetTrappedMoveAnimId: @ 81734B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -5805,7 +5805,7 @@ _0817350C: pop {r0} bx r0 .pool - thumb_func_end sub_81734B4 + thumb_func_end AnimTask_GetTrappedMoveAnimId thumb_func_start sub_817351C sub_817351C: @ 817351C diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 2b7501734..1d5b01de7 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -66,9 +66,9 @@ .byte \battler .endm - .macro setalpha param0 - .byte 0xc - .2byte \param0 + .macro setalpha eva, evb + .byte 0x0C + .2byte ((\evb) << 8) | (\eva) .endm .macro blendoff diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s index 749db42f8..3d1c8ec15 100644 --- a/data/battle_anim_80FE840.s +++ b/data/battle_anim_80FE840.s @@ -14,15 +14,15 @@ gUnknown_08592114:: @ 8592114 .4byte gUnknown_085920F0 .align 2 -gUnknown_08592118:: @ 8592118 +gSleepPowderParticleSpriteTemplate:: @ 8592118 spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 .align 2 -gUnknown_08592130:: @ 8592130 +gStunSporeParticleSpriteTemplate:: @ 8592130 spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 .align 2 -gUnknown_08592148:: @ 8592148 +gPoisonPowderParticleSpriteTemplate:: @ 8592148 spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 .align 2 @@ -142,7 +142,7 @@ gUnknown_085922B4:: @ 85922B4 .4byte gUnknown_085922A8 .align 2 -gUnknown_085922BC:: @ 85922BC +gLeechSeedSpriteTemplate:: @ 85922BC spr_template 0x2716, 0x2716, gUnknown_0852490C, gUnknown_085922B4, NULL, gDummySpriteAffineAnimTable, sub_80FEC48 .align 2 @@ -230,7 +230,7 @@ gUnknown_08592400:: @ 8592400 .4byte gUnknown_085923F0 .align 2 -gUnknown_08592404:: @ 8592404 +gSwiftStarSpriteTemplate:: @ 8592404 spr_template 0x27be, 0x27be, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4 .align 2 @@ -353,7 +353,7 @@ gUnknown_08592610:: @ 8592610 spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18 .align 2 -gUnknown_08592628:: @ 8592628 +gBattleAnimSpriteTemplate_8592628:: @ 8592628 spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4 .align 2 @@ -599,7 +599,7 @@ gUnknown_08592A18:: @ 8592A18 .4byte gUnknown_08592A04 .align 2 -gUnknown_08592A1C:: @ 8592A1C +gCuttingSliceSpriteTemplate:: @ 8592A1C spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0 .align 2 @@ -888,7 +888,7 @@ gUnknown_08592EE8:: @ 8592EE8 .4byte gUnknown_08592ED4 .align 2 -gUnknown_08592EEC:: @ 8592EEC +gBattleAnimSpriteTemplate_8592EEC:: @ 8592EEC spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540 .align 2 @@ -1157,11 +1157,11 @@ gUnknown_0859337C:: @ 859337C .4byte gUnknown_0859335C .align 2 -gUnknown_08593380:: @ 8593380 +gBattleAnimSpriteTemplate_8593380:: @ 8593380 spr_template 0x2715, 0x2715, gUnknown_08524ADC, gDummySpriteAnimTable, NULL, gUnknown_0859337C, sub_810387C .align 2 -gUnknown_08593398:: @ 8593398 +gSonicBoomSpriteTemplate:: @ 8593398 spr_template 0x2713, 0x2713, gUnknown_08524B14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81038C8 .align 2 @@ -1189,11 +1189,11 @@ gUnknown_08593424:: @ 8593424 .4byte gUnknown_085933E0 .align 2 -gUnknown_08593428:: @ 8593428 +gSupersonicWaveSpriteTemplate:: @ 8593428 spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820 .align 2 -gUnknown_08593440:: @ 8593440 +gScreechWaveSpriteTemplate:: @ 8593440 spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820 .align 2 @@ -1357,7 +1357,7 @@ gUnknown_08593718:: @ 8593718 .4byte gUnknown_08593704 .align 2 -gUnknown_0859371C:: @ 859371C +gBattleAnimSpriteTemplate_859371C:: @ 859371C spr_template 0x27d6, 0x27d6, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 @@ -1436,7 +1436,7 @@ gUnknown_08593880:: @ 8593880 spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4 .align 2 -gUnknown_08593898:: @ 8593898 +gBattleAnimSpriteTemplate_8593898:: @ 8593898 spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8 .align 2 @@ -1497,7 +1497,7 @@ gUnknown_085939A0:: @ 85939A0 spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140 .align 2 -gUnknown_085939B8:: @ 85939B8 +gBattleAnimSpriteTemplate_85939B8:: @ 85939B8 spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 .align 2 @@ -1514,11 +1514,11 @@ gUnknown_08593A00:: @ 8593A00 .4byte gUnknown_085939E8 .align 2 -gUnknown_08593A04:: @ 8593A04 +gHiddenPowerOrbSpriteTemplate:: @ 8593A04 spr_template 0x27e9, 0x27e9, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C .align 2 -gUnknown_08593A1C:: @ 8593A1C +gHiddenPowerOrbScatterSpriteTemplate:: @ 8593A1C spr_template 0x27e9, 0x27e9, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878 .align 2 @@ -1620,7 +1620,7 @@ gUnknown_08593B98:: @ 8593B98 .2byte 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 .align 2 -gUnknown_08593BB8:: @ 8593BB8 +gBattleAnimSpriteTemplate_8593BB8:: @ 8593BB8 spr_template 0x27f1, 0x27f1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00 .align 2 @@ -1703,7 +1703,7 @@ gUnknown_08595064:: @ 8595064 .4byte gUnknown_08595054 .align 2 -gUnknown_08595068:: @ 8595068 +gBattleAnimSpriteTemplate_8595068:: @ 8595068 spr_template 0x27a2, 0x27a2, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260 .align 2 @@ -1990,11 +1990,11 @@ gUnknown_085954D0:: @ 85954D0 .4byte gUnknown_085954B8 .align 2 -gUnknown_085954D4:: @ 85954D4 +gEmberSpriteTemplate:: @ 85954D4 spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820 .align 2 -gUnknown_085954EC:: @ 85954EC +gEmberFlareSpriteTemplate:: @ 85954EC spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8109198 .align 2 @@ -2031,7 +2031,7 @@ gUnknown_0859556C:: @ 859556C spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595540, NULL, gDummySpriteAffineAnimTable, sub_8109364 .align 2 -gUnknown_08595584:: @ 8595584 +gBattleAnimSpriteTemplate_8595584:: @ 8595584 spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_81093A4 .align 2 @@ -2138,7 +2138,7 @@ gUnknown_08595734:: @ 8595734 spr_template 0x275f, 0x275f, gUnknown_08524914, gUnknown_08595730, NULL, gDummySpriteAffineAnimTable, sub_810A274 .align 2 -gUnknown_0859574C:: @ 859574C +gBattleAnimSpriteTemplate_859574C:: @ 859574C spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A308 .align 2 @@ -2175,15 +2175,15 @@ gUnknown_085957DC:: @ 85957DC .4byte gUnknown_085957BC .align 2 -gUnknown_085957E0:: @ 85957E0 +gBattleAnimSpriteTemplate_85957E0:: @ 85957E0 spr_template 0x282a, 0x282a, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC .align 2 -gUnknown_085957F8:: @ 85957F8 +gBattleAnimSpriteTemplate_85957F8:: @ 85957F8 spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859578C, sub_810A628 .align 2 -gUnknown_08595810:: @ 8595810 +gElectricitySpriteTemplate:: @ 8595810 spr_template 0x271b, 0x271b, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A75C .align 2 @@ -2613,7 +2613,7 @@ gUnknown_08595E80:: @ 8595E80 spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4 .align 2 -gUnknown_08595E98:: @ 8595E98 +gFistFootSpriteTemplate:: @ 8595E98 spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0 .align 2 @@ -2651,7 +2651,7 @@ gUnknown_08595F44:: @ 8595F44 .4byte gUnknown_08595F2C .align 2 -gUnknown_08595F48:: @ 8595F48 +gMegaPunchKickSpriteTemplate:: @ 8595F48 spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278 .align 2 @@ -2841,11 +2841,11 @@ gUnknown_0859623C:: @ 859623C .4byte gUnknown_08596224 .align 2 -gUnknown_08596240:: @ 8596240 +gPoisonBubbleSpriteTemplate:: @ 8596240 spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4 .align 2 -gUnknown_08596258:: @ 8596258 +gWaterBubbleSpriteTemplate:: @ 8596258 spr_template 0x27ab, 0x27ab, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4 .align 2 @@ -2862,7 +2862,7 @@ gUnknown_085962A0:: @ 85962A0 .4byte gUnknown_08596288 .align 2 -gUnknown_085962A4:: @ 85962A4 +gBattleAnimSpriteTemplate_85962A4:: @ 85962A4 spr_template 0x2719, 0x2719, gUnknown_085249BC, gDummySpriteAnimTable, NULL, gUnknown_085962A0, sub_810DFA8 .align 2 @@ -3268,15 +3268,15 @@ gUnknown_08596A2C:: @ 8596A2C spr_template 0x27c5, 0x27c5, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C .align 2 -gUnknown_08596A44:: @ 8596A44 +gLinearStingerSpriteTemplate:: @ 8596A44 spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720 .align 2 -gUnknown_08596A5C:: @ 8596A5C +gPinMissileSpriteTemplate:: @ 8596A5C spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 .align 2 -gUnknown_08596A74:: @ 8596A74 +gIcicleSpearSpriteTemplate:: @ 8596A74 spr_template 0x2816, 0x2816, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 .align 2 @@ -3342,7 +3342,7 @@ gUnknown_08596B88:: @ 8596B88 spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8110B38 .align 2 -gUnknown_08596BA0:: @ 8596BA0 +gBattleAnimSpriteTemplate_8596BA0:: @ 8596BA0 spr_template 0x2815, 0x2815, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C .align 2 @@ -3500,11 +3500,11 @@ gUnknown_08596DD0:: @ 8596DD0 spr_template 0x27d7, 0x27d7, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0 .align 2 -gUnknown_08596DE8:: @ 8596DE8 +gBattleAnimSpriteTemplate_8596DE8:: @ 8596DE8 spr_template 0x27d8, 0x27d8, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 .align 2 -gUnknown_08596E00:: @ 8596E00 +gBattleAnimSpriteTemplate_8596E00:: @ 8596E00 spr_template 0x27ed, 0x27ed, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 .align 2 @@ -3533,7 +3533,7 @@ gUnknown_08596E78:: @ 8596E78 .4byte gUnknown_08596E60 .align 2 -gUnknown_08596E7C:: @ 8596E7C +gBattleAnimSpriteTemplate_8596E7C:: @ 8596E7C spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08596E78, NULL, gDummySpriteAffineAnimTable, sub_8113064 .align 2 @@ -3705,7 +3705,7 @@ gUnknown_08597130:: @ 8597130 .4byte gUnknown_08597118 .align 2 -gUnknown_08597138:: @ 8597138 +gBattleAnimSpriteTemplate_8597138:: @ 8597138 spr_template 0x2737, 0x2737, gUnknown_08524914, gUnknown_08597130, NULL, gDummySpriteAffineAnimTable, sub_81144BC .align 2 @@ -3774,15 +3774,15 @@ gUnknown_08597254:: @ 8597254 .4byte gUnknown_08597240 .align 2 -gUnknown_0859725C:: @ 859725C +gConfusionDuckSpriteTemplate:: @ 859725C spr_template 0x2759, 0x2759, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C .align 2 -gUnknown_08597274:: @ 8597274 +gSimplePaletteBlendSpriteTemplate:: @ 8597274 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC .align 2 -gUnknown_0859728C:: @ 859728C +gBattleAnimSpriteTemplate_859728C:: @ 859728C spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4 .align 2 @@ -3799,7 +3799,7 @@ gUnknown_085972C0:: @ 85972C0 spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4 .align 2 -gUnknown_085972D8:: @ 85972D8 +gBattleAnimSpriteTemplate_85972D8:: @ 85972D8 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81160A4 .align 2 @@ -3829,11 +3829,11 @@ gUnknown_08597348:: @ 8597348 .4byte gUnknown_08597330 .align 2 -gUnknown_08597358:: @ 8597358 +gBasicHitSplatSpriteTemplate:: @ 8597358 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 .align 2 -gUnknown_08597370:: @ 8597370 +gBattleAnimSpriteTemplate_8597370:: @ 8597370 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420 .align 2 @@ -3845,7 +3845,7 @@ gUnknown_085973A0:: @ 85973A0 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458 .align 2 -gUnknown_085973B8:: @ 85973B8 +gBattleAnimSpriteTemplate_85973B8:: @ 85973B8 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0 .align 2 diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index 0cb95a7e1..660e5774b 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -330,7 +330,7 @@ gUnknown_085CE5A8:: spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 gUnknown_085CE5C0:: spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 -gUnknown_085CE5D8:: +gBattleAnimSpriteTemplate_85CE5D8:: spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 .align 2 diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s index 07516ba35..5ccf37c54 100644 --- a/data/battle_anim_8170478.s +++ b/data/battle_anim_8170478.s @@ -140,7 +140,7 @@ gUnknown_085E5310:: @ 85E5310 .2byte 0x0100, 0x0503, 0x0506, 0x0004 .align 2 -gUnknown_085E5338:: @ 85E5338 +gBattleAnimSpriteTemplate_85E5338:: @ 85E5338 spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C .align 2 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 2d29d26f0..d39bc07c9 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,3 +1,4 @@ +#include "constants/battle.h" #include "constants/battle_anim.h" #include "constants/rgb.h" #include "constants/songs.h" @@ -8,12 +9,12 @@ .section script_data, "aw", %progbits -.align 2 -gMovesWithQuietBGM:: @ 82C8D64 + .align 2 +gMovesWithQuietBGM:: .2byte MOVE_SING, MOVE_PERISH_SONG, MOVE_GRASS_WHISTLE, 0xFFFF -.align 2 -gBattleAnims_Moves:: @ 82C8D6C + .align 2 +gBattleAnims_Moves:: .4byte Move_NONE .4byte Move_POUND .4byte Move_KARATE_CHOP @@ -371,8 +372,8 @@ gBattleAnims_Moves:: @ 82C8D6C .4byte Move_PSYCHO_BOOST .4byte Move_COUNT @ cannot be reached, because last move is Psycho Boost -.align 2 -gBattleAnims_Statuses:: @ 82C92FC + .align 2 +gBattleAnims_StatusConditions:: .4byte Status_Poison .4byte Status_Confusion .4byte Status_Burn @@ -383,211 +384,209 @@ gBattleAnims_Statuses:: @ 82C92FC .4byte Status_Curse .4byte Status_Nightmare -.align 2 -gBattleAnims_VariousTable:: @ 82C9320 - .4byte Anim_CastformTransform - .4byte Anim_StatChange - .4byte Anim_SubsituteOff - .4byte Anim_SubsituteOn - .4byte Anim_PokeblockThrow - .4byte Anim_ItemKnockOff - .4byte Status_Wrap - .4byte Anim_ItemEffect - .4byte Anim_SmokeBallEscape - .4byte Anim_HangedOn - .4byte Anim_Rain - .4byte Anim_Sun - .4byte Anim_Sandstorm - .4byte Anim_Hail - .4byte Status_LeechSeed - .4byte Anim_Hit - .4byte Anim_ItemSteal - .4byte Anim_SnatchMove - .4byte Anim_FutureSightHit - .4byte Anim_DoomDesireHit - .4byte Anim_FocusPunchSetUp - .4byte Status_Ingrain - .4byte Anim_WishHeal + .align 2 +gBattleAnims_General:: + .4byte General_CastformChange + .4byte General_StatsChange + .4byte General_SubstituteFade + .4byte General_SubstituteAppear + .4byte General_PokeblockThrow + .4byte General_ItemKnockoff + .4byte General_TurnTrap + .4byte General_ItemEffect + .4byte General_SmokeballEscape + .4byte General_HangedOn + .4byte General_Rain + .4byte General_Sun + .4byte General_Sandstorm + .4byte General_Hail + .4byte General_LeechSeedDrain + .4byte General_MonHit + .4byte General_ItemSteal + .4byte General_SnatchMove + .4byte General_FutureSightHit + .4byte General_DoomDesireHit + .4byte General_FocusPunchSetUp + .4byte General_IngrainHeal + .4byte General_WishHeal -.align 2 -gBattleAnims_Special:: @ 82C937C - .4byte Anim_LevelUp - .4byte Anim_SwitchOutPlayer - .4byte Anim_SwitchOutOpponent - .4byte Anim_BallThrow - .4byte Anim_SafariBallThrow - .4byte Anim_SubstituteToMon - .4byte Anim_MonToSubstitute + .align 2 +gBattleAnims_Special:: + .4byte Special_LevelUp + .4byte Special_SwitchOutPlayerMon + .4byte Special_SwitchOutOpponentMon + .4byte Special_BallThrow + .4byte Special_SafariBallThrow + .4byte Special_SubstituteToMon + .4byte Special_MonToSubstitute Move_NONE: Move_MIRROR_MOVE: Move_POUND: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_DOUBLE_SLAP: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim Anim_DoubleSlapLeft, Anim_DoubleSlapRight -Anim_DoubleSlapContinue: - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + choosetwoturnanim DoubleSlapLeft, DoubleSlapRight +DoubleSlapContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W003, +63 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_DoubleSlapLeft: - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - goto Anim_DoubleSlapContinue - -Anim_DoubleSlapRight: - createsprite gUnknown_08597358, 0x2, 8, 0, 1, 2 - goto Anim_DoubleSlapContinue +DoubleSlapLeft: + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + goto DoubleSlapContinue +DoubleSlapRight: + createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 2 + goto DoubleSlapContinue Move_POISON_POWDER: loadspritegfx 0x2751 loadspritegfx 0x27A6 - loopsewithpan SE_W077, +63, 0xA, 0x6 - createsprite gUnknown_08592148, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592148, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592148, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592148, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592148, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592148, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592148, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592148, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592148, 0x82, 5, -22, 117, 80, 5, 1 + loopsewithpan SE_W077, +63, 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 + delay 15 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + delay 30 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + delay 20 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_STUN_SPORE: loadspritegfx 0x2754 - loopsewithpan SE_W077, +63, 0xA, 0x6 - createsprite gUnknown_08592130, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592130, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592130, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592130, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592130, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592130, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592130, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592130, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592130, 0x82, 5, -22, 117, 80, 5, 1 + loopsewithpan SE_W077, +63, 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 + delay 15 + createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + delay 30 + createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + delay 20 + createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SLEEP_POWDER: loadspritegfx 0x2753 - loopsewithpan SE_W077, +63, 0xA, 0x6 - createsprite gUnknown_08592118, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592118, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592118, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592118, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592118, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592118, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592118, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592118, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592118, 0x82, 5, -22, 117, 80, 5, 1 + loopsewithpan SE_W077, +63, 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 + delay 15 + createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + delay 30 + createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + delay 20 + createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SWIFT: loadspritegfx 0x27BE - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 20, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 5, 22, -18, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, -10, 22, 15, 1 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 18, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, -10, 22, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, -20, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 12, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1 + delay 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_STRENGTH: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, -64 - createvisualtask sub_80D5644, 0x5, 0, 2, 0, 96, 30 + createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 4 - createvisualtask sub_80D5830, 0x2, 1, 18, 6, 2, 4 - delay 0x4 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 + delay 4 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 16, 12, 1, 1 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1 + delay 4 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, -16, -12, 1, 1 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1 + delay 4 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 3, 4, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_TACKLE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -595,26 +594,26 @@ Move_TACKLE: end Move_BODY_SLAM: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, -64 - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER waitforvisualfinish - delay 0xB - createsprite gUnknown_0857FE70, 0x2, 0, 26, 0, 0, 5 - delay 0x6 - createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 - loopsewithpan SE_W025B, +63, 0xA, 0x2 - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 + 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 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -624,107 +623,105 @@ Move_SUPERSONIC: loadspritegfx 0x27B3 monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER - setalpha 0x80C - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end - -Anim_Supersonic1: +Supersonic1: playsewithpan SE_W048, -64 - createsprite gUnknown_08593428, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 + createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_SCREECH: loadspritegfx 0x27B4 - createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 2, 1 - call Anim_Screech1 - call Anim_Screech1 - delay 0x10 - createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 + call Screech1 + call Screech1 + delay 16 + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_TARGET waitforvisualfinish end - -Anim_Screech1: +Screech1: playsewithpan SE_W103, -64 - createsprite gUnknown_08593440, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 + createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_FLAME_WHEEL: loadspritegfx 0x272D monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 0 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 4 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 4 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 8 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 8 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 12 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 12 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 16 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 16 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 20 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 20 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 24 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 24 playsewithpan SE_W172, -64 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 - delay 0x4 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1 - createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + delay 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 playsewithpan SE_W172B, +63 - call Anim_FireMoveEffect - delay 0x7 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 9 + call FireMoveEffect + delay 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_FlameWheel1: @ Unused - createsprite gUnknown_08595584, 0x3, 0, 0, 50 - delay 0x4 +FlameWheel1: @ Unused + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 50 + delay 4 return Move_PIN_MISSILE: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W026, -64 - createsprite gUnknown_08596A5C, 0x2, 20, -8, -8, -8, 20, -32 - delay 0xF - createsprite gUnknown_08596A5C, 0x2, 20, -8, 8, 8, 20, -40 - delay 0x4 + 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 - createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 0x9 - createsprite gUnknown_08596A5C, 0x2, 20, -8, 0, 0, 20, -32 - delay 0x4 + createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + delay 4 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 14 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -732,104 +729,104 @@ Move_PIN_MISSILE: Move_ICICLE_SPEAR: loadspritegfx 0x2816 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W196, -64 - createsprite gUnknown_08596A74, 0x2, 20, -8, -8, -8, 20, -32 - delay 0xF - createsprite gUnknown_08596A74, 0x2, 20, -8, 8, 8, 20, -40 - delay 0x4 + 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 - createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 0x9 - createsprite gUnknown_08596A74, 0x2, 20, -8, 0, 0, 20, -32 - delay 0x4 + createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + delay 4 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 14 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TAKE_DOWN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D5C50, 0x5, 0, -24, 8, 23, 10, 40, 10 - delay 0x23 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 - createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 + setalpha 12, 8 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 + delay 35 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 playsewithpan SE_W025B, +63 - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -16, 0, 0, 4 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish - delay 0x2 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + delay 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_EDGE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W129, -64 - createsprite gUnknown_0859728C, 0x2, 2, 4, 2, 0x7FFF, 10, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 2, 4, 2, 0x7FFF, 10, 0, 0 waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W207, -64 - waitplaysewithpan SE_W207, -64, 0x8 - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4 + waitplaysewithpan SE_W207, -64, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, RGB_WHITE - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, RGB_WHITE + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 3 waitforvisualfinish playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x84, -10, 0, 1, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -32, 0, 0, 3 + createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 8, -256, 0, 0 - createvisualtask sub_80D6134, 0x2, 8, -256, 1, 0 - createvisualtask sub_80D5484, 0x2, 0, 4, 0, 12, 1 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_WHITE + createvisualtask sub_80D6134, 2, 8, -256, 0, 0 + createvisualtask sub_80D6134, 2, 8, -256, 1, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 8, -256, 0, 1 - createvisualtask sub_80D6134, 0x2, 8, -256, 1, 1 + createvisualtask sub_80D6134, 2, 8, -256, 0, 1 + createvisualtask sub_80D6134, 2, 8, -256, 1, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish end Move_POISON_STING: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27A6 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, -64 - createsprite gUnknown_08596A44, 0x82, 20, 0, -8, 0, 20 + createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20 waitforvisualfinish - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 playsewithpan SE_W030, +63 waitforvisualfinish - call Anim_PoisonEffect + call PoisonBubblesEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -837,19 +834,19 @@ Move_POISON_STING: Move_TWINEEDLE: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W013B, -64, 0x6, 0x2 - createsprite gUnknown_08596A44, 0x82, 10, -4, 0, -4, 20 - createsprite gUnknown_08596A44, 0x82, 20, 12, 10, 12, 20 - delay 0x14 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 - createsprite gUnknown_08597370, 0x3, 0, -4, 1, 3 - loopsewithpan SE_W030, +63, 0x5, 0x2 - delay 0x1 - createsprite gUnknown_08597370, 0x3, 10, 12, 1, 3 + setalpha 12, 8 + loopsewithpan SE_W013B, -64, 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_TARGET, 2, 0, 5, 1 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, -4, 1, 3 + loopsewithpan SE_W030, +63, 5, 2 + delay 1 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 10, 12, 1, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -858,349 +855,338 @@ Move_TWINEEDLE: Move_FIRE_BLAST: loadspritegfx 0x272D createsoundtask sub_8158B30, 144, 145 - call Anim_FireBlast1 - call Anim_FireBlast1 - call Anim_FireBlast1 - delay 0x18 - createvisualtask sub_8116620, 0xA, 1, 3, 0, 8, RGB_BLACK + call FireBlast1 + call FireBlast1 + call FireBlast1 + delay 24 + createvisualtask sub_8116620, 10, 1, 3, 0, 8, RGB_BLACK waitforvisualfinish - delay 0x13 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 20, 1 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 + delay 19 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 20, 1 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 2, 8, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 2, 8, 0, RGB_BLACK waitforvisualfinish end -Anim_FireBlast1: - createsprite gUnknown_0859551C, 0x82, 0, 0, 0 - createsprite gUnknown_0859551C, 0x82, 0, 0, 51 - createsprite gUnknown_0859551C, 0x82, 0, 0, 102 - createsprite gUnknown_0859551C, 0x82, 0, 0, 153 - createsprite gUnknown_0859551C, 0x82, 0, 0, 204 - delay 0x5 +FireBlast1: + createsprite gUnknown_0859551C, 130, 0, 0, 0 + createsprite gUnknown_0859551C, 130, 0, 0, 51 + createsprite gUnknown_0859551C, 130, 0, 0, 102 + createsprite gUnknown_0859551C, 130, 0, 0, 153 + createsprite gUnknown_0859551C, 130, 0, 0, 204 + delay 5 return -Anim_FireBlast2: - createsprite gUnknown_0859556C, 0x82, 0, 0, 10, 0, -2 - createsprite gUnknown_0859556C, 0x82, 0, 0, 13, -2, 0 - createsprite gUnknown_0859556C, 0x82, 0, 0, 13, 2, 0 - createsprite gUnknown_0859556C, 0x82, 0, 0, 15, -2, 2 - createsprite gUnknown_0859556C, 0x82, 0, 0, 15, 2, 2 +FireBlast2: + createsprite gUnknown_0859556C, 130, 0, 0, 10, 0, -2 + createsprite gUnknown_0859556C, 130, 0, 0, 13, -2, 0 + createsprite gUnknown_0859556C, 130, 0, 0, 13, 2, 0 + createsprite gUnknown_0859556C, 130, 0, 0, 15, -2, 2 + createsprite gUnknown_0859556C, 130, 0, 0, 15, 2, 2 return Move_LEECH_SEED: loadspritegfx 0x2716 playsewithpan SE_W077, -64 - createsprite gUnknown_085922BC, 0x82, 15, 0, 0, 24, 35, -32 - delay 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 + delay 8 playsewithpan SE_W077, -64 - createsprite gUnknown_085922BC, 0x82, 15, 0, -16, 24, 35, -40 - delay 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40 + delay 8 playsewithpan SE_W077, -64 - createsprite gUnknown_085922BC, 0x82, 15, 0, 16, 24, 35, -37 - delay 0xC - loopsewithpan SE_W039, +63, 0xA, 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37 + delay 12 + loopsewithpan SE_W039, +63, 10, 8 waitforvisualfinish end Move_EMBER: loadspritegfx 0x272D - loopsewithpan SE_W052, -64, 0x5, 0x2 - createsprite gUnknown_085954D4, 0x82, 20, 0, -16, 24, 20, 1 - delay 0x4 - createsprite gUnknown_085954D4, 0x82, 20, 0, 0, 24, 20, 1 - delay 0x4 - createsprite gUnknown_085954D4, 0x82, 20, 0, 16, 24, 20, 1 - delay 0x10 + loopsewithpan SE_W052, -64, 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 - call Anim_Ember1 - call Anim_Ember1 - call Anim_Ember1 + call Ember1 + call Ember1 + call Ember1 end -Anim_Ember1: - createsprite gUnknown_085954EC, 0x82, -24, 24, 24, 24, 20, 1, 1 - delay 0x4 +Ember1: + createsprite gEmberFlareSpriteTemplate, 130, -24, 24, 24, 24, 20, 1, 1 + delay 4 return Move_MEGA_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - delay 0x2 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK - setalpha 0x80C + delay 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + setalpha 12, 8 playsewithpan SE_W025, +63 - createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE - delay 0x32 - call Anim_SetImpactBackground - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 0, 50 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 50 + call SetImpactBackground + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x2 + delay 2 restorebg waitbgfadein end - -Anim_SetImpactBackground: - delay 0x2 - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_SetImpactContestsBG - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_SetImpactOpponentBG - jumprettrue Anim_SetImpactPlayerBG - -Anim_SetImpactBackgroundRet: +SetImpactBackground: + delay 2 + createvisualtask AnimTask_IsContest, 2 + jumprettrue SetImpactContestsBG + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse SetImpactOpponentBG + jumprettrue SetImpactPlayerBG +SetImpactBackgroundRet: return - -Anim_SetImpactOpponentBG: +SetImpactOpponentBG: changebg BG_IMPACT_OPPONENT - goto Anim_SetImpactBackgroundRet - -Anim_SetImpactPlayerBG: + goto SetImpactBackgroundRet +SetImpactPlayerBG: changebg BG_IMPACT_PLAYER - goto Anim_SetImpactBackgroundRet - -Anim_SetImpactContestsBG: + goto SetImpactBackgroundRet +SetImpactContestsBG: changebg BG_IMPACT_CONTESTS - goto Anim_SetImpactBackgroundRet + goto SetImpactBackgroundRet Move_MEGA_KICK: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - delay 0x2 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK - setalpha 0x80C + delay 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + setalpha 12, 8 playsewithpan SE_W025, +63 - createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE - delay 0x32 + createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 50 playsewithpan SE_W025B, +63 - call Anim_SetImpactBackground - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + call SetImpactBackground + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x2 + delay 2 restorebg waitbgfadein end Move_COMET_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim Anim_CometPunchLeft, Anim_CometPunchRight -Anim_CometPunchContinue: - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + choosetwoturnanim CometPunchLeft, CometPunchRight +CometPunchContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_CometPunchLeft: - createsprite gUnknown_08597358, 0x2, -8, -8, 1, 2 - createsprite gUnknown_08595E98, 0x3, -8, 0, 8, 1, 0 - goto Anim_CometPunchContinue - -Anim_CometPunchRight: - createsprite gUnknown_08597358, 0x2, 8, -8, 1, 2 - createsprite gUnknown_08595E98, 0x3, 8, 0, 8, 1, 0 - goto Anim_CometPunchContinue +CometPunchLeft: + createsprite gBasicHitSplatSpriteTemplate, 2, -8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, 3, -8, 0, 8, 1, 0 + goto CometPunchContinue +CometPunchRight: + createsprite gBasicHitSplatSpriteTemplate, 2, 8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, 3, 8, 0, 8, 1, 0 + goto CometPunchContinue Move_SONIC_BOOM: - loadspritegfx 0x2713 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_003 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - call Anim_SonicBoom1 - call Anim_SonicBoom1 - call Anim_SonicBoom1 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 10, 1 - call Anim_SonicBoom2 + setalpha 12, 8 + call SonicBoom1 + call SonicBoom1 + call SonicBoom1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1 + call SonicBoom2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_SonicBoom1: +SonicBoom1: playsewithpan SE_W013B, -64 - createsprite gUnknown_08593398, 0x82, 16, 0, 0, 0, 15 - delay 0x4 + createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15 + delay 4 return - -Anim_SonicBoom2: - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 - delay 0x4 +SonicBoom2: + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 + delay 4 return Move_THUNDER_SHOCK: - loadspritegfx 0x2711 - loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK + loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_011 + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 0, -44, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 0, -44, 0 playsewithpan SE_W085, +63 delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish - delay 0x14 - call Anim_ParalysisEffect + delay 20 + call ElectricityEffect waitforvisualfinish - delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK + delay 20 + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDERBOLT: - loadspritegfx 0x2711 - loadspritegfx 0x282A - loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK + loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_282 + loadspritegfx ANIM_TAG_011 + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 24, -52, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 24, -52, 0 playsewithpan SE_W085, +63 - delay 0x7 - createvisualtask sub_810A7DC, 0x5, -24, -52, 0 + delay 7 + createvisualtask sub_810A7DC, 5, -24, -52, 0 playsewithpan SE_W085, +63 - delay 0x7 - createvisualtask sub_810A7DC, 0x5, 0, -60, 1 + delay 7 + createvisualtask sub_810A7DC, 5, 0, -60, 1 playsewithpan SE_W085, +63 delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish - delay 0x14 - createsprite gUnknown_085957E0, 0x83, 44, 0, 0, 3 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 0, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 64, 40, 1, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 128, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 192, 40, 2, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 32, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 96, 40, 1, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 160, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 224, 40, 2, -32765 + delay 20 + createsprite gBattleAnimSpriteTemplate_85957E0, 131, 44, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 0, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 64, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 128, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 192, 40, 2, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 32, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 96, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 160, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, +63 - delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, RGB_BLACK - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, RGB_BLACK - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, RGB_BLACK - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, RGB_BLACK + delay 0 + createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish - delay 0x14 - waitplaysewithpan SE_W085B, +63, 0x13 - call Anim_ParalysisEffect + delay 20 + waitplaysewithpan SE_W085B, +63, 19 + call ElectricityEffect waitforvisualfinish - delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK + delay 20 + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDER_WAVE: - loadspritegfx 0x2711 - loadspritegfx 0x271B + loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_011 loadspritegfx 0x27BD - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 0, -48, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 0, -48, 0 playsewithpan SE_W086, +63 - delay 0x14 - loopsewithpan SE_W085B, +63, 0xA, 0x4 - createsprite gUnknown_08595840, 0x82, -16, -16 - delay 0x4 - createsprite gUnknown_08595840, 0x82, -16, 0 - delay 0x4 - createsprite gUnknown_08595840, 0x82, -16, 16 + delay 20 + loopsewithpan SE_W085B, +63, 10, 4 + createsprite gUnknown_08595840, 130, -16, -16 + delay 4 + createsprite gUnknown_08595840, 130, -16, 0 + delay 4 + createsprite gUnknown_08595840, 130, -16, 16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_BEAT_UP: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim Anim_BeatUpLeft, Anim_BeatUpRight -Anim_BeatUpContinue: + setalpha 12, 8 + choosetwoturnanim BeatUpLeft, BeatUpRight +BeatUpContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_BeatUpLeft: - createsprite gUnknown_08597358, 0x82, -20, -20, 1, 2 - createsprite gUnknown_08595E98, 0x83, -20, -12, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 +BeatUpLeft: + createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2 + createsprite gFistFootSpriteTemplate, 131, -20, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 - createsprite gUnknown_08595E98, 0x83, 8, 8, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 + createsprite gFistFootSpriteTemplate, 131, 8, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - goto Anim_BeatUpContinue - -Anim_BeatUpRight: - createsprite gUnknown_08597358, 0x82, 12, -20, 1, 2 - createsprite gUnknown_08595E98, 0x83, 12, -12, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + goto BeatUpContinue +BeatUpRight: + createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2 + createsprite gFistFootSpriteTemplate, 131, 12, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x82, -12, 0, 1, 2 - createsprite gUnknown_08595E98, 0x83, -12, 8, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2 + createsprite gFistFootSpriteTemplate, 131, -12, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - goto Anim_BeatUpContinue + goto BeatUpContinue Move_STOMP: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, +63 - createsprite gUnknown_08595F60, 0x3, 0, -32, 15 - delay 0x13 - createsprite gUnknown_08597358, 0x2, 0, -8, 1, 1 - createvisualtask sub_80D51AC, 0x2, 1, 0, 4, 9, 1 + createsprite gUnknown_08595F60, 3, 0, -32, 15 + delay 19 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -1208,19 +1194,19 @@ Move_STOMP: end Move_TAIL_WHIP: - loopsewithpan SE_W039, -64, 0x18, 0x3 - createvisualtask sub_80D5830, 0x2, 0, 12, 4, 2, 3 + loopsewithpan SE_W039, -64, 24, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end Move_CUT: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W015, +63 - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1230,109 +1216,107 @@ Move_CUT: Move_HIDDEN_POWER: loadspritegfx 0x27E9 playsewithpan SE_W036, -64 - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish - delay 0x1E - createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 31, 19), 12, 5, 1 - delay 0x4 - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 + delay 30 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 + delay 4 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 playsewithpan SE_W179, -64 - createsprite gUnknown_08593A04, 0x2, 26, 0 - createsprite gUnknown_08593A04, 0x2, 26, 42 - createsprite gUnknown_08593A04, 0x2, 26, 84 - createsprite gUnknown_08593A04, 0x2, 26, 126 - createsprite gUnknown_08593A04, 0x2, 26, 168 - createsprite gUnknown_08593A04, 0x2, 26, 210 - delay 0x34 - setarg 0x7, 0xFFFF + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 0 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 42 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 84 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 126 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 168 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210 + delay 52 + setarg 7, 0xFFFF playsewithpan SE_W115, -64 - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 - createsprite gUnknown_08593A1C, 0x82, 0 - createsprite gUnknown_08593A1C, 0x82, 32 - createsprite gUnknown_08593A1C, 0x82, 64 - createsprite gUnknown_08593A1C, 0x82, 96 - createsprite gUnknown_08593A1C, 0x82, 128 - createsprite gUnknown_08593A1C, 0x82, 160 - createsprite gUnknown_08593A1C, 0x82, 192 - createsprite gUnknown_08593A1C, 0x82, 224 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 32 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 64 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 96 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 128 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 160 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 192 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 224 end Move_REVERSAL: loadspritegfx 0x27FC - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W197, -64 - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 0x7FFF, 8, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 0x7FFF, 8, 0, 0 waitforvisualfinish - delay 0x1E - createvisualtask sub_8115A04, 0x2, 31, 3, 2, 0, 10, RGB_WHITE - delay 0xA + delay 30 + createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE + delay 10 playsewithpan SE_W179, -64 - createsprite gUnknown_085CE5D8, 0x2, 26, 0 - createsprite gUnknown_085CE5D8, 0x2, 26, 42 - createsprite gUnknown_085CE5D8, 0x2, 26, 84 - createsprite gUnknown_085CE5D8, 0x2, 26, 126 - createsprite gUnknown_085CE5D8, 0x2, 26, 168 - createsprite gUnknown_085CE5D8, 0x2, 26, 210 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 0 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 42 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 84 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 126 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 168 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 210 waitforvisualfinish - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x8 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 8 playsewithpan SE_W233B, +63 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 8, 0, 0 - createsprite gUnknown_08595E98, 0x84, 0, 0, 10, 1, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0x7FFF, 8, 0, 0 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 end Move_PURSUIT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein - delay 0x0 - setalpha 0x80C - choosetwoturnanim Anim_PursuitNormal, Anim_PursuitOnSwitchout -Anim_PursuitContinue: + delay 0 + setalpha 12, 8 + choosetwoturnanim PursuitNormal, PursuitOnSwitchout +PursuitContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x0 + delay 0 restorebg waitbgfadein end - -Anim_PursuitNormal: +PursuitNormal: playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto Anim_PursuitContinue - -Anim_PursuitOnSwitchout: + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 + goto PursuitContinue +PursuitOnSwitchout: playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto Anim_PursuitContinue + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 + goto PursuitContinue Move_SPIKE_CANNON: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5C50, 0x5, 0, -4, 0, 4, 6, 8, 4 + setalpha 12, 8 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, -64, 0x5, 0x3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - createsprite gUnknown_08596A44, 0x2, 10, -8, -8, -8, 20 - createsprite gUnknown_08596A44, 0x2, 18, 0, 0, 0, 20 - createsprite gUnknown_08596A44, 0x2, 26, 8, 8, 8, 20 + loopsewithpan SE_W013B, -64, 5, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite gLinearStingerSpriteTemplate, 2, 10, -8, -8, -8, 20 + createsprite gLinearStingerSpriteTemplate, 2, 18, 0, 0, 0, 20 + createsprite gLinearStingerSpriteTemplate, 2, 26, 8, 8, 8, 20 waitforvisualfinish - createsprite gUnknown_08597370, 0x3, -8, -8, 1, 2 - createsprite gUnknown_08597370, 0x3, 0, 0, 1, 2 - createsprite gUnknown_08597370, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 - loopsewithpan SE_W030, +63, 0x5, 0x3 + createsprite gBattleAnimSpriteTemplate_8597370, 3, -8, -8, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, 0, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 + loopsewithpan SE_W030, +63, 5, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1341,194 +1325,188 @@ Move_SPIKE_CANNON: Move_SWORDS_DANCE: loadspritegfx 0x2715 monbg ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W014, -64 - createvisualtask sub_80D5830, 0x2, 0, 16, 6, 1, 4 - createsprite gUnknown_08593380, 0x2, 0, 0 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 + createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0 delay 0x16 - createvisualtask sub_8115D94, 0x2, 0x2715, 2, 2, RGB(18, 31, 31), 16, 0, 0 + createvisualtask sub_8115D94, 2, 0x2715, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 end Move_PSYCH_UP: loadspritegfx 0x27D4 monbg ANIM_ATK_PARTNER - createvisualtask sub_8115B0C, 0x2, 1, 2, 6, 1, 11, 0 - setalpha 0x80C - loopsewithpan SE_W060B, -64, 0x5, 0xA - createsprite gUnknown_08596548, 0x2, 0, 0, 0, 0 - createvisualtask sub_80D5EB8, 0x5, 0, 5, 2560, 8, 0 - delay 0x7F - delay 0x4 + createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 + setalpha 12, 8 + loopsewithpan SE_W060B, -64, 5, 10 + createsprite gUnknown_08596548, 2, 0, 0, 0, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER + delay 127 + delay 4 playsewithpan SE_W060, -64 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, RGB_YELLOW - delay 0x1E + delay 30 clearmonbg ANIM_ATK_PARTNER blendoff waitforvisualfinish end Move_DIZZY_PUNCH: - loadspritegfx 0x2759 - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - call Anim_DizzyPunch1 - createsprite gUnknown_08595E98, 0x85, 16, 8, 20, 1, 0 - createsprite gUnknown_08597358, 0x84, 16, 0, 1, 1 + setalpha 12, 8 + call DizzyPunch1 + createsprite gFistFootSpriteTemplate, 0x85, 16, 8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1 playsewithpan SE_W004, +63 - createsprite gUnknown_08595F78, 0x83, 16, 8, 160, -32 - createsprite gUnknown_08595F78, 0x83, 16, 8, -256, -40 - createsprite gUnknown_08595F78, 0x83, 16, 8, 128, -16 - createsprite gUnknown_08595F78, 0x83, 16, 8, 416, -38 - createsprite gUnknown_08595F78, 0x83, 16, 8, -128, -22 - createsprite gUnknown_08595F78, 0x83, 16, 8, -384, -31 - delay 0xA - call Anim_DizzyPunch1 - createsprite gUnknown_08595E98, 0x85, -16, -8, 20, 1, 0 - createsprite gUnknown_08597358, 0x84, -16, -16, 1, 1 + createsprite gUnknown_08595F78, 131, 16, 8, 160, -32 + createsprite gUnknown_08595F78, 131, 16, 8, -256, -40 + createsprite gUnknown_08595F78, 131, 16, 8, 128, -16 + createsprite gUnknown_08595F78, 131, 16, 8, 416, -38 + createsprite gUnknown_08595F78, 131, 16, 8, -128, -22 + createsprite gUnknown_08595F78, 131, 16, 8, -384, -31 + delay 10 + call DizzyPunch1 + createsprite gFistFootSpriteTemplate, 0x85, -16, -8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08595F78, 0x83, -16, -8, 160, -32 - createsprite gUnknown_08595F78, 0x83, -16, -8, -256, -40 - createsprite gUnknown_08595F78, 0x83, -16, -8, 128, -16 - createsprite gUnknown_08595F78, 0x83, -16, -8, 416, -38 - createsprite gUnknown_08595F78, 0x83, -16, -8, -128, -22 - createsprite gUnknown_08595F78, 0x83, -16, -8, -384, -31 + createsprite gUnknown_08595F78, 131, -16, -8, 160, -32 + createsprite gUnknown_08595F78, 131, -16, -8, -256, -40 + createsprite gUnknown_08595F78, 131, -16, -8, 128, -16 + createsprite gUnknown_08595F78, 131, -16, -8, 416, -38 + createsprite gUnknown_08595F78, 131, -16, -8, -128, -22 + createsprite gUnknown_08595F78, 131, -16, -8, -384, -31 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_DizzyPunch1: - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x6 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 +DizzyPunch1: + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 return Move_FIRE_SPIN: loadspritegfx 0x272D playsewithpan SE_W221B, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 47, 1 - call Anim_FireSpinEffect - call Anim_FireSpinEffect - call Anim_FireSpinEffect + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 + call FireSpinEffect + call FireSpinEffect + call FireSpinEffect waitforvisualfinish end -Anim_FireSpinEffect: - createsprite gUnknown_08596B88, 0x82, 0, 28, 528, 30, 13, 50, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 32, 480, 20, 16, -46, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 33, 576, 20, 8, 42, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 31, 400, 25, 11, -42, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 28, 512, 25, 16, 46, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 33, 464, 30, 15, -50, 1 - delay 0x2 +FireSpinEffect: + createsprite gUnknown_08596B88, 130, 0, 28, 528, 30, 13, 50, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 32, 480, 20, 16, -46, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 33, 576, 20, 8, 42, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 31, 400, 25, 11, -42, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 28, 512, 25, 16, 46, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 33, 464, 30, 15, -50, 1 + delay 2 return Move_FURY_CUTTER: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013, +63 - createvisualtask AnimTask_IsFuryCutterHitRight, 0x2 - jumpretfalse Anim_FuryCutterLeft - goto Anim_FuryCutterRight -Anim_FuryCutterContinue: - createvisualtask AnimTask_GetFuryCutterHitCount, 0x2 - jumpreteq 0x1, Anim_FuryCutterContinue2 - jumpreteq 0x2, Anim_FuryCutterMedium - jumpreteq 0x3, Anim_FuryCutterStrong - goto Anim_FuryCutterStrongest -Anim_FuryCutterContinue2: - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 + createvisualtask AnimTask_IsFuryCutterHitRight, 2 + jumpretfalse FuryCutterLeft + goto FuryCutterRight +FuryCutterContinue: + createvisualtask AnimTask_GetFuryCutterHitCount, 2 + jumpreteq 1, FuryCutterContinue2 + jumpreteq 2, FuryCutterMedium + jumpreteq 3, FuryCutterStrong + goto FuryCutterStrongest +FuryCutterContinue2: + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff waitforvisualfinish end - -Anim_FuryCutterLeft: - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - goto Anim_FuryCutterContinue - -Anim_FuryCutterRight: - createsprite gUnknown_08592A1C, 0x2, 40, -32, 1 - goto Anim_FuryCutterContinue - -Anim_FuryCutterMedium: - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 10505, 4, 0, 0 - goto Anim_FuryCutterContinue2 - -Anim_FuryCutterStrong: - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto Anim_FuryCutterContinue2 - -Anim_FuryCutterStrongest: - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto Anim_FuryCutterContinue2 +FuryCutterLeft: + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + goto FuryCutterContinue +FuryCutterRight: + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 1 + goto FuryCutterContinue +FuryCutterMedium: + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 10505, 4, 0, 0 + goto FuryCutterContinue2 +FuryCutterStrong: + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 10505, 4, 0, 0 + goto FuryCutterContinue2 +FuryCutterStrongest: + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 10505, 4, 0, 0 + goto FuryCutterContinue2 Move_SELF_DESTRUCT: loadspritegfx 0x27D6 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, RGB_RED - createvisualtask sub_80D52D0, 0x5, 4, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 5, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 6, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 7, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 8, 6, 0, 38, 1 - call Anim_SelfDestruct1 - call Anim_SelfDestruct1 + createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_RED + createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1 + call SelfDestruct1 + call SelfDestruct1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 9, 0, RGB_RED + createvisualtask sub_8116620, 10, 2, 1, 9, 0, RGB_RED end - -Anim_SelfDestruct1: +SelfDestruct1: playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + delay 6 return Move_SLAM: loadspritegfx 0x2748 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W004, -64 - createsprite gUnknown_0857FE70, 0x2, 0, 20, 3, 0, 4 - delay 0x1 - createsprite gUnknown_085928D0, 0x2, 0, 0 - delay 0x3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4 + delay 1 + createsprite gUnknown_085928D0, 2, 0, 0 + delay 3 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1537,157 +1515,157 @@ Move_SLAM: Move_VINE_WHIP: loadspritegfx 0x282F playsewithpan SE_W026, -64 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 6 playsewithpan SE_W010, +63 - createsprite gUnknown_085928E8, 0x82, 0, 0 - delay 0x6 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 1 + createsprite gUnknown_085928E8, 130, 0, 0 + delay 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27B2 - createsprite gUnknown_08592CD8, 0x2, 0 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - delay 0x2 - loopsewithpan SE_W030, +63, 0x4, 0x8 - createvisualtask sub_810EB88, 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + delay 2 + loopsewithpan SE_W030, +63, 4, 8 + createvisualtask sub_810EB88, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish - createsprite gUnknown_08592CD8, 0x2, 2 + createsprite gUnknown_08592CD8, 2, 2 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 waitforvisualfinish end Move_WATERFALL: loadspritegfx 0x27A4 - loadspritegfx 0x27AB - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 23, 1 - delay 0x5 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 + delay 5 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 10, 10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 10, 10, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, -15, 0, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -15, 0, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 20, 10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 20, 10, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 0, -10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 0, -10, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, -10, 15, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -10, 15, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 25, 20, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 25, 20, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, -20, 20, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -20, 20, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 12, 0, 25, 0 + createsprite gUnknown_08595238, 2, 12, 0, 25, 0 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE28, 0x2, 6, 5 - delay 0x6 - call Anim_UnderWaterAttack1 + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 5 + delay 6 + call UnderWaterAttack1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_UnderWaterAttack1: +UnderWaterAttack1: playsewithpan SE_W127, +63 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 17, 1 - createsprite gUnknown_08597388, 0x3, 0, 20, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 20 - createsprite gUnknown_08595250, 0x4, 0, 20 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 15, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 15 - createsprite gUnknown_08595250, 0x4, 0, 15 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 10, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 10 - createsprite gUnknown_08595250, 0x4, 0, 10 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 5, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 5 - createsprite gUnknown_08595250, 0x4, 0, 5 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 0 - createsprite gUnknown_08595250, 0x4, 0, 0 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -5, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -5 - createsprite gUnknown_08595250, 0x4, 0, -5 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -10, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -10 - createsprite gUnknown_08595250, 0x4, 0, -10 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -15, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -15 - createsprite gUnknown_08595250, 0x4, 0, -15 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -20, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -20 - createsprite gUnknown_08595250, 0x4, 0, -20 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1 + createsprite gUnknown_08597388, 3, 0, 20, 1, 1 + createsprite gUnknown_08595250, 4, 0, 20 + createsprite gUnknown_08595250, 4, 0, 20 + delay 2 + createsprite gUnknown_08597388, 3, 0, 15, 1, 1 + createsprite gUnknown_08595250, 4, 0, 15 + createsprite gUnknown_08595250, 4, 0, 15 + delay 2 + createsprite gUnknown_08597388, 3, 0, 10, 1, 1 + createsprite gUnknown_08595250, 4, 0, 10 + createsprite gUnknown_08595250, 4, 0, 10 + delay 2 + createsprite gUnknown_08597388, 3, 0, 5, 1, 1 + createsprite gUnknown_08595250, 4, 0, 5 + createsprite gUnknown_08595250, 4, 0, 5 + delay 2 + createsprite gUnknown_08597388, 3, 0, 0, 1, 1 + createsprite gUnknown_08595250, 4, 0, 0 + createsprite gUnknown_08595250, 4, 0, 0 + delay 2 + createsprite gUnknown_08597388, 3, 0, -5, 1, 1 + createsprite gUnknown_08595250, 4, 0, -5 + createsprite gUnknown_08595250, 4, 0, -5 + delay 2 + createsprite gUnknown_08597388, 3, 0, -10, 1, 1 + createsprite gUnknown_08595250, 4, 0, -10 + createsprite gUnknown_08595250, 4, 0, -10 + delay 2 + createsprite gUnknown_08597388, 3, 0, -15, 1, 1 + createsprite gUnknown_08595250, 4, 0, -15 + createsprite gUnknown_08595250, 4, 0, -15 + delay 2 + createsprite gUnknown_08597388, 3, 0, -20, 1, 1 + createsprite gUnknown_08595250, 4, 0, -20 + createsprite gUnknown_08595250, 4, 0, -20 return Move_EXPLOSION: loadspritegfx 0x27D6 - createsprite gUnknown_0859728C, 0x2, 1, 8, 9, 8474, 8, 0, 8 - createvisualtask sub_80D52D0, 0x5, 4, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 5, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 6, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 7, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 8, 8, 0, 40, 1 - call Anim_Explosion1 - call Anim_Explosion1 + createsprite gBattleAnimSpriteTemplate_859728C, 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 + createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1 + call Explosion1 + call Explosion1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 1, 16, 16, RGB_WHITE - delay 0x32 - createvisualtask sub_8116620, 0xA, 1, 3, 16, 0, RGB_WHITE + createvisualtask sub_8116620, 10, 1, 1, 16, 16, RGB_WHITE + delay 50 + createvisualtask sub_8116620, 10, 1, 3, 16, 0, RGB_WHITE end -Anim_Explosion1: +Explosion1: playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + delay 6 return Move_DEFENSE_CURL: loadspritegfx 0x27FA - loopsewithpan SE_W161, -64, 0x12, 0x3 - createvisualtask sub_811489C, 0x5, 0, 0 - createvisualtask sub_815B338, 0x5 + loopsewithpan SE_W161, -64, 0x12, 3 + createvisualtask sub_811489C, 5, 0, 0 + createvisualtask sub_815B338, 5 waitforvisualfinish - createsprite gUnknown_085CE338, 0x2, 0, 6, 0, 1 + createsprite gUnknown_085CE338, 2, 0, 6, 0, 1 waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 waitforvisualfinish end @@ -1695,149 +1673,145 @@ Move_PROTECT: loadspritegfx 0x2828 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - waitplaysewithpan SE_W115, -64, 0x10 - createsprite gUnknown_08592ADC, 0x2, 24, 0, 90 + waitplaysewithpan SE_W115, -64, 16 + createsprite gUnknown_08592ADC, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end Move_DETECT: loadspritegfx 0x2757 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, RGB_WHITE + createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE delay 0x12 playsewithpan SE_W197, -64 createsprite gUnknown_0853EE84, 0xD, 20, -20 waitforvisualfinish - delay 0xA - createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, RGB_BLACK - createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, RGB_WHITE + delay 10 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 9, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end Move_FRUSTRATION: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2767 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask AnimTask_GetHappinessPowerLevel, 0x1 - jumpreteq 0x0, Anim_Frustration_Strongest - jumpreteq 0x1, Anim_Frustration_Strong - jumpreteq 0x2, Anim_Frustration_Medium - goto Anim_Frustration_Weak -Anim_Frustration_Continue: + setalpha 12, 8 + createvisualtask AnimTask_GetFrustrationPowerLevel, 1 + jumpreteq 0, Frustration_Strongest + jumpreteq 1, Frustration_Strong + jumpreteq 2, Frustration_Medium + goto Frustration_Weak +Frustration_Continue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_Frustration_Strongest: +Frustration_Strongest: playsewithpan SE_W082, -64 - createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 - createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish - delay 0x14 + delay 20 playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0xA - createvisualtask sub_80D5EB8, 0x5, 0, 16, 6144, 8, 0 - delay 0x5 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 30, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 + delay 10 + createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER + delay 5 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 24, 8, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, -24, -16, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 8, 4, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, -16, 19, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, -18, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0 playsewithpan SE_W004, +63 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto Anim_Frustration_Continue - -Anim_Frustration_Strong: + createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 + goto Frustration_Continue +Frustration_Strong: playsewithpan SE_W082, -64 - createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 - createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish - delay 0x14 + delay 20 playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0x5 - createvisualtask sub_815C3A8, 0x5 - delay 0x7 + delay 5 + createvisualtask sub_815C3A8, 5 + delay 7 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 8, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + delay 14 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 12, -6, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + delay 14 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, -12, -6, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto Anim_Frustration_Continue - -Anim_Frustration_Medium: + createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 + goto Frustration_Continue +Frustration_Medium: playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 + delay 5 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x2, 10, 4, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x2, -10, -4, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 - goto Anim_Frustration_Continue - -Anim_Frustration_Weak: - createsprite gUnknown_085CE4D0, 0x2, 20, -28 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + goto Frustration_Continue +Frustration_Weak: + createsprite gUnknown_085CE4D0, 2, 20, -28 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE28, 0x2, 10, 2 - delay 0xC + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2 + delay 12 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 - goto Anim_Frustration_Continue + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + goto Frustration_Continue Move_SAFEGUARD: loadspritegfx 0x2804 monbg ANIM_ATK_PARTNER - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W208, -64 - createsprite gUnknown_08593C64, 0x2 - delay 0x4 - createsprite gUnknown_08593C64, 0x2 - delay 0x4 - createsprite gUnknown_08593C64, 0x2 + createsprite gUnknown_08593C64, 2 + delay 4 + createsprite gUnknown_08593C64, 2 + delay 4 + createsprite gUnknown_08593C64, 2 waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createvisualtask sub_8115A04, 0x2, 10, 0, 2, 0, 10, RGB_WHITE + createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -1845,61 +1819,61 @@ Move_SAFEGUARD: Move_PAIN_SPLIT: loadspritegfx 0x27FF - createsprite gUnknown_085CE590, 0x2, -8, -42, 0 - createsprite gUnknown_085CE590, 0x82, -8, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, -8, -42, 0 + createsprite gUnknown_085CE590, 130, -8, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 0 - createvisualtask sub_815CA20, 0x2, 1, 0 + createvisualtask sub_815CA20, 2, 0, 0 + createvisualtask sub_815CA20, 2, 1, 0 waitforvisualfinish - createsprite gUnknown_085CE590, 0x2, -24, -42, 0 - createsprite gUnknown_085CE590, 0x82, -24, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, -24, -42, 0 + createsprite gUnknown_085CE590, 130, -24, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 1 - createvisualtask sub_815CA20, 0x2, 1, 1 + createvisualtask sub_815CA20, 2, 0, 1 + createvisualtask sub_815CA20, 2, 1, 1 waitforvisualfinish - createsprite gUnknown_085CE590, 0x2, 8, -42, 0 - createsprite gUnknown_085CE590, 0x82, 8, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, 8, -42, 0 + createsprite gUnknown_085CE590, 130, 8, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 2 - createvisualtask sub_815CA20, 0x2, 1, 2 + createvisualtask sub_815CA20, 2, 0, 2 + createvisualtask sub_815CA20, 2, 1, 2 end Move_VICE_GRIP: - loadspritegfx 0x279A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, +63 - createsprite gUnknown_08593590, 0x2, 0 - createsprite gUnknown_08593590, 0x2, 1 + createsprite gUnknown_08593590, 2, 0 + createsprite gUnknown_08593590, 2, 1 delay 0x9 - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_GUILLOTINE: - loadspritegfx 0x279A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein playsewithpan SE_W011, +63 - createsprite gUnknown_085935D0, 0x2, 0 - createsprite gUnknown_085935D0, 0x2, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, RGB_BLACK + createsprite gUnknown_085935D0, 2, 0 + createsprite gUnknown_085935D0, 2, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK delay 0x9 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 23, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1 delay 0x2E - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 8, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -1910,17 +1884,17 @@ Move_GUILLOTINE: Move_PAY_DAY: loadspritegfx 0x2774 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, -64 - createsprite gUnknown_085934D8, 0x2, 20, 0, 0, 0, 1152 + createsprite gUnknown_085934D8, 2, 20, 0, 0, 0, 1152 waitforvisualfinish playsewithpan SE_W006, +63 - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2 - createsprite gUnknown_085934F0, 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 + createsprite gUnknown_085934F0, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1928,113 +1902,112 @@ Move_PAY_DAY: Move_OUTRAGE: loadspritegfx 0x272D - loopsewithpan SE_W082, -64, 0x8, 0x3 - createvisualtask sub_8115A04, 0x2, 7, 2, 5, 3, 8, RGB(14, 13, 0) - createvisualtask sub_80D5830, 0x2, 0, 12, 6, 5, 4 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3 - delay 0x0 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 40, 1 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 - call Anim_Outrage1 - call Anim_Outrage1 + loopsewithpan SE_W082, -64, 8, 3 + createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + delay 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 40, 1 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + call Outrage1 + call Outrage1 waitforvisualfinish end - -Anim_Outrage1: - delay 0x3 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3 +Outrage1: + delay 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 return Move_SPARK: - loadspritegfx 0x2797 - loadspritegfx 0x271B - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, RGB(31, 31, 22) + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_011 + delay 0 + createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, -64 - createsprite gUnknown_0859574C, 0x0, 32, 24, 190, 12, 0, 1, 0 - delay 0x0 - createsprite gUnknown_0859574C, 0x0, 80, 24, 22, 12, 0, 1, 0 - createsprite gUnknown_0859574C, 0x0, 156, 24, 121, 13, 0, 1, 1 - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - delay 0xA - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, RGB(31, 31, 22) + createsprite gBattleAnimSpriteTemplate_859574C, 0, 32, 24, 190, 12, 0, 1, 0 + delay 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 80, 24, 22, 12, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 156, 24, 121, 13, 0, 1, 1 + delay 0 + createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) + delay 10 + createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, -64 - createsprite gUnknown_0859574C, 0x0, 100, 24, 60, 10, 0, 1, 0 - createsprite gUnknown_0859574C, 0x0, 170, 24, 42, 11, 0, 1, 1 - delay 0x0 - createsprite gUnknown_0859574C, 0x0, 238, 24, 165, 10, 0, 1, 1 - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - delay 0x14 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 7, 7, RGB(31, 31, 22) + createsprite gBattleAnimSpriteTemplate_859574C, 0, 100, 24, 60, 10, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 170, 24, 42, 11, 0, 1, 1 + delay 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 238, 24, 165, 10, 0, 1, 1 + delay 0 + createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) + delay 20 + createvisualtask sub_8115A04, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) playsewithpan SE_W085B, -64 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 0, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 64, 20, 1, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 128, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 192, 20, 2, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 32, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 96, 20, 1, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 160, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 224, 20, 2, 0 - delay 0x4 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 0, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 64, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 128, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 192, 20, 2, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 32, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 96, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 160, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 224, 20, 2, 0 + delay 4 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x4 + createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 4 playsewithpan SE_W063, +63 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, -31, 2, 0, 6, RGB(31, 31, 22) - call Anim_ParalysisEffect + createvisualtask sub_8115A04, 2, 4, -31, 2, 0, 6, RGB(31, 31, 22) + call ElectricityEffect waitforvisualfinish end Move_ATTRACT: loadspritegfx 0x27E8 - loopsewithpan SE_W204, -64, 0xC, 0x3 - createvisualtask sub_80D5EB8, 0x5, 0, 12, 4096, 4, 0 - delay 0xF - createsprite gUnknown_085939A0, 0x83, 20, -8 + loopsewithpan SE_W204, -64, 12, 3 + createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER + delay 15 + createsprite gUnknown_085939A0, 131, 20, -8 waitforvisualfinish playsewithpan SE_W213, +63 - createsprite gUnknown_085939B8, 0x83, 160, -32 - createsprite gUnknown_085939B8, 0x83, -256, -40 - createsprite gUnknown_085939B8, 0x83, 128, -16 - createsprite gUnknown_085939B8, 0x83, 416, -38 - createsprite gUnknown_085939B8, 0x83, -128, -22 - createsprite gUnknown_085939B8, 0x83, -384, -31 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -32 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -40 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -16 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 0xF - createvisualtask sub_81062E8, 0x5 + waitplaysewithpan SE_W213B, 0, 15 + createvisualtask sub_81062E8, 5 createsprite gUnknown_085939D0, 0x28, 16, 256, 0 createsprite gUnknown_085939D0, 0x28, 224, 240, 15 createsprite gUnknown_085939D0, 0x28, 126, 272, 30 @@ -2044,38 +2017,37 @@ Move_ATTRACT: createsprite gUnknown_085939D0, 0x28, 112, 256, 90 createsprite gUnknown_085939D0, 0x28, 200, 272, 90 delay 0x4B - createvisualtask sub_8115A04, 0x2, 4, 4, 4, 0, 10, RGB(31, 25, 27) + createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end Move_GROWTH: - call Anim_Growth1 + call Growth1 waitforvisualfinish - call Anim_Growth1 + call Growth1 waitforvisualfinish end - -Anim_Growth1: - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE +Growth1: + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, -64 - createvisualtask sub_80D6064, 0x5, -3, -3, 16, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return Move_WHIRLWIND: loadspritegfx 0x27B2 - createsprite gUnknown_085963D4, 0x2, 0, -8, 1, 60, 0 - createsprite gUnknown_085963D4, 0x2, 0, 0, 1, 60, 1 - createsprite gUnknown_085963D4, 0x2, 0, 8, 1, 60, 2 - createsprite gUnknown_085963D4, 0x2, 0, 16, 1, 60, 3 - createsprite gUnknown_085963D4, 0x2, 0, 24, 1, 60, 4 - createsprite gUnknown_085963D4, 0x2, 0, 32, 1, 60, 0 - delay 0x5 - loopsewithpan SE_W104, +63, 0xA, 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 15, 1 + createsprite gUnknown_085963D4, 2, 0, -8, 1, 60, 0 + createsprite gUnknown_085963D4, 2, 0, 0, 1, 60, 1 + createsprite gUnknown_085963D4, 2, 0, 8, 1, 60, 2 + createsprite gUnknown_085963D4, 2, 0, 16, 1, 60, 3 + createsprite gUnknown_085963D4, 2, 0, 24, 1, 60, 4 + createsprite gUnknown_085963D4, 2, 0, 32, 1, 60, 0 + delay 5 + loopsewithpan SE_W104, +63, 10, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 delay 0x1D - createvisualtask sub_80D5830, 0x2, 1, 12, 6, 1, 5 - delay 0x7 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 + delay 7 playsewithpan SE_W081, +63 - createvisualtask sub_80D5DB0, 0x5, 1, 8 + createvisualtask sub_80D5DB0, 5, 1, 8 waitforvisualfinish end @@ -2084,15 +2056,15 @@ Move_CONFUSE_RAY: monbg ANIM_DEF_PARTNER fadetobg BG_GHOST waitbgfadein - createvisualtask sub_8159278, 0x2, -64, 63, 2, 0 - createvisualtask sub_8115C80, 0x2, 10013, 0, 6, 0, 14, 351 - createsprite gUnknown_08596D14, 0x82, 28, 0, 288 + createvisualtask sub_8159278, 2, -64, 63, 2, 0 + createvisualtask sub_8115C80, 2, 10013, 0, 6, 0, 14, 351 + createsprite gUnknown_08596D14, 130, 28, 0, 288 waitforvisualfinish - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W081B, +63 - createsprite gUnknown_08596D2C, 0x82, 0, -16 + createsprite gUnknown_08596D2C, 130, 0, -16 waitforvisualfinish - delay 0x0 + delay 0 blendoff clearmonbg ANIM_DEF_PARTNER restorebg @@ -2106,8 +2078,8 @@ Move_LOCK_ON: createsprite gUnknown_08592CB8, 0x28, 2 createsprite gUnknown_08592CB8, 0x28, 3 createsprite gUnknown_08592CB8, 0x28, 4 - delay 0x78 - setarg 0x7, 0xFFFF + delay 120 + setarg 7, 0xFFFF waitforvisualfinish end @@ -2115,103 +2087,103 @@ Move_MEAN_LOOK: loadspritegfx 0x27CB monbg ANIM_DEF_PARTNER playsewithpan SE_W060, -64 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK - loopsewithpan SE_W109, +63, 0xF, 0x4 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK + loopsewithpan SE_W109, +63, 15, 4 waitplaysewithpan SE_W043, +63, 0x55 - createsprite gUnknown_085CE104, 0x2 - delay 0x78 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK - delay 0x1E + createsprite gUnknown_085CE104, 2 + delay 120 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + delay 30 clearmonbg ANIM_DEF_PARTNER waitforvisualfinish end Move_ROCK_THROW: - loadspritegfx 0x274A - createsprite gUnknown_085972D8, 0x82, 6, 1, 15, 1 - createsprite gUnknown_08596B04, 0x82, 0, 1, 0, 0 + loadspritegfx ANIM_TAG_058 + createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1 + createsprite gUnknown_08596B04, 130, 0, 1, 0, 0 playsewithpan SE_W088, +63 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, 19, 1, 10, 0 playsewithpan SE_W088, +63 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, -23, 2, -10, 0 playsewithpan SE_W088, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 20, 1 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, -15, 1, -10, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 + delay 6 + createsprite gUnknown_08596B04, 130, -15, 1, -10, 0 playsewithpan SE_W088, +63 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, 23, 2, 10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, 23, 2, 10, 0 playsewithpan SE_W088, +63 waitforvisualfinish end Move_ROCK_SLIDE: - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER - createsprite gUnknown_085972D8, 0x2, 7, 1, 11, 1 - createsprite gUnknown_08596B04, 0x82, -5, 1, -5, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1 + createsprite gUnknown_08596B04, 130, -5, 1, -5, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 5, 0, 6, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 5, 0, 6, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 19, 1, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -23, 2, -10, 1 playsewithpan SE_W088, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 50, 1 - createvisualtask sub_80D51AC, 0x2, 3, 0, 5, 50, 1 - delay 0x2 - call Anim_RockSlide1 - call Anim_RockSlide1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1 + delay 2 + call RockSlide1 + call RockSlide1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_RockSlide1: - createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 +RockSlide1: + createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 28, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 28, 1, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -10, 1, -5, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -10, 1, -5, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 10, 0, 6, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 10, 0, 6, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 24, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 24, 1, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -32, 2, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -32, 2, -10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 30, 2, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 30, 2, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 + delay 2 return Move_THIEF: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - delay 0x1 + delay 1 fadetobg BG_DARK waitbgfadein - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x6 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 6 playsewithpan SE_W233, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 waitforvisualfinish - delay 0x14 + delay 20 clearmonbg ANIM_TARGET blendoff restorebg @@ -2220,77 +2192,75 @@ Move_THIEF: Move_BUBBLE_BEAM: loadspritegfx 0x27A2 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x1 - call Anim_Bulbblebeam1 - createvisualtask sub_80D5EB8, 0x5, 0, 3, 3072, 8, 1 - call Anim_Bulbblebeam1 - call Anim_Bulbblebeam1 + setalpha 12, 8 + delay 1 + call Bulbblebeam1 + createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_TARGET + call Bulbblebeam1 + call Bulbblebeam1 waitforvisualfinish - call Anim_BulbblebeamEffect + call WaterBubbleEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_Bulbblebeam1: - createsprite gUnknown_08595068, 0x2, 18, 0, 35, 70, 0, 256, 50 +Bulbblebeam1: + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 70, 0, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 20, 40, -10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 40, -10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 10, -60, 0, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -60, 0, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, -10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, -10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 + delay 3 return Move_ICY_WIND: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 loadspritegfx 0x279E monbg ANIM_DEF_PARTNER - createvisualtask sub_8116620, 0xA, 11, 4, 0, 4, RGB_BLACK + createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0x0 - call Anim_IcyWind1 - delay 0x5 - call Anim_IcyWind1 + panse_1B SE_W016, -64, +63, +2, 0 + call IcyWind1 + delay 5 + call IcyWind1 playsewithpan SE_W016B, +63 delay 0x37 - call Anim_IcyWindEffect2 + call IcyWindEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadeout - createvisualtask sub_8116620, 0xA, 11, 4, 4, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 11, 4, 4, 0, RGB_BLACK waitbgfadein end - -Anim_IcyWind1: +IcyWind1: createsprite gUnknown_08595B98, 0xA8, 0, 0, 0, 0, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, 10, 0, 10, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, -10, 0, -10, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, 15, 0, 15, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, -5, 0, -5, 72, 1 return @@ -2298,23 +2268,23 @@ Move_SMOKESCREEN: loadspritegfx 0x2720 loadspritegfx 0x2721 playsewithpan SE_W104, -64 - createsprite gUnknown_085CE050, 0x82, 20, 0, 0, 0, 35, -25 + createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25 waitforvisualfinish - createvisualtask sub_815A160, 0x2 - delay 0x2 + createvisualtask sub_815A160, 2 + delay 2 playsewithpan SE_W028, +63 - createsprite gUnknown_085CE038, 0x84, 0, -12, 104, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, -12, 72, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, -6, 56, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, -6, 88, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 0, 56, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 0, 88, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 6, 72, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 6, 104, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 12, 72, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 12, 56, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 18, 80, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 18, 72, 1, 75 + createsprite gUnknown_085CE038, 132, 0, -12, 104, 0, 75 + createsprite gUnknown_085CE038, 132, 0, -12, 72, 1, 75 + createsprite gUnknown_085CE038, 132, 0, -6, 56, 1, 75 + createsprite gUnknown_085CE038, 132, 0, -6, 88, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 0, 56, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 0, 88, 1, 75 + createsprite gUnknown_085CE038, 132, 0, 6, 72, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 6, 104, 1, 75 + createsprite gUnknown_085CE038, 132, 0, 12, 72, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 12, 56, 1, 75 + createsprite gUnknown_085CE038, 132, 0, 18, 80, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 18, 72, 1, 75 waitforvisualfinish end @@ -2322,50 +2292,50 @@ Move_CONVERSION: loadspritegfx 0x2722 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x10 - delay 0x0 + setalpha 16, 0 + delay 0 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, -24 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, -24 + delay 3 + createsprite gUnknown_08592E74, 2, -8, -24 + delay 3 + createsprite gUnknown_08592E74, 2, 8, -24 + delay 3 + createsprite gUnknown_08592E74, 2, 24, -24 + delay 3 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, -8 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, -8 + delay 3 + createsprite gUnknown_08592E74, 2, -8, -8 + delay 3 + createsprite gUnknown_08592E74, 2, 8, -8 + delay 3 + createsprite gUnknown_08592E74, 2, 24, -8 + delay 3 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, 8 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, 8 + delay 3 + createsprite gUnknown_08592E74, 2, -8, 8 + delay 3 + createsprite gUnknown_08592E74, 2, 8, 8 + delay 3 + createsprite gUnknown_08592E74, 2, 24, 8 + delay 3 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, 24 - delay 0x14 + createsprite gUnknown_08592E74, 2, -24, 24 + delay 3 + createsprite gUnknown_08592E74, 2, -8, 24 + delay 3 + createsprite gUnknown_08592E74, 2, 8, 24 + delay 3 + createsprite gUnknown_08592E74, 2, 24, 24 + delay 20 playsewithpan SE_W112, -64 - createvisualtask sub_8115D94, 0x2, 10018, 1, 1, 14335, 12, 0, 0 - delay 0x6 - createvisualtask sub_81022D4, 0x5 + createvisualtask sub_8115D94, 2, 10018, 1, 1, 14335, 12, 0, 0 + delay 6 + createvisualtask sub_81022D4, 5 waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_ATK_PARTNER blendoff end @@ -2374,41 +2344,41 @@ Move_CONVERSION_2: loadspritegfx 0x2722 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x1000 - delay 0x0 + setalpha 0, 16 + delay 0 playsewithpan SE_W112, +63 - createsprite gUnknown_08592EA4, 0x2, -24, -24, 60 - createsprite gUnknown_08592EA4, 0x2, -8, -24, 65 - createsprite gUnknown_08592EA4, 0x2, 8, -24, 70 - createsprite gUnknown_08592EA4, 0x2, 24, -24, 75 - createsprite gUnknown_08592EA4, 0x2, -24, -8, 80 - createsprite gUnknown_08592EA4, 0x2, -8, -8, 85 - createsprite gUnknown_08592EA4, 0x2, 8, -8, 90 - createsprite gUnknown_08592EA4, 0x2, 24, -8, 95 - createsprite gUnknown_08592EA4, 0x2, -24, 8, 100 - createsprite gUnknown_08592EA4, 0x2, -8, 8, 105 - createsprite gUnknown_08592EA4, 0x2, 8, 8, 110 - createsprite gUnknown_08592EA4, 0x2, 24, 8, 115 - createsprite gUnknown_08592EA4, 0x2, -24, 24, 120 - createsprite gUnknown_08592EA4, 0x2, -8, 24, 125 - createsprite gUnknown_08592EA4, 0x2, 8, 24, 130 - createsprite gUnknown_08592EA4, 0x2, 24, 24, 135 - createvisualtask sub_81023E0, 0x5 - delay 0x3C + createsprite gUnknown_08592EA4, 2, -24, -24, 60 + createsprite gUnknown_08592EA4, 2, -8, -24, 65 + createsprite gUnknown_08592EA4, 2, 8, -24, 70 + createsprite gUnknown_08592EA4, 2, 24, -24, 75 + createsprite gUnknown_08592EA4, 2, -24, -8, 80 + createsprite gUnknown_08592EA4, 2, -8, -8, 85 + createsprite gUnknown_08592EA4, 2, 8, -8, 90 + createsprite gUnknown_08592EA4, 2, 24, -8, 95 + createsprite gUnknown_08592EA4, 2, -24, 8, 100 + createsprite gUnknown_08592EA4, 2, -8, 8, 105 + createsprite gUnknown_08592EA4, 2, 8, 8, 110 + createsprite gUnknown_08592EA4, 2, 24, 8, 115 + createsprite gUnknown_08592EA4, 2, -24, 24, 120 + createsprite gUnknown_08592EA4, 2, -8, 24, 125 + createsprite gUnknown_08592EA4, 2, 8, 24, 130 + createsprite gUnknown_08592EA4, 2, 24, 24, 135 + createvisualtask sub_81023E0, 5 + delay 60 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -2416,364 +2386,361 @@ Move_CONVERSION_2: end Move_ROLLING_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W104, -64 - delay 0x6 + delay 6 playsewithpan SE_W104, -64 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 0x2, -24, 0, 48, 10, 160, 0 - delay 0x5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, 2, -24, 0, 48, 10, 160, 0 + delay 5 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 1, 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 8 clearmonbg ANIM_TARGET blendoff end Move_HEADBUTT: - loadspritegfx 0x2797 - createsprite gUnknown_08592CD8, 0x2, 0 + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 0x2, 2 - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gUnknown_08592CD8, 2, 2 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W233B, +63 waitforvisualfinish end Move_HORN_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2724 - createsprite gUnknown_08592CD8, 0x2, 0 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - createsprite gUnknown_08592F44, 0x84, 0, 0, 10 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592F44, 132, 0, 0, 10 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 0x2, 2 - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gUnknown_08592CD8, 2, 2 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, +63 waitforvisualfinish end Move_FURY_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2724 - createvisualtask sub_80D6134, 0x2, 4, 256, 0, 2 - choosetwoturnanim Anim_FuryAttackRight, Anim_FuryAttackLeft -Anim_FuryAttackContinue: - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createvisualtask sub_80D6134, 2, 4, 256, 0, 2 + choosetwoturnanim FuryAttackRight, FuryAttackLeft +FuryAttackContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish end -Anim_FuryAttackRight: - createsprite gUnknown_08592F44, 0x84, 8, 8, 10 +FuryAttackRight: + createsprite gUnknown_08592F44, 132, 8, 8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, +63 - goto Anim_FuryAttackContinue + goto FuryAttackContinue -Anim_FuryAttackLeft: - createsprite gUnknown_08592F44, 0x84, -8, -8, 10 +FuryAttackLeft: + createsprite gUnknown_08592F44, 132, -8, -8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, +63 - goto Anim_FuryAttackContinue + goto FuryAttackContinue Move_HORN_DRILL: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2724 - jumpifcontest Anim_HornDrillInContest + jumpifcontest HornDrillInContest fadetobg BG_DRILL waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 -Anim_HornDrillContinue: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +HornDrillContinue: waitbgfadein - setalpha 0x80C - createsprite gUnknown_08592CD8, 0x2, 0 + setalpha 12, 8 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - createsprite gUnknown_08592F44, 0x84, 0, 0, 12 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592F44, 132, 0, 0, 12 waitforvisualfinish playse SE_BAN - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 0, 2, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 0, 2, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -4, 3, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, -4, 3, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -8, -5, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, -8, -5, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 4, -12, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 4, -12, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 16, 0, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 16, 0, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 5, 18, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 5, 18, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -17, 12, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, -17, 12, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -21, -15, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, -21, -15, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 8, -27, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, 8, -27, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 32, 0, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, 32, 0, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_08592CD8, 0x2, 2 + delay 4 + createsprite gUnknown_08592CD8, 2, 2 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end -Anim_HornDrillInContest: +HornDrillInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto Anim_HornDrillContinue + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto HornDrillContinue Move_THRASH: - loadspritegfx 0x2797 - loadspritegfx 0x279F - createvisualtask sub_8104C38, 0x2 - createvisualtask sub_8104CA4, 0x2 - createsprite gUnknown_08595EB0, 0x83, 1, 10, 0 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + createvisualtask sub_8104C38, 2 + createvisualtask sub_8104CA4, 2 + createsprite gUnknown_08595EB0, 131, 1, 10, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W004, +63 delay 0x1C - createsprite gUnknown_08595EB0, 0x83, 1, 10, 1 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 + createsprite gUnknown_08595EB0, 131, 1, 10, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W233B, +63 delay 0x1C - createsprite gUnknown_08595EB0, 0x83, 1, 10, 3 - createvisualtask sub_80D5484, 0x2, 1, 8, 0, 16, 1 + createsprite gUnknown_08595EB0, 131, 1, 10, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, +63 end Move_SING: - loadspritegfx 0x2758 + loadspritegfx ANIM_TAG_072 monbg ANIM_DEF_PARTNER - createvisualtask sub_8102BE8, 0x2 + createvisualtask sub_8102BE8, 2 waitforvisualfinish - panse_1B SE_W047, -64, +63, +2, 0x0 - createsprite gUnknown_08593008, 0x82, 7, 0, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 6, 1, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 1, 2, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 2, 3, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 3, 0, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 2, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 6, 3, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 0, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 1, 2, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 3, 12 - delay 0x4 + panse_1B SE_W047, -64, +63, +2, 0 + createsprite gUnknown_08593008, 130, 7, 0, 12 + delay 5 + createsprite gUnknown_08593008, 130, 6, 1, 12 + delay 5 + createsprite gUnknown_08593008, 130, 1, 2, 12 + delay 5 + createsprite gUnknown_08593008, 130, 2, 3, 12 + delay 5 + createsprite gUnknown_08593008, 130, 3, 0, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 12 + delay 4 + createsprite gUnknown_08593008, 130, 5, 2, 12 + delay 4 + createsprite gUnknown_08593008, 130, 6, 3, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 0, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 12 + delay 4 + createsprite gUnknown_08593008, 130, 1, 2, 12 + delay 4 + createsprite gUnknown_08593008, 130, 5, 3, 12 + delay 4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - createvisualtask sub_8102CA0, 0x2 + createvisualtask sub_8102CA0, 2 waitforvisualfinish end Move_LOW_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 0x82, -24, 28, 40, 8, 160, 0 - delay 0x4 - createsprite gUnknown_08597358, 0x82, -8, 8, 1, 2 - createvisualtask sub_80D6134, 0x2, 6, 384, 1, 2 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2 + createvisualtask sub_80D6134, 2, 6, 384, 1, 2 playsewithpan SE_W233B, +63 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4 end Move_EARTHQUAKE: - createvisualtask sub_81152DC, 0x5, 5, 10, 50 - createvisualtask sub_81152DC, 0x5, 4, 10, 50 + createvisualtask sub_81152DC, 5, 5, 10, 50 + createvisualtask sub_81152DC, 5, 4, 10, 50 playsewithpan SE_W089, 0 - delay 0xA - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0x10 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 10 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 16 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 end Move_FISSURE: - loadspritegfx 0x275A - createvisualtask sub_81152DC, 0x3, 5, 10, 50 - createvisualtask sub_81152DC, 0x3, 1, 10, 50 + loadspritegfx ANIM_TAG_074 + createvisualtask sub_81152DC, 3, 5, 10, 50 + createvisualtask sub_81152DC, 3, 1, 10, 50 playsewithpan SE_W089, +63 - delay 0x8 - call Anim_Fissure1 - delay 0xF - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0xF - call Anim_Fissure2 - delay 0xF - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0xF - call Anim_Fissure1 - delay 0x32 + delay 8 + call Fissure1 + delay 15 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 15 + call Fissure2 + delay 15 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 15 + call Fissure1 + delay 50 fadetobg BG_FISSURE waitbgfadeout - createvisualtask sub_8115628, 0x5, 1, 5, -1 + createvisualtask sub_8115628, 5, 1, 5, -1 waitbgfadein delay 0x28 restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end -Anim_Fissure1: - createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -48, -16, 24 - createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -16, -10, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -52, -18, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -32, -16, 24 +Fissure1: + createsprite gUnknown_085971FC, 130, 1, 0, 12, -48, -16, 24 + createsprite gUnknown_085971FC, 130, 1, 0, 16, -16, -10, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 14, -52, -18, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 12, -32, -16, 24 playsewithpan SE_W091, +63 return -Anim_Fissure2: - createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -24, -16, 24 - createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -38, -10, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -20, -18, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -36, -16, 24 +Fissure2: + createsprite gUnknown_085971FC, 130, 1, 0, 12, -24, -16, 24 + createsprite gUnknown_085971FC, 130, 1, 0, 16, -38, -10, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 14, -20, -18, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 12, -36, -16, 24 playsewithpan SE_W091, +63 return Move_DIG: - choosetwoturnanim Anim_DigSetUp, Anim_DigUnleash -Anim_DigEnd: + choosetwoturnanim DigSetUp, DigUnleash +DigEnd: end - -Anim_DigSetUp: - loadspritegfx 0x275A +DigSetUp: + loadspritegfx ANIM_TAG_074 loadspritegfx 0x2829 - createsprite gUnknown_08597214, 0x1, 0, 0, 180 - createsprite gUnknown_08597214, 0x1, 0, 1, 180 + createsprite gUnknown_08597214, 1, 0, 0, 180 + createsprite gUnknown_08597214, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8114CBC, 0x2, 0 - delay 0x6 - call Anim_DigSetUp1 - call Anim_DigSetUp1 - call Anim_DigSetUp1 - call Anim_DigSetUp1 - call Anim_DigSetUp1 + delay 1 + createvisualtask sub_8114CBC, 2, 0 + delay 6 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 waitforvisualfinish clearmonbg_23 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8114CBC, 0x2, 1 - goto Anim_DigEnd - -Anim_DigUnleash: - loadspritegfx 0x2797 + delay 1 + createvisualtask sub_8114CBC, 2, 1 + goto DigEnd +DigUnleash: + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2829 - createvisualtask sub_8114F14, 0x2, 0 + createvisualtask sub_8114F14, 2, 0 waitforvisualfinish monbg ANIM_ATTACKER - createsprite gUnknown_08597214, 0x1, 0, 0, 48 - createsprite gUnknown_08597214, 0x1, 0, 1, 48 - delay 0x1 - createvisualtask sub_8114F14, 0x2, 1 - delay 0x10 - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createsprite gUnknown_08597214, 1, 0, 0, 48 + createsprite gUnknown_08597214, 1, 0, 1, 48 + delay 1 + createvisualtask sub_8114F14, 2, 1 + delay 16 + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 playsewithpan SE_W025B, -64 clearmonbg ANIM_ATTACKER - goto Anim_DigEnd - -Anim_DigSetUp1: - createsprite gUnknown_085971FC, 0x2, 0, 0, 12, 4, -16, 18 - createsprite gUnknown_085971FC, 0x2, 0, 0, 16, 4, -10, 18 - createsprite gUnknown_085971FC, 0x2, 0, 1, 14, 4, -18, 18 - createsprite gUnknown_085971FC, 0x2, 0, 1, 12, 4, -16, 18 + goto DigEnd +DigSetUp1: + createsprite gUnknown_085971FC, 2, 0, 0, 12, 4, -16, 18 + createsprite gUnknown_085971FC, 2, 0, 0, 16, 4, -10, 18 + createsprite gUnknown_085971FC, 2, 0, 1, 14, 4, -18, 18 + createsprite gUnknown_085971FC, 2, 0, 1, 12, 4, -16, 18 playsewithpan SE_W091, -64 delay 0x20 return Move_MEDITATE: - call Anim_SetPsychicBackground - createvisualtask sub_810F7D4, 0x2 + call SetPsychicBackground + createvisualtask sub_810F7D4, 2 playsewithpan SE_W029, -64 - delay 0x10 + delay 16 playsewithpan SE_W036, -64 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_AGILITY: monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 4, 4 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 10 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 + createvisualtask sub_81169C0, 2, 0, 4, 7, 10 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_QUICK_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask sub_81169C0, 2, 0, 4, 7, 3 playsewithpan SE_W026, -64 - delay 0x4 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08597358, 0x84, 0, 0, 1, 1 + delay 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2782,321 +2749,317 @@ Move_QUICK_ATTACK: end Move_RAGE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2767 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80A7B98, 0x3, 0, RGB_RED, 10, 0, 2 - createsprite gUnknown_0859368C, 0x2, 0, -20, -28 + setalpha 12, 8 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 + createsprite gUnknown_0859368C, 2, 0, -20, -28 playsewithpan SE_W207B, -64 - delay 0x14 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + delay 20 + createsprite gUnknown_0859368C, 2, 0, 20, -28 playsewithpan SE_W207B, -64 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x4 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x2, 1, 1, 10, 1, 0 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_TARGET end Move_TELEPORT: - call Anim_SetPsychicBackground - createvisualtask sub_810F83C, 0x2 + call SetPsychicBackground + createvisualtask sub_810F83C, 2 playsewithpan SE_W100, -64 - delay 0xF - call Anim_UnsetPsychicBackground + delay 15 + call UnsetPsychicBackground waitforvisualfinish end Move_DOUBLE_TEAM: - createvisualtask sub_81029B4, 0x2 - setalpha 0x80C + createvisualtask sub_81029B4, 2 + setalpha 12, 8 monbg ANIM_ATK_PARTNER playsewithpan SE_W104, -64 delay 0x20 playsewithpan SE_W104, -64 - delay 0x18 + delay 24 playsewithpan SE_W104, -64 - delay 0x10 + delay 16 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_MINIMIZE: - setalpha 0x80A - createvisualtask sub_8104674, 0x2 - loopsewithpan SE_W107, -64, 0x22, 0x3 + setalpha 10, 8 + createvisualtask sub_8104674, 2 + loopsewithpan SE_W107, -64, 0x22, 3 waitforvisualfinish blendoff end Move_METRONOME: loadspritegfx 0x2750 - loadspritegfx 0x27E1 - createsprite gUnknown_08593114, 0xB, 0, 100 + loadspritegfx ANIM_TAG_209 + createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, -64 - delay 0x6 - createsprite gUnknown_085931BC, 0xC, 0 - delay 0x18 - loopsewithpan SE_W039, -64, 0x16, 0x3 + delay 6 + createsprite gUnknown_085931BC, 12, 0 + delay 24 + loopsewithpan SE_W039, -64, 0x16, 3 waitforvisualfinish end Move_SKULL_BASH: - choosetwoturnanim Anim_SkullBashSetUp, Anim_SkullBashAttack -Anim_SkullBashEnd: + choosetwoturnanim SkullBashSetUp, SkullBashAttack +SkullBashEnd: end -Anim_SkullBashSetUp: - call Anim_SkullBashSetUp1 - call Anim_SkullBashSetUp1 +SkullBashSetUp: + call SkullBashSetUp1 + call SkullBashSetUp1 waitforvisualfinish - goto Anim_SkullBashEnd + goto SkullBashEnd -Anim_SkullBashSetUp1: - createsprite gUnknown_0857FE88, 0x2, 0, -24, 0, 0, 10, 0 +SkullBashSetUp1: + createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0 playsewithpan SE_W036, -64 waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 16, 96, 0, 2 + createvisualtask sub_80D6134, 2, 16, 96, 0, 2 waitforvisualfinish - createsprite gUnknown_0857FE88, 0x2, 0, 24, 0, 0, 10, 1 + createsprite gUnknown_0857FE88, 2, 0, 24, 0, 0, 10, 1 waitforvisualfinish return -Anim_SkullBashAttack: - loadspritegfx 0x2797 - createvisualtask sub_8101C94, 0x2, 0 +SkullBashAttack: + loadspritegfx ANIM_TAG_135 + createvisualtask sub_8101C94, 2, 0 playsewithpan SE_W036, -64 waitforvisualfinish playse SE_BAN - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 0x84, 0, 0, 1, 0 - loopsewithpan SE_W025B, +63, 0x8, 0x3 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_085973E8, 132, 0, 0, 1, 0 + loopsewithpan SE_W025B, +63, 8, 3 waitforvisualfinish - createvisualtask sub_8101C94, 0x2, 1 - goto Anim_SkullBashEnd + createvisualtask sub_8101C94, 2, 1 + goto SkullBashEnd Move_AMNESIA: loadspritegfx 0x276D - call Anim_SetPsychicBackground - delay 0x8 - createsprite gUnknown_08596744, 0x14 + call SetPsychicBackground + delay 8 + createsprite gUnknown_08596744, 20 playsewithpan SE_W118, -64 delay 0x36 - loopsewithpan SE_W118, -64, 0x10, 0x3 + loopsewithpan SE_W118, -64, 16, 3 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_KINESIS: loadspritegfx 0x275B loadspritegfx 0x2771 playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - createsprite gUnknown_085966DC, 0x14 - createsprite gUnknown_08593344, 0x13, 32, -8, 0 - createsprite gUnknown_08593344, 0x13, 32, 16, 1 - loopsewithpan SE_W109, -64, 0x15, 0x2 - delay 0x3C + call SetPsychicBackground + createsprite gUnknown_085966DC, 20 + createsprite gUnknown_08593344, 19, 32, -8, 0 + createsprite gUnknown_08593344, 19, 32, 16, 1 + loopsewithpan SE_W109, -64, 0x15, 2 + delay 60 playsewithpan SE_W146, -64 - delay 0x1E - loopsewithpan SE_W146, -64, 0x14, 0x2 - delay 0x46 + delay 30 + loopsewithpan SE_W146, -64, 20, 2 + delay 70 playsewithpan SE_W207B, -64 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_GLARE: loadspritegfx 0x2808 loadspritegfx 0x27EA - createvisualtask sub_815E114, 0x5, 0 + createvisualtask sub_815E114, 5, 0 playsewithpan SE_W060B, -64 waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 0, 16, RGB_BLACK + createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 - createvisualtask sub_81064F8, 0x5 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 + createvisualtask sub_81064F8, 5 playsewithpan SE_W043, -64 - delay 0x2 - createvisualtask sub_810A094, 0x3, 20, 1, 0 + delay 2 + createvisualtask sub_810A094, 3, 20, 1, 0 waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 16, 0, RGB_BLACK + createvisualtask sub_8116620, 5, 1, 0, 16, 0, RGB_BLACK end Move_BARRAGE: loadspritegfx 0x280E - createvisualtask sub_815E47C, 0x3 + createvisualtask sub_815E47C, 3 playsewithpan SE_W207, -64 - delay 0x18 - createsprite gUnknown_085972D8, 0x2, 8, 1, 40, 1 - createvisualtask sub_80D51AC, 0x3, 1, 0, 4, 20, 1 - createvisualtask sub_80D51AC, 0x3, 3, 0, 4, 20, 1 - loopsewithpan SE_W070, +63, 0x8, 0x2 + delay 24 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 8, 1, 40, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1 + loopsewithpan SE_W070, +63, 8, 2 end Move_SKY_ATTACK: - choosetwoturnanim Anim_SkyAttackSetUp, Anim_SkyAttackUnleash -Anim_SkyAttackEnd: + choosetwoturnanim SkyAttackSetUp, SkyAttackUnleash +SkyAttackEnd: end - -Anim_SkyAttackSetUp: +SkyAttackSetUp: monbg ANIM_DEF_PARTNER - setalpha 0xB0C - createvisualtask AnimTask_IsTargetPartner, 0x5, ARG_RET_ID - jumpretfalse Anim_SkyAttackSetUpAgainstOpponent - goto Anim_SkyAttackSetUpAgainstPartner - -Anim_SkyAttackSetUpAgainstOpponent: - createvisualtask sub_8116620, 0xA, 27, 1, 0, 12, RGB_BLACK + setalpha 12, 11 + createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID + jumpretfalse SkyAttackSetUpAgainstOpponent + goto SkyAttackSetUpAgainstPartner +SkyAttackSetUpAgainstOpponent: + createvisualtask sub_8116620, 10, 27, 1, 0, 12, RGB_BLACK waitforvisualfinish - delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, RGB_BLACK - createvisualtask sub_81152DC, 0x5, 0, 2, 16 - loopsewithpan SE_W287, -64, 0x4, 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, RGB_WHITE - delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, RGB_WHITE + delay 12 + createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK + createvisualtask sub_81152DC, 5, 0, 2, 16 + loopsewithpan SE_W287, -64, 4, 8 + createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE + delay 20 + createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_8116620, 0xA, 25, 1, 8, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_SkyAttackEnd - -Anim_SkyAttackSetUpAgainstPartner: - createvisualtask sub_8116664, 0xA, 1, 1, 0, 12, 0 + goto SkyAttackEnd +SkyAttackSetUpAgainstPartner: + createvisualtask sub_8116664, 10, 1, 1, 0, 12, 0 waitforvisualfinish - delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, RGB_BLACK - createvisualtask sub_81152DC, 0x5, 0, 2, 16 + delay 12 + createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK + createvisualtask sub_81152DC, 5, 0, 2, 16 playsewithpan SE_W287, -64 - delay 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, RGB_WHITE - delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, RGB_WHITE + delay 8 + createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE + delay 20 + createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_8116664, 0xA, 4, 1, 8, 0, 0 + createvisualtask sub_8116664, 10, 4, 1, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_SkyAttackEnd - -Anim_SkyAttackUnleash: - loadspritegfx 0x2797 + goto SkyAttackEnd +SkyAttackUnleash: + loadspritegfx ANIM_TAG_135 loadspritegfx 0x282C - call Anim_SetFlyingBg + call SetFlyingBg monbg ANIM_ATTACKER - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, RGB_WHITE - delay 0x4 - createvisualtask sub_81136E8, 0x5, 0 + createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE + delay 4 + createvisualtask sub_81136E8, 5, 0 waitforvisualfinish - createvisualtask sub_8159244, 0x5, 238, -64 - createsprite gUnknown_08596514, 0x82 - delay 0xE - createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x14 - createvisualtask sub_81137E4, 0x5, 1 - delay 0x2 - createvisualtask sub_8116620, 0xA, 2, 0, 15, 0, RGB_WHITE + createvisualtask sub_8159244, 5, 238, -64 + createsprite gUnknown_08596514, 130 + delay 14 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 + createvisualtask sub_8159210, 5, 141, 63 + delay 20 + createvisualtask sub_81137E4, 5, 1 + delay 2 + createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATTACKER - call Anim_UnsetFlyingBg - goto Anim_SkyAttackEnd + call UnsetFlyingBg + goto SkyAttackEnd Move_FLASH: playsewithpan SE_W043, -64 - createvisualtask sub_8117494, 0x2 + createvisualtask sub_8117494, 2 waitforvisualfinish end Move_SPLASH: - createvisualtask sub_8104938, 0x2, 0, 3 - delay 0x8 - loopsewithpan SE_W039, -64, 0x26, 0x3 + createvisualtask sub_8104938, 2, 0, 3 + delay 8 + loopsewithpan SE_W039, -64, 0x26, 3 waitforvisualfinish end Move_ACID_ARMOR: monbg ANIM_ATTACKER - setalpha 0xF - createvisualtask sub_815D240, 0x2, 0 + setalpha 15, 0 + createvisualtask sub_815D240, 2, 0 playsewithpan SE_W151, -64 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_SHARPEN: loadspritegfx 0x27C9 - createsprite gUnknown_08592DE4, 0x2 + createsprite gUnknown_08592DE4, 2 waitforvisualfinish end Move_SUPER_FANG: loadspritegfx 0x27D0 - createvisualtask sub_80D5484, 0x2, 0, 1, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, -64 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1 - createvisualtask sub_80A7B98, 0x2, 0, RGB(31, 6, 1), 12, 4, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1 waitforvisualfinish - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x4 - createsprite gUnknown_08592F74, 0x82 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 4 + createsprite gUnknown_08592F74, 130 playsewithpan SE_W044, +63 - delay 0x8 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 2143, 14, 0x7FFF, 14 - createvisualtask sub_80D51AC, 0x2, 1, 0, 7, 12, 1 + delay 8 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 2143, 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH: loadspritegfx 0x27C7 - createsprite gUnknown_08592D2C, 0x82, 1, -8, 0 + createsprite gUnknown_08592D2C, 130, 1, -8, 0 playsewithpan SE_W013, +63 - delay 0x4 - createsprite gUnknown_08592D2C, 0x82, 1, 8, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 + delay 4 + createsprite gUnknown_08592D2C, 130, 1, 8, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 playsewithpan SE_W013, +63 waitforvisualfinish end Move_STRUGGLE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27E7 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5484, 0x2, 0, 3, 0, 12, 4 - createsprite gUnknown_08593B80, 0x2, 0, 0, 2 - createsprite gUnknown_08593B80, 0x2, 0, 1, 2 - loopsewithpan SE_W029, -64, 0xC, 0x4 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 + createsprite gUnknown_08593B80, 2, 0, 0, 2 + createsprite gUnknown_08593B80, 2, 0, 1, 2 + loopsewithpan SE_W029, -64, 12, 4 waitforvisualfinish - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -3106,31 +3069,30 @@ Move_STRUGGLE: Move_SKETCH: loadspritegfx 0x2712 monbg ANIM_TARGET - createvisualtask sub_8104E74, 0x2 - createsprite gUnknown_085936D4, 0x82 + createvisualtask sub_8104E74, 2 + createsprite gUnknown_085936D4, 130 waitforvisualfinish clearmonbg ANIM_TARGET - createvisualtask sub_8104938, 0x2, 0, 2 - loopsewithpan SE_W039, -64, 0x26, 0x2 + createvisualtask sub_8104938, 2, 0, 2 + loopsewithpan SE_W039, -64, 0x26, 2 end Move_NIGHTMARE: fadetobg BG_GHOST waitbgfadein - jumpifcontest Anim_NightmareInContest + jumpifcontest NightmareInContest monbg ANIM_DEF_PARTNER - createvisualtask sub_8111C50, 0x2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 40, 1 + createvisualtask sub_8111C50, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 playsewithpan SE_W171, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadein end - -Anim_NightmareInContest: - createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1 - createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1 +NightmareInContest: + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1 playsewithpan SE_W171, +63 waitforvisualfinish restorebg @@ -3138,14 +3100,14 @@ Anim_NightmareInContest: end Move_FLAIL: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_815C770, 0x2, 0 - loopsewithpan SE_W029, -64, 0x8, 0x2 + setalpha 12, 8 + createvisualtask sub_815C770, 2, 0 + loopsewithpan SE_W029, -64, 8, 2 waitforvisualfinish - createsprite gUnknown_085973A0, 0x83, 1, 3 - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 + createsprite gUnknown_085973A0, 131, 1, 3 + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -3157,9 +3119,9 @@ Move_SPITE: playsewithpan SE_W060, -64 waitbgfadein monbg ANIM_DEF_PARTNER - createvisualtask sub_8115A04, 0x2, 2, 2, 6, 0, 8, RGB_WHITE - createvisualtask sub_8111E50, 0x2 - loopsewithpan SE_W060, +63, 0x14, 0x3 + createvisualtask sub_8115A04, 2, 2, 2, 6, 0, 8, RGB_WHITE + createvisualtask sub_8111E50, 2 + loopsewithpan SE_W060, +63, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3167,51 +3129,50 @@ Move_SPITE: end Move_MACH_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_ATK_PARTNER - createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 - jumprettrue Anim_MachPunchAgainstPlayer + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT -Anim_MachPunchContinue: +MachPunchContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein - delay 0x0 - setalpha 0x809 - createvisualtask sub_80A8BC4, 0x2, 28968, 10 + delay 0 + setalpha 9, 8 + createvisualtask sub_80A8BC4, 2, 28968, 10 playsewithpan SE_W026, -64 - delay 0x6 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W004, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end - -Anim_MachPunchAgainstPlayer: +MachPunchAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto Anim_MachPunchContinue + goto MachPunchContinue Move_FORESIGHT: loadspritegfx 0x2812 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x10 - createsprite gUnknown_085CE8C4, 0x82, 1 - delay 0x11 - loopsewithpan SE_W166, +63, 0x10, 0x4 - delay 0x30 - delay 0x18 + setalpha 16, 0 + createsprite gUnknown_085CE8C4, 130, 1 + delay 17 + loopsewithpan SE_W166, +63, 16, 4 + delay 48 + delay 24 playsewithpan SE_W166, +63 - delay 0xA - createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 2, 1 + delay 10 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 playsewithpan SE_W197, +63 waitforvisualfinish blendoff @@ -3223,13 +3184,13 @@ Move_DESTINY_BOND: fadetobg BG_GHOST playsewithpan SE_W060, -64 waitbgfadein - createvisualtask sub_81123C4, 0x5, 0, 48 + createvisualtask sub_81123C4, 5, 0, 48 playsewithpan SE_W109, -64 - delay 0x30 - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 24, 1 - createvisualtask sub_8116664, 0x2, 6, 1, 0, 12, 30653 - delay 0x18 - createvisualtask sub_8116664, 0x2, 6, 1, 12, 0, 30653 + delay 48 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 + createvisualtask sub_8116664, 2, 6, 1, 0, 12, 30653 + delay 24 + createvisualtask sub_8116664, 2, 6, 1, 12, 0, 30653 playsewithpan SE_W171, +63 waitforvisualfinish restorebg @@ -3241,53 +3202,53 @@ Move_DESTINY_BOND: Move_ENDURE: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call Anim_EndureEffect - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call Anim_EndureEffect - delay 0x8 - call Anim_EndureEffect + call EndureEffect + delay 8 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + call EndureEffect + delay 8 + call EndureEffect waitforvisualfinish end -Anim_EndureEffect: - createsprite gUnknown_08592D8C, 0x2, 0, -24, 26, 2 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, 14, 28, 1 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, -5, 10, 2 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, 28, 26, 3 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, -12, 0, 1 +EndureEffect: + createsprite gUnknown_08592D8C, 2, 0, -24, 26, 2 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, 14, 28, 1 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, -5, 10, 2 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, 28, 26, 3 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, -12, 0, 1 return Move_CHARM: loadspritegfx 0x27E2 - createvisualtask sub_815C478, 0x5, 0, 2, 0 - createsprite gUnknown_08593970, 0x3, 0, 20 + createvisualtask sub_815C478, 5, 0, 2, 0 + createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, -20, 20 + delay 15 + createsprite gUnknown_08593970, 3, -20, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, 20, 20 + delay 15 + createsprite gUnknown_08593970, 3, 20, 20 playsewithpan SE_W204, -64 waitforvisualfinish end Move_ROLLOUT: - loadspritegfx 0x2797 - loadspritegfx 0x275A - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_8110F74, 0x2 + setalpha 12, 8 + createvisualtask sub_8110F74, 2 waitforvisualfinish - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - createsprite gUnknown_08597358, 0x4, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -3296,109 +3257,107 @@ Move_ROLLOUT: Move_FALSE_SWIPE: loadspritegfx 0x282E - loadspritegfx 0x2797 - createsprite gUnknown_08592D44, 0x82 + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_08592D44, 130 playsewithpan SE_W233, +63 - delay 0x10 - createsprite gUnknown_08592D5C, 0x82, 0 + delay 16 + createsprite gUnknown_08592D5C, 130, 0 playsewithpan SE_W104, +63 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 16 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 32 + delay 2 + createsprite gUnknown_08592D5C, 130, 16 + delay 2 + createsprite gUnknown_08592D5C, 130, 32 playsewithpan SE_W104, +63 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 48 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 64 + delay 2 + createsprite gUnknown_08592D5C, 130, 48 + delay 2 + createsprite gUnknown_08592D5C, 130, 64 playsewithpan SE_W104, +63 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 80 - delay 0x2 + delay 2 + createsprite gUnknown_08592D5C, 130, 80 + delay 2 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08597358, 0x84, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3 playsewithpan SE_W004, +63 end Move_SWAGGER: loadspritegfx 0x2766 loadspritegfx 0x2767 - createvisualtask sub_8104AB4, 0x2 + createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, -64 waitforvisualfinish - createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, -64, 0x4, 0x2 + createsprite gUnknown_08593658, 2 + loopsewithpan SE_W207, -64, 4, 2 waitforvisualfinish - delay 0x18 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + delay 24 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, +63 - delay 0xC - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 12 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, +63 waitforvisualfinish end Move_MILK_DRINK: loadspritegfx 0x2773 - loadspritegfx 0x27DB - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_031 monbg ANIM_TARGET - createsprite gUnknown_08592B3C, 0x2 + createsprite gUnknown_08592B3C, 2 delay 0x28 playsewithpan SE_W152, -64 - delay 0xC + delay 12 playsewithpan SE_W152, -64 - delay 0x14 + delay 20 playsewithpan SE_W152, -64 waitforvisualfinish - createsprite gUnknown_0859381C, 0x3, 0, 0, 1, 0 + createsprite gUnknown_0859381C, 3, 0, 0, 1, 0 playsewithpan SE_W208, -64 waitforvisualfinish clearmonbg ANIM_TARGET - call Anim_HealingEffect2 + call HealingEffect2 waitforvisualfinish end Move_MAGNITUDE: - createvisualtask AnimTask_IsPowerOver99, 0x2 + createvisualtask AnimTask_IsPowerOver99, 2 waitforvisualfinish - jumpargeq 0xF, FALSE, Anim_MagnitudeRegular - jumpargeq 0xF, TRUE, Anim_MagnitudeIntense -Anim_MagnitudeEnd: + jumpargeq 15, FALSE, MagnitudeRegular + jumpargeq 15, TRUE, MagnitudeIntense +MagnitudeEnd: end - -Anim_MagnitudeRegular: - createvisualtask sub_81152DC, 0x5, 5, 0, 50 - createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, +63, 0x8, 0xA - goto Anim_MagnitudeEnd - -Anim_MagnitudeIntense: - createvisualtask sub_81152DC, 0x5, 5, 0, 50 - createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, +63, 0x8, 0xA - delay 0xA - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0x10 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - goto Anim_MagnitudeEnd +MagnitudeRegular: + createvisualtask sub_81152DC, 5, 5, 0, 50 + createvisualtask sub_81152DC, 5, 4, 0, 50 + loopsewithpan SE_W070, +63, 8, 10 + goto MagnitudeEnd +MagnitudeIntense: + createvisualtask sub_81152DC, 5, 5, 0, 50 + createvisualtask sub_81152DC, 5, 4, 0, 50 + loopsewithpan SE_W070, +63, 8, 10 + delay 10 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 16 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + goto MagnitudeEnd Move_RAPID_SPIN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27F5 monbg ANIM_ATTACKER - createsprite gUnknown_085CE288, 0x2, 0, 0, 32, -32, 40, -2 - createvisualtask sub_815ADB0, 0x2, 0, 2, 0 - loopsewithpan SE_W013B, -64, 0x8, 0x4 + createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 + createvisualtask sub_815ADB0, 2, 0, 2, 0 + loopsewithpan SE_W013B, -64, 8, 4 waitforvisualfinish - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 playsewithpan SE_W003, +63 waitforvisualfinish - delay 0x8 - createvisualtask sub_815ADB0, 0x2, 0, 2, 1 - loopsewithpan SE_W013B, -64, 0x8, 0x4 + delay 8 + createvisualtask sub_815ADB0, 2, 0, 2, 1 + loopsewithpan SE_W013B, -64, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3406,206 +3365,205 @@ Move_RAPID_SPIN: Move_MOONLIGHT: loadspritegfx 0x27D2 loadspritegfx 0x27D3 - loadspritegfx 0x272F - setalpha 0x1000 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK + loadspritegfx ANIM_TAG_031 + setalpha 0, 16 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592EBC, 0x2, 120, 56 - createvisualtask sub_80A7A74, 0x3, 0, 16, 16, 0, 1 + createsprite gUnknown_08592EBC, 2, 120, 56 + createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, -12, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, -24, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 21, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 0, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 10, 0 - delay 0x14 - createvisualtask sub_81025C0, 0x2 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, -12, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, -24, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 21, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 0, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 10, 0 + delay 20 + createvisualtask sub_81025C0, 2 waitforvisualfinish - call Anim_HealingEffect + call HealingEffect waitforvisualfinish end Move_EXTREME_SPEED: loadspritegfx 0x27DF - loadspritegfx 0x2797 - createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 - jumprettrue Anim_ExtremeSpeedAgainstPlayer + loadspritegfx ANIM_TAG_135 + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT -Anim_ExtremeSpeedContinue: +ExtremeSpeedContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein - createvisualtask sub_810577C, 0x2 - loopsewithpan SE_W013B, -64, 0x8, 0x3 + createvisualtask sub_810577C, 2 + loopsewithpan SE_W013B, -64, 8, 3 waitforvisualfinish - delay 0x1 - createvisualtask sub_8117F60, 0x2 + delay 1 + createvisualtask sub_8117F60, 2 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 delay 0x12 - createvisualtask sub_8105810, 0x2 - delay 0x2 + createvisualtask sub_8105810, 2 + delay 2 playsewithpan SE_W004, +63 - createsprite gUnknown_085973B8, 0x82, 1, 0, -12, 3 - delay 0xA + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, -12, 3 + delay 10 playsewithpan SE_W004, +63 - createsprite gUnknown_085973B8, 0x82, 1, 0, 12, 3 - delay 0xA + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 12, 3 + delay 10 playsewithpan SE_W233B, +63 - createsprite gUnknown_085973B8, 0x82, 1, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 0, 3 waitforvisualfinish - createvisualtask sub_8105AAC, 0x2 - delay 0xA - createvisualtask sub_810599C, 0x2 - loopsewithpan SE_W104, -64, 0x8, 0x4 + createvisualtask sub_8105AAC, 2 + delay 10 + createvisualtask sub_810599C, 2 + loopsewithpan SE_W104, -64, 8, 4 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein clearmonbg ANIM_TARGET blendoff - delay 0x1 - setarg 0x7, 0x1000 - delay 0x1 + delay 1 + setarg 7, 0x1000 + delay 1 end - -Anim_ExtremeSpeedAgainstPlayer: +ExtremeSpeedAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto Anim_ExtremeSpeedContinue + goto ExtremeSpeedContinue Move_UPROAR: loadspritegfx 0x27F1 - loadspritegfx 0x27DB + loadspritegfx ANIM_TAG_203 monbg ANIM_DEF_PARTNER - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, -64 - createsprite gUnknown_08593BB8, 0x2, 0, 29, -12, 0 - createsprite gUnknown_08593BB8, 0x2, 0, -12, -29, 1 - delay 0x10 - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 29, -12, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -12, -29, 1 + delay 16 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, -64 - createsprite gUnknown_08593BB8, 0x2, 0, 12, -29, 1 - createsprite gUnknown_08593BB8, 0x2, 0, -29, -12, 0 - delay 0x10 - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 12, -29, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -29, -12, 0 + delay 16 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, -64 - createsprite gUnknown_08593BB8, 0x2, 0, 24, -24, 1 - createsprite gUnknown_08593BB8, 0x2, 0, -24, -24, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 24, -24, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -24, -24, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_HEAT_WAVE: loadspritegfx 0x2815 - createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, RGB_RED - createvisualtask sub_8110BCC, 0x5, 1 - createvisualtask sub_810A060, 0x6, 6, 31 - panse_1B SE_W257, -64, +63, +2, 0x0 - delay 0x4 - createvisualtask sub_8109DBC, 0x5 - delay 0xC - createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 1 + createvisualtask sub_8116848, 5, 10261, 0, 6, 6, RGB_RED + createvisualtask sub_8110BCC, 5, 1 + createvisualtask sub_810A060, 6, 6, 31 + panse_1B SE_W257, -64, +63, +2, 0 + delay 4 + createvisualtask sub_8109DBC, 5 + delay 12 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 10, 2304, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 90, 2048, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 50, 2560, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 20, 2304, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 70, 1984, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 0, 2816, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 60, 2560, 96, 1 end Move_HAIL: - loadspritegfx 0x2817 - loadspritegfx 0x279D - createvisualtask sub_8116620, 0xA, 1, 3, 0, 6, RGB_BLACK + loadspritegfx ANIM_TAG_263 + loadspritegfx ANIM_TAG_141 + createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish - createvisualtask sub_810C918, 0x5 - loopsewithpan SE_W258, 0, 0x8, 0xA + createvisualtask sub_810C918, 5 + loopsewithpan SE_W258, 0, 8, 10 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 3, 6, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 3, 6, 0, RGB_BLACK end Move_TORMENT: loadspritegfx 0x2767 - loadspritegfx 0x27E1 - createvisualtask sub_815AFF0, 0x2 + loadspritegfx ANIM_TAG_209 + createvisualtask sub_815AFF0, 2 waitforvisualfinish - createvisualtask sub_80A7B98, 0x2, 1, RGB_RED, 10, 1, 1 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, +63 - delay 0x14 - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 20 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, +63 end Move_MEMENTO: - setalpha 0x1000 - delay 0x1 - createvisualtask sub_81143C0, 0x2 - delay 0x1 - createvisualtask sub_8113BAC, 0x5 + setalpha 0, 16 + delay 1 + createvisualtask sub_81143C0, 2 + delay 1 + createvisualtask sub_8113BAC, 5 playsewithpan SE_W060, -64 - delay 0x30 + delay 48 playsewithpan SE_W060B, -64 waitforvisualfinish - createvisualtask sub_8114470, 0x2 - delay 0xC - setalpha 0x1000 - delay 0x1 + createvisualtask sub_8114470, 2 + delay 12 + setalpha 0, 16 + delay 1 monbg_22 ANIM_TARGET - createvisualtask sub_8113E78, 0x5 + createvisualtask sub_8113E78, 5 playsewithpan SE_W060, +63 waitforvisualfinish clearmonbg_23 ANIM_TARGET - delay 0x1 + delay 1 blendoff - delay 0x1 + delay 1 end Move_FACADE: loadspritegfx 0x2803 - createvisualtask sub_815DCA4, 0x2, 0, 3 - createvisualtask sub_815DF0C, 0x2, 0, 72 - loopsewithpan SE_W207, -64, 0x18, 0x3 + createvisualtask sub_815DCA4, 2, 0, 3 + createvisualtask sub_815DF0C, 2, 0, 72 + loopsewithpan SE_W207, -64, 24, 3 end Move_SMELLING_SALT: loadspritegfx 0x2807 loadspritegfx 0x280F - createsprite gUnknown_085CE864, 0x82, 1, 0, 2 - createsprite gUnknown_085CE864, 0x82, 1, 1, 2 + createsprite gUnknown_085CE864, 130, 1, 0, 2 + createsprite gUnknown_085CE864, 130, 1, 1, 2 delay 0x20 - createvisualtask sub_815E840, 0x3, 1, 2 - loopsewithpan SE_W003, +63, 0xC, 0x2 + createvisualtask sub_815E840, 3, 1, 2 + loopsewithpan SE_W003, +63, 12, 2 waitforvisualfinish - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 2 - createsprite gUnknown_085CE894, 0x82, 1, 8, 3 - loopsewithpan SE_W207B, +63, 0x10, 0x3 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 + createsprite gUnknown_085CE894, 130, 1, 8, 3 + loopsewithpan SE_W207B, +63, 16, 3 end Move_FOLLOW_ME: loadspritegfx 0x2750 - createsprite gUnknown_085931D4, 0x2, 0 + createsprite gUnknown_085931D4, 2, 0 playsewithpan SE_W039, -64 delay 0x12 playsewithpan SE_W213, -64 delay 0x47 - loopsewithpan SE_W039, -64, 0x16, 0x3 + loopsewithpan SE_W039, -64, 0x16, 3 end Move_CHARGE: @@ -3613,87 +3571,87 @@ Move_CHARGE: loadspritegfx 0x27E4 loadspritegfx 0x27E5 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12 + createvisualtask sub_810AAFC, 2, 0, 60, 2, 12 playsewithpan SE_W268, -64 - delay 0x1E + delay 30 playsewithpan SE_W268, -64 - delay 0x1E + delay 30 playsewithpan SE_W268, -64 - createsprite gUnknown_0859595C, 0x2, 0 - delay 0x19 + createsprite gUnknown_0859595C, 2, 0 + delay 25 playsewithpan SE_W268, -64 - delay 0x14 + delay 20 playsewithpan SE_W268, -64 - delay 0xF + delay 15 playsewithpan SE_W268, -64 - delay 0xA - delay 0x6 - loopsewithpan SE_W268, -64, 0x6, 0x5 + delay 10 + delay 6 + loopsewithpan SE_W268, -64, 6, 5 waitforvisualfinish - createsprite gUnknown_0859598C, 0x2, 0, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 0, -16, -16 + createsprite gUnknown_0859598C, 2, 0, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 0, -16, -16 playsewithpan SE_W085B, -64 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff end Move_TAUNT: loadspritegfx 0x27E6 - loadspritegfx 0x27E1 + loadspritegfx ANIM_TAG_209 loadspritegfx 0x2767 - createsprite gUnknown_08593114, 0xB, 0, 45 + createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, -64 - delay 0x6 - createsprite gUnknown_0859324C, 0xC, 0 - delay 0x4 - loopsewithpan SE_W039, -64, 0x10, 0x2 + delay 6 + createsprite gUnknown_0859324C, 12, 0 + delay 4 + loopsewithpan SE_W039, -64, 16, 2 waitforvisualfinish - delay 0x8 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + delay 8 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, +63 waitforvisualfinish - delay 0xC - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 12 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, +63 end Move_HELPING_HAND: loadspritegfx 0x2807 - createvisualtask sub_815EC48, 0x5 + createvisualtask sub_815EC48, 5 createsprite gUnknown_085CE8AC, 0x28, 0 createsprite gUnknown_085CE8AC, 0x28, 1 - delay 0x13 + delay 19 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1 - delay 0xE + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + delay 14 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1 - delay 0x14 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + delay 20 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 3, 0, 10, 1 - createvisualtask sub_80A7B98, 0x2, 2, RGB_YELLOW, 12, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 end Move_ASSIST: loadspritegfx 0x280C - createsprite gUnknown_085CE804, 0x32, 112, -16, 140, 128, 36 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, 208, 128, -16, 48, 36 + createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 + delay 2 + createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, -16, 112, 256, -16, 36 + delay 2 + createsprite gUnknown_085CE804, 50, -16, 112, 256, -16, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, 108, 128, 84, -16, 36 + delay 2 + createsprite gUnknown_085CE804, 50, 108, 128, 84, -16, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, -16, 56, 256, 56, 36 + delay 2 + createsprite gUnknown_085CE804, 50, -16, 56, 256, 56, 36 playsewithpan SE_W010, 0 end @@ -3703,158 +3661,158 @@ Move_SUPERPOWER: loadspritegfx 0x2811 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08595FEC, 0x82, 0 + setalpha 12, 8 + createsprite gUnknown_08595FEC, 130, 0 playsewithpan SE_W025, -64 - delay 0x14 - createsprite gUnknown_085972D8, 0x2, 4, 1, 180, 1 - createvisualtask sub_8159244, 0x5, 234, 0 + delay 20 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 + createvisualtask sub_8159244, 5, 234, 0 delay 0x28 createsprite gUnknown_08596004, 0x29, 200, 96, 1, 120 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 20, 248, 4, 112 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 130, 160, 2, 104 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 160, 192, 0, 96 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 60, 288, 3, 88 delay 0x4A - createsprite gUnknown_0859601C, 0x83, 0 + createsprite gUnknown_0859601C, 131, 0 playsewithpan SE_W207, -64 - delay 0x10 - createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 16, 1 + delay 16 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_RECYCLE: loadspritegfx 0x2826 monbg ANIM_ATTACKER - setalpha 0x1000 - delay 0x1 - createsprite gUnknown_085CE9B0, 0x2 - loopsewithpan SE_W036, -64, 0x18, 0x3 + setalpha 0, 16 + delay 1 + createsprite gUnknown_085CE9B0, 2 + loopsewithpan SE_W036, -64, 24, 3 waitforvisualfinish - createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 playsewithpan SE_W036, -64 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_BRICK_BREAK: - loadspritegfx 0x27B7 - loadspritegfx 0x2797 - loadspritegfx 0x279F - loadspritegfx 0x27E0 - choosetwoturnanim Anim_BrickBreakNormal, Anim_BrickBreakShatteredWall -Anim_BrickBreakNormal: + loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_208 + choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall +BrickBreakNormal: monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x4 - delay 0x1 - createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 4 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK + delay 20 + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK delay 0x25 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, +63 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end -Anim_BrickBreakShatteredWall: +BrickBreakShatteredWall: monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x4 - createsprite gUnknown_08595F90, 0x3, 1, 0, 0, 90, 10 - delay 0x1 - createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 4 + createsprite gUnknown_08595F90, 3, 1, 0, 0, 90, 10 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK + delay 20 + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK delay 0x25 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, +63 waitforvisualfinish - createsprite gUnknown_08595FA8, 0x2, 1, 0, -8, -12 - createsprite gUnknown_08595FA8, 0x2, 1, 1, 8, -12 - createsprite gUnknown_08595FA8, 0x2, 1, 2, -8, 12 - createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12 + createsprite gUnknown_08595FA8, 2, 1, 0, -8, -12 + createsprite gUnknown_08595FA8, 2, 1, 1, 8, -12 + createsprite gUnknown_08595FA8, 2, 1, 2, -8, 12 + createsprite gUnknown_08595FA8, 2, 1, 3, 8, 12 playsewithpan SE_W280, +63 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end Move_YAWN: loadspritegfx 0x2802 - createvisualtask sub_815D64C, 0x2, 0 + createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, -64 waitforvisualfinish createsprite gUnknown_085CE68C, 0x85, 2 playsewithpan SE_W255, -64 - delay 0x4 + delay 4 createsprite gUnknown_085CE68C, 0x85, 1 - delay 0x4 + delay 4 createsprite gUnknown_085CE68C, 0x85, 0 waitforvisualfinish - createvisualtask sub_815D64C, 0x2, 1 + createvisualtask sub_815D64C, 2, 1 playsewithpan SE_W281, +63 end Move_ENDEAVOR: loadspritegfx 0x2803 - loadspritegfx 0x2797 - createvisualtask sub_815DCA4, 0x2, 0, 2 - loopsewithpan SE_W039, -64, 0x18, 0x2 - createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 21, 0), 12, 1, 2 - delay 0x6 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2 + loadspritegfx ANIM_TAG_135 + createvisualtask sub_815DCA4, 2, 0, 2 + loopsewithpan SE_W039, -64, 24, 2 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 + delay 6 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2 playsewithpan SE_W003, +63 - delay 0x18 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, -12, 12, 1, 2 + delay 24 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2 playsewithpan SE_W004, +63 end Move_ERUPTION: loadspritegfx 0x27D9 - createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish - createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, -64, 0x3C + createvisualtask sub_8109460, 2 + waitplaysewithpan SE_W153, -64, 60 waitforvisualfinish - createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, -64, 0x3C + createvisualtask sub_8109460, 2 + waitplaysewithpan SE_W153, -64, 60 waitforvisualfinish - delay 0x1E + delay 30 createsprite gUnknown_085955E8, 0x28, 200, -32, 0, 100, 0 createsprite gUnknown_085955E8, 0x28, 30, -32, 16, 90, 1 createsprite gUnknown_085955E8, 0x28, 150, -32, 32, 60, 2 @@ -3862,41 +3820,41 @@ Move_ERUPTION: createsprite gUnknown_085955E8, 0x28, 110, -32, 64, 50, 0 createsprite gUnknown_085955E8, 0x28, 60, -32, 80, 70, 1 delay 0x16 - createvisualtask sub_81152DC, 0x5, 5, 8, 60 - createvisualtask sub_81152DC, 0x5, 4, 8, 60 - loopsewithpan SE_W088, +63, 0x10, 0xC + createvisualtask sub_81152DC, 5, 5, 8, 60 + createvisualtask sub_81152DC, 5, 4, 8, 60 + loopsewithpan SE_W088, +63, 16, 12 delay 0x50 - createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, 0x28, 31, 4, 4, 0, RGB_RED end Move_SKILL_SWAP: loadspritegfx 0x280B - call Anim_SetPsychicBackground - createvisualtask sub_810FBF0, 0x3, 1 - createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, -64, 0x18, 0x3 - delay 0x10 - createvisualtask sub_810FBF0, 0x3, 0 - createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1 + call SetPsychicBackground + createvisualtask sub_810FBF0, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 + loopsewithpan SE_W179, -64, 24, 3 + delay 16 + createvisualtask sub_810FBF0, 3, 0 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_IMPRISON: loadspritegfx 0x2809 - loadspritegfx 0x280A - call Anim_SetPsychicBackground + loadspritegfx ANIM_TAG_250 + call SetPsychicBackground monbg ANIM_DEF_PARTNER - createvisualtask sub_810F940, 0x5 - delay 0x8 - loopsewithpan SE_W030, -64, 0x8, 0x5 + createvisualtask sub_810F940, 5 + delay 8 + loopsewithpan SE_W030, -64, 8, 5 waitforvisualfinish - delay 0x4 - createsprite gUnknown_085967AC, 0x5, 0, 40 - createvisualtask sub_81152DC, 0x5, 4, 1, 10 + delay 4 + createsprite gUnknown_085967AC, 5, 0, 40 + createvisualtask sub_81152DC, 5, 4, 1, 10 playsewithpan SE_W063, -64 clearmonbg ANIM_DEF_PARTNER - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_GRUDGE: @@ -3906,9 +3864,9 @@ Move_GRUDGE: fadetobg BG_GHOST playsewithpan SE_W060, -64 waitbgfadein - createvisualtask sub_8112C6C, 0x3 - loopsewithpan SE_W052, -64, 0x10, 0x4 - delay 0xA + createvisualtask sub_8112C6C, 3 + loopsewithpan SE_W052, -64, 16, 4 + delay 10 delay 0x50 playsewithpan SE_W171, +63 waitforvisualfinish @@ -3920,16 +3878,16 @@ Move_GRUDGE: Move_CAMOUFLAGE: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x10 - createvisualtask sub_811675C, 0x5, 2, 3, 0, 14 - delay 0x10 - createvisualtask sub_81136E8, 0x2, 4 + setalpha 16, 0 + createvisualtask sub_811675C, 5, 2, 3, 0, 14 + delay 16 + createvisualtask sub_81136E8, 2, 4 playsewithpan SE_W185, -64 waitforvisualfinish - delay 0x8 - createvisualtask sub_811675C, 0x5, 2, 0, 0, 0 + delay 8 + createvisualtask sub_811675C, 5, 2, 0, 0, 0 waitforvisualfinish - createvisualtask sub_81137E4, 0x2, 1 + createvisualtask sub_81137E4, 2, 1 waitforvisualfinish blendoff clearmonbg ANIM_ATK_PARTNER @@ -3938,80 +3896,80 @@ Move_CAMOUFLAGE: Move_TAIL_GLOW: loadspritegfx 0x27E4 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08596AC8, 0x42, 0 + createsprite gUnknown_08596AC8, 66, 0 delay 0x12 - loopsewithpan SE_W234, -64, 0x10, 0x6 + loopsewithpan SE_W234, -64, 16, 6 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 end Move_LUSTER_PURGE: loadspritegfx 0x281B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A5C8, 0x5 + createvisualtask sub_815A5C8, 5 waitbgfadein monbg ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W076, -64 createsprite gUnknown_08596898, 0x29, 0, 0, 0, 0 - delay 0x14 - createvisualtask sub_8116664, 0x5, 5, 2, 0, 16, -1 - createvisualtask sub_8116848, 0x5, 10267, 2, 0, 16, -1 + delay 20 + createvisualtask sub_8116664, 5, 5, 2, 0, 16, -1 + createvisualtask sub_8116848, 5, 10267, 2, 0, 16, -1 waitforvisualfinish - createvisualtask sub_8116848, 0x5, 10135, 0, 12, 12, 23552 + createvisualtask sub_8116848, 5, 10135, 0, 12, 12, 23552 waitforvisualfinish - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 waitforvisualfinish - createvisualtask sub_8116664, 0x5, 5, 2, 16, 0, -1 - createvisualtask sub_81152DC, 0x5, 1, 5, 14 + createvisualtask sub_8116664, 5, 5, 2, 16, 0, -1 + createvisualtask sub_81152DC, 5, 1, 5, 14 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_MIST_BALL: - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 loadspritegfx 0x281E - delay 0x0 + delay 0 playsewithpan SE_W081, -64 createsprite gUnknown_08595C70, 0x80, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, +63 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 10, 0 - createsprite gUnknown_0859728C, 0x0, 1, 1, 1, 32279, 16, 0x7FFF, 16 - delay 0x0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 0, 1, 1, 1, 32279, 16, 0x7FFF, 16 + delay 0 playsewithpan SE_W114, 0 - createvisualtask sub_810C324, 0x5 - createvisualtask sub_8116620, 0xA, 4, 3, 0, 16, RGB_WHITE - delay 0x8 - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 70, 0 - delay 0x46 - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, RGB_WHITE + createvisualtask sub_810C324, 5 + createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE + delay 8 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0 + delay 70 + createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE: @@ -4019,157 +3977,157 @@ Move_FEATHER_DANCE: monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, +63 - delay 0x0 + delay 0 createsprite gUnknown_08596388, 0x80, 0, -16, 64, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 32, 2, 104, 11304, 32, 1 createsprite gUnknown_08596388, 0x80, 0, -16, 0, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 224, 2, 104, 11304, 32, 1 createsprite gUnknown_08596388, 0x80, 0, -16, 128, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 192, 2, 104, 11304, 32, 1 createsprite gUnknown_08596388, 0x80, 0, -16, 160, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 96, 2, 104, 11304, 32, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_TEETER_DANCE: - loadspritegfx 0x2758 - loadspritegfx 0x2759 - createvisualtask sub_8160164, 0x5 - createsprite gUnknown_08593050, 0x2, 0, 16, -2 + loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_073 + createvisualtask sub_8160164, 5 + createsprite gUnknown_08593050, 2, 0, 16, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 0, 0, -2 + delay 24 + createsprite gUnknown_08593050, 2, 0, 0, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 0, -16, -2 + delay 24 + createsprite gUnknown_08593050, 2, 0, -16, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 1, -8, -2 + delay 24 + createsprite gUnknown_08593050, 2, 1, -8, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 2, 8, -2 + delay 24 + createsprite gUnknown_08593050, 2, 2, 8, -2 playsewithpan SE_W298, -64 end Move_MUD_SPORT: - loadspritegfx 0x275A - createvisualtask sub_8104938, 0x2, 0, 6 - delay 0x18 - createsprite gUnknown_085971E4, 0x82, 0, -4, -16 - createsprite gUnknown_085971E4, 0x82, 0, 4, -12 + loadspritegfx ANIM_TAG_074 + createvisualtask sub_8104938, 2, 0, 6 + delay 24 + createsprite gUnknown_085971E4, 130, 0, -4, -16 + createsprite gUnknown_085971E4, 130, 0, 4, -12 playsewithpan SE_W091, -64 delay 0x20 - createsprite gUnknown_085971E4, 0x82, 0, -3, -12 - createsprite gUnknown_085971E4, 0x82, 0, 5, -14 + createsprite gUnknown_085971E4, 130, 0, -3, -12 + createsprite gUnknown_085971E4, 130, 0, 5, -14 playsewithpan SE_W091, -64 delay 0x20 - createsprite gUnknown_085971E4, 0x82, 0, -5, -18 - createsprite gUnknown_085971E4, 0x82, 0, 3, -14 + createsprite gUnknown_085971E4, 130, 0, -5, -18 + createsprite gUnknown_085971E4, 130, 0, 3, -14 playsewithpan SE_W091, -64 - delay 0x10 - createsprite gUnknown_085971E4, 0x82, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 0x19 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 0xE - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 0xA - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 20, 90 + delay 16 + createsprite gUnknown_085971E4, 130, 1, 220, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 60, 100 + waitplaysewithpan SE_W145B, 0, 25 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 140, 55 + waitplaysewithpan SE_W145B, 0, 14 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 180, 50 + waitplaysewithpan SE_W145B, 0, 10 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 20, 90 waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 90, 90 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 90, 90 waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 30, 90 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 160, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 30, 90 waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 0xA + delay 2 + createsprite gUnknown_085971E4, 130, 1, 120, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 200, 40 + waitplaysewithpan SE_W145B, 0, 10 end Move_NEEDLE_ARM: - loadspritegfx 0x281A - loadspritegfx 0x2797 - loadspritegfx 0x279F - loopsewithpan SE_W030, +63, 0x2, 0x10 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, -32, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 22, -22, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 30, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 20, 20, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, 28, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -19, 19, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -27, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -18, -18, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, -25, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 17, -17, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 23, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 16, 16, 16 + loadspritegfx ANIM_TAG_266 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loopsewithpan SE_W030, +63, 2, 16 + createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 22, -22, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 30, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 20, 20, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 0, 28, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -19, 19, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -27, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -18, -18, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 0, -25, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 17, -17, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 23, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 16, 16, 16 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W233B, +63 - createsprite gUnknown_08592888, 0x82, 1, 1, 0, -24, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 17, -17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 24, 0, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 17, 17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 0, 24, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -17, 17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -24, 0, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -17, -17, 10 + createsprite gUnknown_08592888, 130, 1, 1, 0, -24, 10 + createsprite gUnknown_08592888, 130, 1, 1, 17, -17, 10 + createsprite gUnknown_08592888, 130, 1, 1, 24, 0, 10 + createsprite gUnknown_08592888, 130, 1, 1, 17, 17, 10 + createsprite gUnknown_08592888, 130, 1, 1, 0, 24, 10 + createsprite gUnknown_08592888, 130, 1, 1, -17, 17, 10 + createsprite gUnknown_08592888, 130, 1, 1, -24, 0, 10 + createsprite gUnknown_08592888, 130, 1, 1, -17, -17, 10 end Move_SLACK_OFF: - loadspritegfx 0x272F - createvisualtask sub_8160544, 0x2, 0 + loadspritegfx ANIM_TAG_031 + createvisualtask sub_8160544, 2, 0 playsewithpan SE_W281, -64 waitforvisualfinish - call Anim_HealingEffect + call HealingEffect waitforvisualfinish end Move_CRUSH_CLAW: - loadspritegfx 0x27B7 - loadspritegfx 0x2737 - loadspritegfx 0x27E0 + loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_039 + loadspritegfx ANIM_TAG_208 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 playsewithpan SE_W013, +63 - delay 0xC - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 + delay 12 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 playsewithpan SE_W013, +63 waitforvisualfinish blendoff @@ -4178,155 +4136,155 @@ Move_CRUSH_CLAW: Move_AROMATHERAPY: playsewithpan SE_W080, 0 - loadspritegfx 0x27AF - loadspritegfx 0x27DB - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, RGB(13, 31, 12) - delay 0x1 + loadspritegfx ANIM_TAG_159 + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) + delay 1 monbg ANIM_ATTACKER - delay 0x1 - createsprite gUnknown_085927AC, 0x0, 24, 16, 0, 2, 2, 0, 0 - createsprite gUnknown_085927AC, 0x42, 64, 24, 0, 3, 1, 1, 0 - createsprite gUnknown_085927C4, 0x0, 16, 24, 0, 2, 1, 0, 0 - delay 0x14 - createsprite gUnknown_085927AC, 0x42, 48, 12, 0, 4, 3, 1, 0 - createsprite gUnknown_085927AC, 0x0, 100, 16, 0, 3, 2, 0, 0 - createsprite gUnknown_085927AC, 0x0, 74, 24, 180, 3, 2, 0, 0 - delay 0xA - createsprite gUnknown_085927AC, 0x42, 80, 30, 0, 4, 1, 1, 0 - createsprite gUnknown_085927AC, 0x0, 128, 12, 0, 3, 3, 0, 0 - createsprite gUnknown_085927C4, 0x0, 90, 16, 0, 2, 1, 0, 0 + delay 1 + createsprite gUnknown_085927AC, 0, 24, 16, 0, 2, 2, 0, 0 + createsprite gUnknown_085927AC, 66, 64, 24, 0, 3, 1, 1, 0 + createsprite gUnknown_085927C4, 0, 16, 24, 0, 2, 1, 0, 0 + delay 20 + createsprite gUnknown_085927AC, 66, 48, 12, 0, 4, 3, 1, 0 + createsprite gUnknown_085927AC, 0, 100, 16, 0, 3, 2, 0, 0 + createsprite gUnknown_085927AC, 0, 74, 24, 180, 3, 2, 0, 0 + delay 10 + createsprite gUnknown_085927AC, 66, 80, 30, 0, 4, 1, 1, 0 + createsprite gUnknown_085927AC, 0, 128, 12, 0, 3, 3, 0, 0 + createsprite gUnknown_085927C4, 0, 90, 16, 0, 2, 1, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 - createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, RGB(13, 31, 12) - delay 0x1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, RGB(13, 31, 12) + delay 1 playsewithpan SE_W287, -64 - createvisualtask sub_815DFCC, 0x2, 1 + createvisualtask sub_815DFCC, 2, 1 waitforvisualfinish playsewithpan SE_W234, -64 - createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 - delay 0x8 - createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + delay 8 + createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, RGB(13, 31, 12) - createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, RGB(13, 31, 12) + createsprite gUnknown_08593868, 16, 0, 0, 0, 1 waitforvisualfinish end Move_FAKE_TEARS: - loadspritegfx 0x27AB - loadspritegfx 0x27E1 - loadspritegfx 0x2758 - createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, RGB(12, 11, 31) + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_072 + createvisualtask sub_8116848, 5, 10155, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish - createvisualtask sub_815C478, 0x5, 0, 2, 1 - loopsewithpan SE_W039, -64, 0xC, 0x4 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 0 - createsprite gUnknown_085970E8, 0x2, 0, 1 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 2 - createsprite gUnknown_085970E8, 0x2, 0, 3 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 0 - createsprite gUnknown_085970E8, 0x2, 0, 1 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 2 - createsprite gUnknown_085970E8, 0x2, 0, 3 + createvisualtask sub_815C478, 5, 0, 2, 1 + loopsewithpan SE_W039, -64, 12, 4 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 0 + createsprite gUnknown_085970E8, 2, 0, 1 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 2 + createsprite gUnknown_085970E8, 2, 0, 3 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 0 + createsprite gUnknown_085970E8, 2, 0, 1 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 2 + createsprite gUnknown_085970E8, 2, 0, 3 waitforvisualfinish end Move_AIR_CUTTER: - loadspritegfx 0x2713 - loadspritegfx 0x279A - loadspritegfx 0x2797 - delay 0x0 + loadspritegfx ANIM_TAG_003 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 + delay 0 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x0 - createvisualtask sub_8103CF0, 0x2, 32, -24, 1536, 2, 128 + setalpha 12, 8 + delay 0 + createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, +63 - createsprite gUnknown_08592A34, 0x2, 40, -32, 0, 2 - delay 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1 + createsprite gUnknown_08592A34, 2, 40, -32, 0, 2 + delay 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 end Move_ODOR_SLEUTH: monbg ANIM_TARGET - createvisualtask sub_815F620, 0x5 - delay 0x18 - createsprite gUnknown_0857FE28, 0x2, 3, 4 + createvisualtask sub_815F620, 5 + delay 24 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, -64 - delay 0x6 - createsprite gUnknown_0857FE28, 0x2, 3, 4 + delay 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, -64 waitforvisualfinish clearmonbg ANIM_TARGET - delay 0x1 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, -1, 16, -1, 0 + delay 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, -1, 16, -1, 0 playsewithpan SE_W043, -64 end Move_GRASS_WHISTLE: - loadspritegfx 0x2758 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB(18, 31, 12) + loadspritegfx ANIM_TAG_072 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish - createvisualtask sub_8102BE8, 0x2 + createvisualtask sub_8102BE8, 2 waitforvisualfinish - panse_1B SE_W320, -64, +63, +2, 0x0 - createsprite gUnknown_08593008, 0x82, 7, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 6, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 1, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 3, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 6, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 1, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 1, 0 - delay 0x4 + panse_1B SE_W320, -64, +63, +2, 0 + createsprite gUnknown_08593008, 130, 7, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 6, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 1, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 3, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 5, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 6, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 1, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 5, 1, 0 + delay 4 waitforvisualfinish - createvisualtask sub_8102CA0, 0x2 - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB(18, 31, 12) + createvisualtask sub_8102CA0, 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB(18, 31, 12) waitforvisualfinish end Move_TICKLE: loadspritegfx 0x27EA - createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 playsewithpan SE_W197, -64 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish - delay 0x14 - createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0 - delay 0xC - createvisualtask sub_815C478, 0x3, 1, 6, 2 - loopsewithpan SE_W039, +63, 0x8, 0x8 + delay 20 + createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER + delay 12 + createvisualtask sub_815C478, 3, 1, 6, 2 + loopsewithpan SE_W039, +63, 8, 8 waitforvisualfinish end @@ -4334,33 +4292,33 @@ Move_WATER_SPOUT: loadspritegfx 0x281C loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_81080E4, 0x5 + setalpha 12, 8 + createvisualtask sub_81080E4, 5 playsewithpan SE_W029, -64 delay 0x2C playsewithpan SE_W291, -64 waitforvisualfinish - delay 0x10 - createvisualtask sub_81085C8, 0x5 + delay 16 + createvisualtask sub_81085C8, 5 playsewithpan SE_W057, +63 clearmonbg ANIM_DEF_PARTNER blendoff end Move_SHADOW_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 fadetobg BG_GHOST waitbgfadein monbg ANIM_ATK_PARTNER - setalpha 0x809 - createvisualtask sub_80A8BC4, 0x2, 0, 13 + setalpha 9, 8 + createvisualtask sub_80A8BC4, 2, 0, 13 playsewithpan SE_W026, -64 - delay 0x6 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W004, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -4369,37 +4327,37 @@ Move_SHADOW_PUNCH: end Move_EXTRASENSORY: - call Anim_SetPsychicBackground + call SetPsychicBackground monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 - createvisualtask sub_810FE14, 0x5, 0 + setalpha 12, 8 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask sub_810FE14, 5, 0 playsewithpan SE_W020, +63 waitforvisualfinish - createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 - createvisualtask sub_810FE14, 0x5, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask sub_810FE14, 5, 1 playsewithpan SE_W020, +63 waitforvisualfinish - createvisualtask sub_8110034, 0x5, 0 - createvisualtask sub_810FE14, 0x5, 2 + createvisualtask sub_8110034, 5, 0 + createvisualtask sub_810FE14, 5, 2 playsewithpan SE_W043, -64 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_AERIAL_ACE: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask sub_81169C0, 2, 0, 4, 7, 3 + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 playsewithpan SE_W013B, -64 - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 10, 0, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -4407,134 +4365,134 @@ Move_AERIAL_ACE: end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 - createsprite gUnknown_0859728C, 0x2, 1, 8, 2, -1, 14, -1, 0 + loopsewithpan SE_REAPOKE, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish end Move_BLOCK: - loadspritegfx 0x280A + loadspritegfx ANIM_TAG_250 createsprite gUnknown_085CE90C, 0xC2 playsewithpan SE_W207, +63 end Move_HOWL: loadspritegfx 0x2745 - createvisualtask sub_815D64C, 0x2, 0 - delay 0xC - call Anim_RoarEffect - createvisualtask sub_8158D8C, 0x2, 0, 3 + createvisualtask sub_815D64C, 2, 0 + delay 12 + call RoarEffect + createvisualtask sub_8158D8C, 2, 0, 3 waitforvisualfinish - delay 0x1E + delay 30 end Move_BULK_UP: loadspritegfx 0x2766 - createvisualtask sub_8104AB4, 0x2 + createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, -64 waitforvisualfinish - createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, -64, 0x4, 0x2 + createsprite gUnknown_08593658, 2 + loopsewithpan SE_W207, -64, 4, 2 waitforvisualfinish end Move_COVET: loadspritegfx 0x27E2 loadspritegfx 0x27F0 - createvisualtask sub_815C478, 0x5, 0, 2, 0 - createsprite gUnknown_08593970, 0x3, 0, 20 + createvisualtask sub_815C478, 5, 0, 2, 0 + createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, -20, 20 + delay 15 + createsprite gUnknown_08593970, 3, -20, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, 20, 20 + delay 15 + createsprite gUnknown_08593970, 3, 20, 20 playsewithpan SE_W204, -64 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - loopsewithpan SE_W146, +63, 0x4, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + loopsewithpan SE_W146, +63, 4, 3 end Move_VOLT_TACKLE: - loadspritegfx 0x2711 + loadspritegfx ANIM_TAG_001 loadspritegfx 0x27E4 loadspritegfx 0x27E5 monbg ANIM_ATTACKER - setalpha 0x80C - createvisualtask sub_8116620, 0xA, 1, 0, 0, 8, RGB_BLACK + setalpha 12, 8 + createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish - createsprite gUnknown_085959A4, 0x1 + createsprite gUnknown_085959A4, 1 playsewithpan SE_W268, -64 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x8 - createvisualtask sub_810AFCC, 0x5, 0 + delay 8 + createvisualtask sub_810AFCC, 5, 0 playsewithpan SE_W085, -64 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 1 + createvisualtask sub_810AFCC, 5, 1 playsewithpan SE_W085, +63 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 2 + createvisualtask sub_810AFCC, 5, 2 playsewithpan SE_W085, -64 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 3 + createvisualtask sub_810AFCC, 5, 3 playsewithpan SE_W085, +63 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 4 + createvisualtask sub_810AFCC, 5, 4 playsewithpan SE_W085, -64 - delay 0x8 - createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1 + delay 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 playsewithpan SE_W120, +63 - createsprite gUnknown_0859598C, 0x2, 1, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 1, -16, -16 - delay 0x8 - createvisualtask sub_810AE5C, 0x5 + createsprite gUnknown_0859598C, 2, 1, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 1, -16, -16 + delay 8 + createvisualtask sub_810AE5C, 5 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 playsewithpan SE_W085B, -64 - createsprite gUnknown_0859598C, 0x2, 0, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 0, -16, -16 + createsprite gUnknown_0859598C, 2, 0, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 0, -16, -16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 8, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish end Move_WATER_SPORT: loadspritegfx 0x281C - createvisualtask sub_81088E4, 0x5 - delay 0x8 + createvisualtask sub_81088E4, 5 + delay 8 playsewithpan SE_W057, -64 delay 0x2C playsewithpan SE_W057, -64 delay 0x2C playsewithpan SE_W057, -64 delay 0x2C - panse_1B SE_W057, -64, +63, +2, 0x0 + panse_1B SE_W057, -64, +63, +2, 0 end Move_CALM_MIND: - loadspritegfx 0x27DB + loadspritegfx ANIM_TAG_203 monbg ANIM_ATK_PARTNER - createvisualtask sub_8116664, 0x5, 0, 0, 0, 16, 0 + createvisualtask sub_8116664, 5, 0, 0, 0, 16, 0 waitforvisualfinish - createvisualtask sub_81177E4, 0x5, 1 + createvisualtask sub_81177E4, 5, 1 waitforvisualfinish createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 playsewithpan SE_W048, -64 - delay 0xE + delay 14 createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 playsewithpan SE_W048, -64 - delay 0xE + delay 14 createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 playsewithpan SE_W048, -64 waitforvisualfinish - createvisualtask sub_81177E4, 0x5, 0 + createvisualtask sub_81177E4, 5, 0 waitforvisualfinish - createvisualtask sub_8116664, 0x5, 0, 0, 16, 0, 0 + createvisualtask sub_8116664, 5, 0, 0, 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end @@ -4542,22 +4500,22 @@ Move_CALM_MIND: Move_LEAF_BLADE: loadspritegfx 0x274F loadspritegfx 0x282D - createvisualtask sub_80FFFC0, 0x5 - delay 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask sub_80FFFC0, 5 + delay 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, +63 - delay 0x32 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + delay 50 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, +63 - delay 0x32 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + delay 50 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, +63 waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - delay 0xC - createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 18, 1 - createsprite gUnknown_085973D0, 0x82, 0, 0, 1, 36 + setalpha 12, 8 + delay 12 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 + createsprite gUnknown_085973D0, 130, 0, 0, 1, 36 playsewithpan SE_W043, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -4568,103 +4526,103 @@ Move_DRAGON_DANCE: loadspritegfx 0x2809 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_81133E8, 0x5 + delay 1 + createvisualtask sub_81133E8, 5 playsewithpan SE_W100, -64 - delay 0x8 - createvisualtask sub_80A7CB4, 0x5, 10249, 19456, 14, 0, 3 - createsprite gUnknown_08596F98, 0x2, 0 - createsprite gUnknown_08596F98, 0x2, 43 - createsprite gUnknown_08596F98, 0x2, 85 - createsprite gUnknown_08596F98, 0x2, 128 - createsprite gUnknown_08596F98, 0x2, 170 - createsprite gUnknown_08596F98, 0x2, 213 - delay 0x1E + delay 8 + createvisualtask sub_80A7CB4, 5, 10249, 19456, 14, 0, 3 + createsprite gUnknown_08596F98, 2, 0 + createsprite gUnknown_08596F98, 2, 43 + createsprite gUnknown_08596F98, 2, 85 + createsprite gUnknown_08596F98, 2, 128 + createsprite gUnknown_08596F98, 2, 170 + createsprite gUnknown_08596F98, 2, 213 + delay 30 playsewithpan SE_W100, -64 - delay 0x1E + delay 30 playsewithpan SE_W100, -64 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_SHOCK_WAVE: loadspritegfx 0x27E3 loadspritegfx 0x27E4 - loadspritegfx 0x2711 + loadspritegfx ANIM_TAG_001 loadspritegfx 0x2735 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2 + createvisualtask sub_810AAFC, 2, 0, 20, 0, 2 playsewithpan SE_W268, -64 - delay 0xC - createsprite gUnknown_08595A18, 0x2 - delay 0x1E - createvisualtask sub_810B29C, 0x5 - delay 0xC + delay 12 + createsprite gUnknown_08595A18, 2 + delay 30 + createvisualtask sub_810B29C, 5 + delay 12 waitforvisualfinish - createvisualtask sub_810B55C, 0x5 + createvisualtask sub_810B55C, 5 playsewithpan SE_W161B, +63 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 0, 6, 18, 1 - createvisualtask sub_8116620, 0x5, 1, 3, 16, 0, RGB_WHITE - createvisualtask sub_8116620, 0x5, 4, 0, 16, 16, RGB_BLACK - delay 0x4 - createvisualtask sub_8116620, 0x5, 4, 0, 0, 0, RGB_BLACK + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1 + createvisualtask sub_8116620, 5, 1, 3, 16, 0, RGB_WHITE + createvisualtask sub_8116620, 5, 4, 0, 16, 16, RGB_BLACK + delay 4 + createvisualtask sub_8116620, 5, 4, 0, 0, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff end Move_HARDEN: - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish end Move_BELLY_DRUM: - loadspritegfx 0x2758 + loadspritegfx ANIM_TAG_072 loadspritegfx 0x27D1 - createvisualtask sub_8102BE8, 0x2 + createvisualtask sub_8102BE8, 2 waitforvisualfinish - call Anim_BellyDrum1 - createsprite gUnknown_0859309C, 0x2, 0, 0, 0, 0 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 0, 0, 0 playsewithpan SE_W187, -64 - delay 0xF - call Anim_BellyDrum2 - createsprite gUnknown_0859309C, 0x2, 1, 1, 1, 0 + delay 15 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 1, 1, 0 playsewithpan SE_W187, -64 - delay 0xF - call Anim_BellyDrum1 - createsprite gUnknown_0859309C, 0x2, 0, 3, 3, 128 + delay 15 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 3, 3, 128 playsewithpan SE_W187, -64 - delay 0x7 - call Anim_BellyDrum2 - createsprite gUnknown_0859309C, 0x2, 1, 2, 0, 128 + delay 7 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 2, 0, 128 playsewithpan SE_W187, -64 - delay 0x7 - call Anim_BellyDrum1 - createsprite gUnknown_0859309C, 0x2, 0, 1, 1, 0 + delay 7 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 1, 1, 0 playsewithpan SE_W187, -64 - delay 0x7 - call Anim_BellyDrum2 - createsprite gUnknown_0859309C, 0x2, 1, 0, 3, 0 + delay 7 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 0, 3, 0 playsewithpan SE_W187, -64 waitforvisualfinish - createvisualtask sub_8102CA0, 0x2 + createvisualtask sub_8102CA0, 2 waitforvisualfinish end -Anim_BellyDrum2: - createsprite gUnknown_08593068, 0x3, 0 - createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 +BellyDrum2: + createsprite gUnknown_08593068, 3, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return -Anim_BellyDrum1: - createsprite gUnknown_08593068, 0x3, 1 - createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 +BellyDrum1: + createsprite gUnknown_08593068, 3, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return Move_MIND_READER: @@ -4673,72 +4631,72 @@ Move_MIND_READER: loadspritegfx 0x27CF monbg ANIM_DEF_PARTNER playsewithpan SE_W109, +63 - createsprite gUnknown_085CE07C, 0x5, 0, 0, 1, 0 - createsprite gUnknown_085CE094, 0x5 + createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 + createsprite gUnknown_085CE094, 5 delay 0x28 playsewithpan SE_W043, +63 - createvisualtask sub_8115A04, 0x2, 1, 1, 2, 0, 10, RGB_BLACK - call Anim_MindReaderEffect + createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK + call MindReaderEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_MindReaderEffect: - createsprite gUnknown_085CE0AC, 0x4, 70, 0, 6 - createsprite gUnknown_085CE0AC, 0x4, 40, 40, 6 - createsprite gUnknown_085CE0AC, 0x4, 10, -60, 6 - createsprite gUnknown_085CE0AC, 0x4, -50, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, -40, 40, 6 - createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6 - delay 0x2 - createsprite gUnknown_085CE0AC, 0x4, 50, -30, 6 - createsprite gUnknown_085CE0AC, 0x4, 60, 10, 6 - createsprite gUnknown_085CE0AC, 0x4, 0, 60, 6 - createsprite gUnknown_085CE0AC, 0x4, 0, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, -30, 6 - delay 0x2 - createsprite gUnknown_085CE0AC, 0x4, -50, 50, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 0x4, -40, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, 20, -60, 6 - createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6 - createsprite gUnknown_085CE0AC, 0x4, 35, 40, 6 - delay 0x2 +MindReaderEffect: + createsprite gUnknown_085CE0AC, 4, 70, 0, 6 + createsprite gUnknown_085CE0AC, 4, 40, 40, 6 + createsprite gUnknown_085CE0AC, 4, 10, -60, 6 + createsprite gUnknown_085CE0AC, 4, -50, -40, 6 + createsprite gUnknown_085CE0AC, 4, -40, 40, 6 + createsprite gUnknown_085CE0AC, 4, 50, -50, 6 + delay 2 + createsprite gUnknown_085CE0AC, 4, 50, -30, 6 + createsprite gUnknown_085CE0AC, 4, 60, 10, 6 + createsprite gUnknown_085CE0AC, 4, 0, 60, 6 + createsprite gUnknown_085CE0AC, 4, 0, -40, 6 + createsprite gUnknown_085CE0AC, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, 4, -60, -30, 6 + delay 2 + createsprite gUnknown_085CE0AC, 4, -50, 50, 6 + createsprite gUnknown_085CE0AC, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, 4, -40, -40, 6 + createsprite gUnknown_085CE0AC, 4, 20, -60, 6 + createsprite gUnknown_085CE0AC, 4, 50, -50, 6 + createsprite gUnknown_085CE0AC, 4, 35, 40, 6 + delay 2 return Move_ICE_PUNCH: monbg ANIM_DEF_PARTNER - setalpha 0x80C - loadspritegfx 0x279D - loadspritegfx 0x2797 - loadspritegfx 0x279F - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, RGB(12, 26, 31) - delay 0x14 + setalpha 12, 8 + loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) + delay 20 playsewithpan SE_W081, +63 - createsprite gUnknown_08595AE8, 0x2, 0 - createsprite gUnknown_08595AE8, 0x2, 64 - createsprite gUnknown_08595AE8, 0x2, 128 - createsprite gUnknown_08595AE8, 0x2, 192 - delay 0x5 - createsprite gUnknown_08595AD0, 0x2, 32 - createsprite gUnknown_08595AD0, 0x2, 96 - createsprite gUnknown_08595AD0, 0x2, 160 - createsprite gUnknown_08595AD0, 0x2, 224 - delay 0x11 - createsprite gUnknown_08595E98, 0x4, 0, -10, 8, 1, 0 - createsprite gUnknown_08597358, 0x3, 0, -10, 1, 1 + createsprite gUnknown_08595AE8, 2, 0 + createsprite gUnknown_08595AE8, 2, 64 + createsprite gUnknown_08595AE8, 2, 128 + createsprite gUnknown_08595AE8, 2, 192 + delay 5 + createsprite gUnknown_08595AD0, 2, 32 + createsprite gUnknown_08595AD0, 2, 96 + createsprite gUnknown_08595AD0, 2, 160 + createsprite gUnknown_08595AD0, 2, 224 + delay 17 + createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1 playsewithpan SE_W004, +63 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 3, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 waitforvisualfinish - delay 0xF - call Anim_FreezeEffect1 - delay 0x5 - createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, RGB(12, 26, 31) + delay 15 + call FreezeEffect1 + delay 5 + createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -4747,156 +4705,154 @@ Move_ICE_PUNCH: Move_REST: playsewithpan SE_W173, -64 loadspritegfx 0x27F4 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x14 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x14 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 20 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 20 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 waitforvisualfinish end Move_CONFUSION: monbg ANIM_DEF_PARTNER - call Anim_SetPsychicBackground - setalpha 0x808 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE + call SetPsychicBackground + setalpha 8, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish playsewithpan SE_W048, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end Move_PSYCHIC: monbg ANIM_DEF_PARTNER - call Anim_SetPsychicBackground - setalpha 0x808 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB(31, 23, 0) + call SetPsychicBackground + setalpha 8, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish - loopsewithpan SE_W048, +63, 0xA, 0x3 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 + loopsewithpan SE_W048, +63, 10, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end Move_FUTURE_SIGHT: - goto Anim_FutureSight - -Anim_FutureSightContinue: + goto FutureSight +FutureSightContinue: waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_FutureSight: +FutureSight: monbg ANIM_ATK_PARTNER playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W048, -64 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto Anim_FutureSightContinue + goto FutureSightContinue Move_THUNDER: loadspritegfx 0x2735 fadetobg BG_THUNDER waitbgfadeout - createvisualtask sub_8117660, 0x5, -256, 0, 1, -1 + createvisualtask sub_8117660, 5, -256, 0, 1, -1 waitbgfadein - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK - delay 0x10 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + delay 16 + createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W086, +63 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, -36 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, -20 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, 12 - delay 0x14 + delay 1 + createsprite gUnknown_085956C0, 130, 16, -36 + delay 1 + createsprite gUnknown_085956C0, 130, 16, -20 + delay 1 + createsprite gUnknown_085956C0, 130, 16, 12 + delay 20 createsprite gUnknown_085956C0, 0x86, -16, -32 playsewithpan SE_W086, +63 - delay 0x1 + delay 1 createsprite gUnknown_085956C0, 0x86, -16, -16 - delay 0x1 + delay 1 createsprite gUnknown_085956C0, 0x86, -16, 16 playsewithpan SE_W086, +63 - delay 0x5 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, -32 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, 16 - delay 0x1E - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x5 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -32 + delay 5 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 24, -32 + delay 1 + createsprite gUnknown_085956C0, 130, 24, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 24, 16 + delay 30 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 5 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -32 playsewithpan SE_W161B, +63 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, 16 - delay 0xA - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createvisualtask sub_810A094, 0x2, 30, 3, 1, 0 - delay 0x2 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, RGB_BLACK + delay 1 + createsprite gUnknown_085956C0, 130, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 0, 16 + delay 10 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createvisualtask sub_810A094, 2, 30, 3, 1, 0 + delay 2 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 130, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end Move_THUNDER_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 loadspritegfx 0x2735 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish playsewithpan SE_W004, +63 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -48 - delay 0x1 - createsprite gUnknown_085956C0, 0x2, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x2, 0, 16 - delay 0x1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -48 + delay 1 + createsprite gUnknown_085956C0, 2, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 2, 0, 16 + delay 1 playsewithpan SE_W161B, +63 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK - delay 0x14 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + delay 20 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4904,68 +4860,68 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx 0x2731 - loadspritegfx 0x2733 - loopsewithpan SE_W221, -64, 0x7, 0x5 - createsprite gUnknown_08595428, 0x2, -32, 0, 50, 5, -2, 0 - delay 0x1 - createsprite gUnknown_08595428, 0x42, -20, -10, 50, 5, -1, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x42, 0, -16, 50, 5, 0, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x42, 20, -10, 50, 5, 1, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 32, 0, 50, 5, 2, 0 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 20, 10, 50, 5, 1, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 0, 16, 50, 5, 0, 1 - delay 0x1 - createsprite gUnknown_08595428, 0x2, -20, 10, 50, 5, -1, 1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + loadspritegfx ANIM_TAG_035 + loopsewithpan SE_W221, -64, 7, 5 + createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 + delay 1 + createsprite gUnknown_08595428, 66, -20, -10, 50, 5, -1, -1 + delay 1 + createsprite gUnknown_08595428, 66, 0, -16, 50, 5, 0, -1 + delay 1 + createsprite gUnknown_08595428, 66, 20, -10, 50, 5, 1, -1 + delay 1 + createsprite gUnknown_08595428, 2, 32, 0, 50, 5, 2, 0 + delay 1 + createsprite gUnknown_08595428, 2, 20, 10, 50, 5, 1, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_08595428, 2, 0, 16, 50, 5, 0, 1 + delay 1 + createsprite gUnknown_08595428, 2, -20, 10, 50, 5, -1, 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 waitforvisualfinish playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 0x82, -16, 0, 70, 16, 0, 1 - delay 0xA + createsprite gUnknown_085953F8, 130, -16, 0, 70, 16, 0, 1 + delay 10 playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 0x82, 0, 0, 70, 16, 0, 1 - delay 0xA + createsprite gUnknown_085953F8, 130, 0, 0, 70, 16, 0, 1 + delay 10 playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 0x82, 16, 0, 80, 16, 0, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + createsprite gUnknown_085953F8, 130, 16, 0, 80, 16, 0, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 waitforvisualfinish - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 playsewithpan SE_W172B, +63 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 waitforvisualfinish end Move_SCRATCH: loadspritegfx 0x2799 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W010, +63 - createsprite gUnknown_085CE020, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gUnknown_085CE020, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4976,32 +4932,32 @@ Move_DRAGON_BREATH: loadspritegfx 0x272D monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W172, -64, 0x7, 0x7 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 9, RGB_RED - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 21, 1 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 + loopsewithpan SE_W172, -64, 7, 7 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createvisualtask sub_8116620, 10, 4, 1, 0, 9, RGB_RED + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 9, 0, RGB_RED + createvisualtask sub_8116620, 10, 4, 1, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -5010,162 +4966,161 @@ Move_ROAR: loadspritegfx 0x2745 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - setalpha 0x808 - createvisualtask sub_8158E9C, 0x2, 0, 2 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 - call Anim_RoarEffect - delay 0x14 - createvisualtask sub_80D5DB0, 0x5, 1, 2 + setalpha 8, 8 + createvisualtask sub_8158E9C, 2, 0, 2 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 + call RoarEffect + delay 20 + createvisualtask sub_80D5DB0, 5, 1, 2 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff waitforvisualfinish - createvisualtask sub_8159078, 0x5 + createvisualtask sub_8159078, 5 waitforvisualfinish end -Anim_RoarEffect: - createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1 - delay 0xF - createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1 +RoarEffect: + createsprite gUnknown_085CE7D4, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, 2, 24, 8, 1 + delay 15 + createsprite gUnknown_085CE7D4, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, 2, 24, 8, 1 return Move_GROWL: loadspritegfx 0x2745 - createvisualtask sub_8158E9C, 0x2, 0, 255 - call Anim_RoarEffect - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1 + createvisualtask sub_8158E9C, 2, 0, 255 + call RoarEffect + delay 10 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish - createvisualtask sub_8159078, 0x5 + createvisualtask sub_8159078, 5 waitforvisualfinish end Move_SNORE: loadspritegfx 0x27D5 monbg ANIM_ATK_PARTNER - setalpha 0x808 - call Anim_Snore1 - delay 0x1E - call Anim_Snore1 + setalpha 8, 8 + call Snore1 + delay 30 + call Snore1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end - -Anim_Snore1: +Snore1: playsewithpan SE_W173, -64 - createvisualtask sub_80D6064, 0x5, -7, -7, 7, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 - createsprite gUnknown_085972D8, 0x2, 6, 1, 14, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, -42, -38, 24, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, 0, -42, 24, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, 42, -38, 24, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 6, 1, 14, 0, 0 + createsprite gUnknown_085936EC, 2, 0, 0, -42, -38, 24, 0, 0 + createsprite gUnknown_085936EC, 2, 0, 0, 0, -42, 24, 0, 0 + createsprite gUnknown_085936EC, 2, 0, 0, 42, -38, 24, 0, 0 return Move_LIGHT_SCREEN: loadspritegfx 0x2756 loadspritegfx 0x27B6 - setalpha 0x1000 - waitplaysewithpan SE_W115, -64, 0xF - createsprite gUnknown_08596560, 0x1, 40, 0, 10166 - delay 0xA - call Anim_SpecialScreenEffect + setalpha 0, 16 + waitplaysewithpan SE_W115, -64, 15 + createsprite gUnknown_08596560, 1, 40, 0, 10166 + delay 10 + call SpecialScreenEffect waitforvisualfinish - delay 0x1 + delay 1 blendoff end -Anim_SpecialScreenEffect: - createsprite gUnknown_08596624, 0x2, 23, 0, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 31, -8, 0, 1 - delay 0x5 - createsprite gUnknown_08596624, 0x2, 30, 20, 0, 1 - delay 0x7 - createsprite gUnknown_08596624, 0x2, 10, -15, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 20, 10, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 10, 18, 0, 1 +SpecialScreenEffect: + createsprite gUnknown_08596624, 2, 23, 0, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 31, -8, 0, 1 + delay 5 + createsprite gUnknown_08596624, 2, 30, 20, 0, 1 + delay 7 + createsprite gUnknown_08596624, 2, 10, -15, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 20, 10, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 10, 18, 0, 1 return Move_MIRROR_COAT: loadspritegfx 0x2756 loadspritegfx 0x27B8 - setalpha 0x1000 - createsprite gUnknown_08596590, 0x1, 40, 0, 10168 - delay 0xA + setalpha 0, 16 + createsprite gUnknown_08596590, 1, 40, 0, 10168 + delay 10 playsewithpan SE_W115, -64 - call Anim_SpecialScreenEffect + call SpecialScreenEffect waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_REFLECT: loadspritegfx 0x2757 - loadspritegfx 0x27B7 - setalpha 0x1000 - waitplaysewithpan SE_W115, -64, 0xF - createsprite gUnknown_08596578, 0x1, 40, 0, 10167 - delay 0x14 - createsprite gUnknown_085965F4, 0x2, 30, 0, 0, 1 - delay 0x7 - createsprite gUnknown_085965F4, 0x2, 19, -12, 0, 1 - delay 0x7 - createsprite gUnknown_085965F4, 0x2, 10, 20, 0, 1 + loadspritegfx ANIM_TAG_167 + setalpha 0, 16 + waitplaysewithpan SE_W115, -64, 15 + createsprite gUnknown_08596578, 1, 40, 0, 10167 + delay 20 + createsprite gUnknown_085965F4, 2, 30, 0, 0, 1 + delay 7 + createsprite gUnknown_085965F4, 2, 19, -12, 0, 1 + delay 7 + createsprite gUnknown_085965F4, 2, 10, 20, 0, 1 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_BARRIER: loadspritegfx 0x27B9 - setalpha 0x1000 - waitplaysewithpan SE_W112, -64, 0xF - createsprite gUnknown_085965A8, 0x3, 40, 0, 10169 + setalpha 0, 16 + waitplaysewithpan SE_W112, -64, 15 + createsprite gUnknown_085965A8, 3, 40, 0, 10169 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_BUBBLE: loadspritegfx 0x27A2 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET - setalpha 0x80C - delay 0x1 - createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 128, 100 + setalpha 12, 8 + delay 1 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 35, 37, 40, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 10, -37, 30, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, 15, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 20, 33, 20, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 waitforvisualfinish - call Anim_BulbbleEffect + call WaterBubbleEffect2 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -5175,221 +5130,221 @@ Move_SMOG: loadspritegfx 0x27BC monbg ANIM_DEF_PARTNER monbgprio_29 - setalpha 0x80C - loopsewithpan SE_W054, +63, 0x11, 0xA - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - delay 0x78 - loopsewithpan SE_W092, +63, 0x12, 0x2 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(26, 0, 26) - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 15, 1 + setalpha 12, 8 + loopsewithpan SE_W054, +63, 17, 10 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + delay 120 + loopsewithpan SE_W092, +63, 0x12, 2 + createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) + delay 10 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Smog1: - createsprite gUnknown_08595C44, 0x2, 0, -24, 48, 240, 1, 0 - delay 0x7 +Smog1: + createsprite gUnknown_08595C44, 2, 0, -24, 48, 240, 1, 0 + delay 7 return Move_FAINT_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein - delay 0x0 + delay 0 playsewithpan SE_W185, -64 - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 3 - createvisualtask sub_81136E8, 0x2, 1 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 + createvisualtask sub_81136E8, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8117F60, 0x2 - setalpha 0x80C + delay 1 + createvisualtask sub_8117F60, 2 + setalpha 12, 8 monbg ANIM_TARGET - delay 0x1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 9, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 - setarg 0x7, 0x1000 + delay 1 + setarg 7, 0x1000 delay 0x20 - createvisualtask sub_8113888, 0x2 + createvisualtask sub_8113888, 2 monbg ANIM_ATTACKER - createvisualtask sub_81137E4, 0x2, 1 + createvisualtask sub_81137E4, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 restorebg waitbgfadein end Move_SAND_ATTACK: - loadspritegfx 0x275A + loadspritegfx ANIM_TAG_074 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W028, -64 - createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -Anim_SandAttack1: - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 0, 0 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 10, 10 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -10, -10 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 20, 5 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -20, -5 - delay 0x2 +SandAttack1: + createsprite gUnknown_085971A8, 130, 15, 15, 20, 0, 0 + createsprite gUnknown_085971A8, 130, 15, 15, 20, 10, 10 + createsprite gUnknown_085971A8, 130, 15, 15, 20, -10, -10 + createsprite gUnknown_085971A8, 130, 15, 15, 20, 20, 5 + createsprite gUnknown_085971A8, 130, 15, 15, 20, -20, -5 + delay 2 return Move_MUD_SLAP: - loadspritegfx 0x275A + loadspritegfx ANIM_TAG_074 playsewithpan SE_W028, -64 - createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 waitforvisualfinish end -Anim_MudSlap1: - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 0, 0 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 10, 5 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -10, -5 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 20, 10 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -20, -10 - delay 0x2 +MudSlap1: + createsprite gUnknown_085971CC, 130, 15, 15, 20, 0, 0 + createsprite gUnknown_085971CC, 130, 15, 15, 20, 10, 5 + createsprite gUnknown_085971CC, 130, 15, 15, 20, -10, -5 + createsprite gUnknown_085971CC, 130, 15, 15, 20, 20, 10 + createsprite gUnknown_085971CC, 130, 15, 15, 20, -20, -10 + delay 2 return Move_DRAGON_RAGE: loadspritegfx 0x272D - loadspritegfx 0x2733 + loadspritegfx ANIM_TAG_035 playsewithpan SE_W082, -64 - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x82, 0, 15, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4 waitforvisualfinish - createsprite gUnknown_08596F80, 0x82, 30, 15, 0, 10, 10 + createsprite gUnknown_08596F80, 130, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, +63, 0xB, 0x3 - createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 25, 1 + loopsewithpan SE_W172B, +63, 11, 3 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 createsprite gUnknown_08596F28, 0xC2, 1, 5, 0 - delay 0x1 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, -10, -15 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, 0, 25 - delay 0x1 + delay 1 + createsprite gUnknown_08596F28, 130, 1, 0, 25 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, 15, 5 - delay 0x1 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, -25, 0 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, 30, 30 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, -27, 25 - delay 0x1 + delay 1 + createsprite gUnknown_08596F28, 130, 1, 30, 30 + delay 1 + createsprite gUnknown_08596F28, 130, 1, -27, 25 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, 0, 8 waitforvisualfinish - createsprite gUnknown_0857FE58, 0xC2, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 0xC2, 0, 0, 4 waitforvisualfinish end Move_RAIN_DANCE: loadspritegfx 0x2783 playsewithpan SE_W240, -64 - createvisualtask sub_8116620, 0xA, 0x781, 2, 0, 4, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_8107188, 0x2, 0, 3, 120 - createvisualtask sub_8107188, 0x2, 0, 3, 120 - delay 0x78 - delay 0x1E + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 + delay 120 + delay 30 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 0x781, 2, 4, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end Move_BITE: loadspritegfx 0x279B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 0x2, 0, -32, 0, 0, 819, 10 - createsprite gUnknown_08597080, 0x2, 0, 32, 4, 0, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 7, 1 + createsprite gUnknown_08597080, 2, 0, -32, 0, 0, 819, 10 + createsprite gUnknown_08597080, 2, 0, 32, 4, 0, -819, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 + delay 1 end Move_CRUNCH: loadspritegfx 0x279B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 0x2, -32, -32, 1, 819, 819, 10 - createsprite gUnknown_08597080, 0x2, 32, 32, 5, -819, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 7, 5, 2 + createsprite gUnknown_08597080, 2, -32, -32, 1, 819, 819, 10 + createsprite gUnknown_08597080, 2, 32, 32, 5, -819, -819, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2 waitforvisualfinish playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 0x2, 32, -32, 7, -819, 819, 10 - createsprite gUnknown_08597080, 0x2, -32, 32, 3, 819, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 8, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 8, 4, 2 + createsprite gUnknown_08597080, 2, 32, -32, 7, -819, 819, 10 + createsprite gUnknown_08597080, 2, -32, 32, 3, 819, -819, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 + delay 1 restorebg waitbgfadein end Move_CLAMP: loadspritegfx 0x27A1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, +63 - createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 + createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -5399,51 +5354,51 @@ Move_CLAMP: Move_ICE_BEAM: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - loadspritegfx 0x279D - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK + setalpha 12, 8 + loadspritegfx ANIM_TAG_141 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10 - createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 - delay 0x1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, RGB(0, 20, 31) - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - delay 0x1 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 + createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 + delay 1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, -31, 0, 7, RGB(0, 20, 31) + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + delay 1 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 waitforvisualfinish - delay 0x14 - call Anim_FreezeEffect1 - createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, RGB(0, 20, 31) + delay 20 + call FreezeEffect1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, 5, 7, 0, RGB(0, 20, 31) waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_IceBeam1: - createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - delay 0x1 +IceBeam1: + createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + delay 1 return Move_WITHDRAW: playsewithpan SE_W029, -64 - createvisualtask sub_81036A0, 0x5 + createvisualtask sub_81036A0, 5 waitforvisualfinish end @@ -5452,218 +5407,218 @@ Move_AURORA_BEAM: fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, -64 - setarg 0x7, 0x0 - createvisualtask sub_8107528, 0xA, 130 - call Anim_AuroraBeam1 - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 17, 1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - setarg 0x7, 0xFFFF + setarg 7, 0 + createvisualtask sub_8107528, 10, 130 + call AuroraBeam1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 17, 1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + setarg 7, 0xFFFF createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 40, 1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 waitforvisualfinish restorebg waitbgfadein end -Anim_AuroraBeam1: - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 +AuroraBeam1: + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 return Move_SOLAR_BEAM: loadspritegfx 0x27A3 - choosetwoturnanim Anim_SolarBeamSetUp, Anim_SolarBeamUnleash -Anim_SolarBeamEnd: + choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash +SolarBeamEnd: waitforvisualfinish end -Anim_SolarBeamSetUp: +SolarBeamSetUp: monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_8115A04, 0x2, 2, 1, 4, 0, 11, RGB(31, 31, 11) + setalpha 12, 8 + createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) playsewithpan SE_W025, -64 - call Anim_SolarBeamSetUp1 + call SolarBeamSetUp1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto Anim_SolarBeamEnd + goto SolarBeamEnd -Anim_SolarBeamSetUp1: - createsprite gUnknown_085921E0, 0x2, 40, 40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, -40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 0, 40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 0, -40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, -20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, 20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, -20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, 20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -20, 30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 20, -30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -20, -30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 20, 30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, 0, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, 0, 16 - delay 0x2 +SolarBeamSetUp1: + createsprite gUnknown_085921E0, 2, 40, 40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, -40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 0, 40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 0, -40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, -20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, 20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, -20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, 20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -20, 30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 20, -30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -20, -30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 20, 30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, 0, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, 0, 16 + delay 2 return -Anim_SolarBeamUnleash: - call Anim_SetSolarbeamBg - panse_1B SE_W076, -64, +63, +2, 0x0 - createvisualtask sub_80FEA58, 0x5 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 - delay 0x4 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2 - delay 0x4 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 65, 1 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6 - delay 0x4 - call Anim_SolarBeamUnleash1 - call Anim_SolarBeamUnleash1 +SolarBeamUnleash: + call SetSolarbeamBg + panse_1B SE_W076, -64, +63, +2, 0 + createvisualtask sub_80FEA58, 5 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + delay 4 + createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0) + createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + delay 4 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + delay 4 + call SolarBeamUnleash1 + call SolarBeamUnleash1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 10, 0, RGB(25, 31, 0) - call Anim_UnsetSolarbeamBg - goto Anim_SolarBeamEnd + createvisualtask sub_8116620, 10, 4, 1, 10, 0, RGB(25, 31, 0) + call UnsetSolarbeamBg + goto SolarBeamEnd -Anim_SolarBeamUnleash1: - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6 - delay 0x4 +SolarBeamUnleash1: + createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + delay 4 return Move_BLIZZARD: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 - jumprettrue Anim_BlizzardAgainstPlayer + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT -Anim_BlizzardContinue: +BlizzardContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, -64, +63, +2, 0x0 - call Anim_Blizzard1 - call Anim_Blizzard1 + panse_1B SE_W059, -64, +63, +2, 0 + call Blizzard1 + call Blizzard1 playsewithpan SE_W059B, +63 waitforvisualfinish - call Anim_FreezeEffect2 + call FreezeEffect2 waitforvisualfinish - delay 0x14 + delay 20 restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein clearmonbg ANIM_DEF_PARTNER end -Anim_Blizzard1: +Blizzard1: createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 0, 0, 0, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, -10, 0, -10, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -5, 0, -5, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 10, 0, 10, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -20, 0, -20, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 15, 0, 15, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -25, 0, -25, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 20, 0, 20, 80, 0, 0, 1 - delay 0x3 + delay 3 return -Anim_BlizzardAgainstPlayer: +BlizzardAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto Anim_BlizzardContinue + goto BlizzardContinue Move_POWDER_SNOW: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0x0 - call Anim_PowderSnow1 - call Anim_PowderSnow1 + panse_1B SE_W016, -64, +63, +2, 0 + call PowderSnow1 + call PowderSnow1 playsewithpan SE_W016B, +63 waitforvisualfinish waitsound - call Anim_FreezeEffect2 + call FreezeEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x14 - createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, RGB_BLACK + delay 20 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, RGB_BLACK end -Anim_PowderSnow1: +PowderSnow1: createsprite gUnknown_08595BC8, 0x28, 0, 0, 0, 0, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, -10, 0, -10, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, 10, 0, 10, 56, -4, 3, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, -4, 5, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, 15, 0, 15, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, 20, 0, 20, 56, 4, 4, 1 - delay 0x3 + delay 3 return Move_HYDRO_PUMP: @@ -5671,427 +5626,427 @@ Move_HYDRO_PUMP: loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 - delay 0x6 - panse_1B SE_W056, -64, +63, +2, 0x0 - createvisualtask sub_81076C8, 0x5, 100 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 37, 1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - delay 0x1 - delay 0x1 - call Anim_HydroPump2 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 + delay 6 + panse_1B SE_W056, -64, +63, +2, 0 + createvisualtask sub_81076C8, 5, 100 + call HydroPump1 + call HydroPump1 + call HydroPump1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 37, 1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + delay 1 + delay 1 + call HydroPump2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_HydroPump1: - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16 - delay 0x1 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16 - delay 0x1 +HydroPump1: + createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + delay 1 + createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + delay 1 return -Anim_HydroPump2: - createsprite gUnknown_08597388, 0x4, 0, 15, 1, 1 - createsprite gUnknown_08597388, 0x4, 0, -15, 1, 1 +HydroPump2: + createsprite gUnknown_08597388, 4, 0, 15, 1, 1 + createsprite gUnknown_08597388, 4, 0, -15, 1, 1 return Move_SIGNAL_BEAM: loadspritegfx 0x2818 loadspritegfx 0x2819 - loadspritegfx 0x2759 - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 25, 1 - delay 0x6 - panse_1B SE_W062, -64, +63, +1, 0x0 - createvisualtask sub_81076C8, 0x5, 100 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 25, 1 - createsprite gUnknown_0859728C, 0x2, 4, 8, 5, 31, 8, 961, 8 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 + loadspritegfx ANIM_TAG_073 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 + delay 6 + panse_1B SE_W062, -64, +63, +1, 0 + createvisualtask sub_81076C8, 5, 100 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 25, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 4, 8, 5, 31, 8, 961, 8 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 waitforvisualfinish end -Anim_SignalBeam1: - createsprite gUnknown_08595114, 0x83, 10, 10, 0, 16 - createsprite gUnknown_0859512C, 0x83, 10, 10, 0, -16 - delay 0x1 +SignalBeam1: + createsprite gUnknown_08595114, 131, 10, 10, 0, 16 + createsprite gUnknown_0859512C, 131, 10, 10, 0, -16 + delay 1 return Move_ABSORB: loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call Anim_AbsorbEffect + delay 3 + call AbsorbEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_AbsorbEffect: +AbsorbEffect: playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_MEGA_DRAIN: loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call Anim_MegaDrainEffect + delay 3 + call MegaDrainEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 8, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_MegaDrainEffect: +MegaDrainEffect: playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_GIGA_DRAIN: loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call Anim_GigaDrainEffect + delay 3 + call GigaDrainEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 12, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_GigaDrainEffect: +GigaDrainEffect: playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_LEECH_LIFE: loadspritegfx 0x27B1 loadspritegfx 0x27A3 - delay 0x1 - loadspritegfx 0x272F - loadspritegfx 0x2797 + delay 1 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - delay 0x1 - createsprite gUnknown_085969C8, 0x2, -20, 15, 12 + setalpha 12, 8 + delay 1 + createsprite gUnknown_085969C8, 2, -20, 15, 12 waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 playsewithpan SE_W071, +63 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish - call Anim_AbsorbEffect + call AbsorbEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SYNTHESIS: - loadspritegfx 0x2741 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 16, RGB(27, 31, 18) + loadspritegfx ANIM_TAG_049 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_W025, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish - unloadspritegfx 0x2741 - delay 0x1 - loadspritegfx 0x272F - call Anim_HealingEffect + unloadspritegfx ANIM_TAG_049 + delay 1 + loadspritegfx ANIM_TAG_031 + call HealingEffect waitforvisualfinish end Move_TOXIC: loadspritegfx 0x27A7 loadspritegfx 0x27A6 - call Anim_Toxic1 - call Anim_Toxic1 + call Toxic1 + call Toxic1 waitforvisualfinish - delay 0xF - call Anim_PoisonEffect + delay 15 + call PoisonBubblesEffect waitforvisualfinish end -Anim_Toxic1: - createsprite gUnknown_08596134, 0x82, -24, 16, 1, 1 +Toxic1: + createsprite gUnknown_08596134, 130, -24, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF - createsprite gUnknown_08596134, 0x82, 8, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, 8, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF - createsprite gUnknown_08596134, 0x82, -8, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, -8, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF - createsprite gUnknown_08596134, 0x82, 24, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, 24, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF + delay 15 return Move_SLUDGE: loadspritegfx 0x27A6 playsewithpan SE_W145C, -64 - createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 + createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 waitforvisualfinish - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - call Anim_PoisonEffect + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) + call PoisonBubblesEffect waitforvisualfinish end Move_SLUDGE_BOMB: loadspritegfx 0x27A6 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - createvisualtask sub_80D52D0, 0x5, 1, 3, 0, 15, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_085961D8, 0x82, 42, 27, 20 - createsprite gUnknown_085961D8, 0x82, -27, 44, 20 - createsprite gUnknown_085961D8, 0x82, 39, -28, 20 - createsprite gUnknown_085961D8, 0x82, -42, -42, 20 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1 + createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) + createsprite gUnknown_085961D8, 130, 42, 27, 20 + createsprite gUnknown_085961D8, 130, -27, 44, 20 + createsprite gUnknown_085961D8, 130, 39, -28, 20 + createsprite gUnknown_085961D8, 130, -42, -42, 20 playsewithpan SE_W091, +63 - delay 0x5 - createsprite gUnknown_085961D8, 0x82, 0, 40, 20 - createsprite gUnknown_085961D8, 0x82, -8, -44, 20 - createsprite gUnknown_085961D8, 0x82, -46, -28, 20 - createsprite gUnknown_085961D8, 0x82, 46, 9, 20 + delay 5 + createsprite gUnknown_085961D8, 130, 0, 40, 20 + createsprite gUnknown_085961D8, 130, -8, -44, 20 + createsprite gUnknown_085961D8, 130, -46, -28, 20 + createsprite gUnknown_085961D8, 130, 46, 9, 20 playsewithpan SE_W091, +63 - delay 0x5 - createsprite gUnknown_085961D8, 0x82, 42, 0, 20 - createsprite gUnknown_085961D8, 0x82, -43, -12, 20 - createsprite gUnknown_085961D8, 0x82, 16, -46, 20 - createsprite gUnknown_085961D8, 0x82, -16, 44, 20 + delay 5 + createsprite gUnknown_085961D8, 130, 42, 0, 20 + createsprite gUnknown_085961D8, 130, -43, -12, 20 + createsprite gUnknown_085961D8, 130, 16, -46, 20 + createsprite gUnknown_085961D8, 130, -16, 44, 20 playsewithpan SE_W091, +63 - delay 0x0 + delay 0 waitsound waitforvisualfinish - call Anim_PoisonEffect + call PoisonBubblesEffect waitforvisualfinish end -Anim_SludgeBomb1: +SludgeBomb1: playsewithpan SE_W145C, -64 - createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 - delay 0x3 + createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 + delay 3 return Move_ACID: loadspritegfx 0x27A6 monbg ANIM_DEF_PARTNER - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 0, 0 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 24, 0 + delay 5 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 24, 0 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, -24, 0 + delay 5 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, -24, 0 playsewithpan SE_W145C, -64 - delay 0xF - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 10, 1 - createvisualtask sub_80D52D0, 0x5, 3, 2, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 20, 2, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_0859620C, 0x82, 0, -22, 0, 15, 55 + delay 15 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1 + createvisualtask sub_8115A04, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31) + createsprite gUnknown_0859620C, 130, 0, -22, 0, 15, 55 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, -26, -24, 0, 15, 55 + delay 10 + createsprite gUnknown_0859620C, 130, -26, -24, 0, 15, 55 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, 15, -27, 0, 15, 50 + delay 10 + createsprite gUnknown_0859620C, 130, 15, -27, 0, 15, 50 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, -15, -17, 0, 10, 45 + delay 10 + createsprite gUnknown_0859620C, 130, -15, -17, 0, 10, 45 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, 27, -22, 0, 15, 50 + delay 10 + createsprite gUnknown_0859620C, 130, 27, -22, 0, 15, 50 playsewithpan SE_W145, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6099,19 +6054,19 @@ Move_ACID: Move_BONEMERANG: loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, -64 - createsprite gUnknown_08597178, 0x2 - delay 0x14 + createsprite gUnknown_08597178, 2 + delay 20 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 5, 1 - delay 0x11 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 + delay 17 playsewithpan SE_W233, -64 - createsprite gUnknown_0857FE28, 0x2, 6, -4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6119,16 +6074,16 @@ Move_BONEMERANG: Move_BONE_CLUB: loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, +63 - createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 - delay 0xC - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 - createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0, 10, 0, 0 + createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + delay 12 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 7, 5, 1, 0, 10, 0, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6137,14 +6092,14 @@ Move_BONE_CLUB: Move_BONE_RUSH: loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, +63 - createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 - delay 0xC - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 5, 1 + createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + delay 12 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1 playsewithpan SE_W030, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6156,74 +6111,74 @@ Move_SPIKES: monbg ANIM_DEF_PARTNER playsewithpan SE_W026, -64 waitplaysewithpan SE_W030, +63, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, 0, 24, 30 - delay 0xA + createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30 + delay 10 playsewithpan SE_W026, -64 waitplaysewithpan SE_W030, +63, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, -24, 24, 30 - delay 0xA + createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30 + delay 10 waitplaysewithpan SE_W030, +63, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, 24, 24, 30 + createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_MEGAHORN: loadspritegfx 0x27A9 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER playsewithpan SE_W082, -64 - jumpifcontest Anim_MegahornInContest + jumpifcontest MegahornInContest fadetobg BG_DRILL waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 -Anim_MegahornContinue: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +MegahornContinue: waitbgfadein - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 - delay 0x3 - createsprite gUnknown_08596974, 0x3, -42, 25, 0, 0, 6 - delay 0x4 + delay 10 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + delay 3 + createsprite gUnknown_08596974, 3, -42, 25, 0, 0, 6 + delay 4 playsewithpan SE_W011, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -16, 4, 1, 4 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, -4, 1, 12, 1 - createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0x7FFF, 10, 0, 0 - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 7, 5, 1, 0x7FFF, 10, 0, 0 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end -Anim_MegahornInContest: +MegahornInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto Anim_MegahornContinue + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto MegahornContinue Move_GUST: loadspritegfx 0x2719 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W016, +63 - createsprite gUnknown_08596270, 0x2, 0, -16 - createvisualtask sub_810DED8, 0x5, 1, 70 + createsprite gUnknown_08596270, 2, 0, -16 + createvisualtask sub_810DED8, 5, 1, 70 waitforvisualfinish - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 7, 1 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 playsewithpan SE_W016B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6232,96 +6187,96 @@ Move_GUST: Move_WING_ATTACK: loadspritegfx 0x2719 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W017, -64, 0x14, 0x2 - createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 - createvisualtask sub_810DED8, 0x5, 1, 70 - createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 - createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20 - delay 0x18 - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9 - delay 0x11 - createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 - createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 - loopsewithpan SE_W003, +63, 0x5, 0x2 + setalpha 12, 8 + loopsewithpan SE_W017, -64, 20, 2 + createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 + createvisualtask sub_810DED8, 5, 1, 70 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + delay 24 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + delay 17 + createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 + loopsewithpan SE_W003, +63, 5, 2 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_PECK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W030, +63 - createvisualtask sub_80D622C, 0x2, 3, -768, 1, 2 - createsprite gUnknown_085973E8, 0x83, -12, 0, 1, 3 + createvisualtask sub_80D622C, 2, 3, -768, 1, 2 + createsprite gUnknown_085973E8, 131, -12, 0, 1, 3 waitforvisualfinish end Move_AEROBLAST: loadspritegfx 0x27AA - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - call Anim_SetFlyingBg + call SetFlyingBg monbgprio_28 ANIM_TARGET - setalpha 0x80C - call Anim_Aeroblast1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 50, 1 - call Anim_Aeroblast1 - call Anim_Aeroblast1 - call Anim_Aeroblast1 - call Anim_Aeroblast1 + setalpha 12, 8 + call Aeroblast1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 50, 1 + call Aeroblast1 + call Aeroblast1 + call Aeroblast1 + call Aeroblast1 waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x0 - call Anim_UnsetFlyingBg + delay 0 + call UnsetFlyingBg end -Anim_Aeroblast1: +Aeroblast1: playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 0, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 0, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 0, 0 + delay 3 playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 1, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 1, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 1, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 1, 0 + delay 3 playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 2, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 2, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 2, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 2, 0 + delay 3 playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 3, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 3, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 3, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 3, 0 + delay 3 return Move_WATER_GUN: - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08595208, 0x2, 20, 0, 0, 0, 40, -25 + setalpha 12, 8 + createsprite gUnknown_08595208, 2, 20, 0, 0, 0, 40, -25 playsewithpan SE_W145, -64 waitforvisualfinish - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 8, 1 - createsprite gUnknown_08597388, 0x4, 0, 0, 1, 2 - createsprite gUnknown_08595220, 0x2, 0, -15, 0, 15, 55 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 + createsprite gUnknown_08597388, 4, 0, 0, 1, 2 + createsprite gUnknown_08595220, 2, 0, -15, 0, 15, 55 playsewithpan SE_W152, +63 - delay 0xA - createsprite gUnknown_08595220, 0x2, 15, -20, 0, 15, 50 + delay 10 + createsprite gUnknown_08595220, 2, 15, -20, 0, 15, 50 playsewithpan SE_W152, +63 - delay 0xA - createsprite gUnknown_08595220, 0x2, -15, -10, 0, 10, 45 + delay 10 + createsprite gUnknown_08595220, 2, -15, -10, 0, 10, 45 playsewithpan SE_W152, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6329,46 +6284,46 @@ Move_WATER_GUN: end Move_CRABHAMMER: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08597388, 0x4, 0, 0, 1, 0 + setalpha 12, 8 + createsprite gUnknown_08597388, 4, 0, 0, 1, 0 playsewithpan SE_W233B, +63 - delay 0x1 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 32429, 10, 0, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 + delay 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 32429, 10, 0, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish - delay 0x8 + delay 8 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 1, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, +63, 0x14, 0x3 - createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 8, 1 - createsprite gUnknown_08595238, 0x2, 10, 10, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 20, -20, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -15, 15, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 0, 0, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -10, -20, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 16, -8, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 5, 8, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -16, 0, 20, 1 + loopsewithpan SE_W152, +63, 20, 3 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 + createsprite gUnknown_08595238, 2, 10, 10, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 20, -20, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -15, 15, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 0, 0, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -10, -20, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 16, -8, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 5, 8, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -16, 0, 20, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SURF: - createvisualtask sub_8107954, 0x2, 0 - delay 0x18 - panse_1B SE_W057, -64, +63, +2, 0x0 + createvisualtask sub_8107954, 2, 0 + delay 24 + panse_1B SE_W057, -64, +63, +2, 0 waitforvisualfinish end @@ -6376,188 +6331,188 @@ Move_FLAMETHROWER: loadspritegfx 0x272D monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 - delay 0x6 - createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W053, -64, +63, +2, 0x0 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 + delay 6 + createvisualtask sub_81076C8, 5, 100 + panse_1B SE_W053, -64, +63, +2, 0 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Flamethrower1: - createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 - delay 0x2 - createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 - delay 0x2 +Flamethrower1: + createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + delay 2 + createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + delay 2 return Move_SANDSTORM: loadspritegfx 0x2815 playsewithpan SE_W201, 0 - createvisualtask sub_8110BCC, 0x5, 0 - delay 0x10 - createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 0 + createvisualtask sub_8110BCC, 5, 0 + delay 16 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 10, 2304, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 90, 2048, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 50, 2560, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 20, 2304, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 70, 1984, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 0, 2816, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 60, 2560, 96, 0 end Move_WHIRLPOOL: loadspritegfx 0x27A5 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x0 - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) + setalpha 12, 8 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1 - call Anim_WhirlpoolEffect - call Anim_WhirlpoolEffect - call Anim_WhirlpoolEffect - delay 0xC - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 + call WhirlpoolEffect + call WhirlpoolEffect + call WhirlpoolEffect + delay 12 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_WhirlpoolEffect: - createsprite gUnknown_08596B70, 0x82, 0, 28, 384, 50, 8, 50, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 32, 240, 40, 11, -46, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 33, 416, 40, 4, 42, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 31, 288, 45, 6, -42, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 28, 448, 45, 11, 46, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 33, 464, 50, 10, -50, 1 - delay 0x2 +WhirlpoolEffect: + createsprite gUnknown_08596B70, 130, 0, 28, 384, 50, 8, 50, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 32, 240, 40, 11, -46, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 33, 416, 40, 4, 42, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 31, 288, 45, 6, -42, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 28, 448, 45, 11, 46, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 33, 464, 50, 10, -50, 1 + delay 2 return Move_FLY: loadspritegfx 0x27AC - loadspritegfx 0x2797 - choosetwoturnanim Anim_FlySetUp, Anim_FlyUnleash -Anim_FlyEnd: + loadspritegfx ANIM_TAG_135 + choosetwoturnanim FlySetUp, FlyUnleash +FlyEnd: waitforvisualfinish end -Anim_FlySetUp: +FlySetUp: playsewithpan SE_W019, -64 - createsprite gUnknown_08596340, 0x2, 0, 0, 13, 336 - goto Anim_FlyEnd + createsprite gUnknown_08596340, 2, 0, 0, 13, 336 + goto FlyEnd -Anim_FlyUnleash: +FlyUnleash: monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, -64 - createsprite gUnknown_08596358, 0x2, 20 - delay 0x14 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 + createsprite gUnknown_08596358, 2, 20 + delay 20 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_FlyEnd + goto FlyEnd Move_BOUNCE: loadspritegfx 0x27AC - loadspritegfx 0x2797 - choosetwoturnanim Anim_BounceSetUp, Anim_BounceUnleash -Anim_BounceEnd: + loadspritegfx ANIM_TAG_135 + choosetwoturnanim BounceSetUp, BounceUnleash +BounceEnd: end -Anim_BounceSetUp: +BounceSetUp: playsewithpan SE_W100, -64 - createsprite gUnknown_08596420, 0x2, 0, 0 - goto Anim_BounceEnd + createsprite gUnknown_08596420, 2, 0, 0 + goto BounceEnd -Anim_BounceUnleash: +BounceUnleash: monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W207, +63 - createsprite gUnknown_0859644C, 0x83 - delay 0x7 + createsprite gUnknown_0859644C, 131 + delay 7 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 11, 1 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_BounceEnd + goto BounceEnd Move_KARATE_CHOP: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, +63 - createsprite gUnknown_08595E68, 0x2, -16, 0, 0, 0, 10, 1, 3, 0 + createsprite gUnknown_08595E68, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_CROSS_CHOP: - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_143 loadspritegfx 0x282D monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W025, +63 - createsprite gUnknown_08595EC8, 0x2, 0, 0, 0 - createsprite gUnknown_08595EC8, 0x2, 0, 0, 1 + createsprite gUnknown_08595EC8, 2, 0, 0, 0 + createsprite gUnknown_08595EC8, 2, 0, 0, 1 delay 0x28 playsewithpan SE_W013, +63 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 10, 0, 10 - createsprite gUnknown_085973D0, 0x3, 0, 0, 1, 20 - createvisualtask sub_80D51AC, 0x5, 1, 7, 0, 9, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0x7FFF, 10, 0, 10 + createsprite gUnknown_085973D0, 3, 0, 0, 1, 20 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_JUMP_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x3 - createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 3 + createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, +63 waitforvisualfinish - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6565,38 +6520,38 @@ Move_JUMP_KICK: end Move_HI_JUMP_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_0857FE70, 0x2, 0, -24, 0, 0, 8 + setalpha 12, 8 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 3 - delay 0x2 - createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3 + delay 2 + createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, +63 waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 11, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08595EB0, 0x3, 1, 20, 1 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + setalpha 12, 8 + createsprite gUnknown_08595EB0, 3, 1, 20, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6604,288 +6559,288 @@ Move_DOUBLE_KICK: end Move_TRIPLE_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233B, +63 - jumpifmoveturn 0x0, Anim_TripleKickLeft - jumpifmoveturn 0x1, Anim_TripleKickRight - goto Anim_TripleKickCenter -Anim_TripleKickContinue: + jumpifmoveturn 0, TripleKickLeft + jumpifmoveturn 1, TripleKickRight + goto TripleKickCenter +TripleKickContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_TripleKickLeft: - createsprite gUnknown_08595E98, 0x84, -16, -8, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, -16, -16, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto Anim_TripleKickContinue +TripleKickLeft: + createsprite gFistFootSpriteTemplate, 132, -16, -8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, -16, -16, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + goto TripleKickContinue -Anim_TripleKickRight: - createsprite gUnknown_08595E98, 0x84, 8, 8, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, 8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto Anim_TripleKickContinue +TripleKickRight: + createsprite gFistFootSpriteTemplate, 132, 8, 8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + goto TripleKickContinue -Anim_TripleKickCenter: - createsprite gUnknown_08595E98, 0x84, 0, 0, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, 0, -8, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto Anim_TripleKickContinue +TripleKickCenter: + createsprite gFistFootSpriteTemplate, 132, 0, 0, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + goto TripleKickContinue Move_DYNAMIC_PUNCH: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27D6 loadspritegfx 0x2717 - delay 0x1 + delay 1 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233B, +63 - createsprite gUnknown_08595E98, 0x83, 0, 0, 20, 1, 0 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 - delay 0x1 + createsprite gFistFootSpriteTemplate, 131, 0, 0, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 + delay 1 waitsound playsewithpan SE_W120, +63 - createvisualtask sub_80D52D0, 0x5, 1, 5, 0, 28, 1 - createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 - delay 0x6 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_COUNTER: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W233, -64 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x4 - createsprite gUnknown_08597358, 0x2, -15, 18, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0 playsewithpan SE_W233B, +63 - delay 0x1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 25, 1 - createsprite gUnknown_08595E98, 0x3, -15, 18, 8, 1, 0 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 0, -4, 1, 0 + delay 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_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 - delay 0x1 - createsprite gUnknown_08595E98, 0x3, 0, -4, 8, 1, 0 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 15, 9, 1, 0 + delay 1 + createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0 playsewithpan SE_W233B, +63 - delay 0x1 - createsprite gUnknown_08595E98, 0x3, 15, 9, 8, 1, 0 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 + delay 1 + createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_VITAL_THROW: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233, -64 - createvisualtask sub_80D5830, 0x2, 0, 12, 4, 1, 2 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x2 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 playsewithpan SE_W233B, +63 - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 - delay 0xB - createsprite gUnknown_0857FE58, 0x2, 1, 0, 10 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + delay 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 10 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ROCK_SMASH: - loadspritegfx 0x274A - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x2, 0, 0, 8, 1, 0 + setalpha 12, 8 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0 playsewithpan SE_W233B, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish playsewithpan SE_W088, +63 - createsprite gUnknown_08596B1C, 0x2, 0, 0, 20, 24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 0x2, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, -5, 0, -20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, 0, -5, 30, 18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, 30, -18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, 18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, -18, 8, 2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 7, 1 + createsprite gUnknown_08596B1C, 2, 0, 0, 20, 24, 14, 2 + createsprite gUnknown_08596B1C, 2, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, 2, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, 2, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, 2, 0, -5, 30, 18, 8, 2 + createsprite gUnknown_08596B1C, 2, 0, 0, 30, -18, 8, 2 + createsprite gUnknown_08596B1C, 2, 0, 0, -30, 18, 8, 2 + createsprite gUnknown_08596B1C, 2, 0, 0, -30, -18, 8, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SUBMISSION: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, -64 - waitplaysewithpan SE_W004, +63, 0xA - waitplaysewithpan SE_W104, -64, 0x14 - waitplaysewithpan SE_W004, +63, 0x1E + waitplaysewithpan SE_W004, +63, 10 + waitplaysewithpan SE_W104, -64, 20 + waitplaysewithpan SE_W004, +63, 30 waitplaysewithpan SE_W104, -64, 0x28 - waitplaysewithpan SE_W004, +63, 0x32 - waitplaysewithpan SE_W104, -64, 0x3C - waitplaysewithpan SE_W004, +63, 0x46 + waitplaysewithpan SE_W004, +63, 50 + waitplaysewithpan SE_W104, -64, 60 + waitplaysewithpan SE_W004, +63, 70 waitplaysewithpan SE_W104, -64, 0x50 waitplaysewithpan SE_W004, +63, 0x5A - createvisualtask sub_80D5738, 0x2, 0, -18, 6, 6, 4 - createvisualtask sub_80D5738, 0x2, 1, 18, 6, 6, 4 - call Anim_Submission1 - call Anim_Submission1 - call Anim_Submission1 + createvisualtask sub_80D5738, 2, 0, -18, 6, 6, 4 + createvisualtask sub_80D5738, 2, 1, 18, 6, 6, 4 + call Submission1 + call Submission1 + call Submission1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Submission1: - createsprite gUnknown_08597358, 0x3, 0, -12, 1, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x3, -12, 8, 1, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x3, 12, 0, 1, 1 - delay 0x8 +Submission1: + createsprite gBasicHitSplatSpriteTemplate, 3, 0, -12, 1, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 3, -12, 8, 1, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 3, 12, 0, 1, 1 + delay 8 return Move_SUNNY_DAY: loadspritegfx 0x27AD monbg ANIM_ATK_PARTNER - setalpha 0x30D - createvisualtask sub_8116620, 0xA, 0x781, 1, 0, 6, RGB_WHITE + setalpha 13, 3 + createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish - panse_26 SE_W080, -64, +63, +1, 0x0 - call Anim_SunnyDay1 - call Anim_SunnyDay1 - call Anim_SunnyDay1 - call Anim_SunnyDay1 + panse_26 SE_W080, -64, +63, +1, 0 + call SunnyDay1 + call SunnyDay1 + call SunnyDay1 + call SunnyDay1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 0x781, 1, 6, 0, RGB_WHITE + createvisualtask sub_8116620, 10, 0x781, 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -Anim_SunnyDay1: +SunnyDay1: createsprite gUnknown_085954A0, 0x28 - delay 0x6 + delay 6 return Move_COTTON_SPORE: loadspritegfx 0x27AE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, +63, 0x12, 0xA - call Anim_CottonSpore1 - call Anim_CottonSpore1 - call Anim_CottonSpore1 + loopsewithpan SE_W077, +63, 0x12, 10 + call CottonSpore1 + call CottonSpore1 + call CottonSpore1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_CottonSpore1: - createsprite gUnknown_085922EC, 0x2, 0, -20, 85, 80, 0 - delay 0xC - createsprite gUnknown_085922EC, 0x2, 0, -10, 170, 80, 0 - delay 0xC - createsprite gUnknown_085922EC, 0x2, 0, -15, 0, 80, 0 - delay 0xC +CottonSpore1: + createsprite gUnknown_085922EC, 2, 0, -20, 85, 80, 0 + delay 12 + createsprite gUnknown_085922EC, 2, 0, -10, 170, 80, 0 + delay 12 + createsprite gUnknown_085922EC, 2, 0, -15, 0, 80, 0 + delay 12 return Move_SPORE: loadspritegfx 0x27AE monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80FEE1C, 0x2 - loopsewithpan SE_W077, +63, 0x10, 0xB - call Anim_Spore1 - call Anim_Spore1 - call Anim_Spore1 + setalpha 12, 8 + createvisualtask sub_80FEE1C, 2 + loopsewithpan SE_W077, +63, 16, 11 + call Spore1 + call Spore1 + call Spore1 waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Spore1: - createsprite gUnknown_085922EC, 0x82, 0, -20, 85, 80, 1 - delay 0xC - createsprite gUnknown_085922EC, 0x82, 0, -10, 170, 80, 1 - delay 0xC - createsprite gUnknown_085922EC, 0x82, 0, -15, 0, 80, 1 - delay 0xC +Spore1: + createsprite gUnknown_085922EC, 130, 0, -20, 85, 80, 1 + delay 12 + createsprite gUnknown_085922EC, 130, 0, -10, 170, 80, 1 + delay 12 + createsprite gUnknown_085922EC, 130, 0, -15, 0, 80, 1 + delay 12 return Move_PETAL_DANCE: - loadspritegfx 0x27AF - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_159 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W080, -64 - createvisualtask sub_80D5830, 0x2, 0, 12, 6, 6, 3 - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 16, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -16, -24, 8, 100 - delay 0xF - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 32, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -32, -24, 8, 100 - delay 0xF - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 24, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -24, -24, 8, 100 - delay 0x1E - createsprite gUnknown_08592334, 0x2, 16, -24, 0, 100 - createsprite gUnknown_08592334, 0x2, -16, -24, 0, 100 - delay 0x1E - createsprite gUnknown_08592334, 0x2, 20, -16, 14, 80 - createsprite gUnknown_08592334, 0x2, -20, -14, 16, 80 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 + createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, 2, 16, -24, 8, 100 + createsprite gUnknown_08592334, 2, -16, -24, 8, 100 + delay 15 + createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, 2, 32, -24, 8, 100 + createsprite gUnknown_08592334, 2, -32, -24, 8, 100 + delay 15 + createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, 2, 24, -24, 8, 100 + createsprite gUnknown_08592334, 2, -24, -24, 8, 100 + delay 30 + createsprite gUnknown_08592334, 2, 16, -24, 0, 100 + createsprite gUnknown_08592334, 2, -16, -24, 0, 100 + delay 30 + createsprite gUnknown_08592334, 2, 20, -16, 14, 80 + createsprite gUnknown_08592334, 2, -20, -14, 16, 80 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 5 - delay 0x3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5 + delay 3 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 6, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish - delay 0x8 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + delay 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6894,38 +6849,38 @@ Move_PETAL_DANCE: Move_RAZOR_LEAF: loadspritegfx 0x274F loadspritegfx 0x27B0 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - loopsewithpan SE_W077, -64, 0xA, 0x5 - createsprite gUnknown_08592390, 0x2, -3, -2, 10 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -1, 15 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -4, -4, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 3, -3, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -6, 8 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -1, 12 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -4, 13 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 4, -5, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -6, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -5, 8 - delay 0x3C + setalpha 12, 8 + delay 1 + loopsewithpan SE_W077, -64, 10, 5 + createsprite gUnknown_08592390, 2, -3, -2, 10 + delay 2 + createsprite gUnknown_08592390, 2, -1, -1, 15 + delay 2 + createsprite gUnknown_08592390, 2, -4, -4, 7 + delay 2 + createsprite gUnknown_08592390, 2, 3, -3, 11 + delay 2 + createsprite gUnknown_08592390, 2, -1, -6, 8 + delay 2 + createsprite gUnknown_08592390, 2, 2, -1, 12 + delay 2 + createsprite gUnknown_08592390, 2, -3, -4, 13 + delay 2 + createsprite gUnknown_08592390, 2, 4, -5, 7 + delay 2 + createsprite gUnknown_08592390, 2, 2, -6, 11 + delay 2 + createsprite gUnknown_08592390, 2, -3, -5, 8 + delay 60 playsewithpan SE_W013B, -64 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, 20, 1 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, -20, 1 - delay 0x14 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, 20, 1 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, -20, 1 + delay 20 playsewithpan SE_W013, +63 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6933,33 +6888,33 @@ Move_RAZOR_LEAF: Move_NATURE_POWER: Move_ANCIENT_POWER: - loadspritegfx 0x274A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_085972D8, 0x2, 4, 1, 10, 1 - createsprite gUnknown_08596C10, 0x2, 20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 0x2, 0, 32, -38, 25, 5 - createsprite gUnknown_08596C10, 0x2, 32, 32, -28, 40, 3 - createsprite gUnknown_08596C10, 0x2, -20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 0x2, 20, 32, -28, 60, 1 - createsprite gUnknown_08596C10, 0x2, 0, 32, -28, 30, 4 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 30, 1 + setalpha 12, 8 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 10, 1 + createsprite gUnknown_08596C10, 2, 20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, 2, 0, 32, -38, 25, 5 + createsprite gUnknown_08596C10, 2, 32, 32, -28, 40, 3 + createsprite gUnknown_08596C10, 2, -20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, 2, 20, 32, -28, 60, 1 + createsprite gUnknown_08596C10, 2, 0, 32, -28, 30, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1 playsewithpan SE_W082, -64 - delay 0xA - createsprite gUnknown_08596C10, 0x2, 15, 32, -48, 25, 5 - createsprite gUnknown_08596C10, 0x2, -10, 32, -42, 30, 4 - delay 0xA - createsprite gUnknown_08596C10, 0x2, 0, 32, -42, 25, 5 - createsprite gUnknown_08596C10, 0x2, -25, 32, -48, 30, 4 + delay 10 + createsprite gUnknown_08596C10, 2, 15, 32, -48, 25, 5 + createsprite gUnknown_08596C10, 2, -10, 32, -42, 30, 4 + delay 10 + createsprite gUnknown_08596C10, 2, 0, 32, -42, 25, 5 + createsprite gUnknown_08596C10, 2, -25, 32, -48, 30, 4 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 16, 0, 0, 4 - delay 0x3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4 + delay 3 playsewithpan SE_W120, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6969,80 +6924,80 @@ Move_OCTAZOOKA: loadspritegfx 0x272E loadspritegfx 0x2721 playsewithpan SE_W025B, -64 - createsprite gUnknown_08592DFC, 0x82, 20, 0, 0, 0, 20, 0 + createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0 waitforvisualfinish playsewithpan SE_W120, +63 - createsprite gUnknown_08592E30, 0x82, 8, 8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, -8, -8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, 8, -8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, -8, 8, 1, 0 + createsprite gUnknown_08592E30, 130, 8, 8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, -8, -8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, 8, -8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, -8, 8, 1, 0 waitforvisualfinish end Move_MIST: loadspritegfx 0x27A0 monbg ANIM_ATK_PARTNER - setalpha 0x80C - loopsewithpan SE_W054, -64, 0x14, 0xF - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 + setalpha 12, 8 + loopsewithpan SE_W054, -64, 20, 15 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 delay 0x20 - createvisualtask sub_8115A04, 0x2, 10, 8, 2, 0, 14, RGB_WHITE + createvisualtask sub_8115A04, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -Anim_Mist1: - createsprite gUnknown_08595C2C, 0x2, 0, -24, 48, 240, 0, 1 - delay 0x7 +Mist1: + createsprite gUnknown_08595C2C, 2, 0, -24, 48, 240, 0, 1 + delay 7 return Move_HAZE: waitforvisualfinish playsewithpan SE_W114, 0 - createvisualtask sub_810C0A0, 0x5 - delay 0x1E - createvisualtask sub_8116620, 0xA, 0x780, 2, 0, 16, RGB_BLACK + createvisualtask sub_810C0A0, 5 + delay 30 + createvisualtask sub_8116620, 10, 0x780, 2, 0, 16, RGB_BLACK delay 0x5A - createvisualtask sub_8116620, 0xA, 0x780, 1, 16, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 0x780, 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH: - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_143 loadspritegfx 0x272D - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, RGB_RED + setalpha 12, 8 + createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED createsprite gUnknown_08595368, 0x81, 0 createsprite gUnknown_08595368, 0x81, 64 createsprite gUnknown_08595368, 0x81, 128 createsprite gUnknown_08595368, 0x81, 196 playsewithpan SE_W172, +63 waitforvisualfinish - createsprite gUnknown_08595E98, 0x83, 0, 0, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 - call Anim_FireMoveEffect - delay 0x4 + createsprite gFistFootSpriteTemplate, 131, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 + call FireMoveEffect + delay 4 playsewithpan SE_W007, +63 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 9, 0, RGB_RED + createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_FireMoveEffect: +FireMoveEffect: createsprite gUnknown_08595380, 0x81, 0, 10, 192, 176, 40 createsprite gUnknown_08595380, 0x81, 0, 10, -192, 240, 40 createsprite gUnknown_08595380, 0x81, 0, 10, 192, -160, 40 @@ -7056,321 +7011,316 @@ Move_LEER: loadspritegfx 0x272B monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W043, -64 - createsprite gUnknown_085CE150, 0x2, 24, -12 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 + createsprite gUnknown_085CE150, 2, 24, -12 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 waitforvisualfinish - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1 + delay 10 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 waitforvisualfinish end Move_DREAM_EATER: loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W107, +63 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish - setalpha 0x80C - createvisualtask sub_80D51AC, 0x2, 1, 0, 2, 25, 1 - call Anim_DreamEaterEffect + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 2, 25, 1 + call DreamEaterEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_DreamEaterEffect: +DreamEaterEffect: playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_POISON_GAS: loadspritegfx 0x27BC loadspritegfx 0x27A6 - delay 0x0 + delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 - setalpha 0x80C - delay 0x0 + setalpha 12, 8 + delay 0 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x28 - loopsewithpan SE_W054, +63, 0x1C, 0x6 - createvisualtask sub_8115A04, 0x2, 4, 6, 2, 0, 12, RGB(26, 0, 26) + loopsewithpan SE_W054, +63, 0x1C, 6 + createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 end Move_BIND: - createvisualtask sub_80D5EB8, 0x5, 0, 6, 3328, 4, 0 - goto Anim_BindWrap + createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_ATTACKER + goto BindWrap -Anim_BindWrap: +BindWrap: playsewithpan SE_W020, +63 - call Anim_BindWrap1 - call Anim_BindWrap1 + call BindWrap1 + call BindWrap1 waitforvisualfinish end - -Anim_BindWrap1: - createvisualtask sub_80D6064, 0x5, 10, -5, 5, 1, 0 - delay 0x10 +BindWrap1: + createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_TARGET, 0 + delay 16 return Move_WRAP: - createvisualtask sub_80D5830, 0x2, 0, 6, 4, 2, 4 - goto Anim_BindWrap + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 6, 4, 2, 4 + goto BindWrap Move_PSYBEAM: loadspritegfx 0x27B3 playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground + call SetPsychicBackground createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15 - call Anim_Psybeam1 - call Anim_Psybeam1 - createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 4, 1 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(31, 18, 31) - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 + call Psybeam1 + call Psybeam1 + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET + createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_Psybeam1: - createsprite gUnknown_0859663C, 0x82, 16, 0, 0, 0, 13, 0 - delay 0x4 +Psybeam1: + createsprite gUnknown_0859663C, 130, 16, 0, 0, 0, 13, 0 + delay 4 return Move_HYPNOSIS: loadspritegfx 0x27B3 - call Anim_SetPsychicBackground - call Anim_Hypnosis1 - call Anim_Hypnosis1 - call Anim_Hypnosis1 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(31, 18, 31) + call SetPsychicBackground + call Hypnosis1 + call Hypnosis1 + call Hypnosis1 + createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_Hypnosis1: +Hypnosis1: playsewithpan SE_W048, -64 - createsprite gUnknown_0859663C, 0x82, 0, 8, 0, 8, 27, 0 - createsprite gUnknown_0859663C, 0x82, 16, -8, 0, -8, 27, 0 - delay 0x6 + createsprite gUnknown_0859663C, 130, 0, 8, 0, 8, 27, 0 + createsprite gUnknown_0859663C, 130, 16, -8, 0, -8, 27, 0 + delay 6 return Move_PSYWAVE: loadspritegfx 0x27B5 playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - createvisualtask sub_81076C8, 0x5, 100 + call SetPsychicBackground + createvisualtask sub_81076C8, 5, 100 createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10 - call Anim_Psywave1 - call Anim_Psywave1 - createvisualtask sub_8115A04, 0x2, 4, 1, 4, 0, 12, RGB(31, 18, 31) - call Anim_Psywave1 - call Anim_Psywave1 - call Anim_Psywave1 - call Anim_Psywave1 + call Psywave1 + call Psywave1 + createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31) + call Psywave1 + call Psywave1 + call Psywave1 + call Psywave1 waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_Psywave1: - createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 - delay 0x4 - createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 - delay 0x4 +Psywave1: + createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + delay 4 + createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + delay 4 return Move_ZAP_CANNON: loadspritegfx 0x27BB - loadspritegfx 0x271B + loadspritegfx ANIM_TAG_011 playsewithpan SE_W086, -64 - createsprite gUnknown_08595764, 0x83, 10, 0, 0, 0, 30, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 0, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 64, 40, 1 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 128, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 192, 40, 2 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 32, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 96, 40, 1 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 160, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 224, 40, 2 + createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 0, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 64, 40, 1 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 128, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 192, 40, 2 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 32, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 96, 40, 1 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 160, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 224, 40, 2 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - delay 0xF - waitplaysewithpan SE_W085B, +63, 0x13 - call Anim_ParalysisEffect + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + delay 15 + waitplaysewithpan SE_W085B, +63, 19 + call ElectricityEffect waitforvisualfinish end Move_STEEL_WING: loadspritegfx 0x2719 - loadspritegfx 0x2797 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loadspritegfx ANIM_TAG_135 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W017, -64, 0x14, 0x2 - createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 - createvisualtask sub_810DED8, 0x5, 1, 70 - createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 - createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20 - delay 0x18 - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9 - delay 0x11 - createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 - createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 + setalpha 12, 8 + loopsewithpan SE_W017, -64, 20, 2 + createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 + createvisualtask sub_810DED8, 5, 1, 70 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + delay 24 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + delay 17 + createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 playsewithpan SE_W013, +63 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_IRON_TAIL: - loadspritegfx 0x2797 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 1, 0, 0 + loadspritegfx ANIM_TAG_135 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET blendoff waitforvisualfinish end Move_POISON_TAIL: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27A6 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 1, 1, RGB(24, 6, 23) + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET blendoff - call Anim_PoisonEffect + call PoisonBubblesEffect waitforvisualfinish end Move_METAL_CLAW: - loadspritegfx 0x2737 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loadspritegfx ANIM_TAG_039 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x2 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 2 playsewithpan SE_W013, +63 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - delay 0x8 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x2 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + delay 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 2 playsewithpan SE_W013, +63 - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 waitforvisualfinish end @@ -7380,15 +7330,15 @@ Move_NIGHT_SHADE: playsewithpan SE_W060, -64 fadetobg BG_GHOST waitbgfadein - delay 0xA + delay 10 playsewithpan SE_W043, -64 - createvisualtask sub_811188C, 0x5, 85 - delay 0x46 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 12, 1 - createvisualtask sub_8115A04, 0x2, 4, 0, 2, 0, 13, RGB_BLACK + createvisualtask sub_811188C, 5, 85 + delay 70 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 + createvisualtask sub_8115A04, 2, 4, 0, 2, 0, 13, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 restorebg waitbgfadein end @@ -7397,24 +7347,24 @@ Move_EGG_BOMB: loadspritegfx 0x27D6 loadspritegfx 0x27BF playsewithpan SE_W039, -64 - createsprite gUnknown_08593488, 0x82, 10, 0, 0, 0, 25, -32 + createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 16, 1 - createsprite gUnknown_0859371C, 0x84, 6, 5, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 6, 5, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, -16, -15, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, -16, -15, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, 16, -5, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 16, -5, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, -12, 18, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, -12, 18, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, 0, 5, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 0, 5, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 + delay 3 waitforvisualfinish end @@ -7422,12 +7372,12 @@ Move_SHADOW_BALL: loadspritegfx 0x27C0 fadetobg BG_GHOST waitbgfadein - delay 0xF + delay 15 createsoundtask sub_8158C58, 168, -64, 63, 5, 5, 0, 5 - createsprite gUnknown_08596D58, 0x82, 16, 16, 8 + createsprite gUnknown_08596D58, 130, 16, 16, 8 waitforvisualfinish playsewithpan SE_W028, +63 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg waitbgfadein @@ -7435,61 +7385,61 @@ Move_SHADOW_BALL: Move_LICK: loadspritegfx 0x27C1 - delay 0xF + delay 15 playsewithpan SE_W122, +63 - createsprite gUnknown_08596D8C, 0x82, 0, 0 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 16, 1 + createsprite gUnknown_08596D8C, 130, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 waitforvisualfinish end Move_FOCUS_ENERGY: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call Anim_EndureEffect - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_WHITE - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call Anim_EndureEffect - delay 0x8 - call Anim_EndureEffect + call EndureEffect + delay 8 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_WHITE + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + call EndureEffect + delay 8 + call EndureEffect waitforvisualfinish end Move_BIDE: - choosetwoturnanim Anim_BideSetUp, Anim_BideUnleash + choosetwoturnanim BideSetUp, BideUnleash end -Anim_BideSetUp: - loopsewithpan SE_W036, -64, 0x9, 0x2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 +BideSetUp: + loopsewithpan SE_W036, -64, 0x9, 2 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish end -Anim_BideUnleash: - loadspritegfx 0x2797 +BideUnleash: + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - loopsewithpan SE_W036, -64, 0x9, 0x2 - createvisualtask sub_8116620, 0xA, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 + setalpha 12, 8 + loopsewithpan SE_W036, -64, 0x9, 2 + createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 12, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 16, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x1, 18, -8, 1, 1 - delay 0x5 + createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1 + delay 5 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x1, -18, 8, 1, 1 - delay 0x5 + createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1 + delay 5 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x1, -8, -5, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 2, 11, 0, RGB_RED + createvisualtask sub_8116620, 10, 2, 2, 11, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -7499,187 +7449,187 @@ Move_STRING_SHOT: loadspritegfx 0x27C3 loadspritegfx 0x27C4 monbg ANIM_DEF_PARTNER - delay 0x0 - createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - loopsewithpan SE_W081, -64, 0x9, 0x6 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 + loopsewithpan SE_W081, -64, 0x9, 6 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 waitforvisualfinish playsewithpan SE_W081B, +63 - createsprite gUnknown_085969F8, 0x82, 0, 10 - delay 0x4 - createsprite gUnknown_085969F8, 0x82, 0, -2 - delay 0x4 - createsprite gUnknown_085969F8, 0x82, 0, 22 + createsprite gUnknown_085969F8, 130, 0, 10 + delay 4 + createsprite gUnknown_085969F8, 130, 0, -2 + delay 4 + createsprite gUnknown_085969F8, 130, 0, 22 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x1 + delay 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK end -Anim_StringShot1: - createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 1 - delay 0x1 +StringShot1: + createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 1 + delay 1 return Move_SPIDER_WEB: loadspritegfx 0x27C5 loadspritegfx 0x27C4 monbg ANIM_DEF_PARTNER - delay 0x0 - createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, -64, 0x9, 0x6 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 + loopsewithpan SE_W081, -64, 0x9, 6 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 waitforvisualfinish playsewithpan SE_W081B, +63 - createsprite gUnknown_08596A2C, 0x2 + createsprite gUnknown_08596A2C, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x1 - createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK end -Anim_SpiderWeb1: - createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 0 - delay 0x1 +SpiderWeb1: + createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 0 + delay 1 return Move_RAZOR_WIND: - choosetwoturnanim Anim_RazorWindSetUp, Anim_RazorWindUnleash -Anim_RazorWindContinue: + choosetwoturnanim RazorWindSetUp, RazorWindUnleash +RazorWindContinue: waitforvisualfinish end -Anim_RazorWindSetUp: +RazorWindSetUp: loadspritegfx 0x2719 playsewithpan SE_W016, -64 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 0, 7, 40 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 85, 7, 40 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 170, 7, 40 + createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40 + createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40 + createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish playsewithpan SE_W016B, -64 - goto Anim_RazorWindContinue + goto RazorWindContinue -Anim_RazorWindUnleash: +RazorWindUnleash: loadspritegfx 0x27AA - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 0x2, 14, 8, 0, 0, 22, 2, 1 - delay 0x2 + createsprite gUnknown_085962D4, 2, 14, 8, 0, 0, 22, 2, 1 + delay 2 playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 0x2, 14, -8, 16, 14, 22, 1, 1 - delay 0x2 + createsprite gUnknown_085962D4, 2, 14, -8, 16, 14, 22, 1, 1 + delay 2 playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 0x2, 14, 12, -16, -14, 22, 0, 1 - delay 0x11 + createsprite gUnknown_085962D4, 2, 14, 12, -16, -14, 22, 0, 1 + delay 17 playsewithpan SE_W013, +63 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 10, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - goto Anim_RazorWindContinue + goto RazorWindContinue Move_DISABLE: loadspritegfx 0x2757 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W197, -64 createsprite gUnknown_0853EE84, 0xD, 24, -16 waitforvisualfinish - createvisualtask sub_81045B0, 0x5 - loopsewithpan SE_W020, +63, 0xF, 0x4 + createvisualtask sub_81045B0, 5 + loopsewithpan SE_W020, +63, 15, 4 waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_TARGET blendoff end Move_RECOVER: loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 monbg ANIM_ATK_PARTNER - setalpha 0x80C - loopsewithpan SE_W025, -64, 0xD, 0x3 - createvisualtask sub_8115A04, 0x2, 2, 0, 6, 0, 11, RGB(31, 31, 11) - call Anim_Recover1 - call Anim_Recover1 - call Anim_Recover1 + setalpha 12, 8 + loopsewithpan SE_W025, -64, 0xD, 3 + createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) + call Recover1 + call Recover1 + call Recover1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 - call Anim_HealingEffect + delay 1 + call HealingEffect waitforvisualfinish end -Anim_Recover1: - createsprite gUnknown_085921E0, 0x2, 40, -10, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -35, -10, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 15, -40, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -10, -32, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 25, -20, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -40, -20, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 5, -40, 13 - delay 0x3 +Recover1: + createsprite gUnknown_085921E0, 2, 40, -10, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -35, -10, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 15, -40, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -10, -32, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 25, -20, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -40, -20, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 5, -40, 13 + delay 3 return Move_MIMIC: loadspritegfx 0x27A3 - setalpha 0x50B + setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 - panse_1B SE_W107, +63, -64, -3, 0x0 - createvisualtask sub_80FF458, 0x5, 128, 24 - delay 0xF - createsprite gUnknown_085924DC, 0x82, -12, 24 - delay 0xA - setarg 0x7, 0xFFFF + panse_1B SE_W107, +63, -64, -3, 0 + createvisualtask sub_80FF458, 5, 128, 24 + delay 15 + createsprite gUnknown_085924DC, 130, -12, 24 + delay 10 + setarg 7, 0xFFFF waitforvisualfinish playsewithpan SE_W036, -64 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 11, RGB_WHITE + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER blendoff @@ -7687,461 +7637,457 @@ Move_MIMIC: Move_CONSTRICT: loadspritegfx 0x27CA - loopsewithpan SE_W010, +63, 0x6, 0x4 - createsprite gUnknown_08592494, 0x84, 0, 16, 0, 2 - delay 0x7 - createsprite gUnknown_08592494, 0x83, 0, 0, 0, 2 - createsprite gUnknown_08592494, 0x82, 0, 8, 1, 2 - delay 0x7 - createsprite gUnknown_08592494, 0x83, 0, -8, 1, 2 - delay 0x8 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 - delay 0x14 + loopsewithpan SE_W010, +63, 6, 4 + createsprite gUnknown_08592494, 132, 0, 16, 0, 2 + delay 7 + createsprite gUnknown_08592494, 131, 0, 0, 0, 2 + createsprite gUnknown_08592494, 130, 0, 8, 1, 2 + delay 7 + createsprite gUnknown_08592494, 131, 0, -8, 1, 2 + delay 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + delay 20 playsewithpan SE_W020, +63 - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitforvisualfinish end Move_CURSE: - choosetwoturnanim Anim_CurseGhost, Anim_CurseStats -Anim_CurseGhost: + choosetwoturnanim CurseGhost, CurseStats +CurseGhost: loadspritegfx 0x27D7 loadspritegfx 0x27D8 monbg ANIM_ATK_PARTNER - createvisualtask sub_8112758, 0x5 + createvisualtask sub_8112758, 5 waitforvisualfinish - delay 0x14 - createsprite gUnknown_08596DD0, 0x2 - delay 0x3C - call Anim_CurseGhost1 + delay 20 + createsprite gUnknown_08596DD0, 2 + delay 60 + call CurseGhost1 delay 0x29 - call Anim_CurseGhost1 + call CurseGhost1 delay 0x29 - call Anim_CurseGhost1 + call CurseGhost1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - delay 0x1 + delay 1 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 - createsprite gUnknown_08596DE8, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 16, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 16, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - -Anim_CurseGhost1: - createvisualtask sub_80D52D0, 0x2, 0, 4, 0, 10, 0 +CurseGhost1: + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 playsewithpan SE_W020, -64 return - -Anim_CurseStats: - createvisualtask sub_80D5EB8, 0x5, 0, 10, 1536, 3, 0 +CurseStats: + createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER waitforvisualfinish - delay 0xA - call Anim_CurseStats1 + delay 10 + call CurseStats1 waitforvisualfinish end - -Anim_CurseStats1: +CurseStats1: playsewithpan SE_W082, -64 - createvisualtask sub_8116B14, 0x5 - createvisualtask sub_8115A04, 0x5, 2, 4, 2, 0, 10, RGB_RED + createvisualtask sub_8116B14, 5 + createvisualtask sub_8115A04, 5, 2, 4, 2, 0, 10, RGB_RED return Move_SOFT_BOILED: loadspritegfx 0x27DA - loadspritegfx 0x27DB - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_031 monbg ANIM_ATK_PARTNER playsewithpan SE_W039, -64 - createvisualtask sub_80D51AC, 0x2, 0, 0, 2, 6, 1 - createsprite gUnknown_085937B0, 0x4, 0, 16, 0 - createsprite gUnknown_085937B0, 0x4, 0, 16, 1 - delay 0x78 - delay 0x7 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 + createsprite gUnknown_085937B0, 4, 0, 16, 0 + createsprite gUnknown_085937B0, 4, 0, 16, 1 + delay 120 + delay 7 playsewithpan SE_W030, -64 - createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 - delay 0x8 - createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 - delay 0x3C - setarg 0x7, 0xFFFF + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + delay 8 + createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + delay 60 + setarg 7, 0xFFFF waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - call Anim_HealingEffect2 + call HealingEffect2 end Move_HEAL_BELL: - loadspritegfx 0x27DD - loadspritegfx 0x27DE - loadspritegfx 0x27DB - createvisualtask sub_8116620, 0xA, 10, 0, 0, 10, RGB_WHITE + loadspritegfx ANIM_TAG_205 + loadspritegfx ANIM_TAG_206 + loadspritegfx ANIM_TAG_203 + createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish - createvisualtask sub_8105CB4, 0x5 - createsprite gUnknown_08593938, 0x2, 0, -24, 0, 1 - delay 0xC + createvisualtask sub_8105CB4, 5 + createsprite gUnknown_08593938, 2, 0, -24, 0, 1 + delay 12 createsprite gUnknown_08593958, 0x28, 0, -24, 48, -18, 35, 0, 0 createsprite gUnknown_08593958, 0x28, 0, -24, -48, 20, 30, 1, 1 createsprite gUnknown_08593958, 0x28, 0, -24, -38, -29, 30, 2, 2 createsprite gUnknown_08593958, 0x28, 0, -24, 36, 18, 30, 3, 3 - call Anim_HealBell1 + call HealBell1 delay 0x21 createsprite gUnknown_08593958, 0x28, 0, -24, 19, 26, 35, 4, 4 createsprite gUnknown_08593958, 0x28, 0, -24, -34, -12, 30, 5, 5 createsprite gUnknown_08593958, 0x28, 0, -24, 41, -20, 34, 6, 2 createsprite gUnknown_08593958, 0x28, 0, -24, -15, 26, 32, 7, 0 - call Anim_HealBell1 + call HealBell1 delay 0x21 createsprite gUnknown_08593958, 0x28, 0, -24, -48, 18, 31, 0, 2 createsprite gUnknown_08593958, 0x28, 0, -24, 48, -20, 30, 2, 5 createsprite gUnknown_08593958, 0x28, 0, -24, 38, 29, 33, 4, 3 createsprite gUnknown_08593958, 0x28, 0, -24, -36, -18, 30, 6, 1 - call Anim_HealBell1 + call HealBell1 waitforvisualfinish - createvisualtask sub_8105D60, 0x5 + createvisualtask sub_8105D60, 5 waitforvisualfinish - unloadspritegfx 0x27DD - unloadspritegfx 0x27DE - unloadspritegfx 0x27DB - loadspritegfx 0x2741 + unloadspritegfx ANIM_TAG_205 + unloadspritegfx ANIM_TAG_206 + unloadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 playsewithpan SE_W234, -64 - createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 - delay 0x8 - createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + delay 8 + createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx 0x2741 - loadspritegfx 0x27DB + unloadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_203 playsewithpan SE_REAPOKE, -64 - createvisualtask sub_8116664, 0xA, 4, 3, 10, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 10, 0, RGB_WHITE - createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 + createvisualtask sub_8116664, 10, 4, 3, 10, 0, 31500 + createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE + createsprite gUnknown_08593868, 16, 0, 0, 0, 1 end - -Anim_HealBell1: - createvisualtask sub_8116664, 0xA, 4, 3, 8, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 2, 10, RGB_WHITE +HealBell1: + createvisualtask sub_8116664, 10, 4, 3, 8, 0, 31500 + createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE createsprite gUnknown_0859381C, 0x28, 0, -24, 0, 1 playsewithpan SE_W215, -64 return Move_FAKE_OUT: playsewithpan SE_W260, 0 - createvisualtask sub_8105EB0, 0x5 + createvisualtask sub_8105EB0, 5 waitforvisualfinish playsewithpan SE_W166, +63 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - createvisualtask sub_8106020, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask sub_8106020, 3 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE: loadspritegfx 0x27EA - createsprite gUnknown_08597274, 0x2, 27, 3, 0, 16, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, -64 waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W043, -64 - createvisualtask sub_81064F8, 0x5 + createvisualtask sub_81064F8, 5 delay 0xD - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 waitforvisualfinish - createvisualtask sub_810A094, 0x3, 20, 1, 0 + createvisualtask sub_810A094, 3, 20, 1, 0 playsewithpan SE_W081B, +63 - createsprite gUnknown_08597274, 0x2, 27, 3, 16, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish end Move_SWEET_KISS: loadspritegfx 0x27E8 loadspritegfx 0x27EC - createsprite gUnknown_08593AA8, 0x82, 16, -48 + createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, +63 delay 0x17 playsewithpan SE_W215, +63 delay 0x17 playsewithpan SE_W215, +63 waitforvisualfinish - createsprite gUnknown_085939B8, 0x83, 160, -30 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30 playsewithpan SE_W213, +63 - createsprite gUnknown_085939B8, 0x83, -256, -42 - createsprite gUnknown_085939B8, 0x83, 128, -14 - createsprite gUnknown_085939B8, 0x83, 416, -38 - createsprite gUnknown_085939B8, 0x83, -128, -22 - createsprite gUnknown_085939B8, 0x83, -384, -31 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -42 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -14 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 end Move_LOVELY_KISS: loadspritegfx 0x27EB loadspritegfx 0x27ED - createsprite gUnknown_08593AF0, 0x82, 0, -24 + createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, +63 waitforvisualfinish playsewithpan SE_W213, +63 - createsprite gUnknown_08593AC0, 0x83, -256, -42 - createsprite gUnknown_08593AC0, 0x83, 128, -14 - createsprite gUnknown_08593AC0, 0x83, 416, -38 - createsprite gUnknown_08593AC0, 0x83, -128, -22 + createsprite gUnknown_08593AC0, 131, -256, -42 + createsprite gUnknown_08593AC0, 131, 128, -14 + createsprite gUnknown_08593AC0, 131, 416, -38 + createsprite gUnknown_08593AC0, 131, -128, -22 end Move_FURY_SWIPES: loadspritegfx 0x27EE - createsprite gUnknown_0857FE28, 0x2, 5, 5 - delay 0x4 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 + delay 4 playsewithpan SE_W010, +63 - createsprite gUnknown_08593B38, 0x82, 16, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 5, 1 - delay 0xA - createsprite gUnknown_0857FE28, 0x82, 5, 5 - delay 0x4 + createsprite gUnknown_08593B38, 130, 16, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5 + delay 4 playsewithpan SE_W010, +63 - createsprite gUnknown_08593B38, 0x82, -16, 0, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 + createsprite gUnknown_08593B38, 130, -16, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end Move_INGRAIN: loadspritegfx 0x27EF loadspritegfx 0x27A3 - createsprite gUnknown_0859254C, 0x2, 16, 26, -1, 2, 150 + createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, -64 - delay 0xA - createsprite gUnknown_0859254C, 0x2, -32, 20, 1, 1, 140 + delay 10 + createsprite gUnknown_0859254C, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, -64 - delay 0xA - createsprite gUnknown_0859254C, 0x2, 32, 22, 1, 0, 130 + delay 10 + createsprite gUnknown_0859254C, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, -64 - delay 0xA - createsprite gUnknown_0859254C, 0x2, -16, 25, -1, 3, 120 + delay 10 + createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, -64 delay 0x28 - createsprite gUnknown_0859258C, 0x3, 32, 26, -1, 3, 30 - delay 0x5 + createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30 + delay 5 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_0859258C, 0x3, -48, 20, 1, 2, 30 + delay 5 + createsprite gUnknown_0859258C, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, -64 - delay 0x5 + delay 5 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_0859258C, 0x3, 48, 26, -2, 3, 18 + delay 5 + createsprite gUnknown_0859258C, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, -64 - delay 0xA + delay 10 waitforvisualfinish end Move_PRESENT: loadspritegfx 0x27F0 - createvisualtask AnimTask_IsHealingMove, 0x2 - createsprite gUnknown_08592610, 0x82, 0, -5, 10, 2, -1 + createvisualtask AnimTask_IsHealingMove, 2 + createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1 playsewithpan SE_W039, -64 - delay 0xE + delay 14 playsewithpan SE_W145B, -64 - delay 0xE + delay 14 playsewithpan SE_W145B, 0 - delay 0x14 + delay 20 playsewithpan SE_W145B, +63 waitforvisualfinish - jumpretfalse Anim_PresentDamage - jumprettrue Anim_PresentHeal + jumpretfalse PresentDamage + jumprettrue PresentHeal end -Anim_PresentDamage: +PresentDamage: loadspritegfx 0x27D6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, 0, 0, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 16, 16, 1, 1 end -Anim_PresentHeal: +PresentHeal: loadspritegfx 0x27D3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 playsewithpan SE_W234, +63 - createsprite gUnknown_08592658, 0x84, -16, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 16, 32, -3, -1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 32, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -32, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 0, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 24, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -24, 32, -3, 1 + createsprite gUnknown_08592658, 132, -16, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 16, 32, -3, -1 + delay 3 + createsprite gUnknown_08592658, 132, 32, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -32, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 0, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 24, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -24, 32, -3, 1 waitforvisualfinish waitsound - call Anim_HealingEffect2 + call HealingEffect2 end Move_BATON_PASS: loadspritegfx 0x27F2 playsewithpan SE_W226, -64 - createvisualtask sub_8115A04, 0x2, 31, 1, 2, 0, 11, RGB(31, 22, 30) - createsprite gUnknown_085CE370, 0x2 + createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) + createsprite gUnknown_085CE370, 2 end Move_PERISH_SONG: - loadspritegfx 0x27DE - createsprite gUnknown_08593C0C, 0x4, 0, 0, 0 - createsprite gUnknown_08593C0C, 0x4, 1, 1, 16 - createsprite gUnknown_08593C0C, 0x4, 2, 1, 32 - createsprite gUnknown_08593C0C, 0x4, 3, 2, 48 - createsprite gUnknown_08593C0C, 0x4, 4, 2, 64 - createsprite gUnknown_08593C0C, 0x4, 5, 0, 80 - createsprite gUnknown_08593C0C, 0x4, 6, 0, 96 - createsprite gUnknown_08593C0C, 0x4, 7, 1, 112 - createsprite gUnknown_08593C0C, 0x4, 8, 2, 128 - createsprite gUnknown_08593C0C, 0x4, 9, 0, 144 - createsprite gUnknown_08593C0C, 0x4, 10, 2, 160 - createsprite gUnknown_08593C0C, 0x4, 11, 0, 176 - createsprite gUnknown_08593C0C, 0x4, 12, 1, 192 - createsprite gUnknown_08593C0C, 0x4, 13, 3, 208 - createsprite gUnknown_08593C0C, 0x4, 14, 3, 224 - createsprite gUnknown_08593C0C, 0x4, 15, 0, 240 - createsprite gUnknown_08593C24, 0x4, 15, 0, 0 - delay 0x14 - panse_1B SE_W195, -64, +63, +2, 0x0 + loadspritegfx ANIM_TAG_206 + createsprite gUnknown_08593C0C, 4, 0, 0, 0 + createsprite gUnknown_08593C0C, 4, 1, 1, 16 + createsprite gUnknown_08593C0C, 4, 2, 1, 32 + createsprite gUnknown_08593C0C, 4, 3, 2, 48 + createsprite gUnknown_08593C0C, 4, 4, 2, 64 + createsprite gUnknown_08593C0C, 4, 5, 0, 80 + createsprite gUnknown_08593C0C, 4, 6, 0, 96 + createsprite gUnknown_08593C0C, 4, 7, 1, 112 + createsprite gUnknown_08593C0C, 4, 8, 2, 128 + createsprite gUnknown_08593C0C, 4, 9, 0, 144 + createsprite gUnknown_08593C0C, 4, 10, 2, 160 + createsprite gUnknown_08593C0C, 4, 11, 0, 176 + createsprite gUnknown_08593C0C, 4, 12, 1, 192 + createsprite gUnknown_08593C0C, 4, 13, 3, 208 + createsprite gUnknown_08593C0C, 4, 14, 3, 224 + createsprite gUnknown_08593C0C, 4, 15, 0, 240 + createsprite gUnknown_08593C24, 4, 15, 0, 0 + delay 20 + panse_1B SE_W195, -64, +63, +2, 0 delay 0x50 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, 0 - createvisualtask sub_811489C, 0x5, 4, 0 - createvisualtask sub_811489C, 0x5, 5, 0 - createvisualtask sub_811489C, 0x5, 6, 0 - createvisualtask sub_811489C, 0x5, 7, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_BLACK + createvisualtask sub_811489C, 5, 4, 0 + createvisualtask sub_811489C, 5, 5, 0 + createvisualtask sub_811489C, 5, 6, 0 + createvisualtask sub_811489C, 5, 7, 0 delay 0x64 - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0 - createvisualtask sub_811489C, 0x5, 4, 1 - createvisualtask sub_811489C, 0x5, 5, 1 - createvisualtask sub_811489C, 0x5, 6, 1 - createvisualtask sub_811489C, 0x5, 7, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_BLACK + createvisualtask sub_811489C, 5, 4, 1 + createvisualtask sub_811489C, 5, 5, 1 + createvisualtask sub_811489C, 5, 6, 1 + createvisualtask sub_811489C, 5, 7, 1 waitforvisualfinish end Move_SLEEP_TALK: loadspritegfx 0x27F4 - createvisualtask sub_80D5EB8, 0x5, 0, 4, 4096, 2, 0 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 + createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 playsewithpan SE_W173, -64 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 playsewithpan SE_W173, -64 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 playsewithpan SE_W173, -64 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 waitforvisualfinish end Move_HYPER_FANG: loadspritegfx 0x27D0 playsewithpan SE_W044, +63 - delay 0x1 - delay 0x2 - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_HyperFangInContest - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_HyperFangOnOpponent - goto Anim_HyperFangOnPlayer -Anim_HyperFangContinue: + delay 1 + delay 2 + createvisualtask AnimTask_IsContest, 2 + jumprettrue HyperFangInContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse HyperFangOnOpponent + goto HyperFangOnPlayer +HyperFangContinue: waitbgfadeout - createsprite gUnknown_085CE1DC, 0x82 + createsprite gUnknown_085CE1DC, 130 waitbgfadein - createvisualtask sub_80D51AC, 0x3, 1, 0, 10, 10, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 playsewithpan SE_W043, +63 - delay 0x14 + delay 20 restorebg waitbgfadein waitforvisualfinish end -Anim_HyperFangOnOpponent: +HyperFangOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto Anim_HyperFangContinue + goto HyperFangContinue -Anim_HyperFangOnPlayer: +HyperFangOnPlayer: fadetobg BG_IMPACT_PLAYER - goto Anim_HyperFangContinue + goto HyperFangContinue -Anim_HyperFangInContest: +HyperFangInContest: fadetobg BG_IMPACT_CONTESTS - goto Anim_HyperFangContinue + goto HyperFangContinue Move_TRI_ATTACK: loadspritegfx 0x27F6 - createsprite gUnknown_085CE2F8, 0x82, 16, 0 + createsprite gUnknown_085CE2F8, 130, 16, 0 playsewithpan SE_W161, -64 - delay 0x14 + delay 20 playsewithpan SE_W161, -64 - delay 0x14 + delay 20 createsoundtask sub_8158C58, 220, -64, 63, 5, 6, 0, 7 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0 - delay 0x10 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + delay 16 loadspritegfx 0x2731 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, +63 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1 - delay 0x2 - createvisualtask sub_810A094, 0x2, 20, 3, 1, 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 + delay 2 + createvisualtask sub_810A094, 2, 20, 3, 1, 1 waitforvisualfinish loadspritegfx 0x2735 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W161B, +63 - createsprite gUnknown_085956C0, 0x82, 0, -48 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, 16 - delay 0x14 - createvisualtask sub_810A094, 0x2, 20, 3, 1, 0 - delay 0x2 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_085956C0, 130, 0, -48 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 0, 16 + delay 20 + createvisualtask sub_810A094, 2, 20, 3, 1, 0 + delay 2 + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx 0x279D - call Anim_FreezeEffect1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0 + loadspritegfx ANIM_TAG_141 + call FreezeEffect1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end @@ -8151,27 +8097,27 @@ Move_WILL_O_WISP: monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W052, -64 - waitplaysewithpan SE_W052, -64, 0xA - createvisualtask sub_8159278, 0x2, -64, -64, 1, 0 - createsprite gUnknown_0859563C, 0x2, 0, 0, 0 - delay 0x3 - createsprite gUnknown_0859563C, 0x3, 0, 0, 1 - delay 0x3 - createsprite gUnknown_0859563C, 0x4, 0, 0, 2 - delay 0x3 - createsprite gUnknown_0859563C, 0x4, 0, 0, 3 + waitplaysewithpan SE_W052, -64, 10 + createvisualtask sub_8159278, 2, -64, -64, 1, 0 + createsprite gUnknown_0859563C, 2, 0, 0, 0 + delay 3 + createsprite gUnknown_0859563C, 3, 0, 0, 1 + delay 3 + createsprite gUnknown_0859563C, 4, 0, 0, 2 + delay 3 + createsprite gUnknown_0859563C, 4, 0, 0, 3 delay 0x28 - createvisualtask sub_8159278, 0x2, -64, 63, 2, 0 + createvisualtask sub_8159278, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 playsewithpan SE_W172B, +63 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 13, 1 - createsprite gUnknown_0859566C, 0x2, 0 - createsprite gUnknown_0859566C, 0x2, 42 - createsprite gUnknown_0859566C, 0x2, 84 - createsprite gUnknown_0859566C, 0x2, 126 - createsprite gUnknown_0859566C, 0x2, 168 - createsprite gUnknown_0859566C, 0x2, 210 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 + createsprite gUnknown_0859566C, 2, 0 + createsprite gUnknown_0859566C, 2, 42 + createsprite gUnknown_0859566C, 2, 84 + createsprite gUnknown_0859566C, 2, 126 + createsprite gUnknown_0859566C, 2, 168 + createsprite gUnknown_0859566C, 2, 210 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -8179,460 +8125,454 @@ Move_WILL_O_WISP: Move_ENCORE: loadspritegfx 0x27F3 loadspritegfx 0x2807 - createvisualtask sub_815ABEC, 0x2 - createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0 + createvisualtask sub_815ABEC, 2 + createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_085CE22C, 0x82, 0, -8 - createsprite gUnknown_085CE244, 0x2, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE244, 0x2, 2, 0, 1, 0, 9 - createsprite gUnknown_085CE25C, 0x3, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE25C, 0x3, 2, 0, 1, 0, 9 - delay 0x10 - createvisualtask sub_8159244, 0x5, 223, 63 - createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 5, 1 + createsprite gUnknown_085CE22C, 130, 0, -8 + createsprite gUnknown_085CE244, 2, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE244, 2, 2, 0, 1, 0, 9 + createsprite gUnknown_085CE25C, 3, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE25C, 3, 2, 0, 1, 0, 9 + delay 16 + createvisualtask sub_8159244, 5, 223, 63 + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish - createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1 + createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 waitforvisualfinish - createvisualtask sub_815AC8C, 0x2 + createvisualtask sub_815AC8C, 2 end Move_TRICK: loadspritegfx 0x27F0 loadspritegfx 0x27DF - createsprite gUnknown_085926E8, 0x2, -40, 80 - createsprite gUnknown_085926E8, 0x2, -40, 208 - delay 0x10 + createsprite gUnknown_085926E8, 2, -40, 80 + createsprite gUnknown_085926E8, 2, -40, 208 + delay 16 playsewithpan SE_W166, 0 - createvisualtask sub_8106020, 0x3 - createvisualtask sub_81060B0, 0x3 - delay 0x1E + createvisualtask sub_8106020, 3 + createvisualtask sub_81060B0, 3 + delay 30 playsewithpan SE_W104, 0 - delay 0x18 + delay 24 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W213, 0 - createvisualtask sub_80D51AC, 0x3, 0, 5, 0, 7, 2 - createvisualtask sub_80D51AC, 0x3, 1, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_ATTACKER, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2 waitforvisualfinish end Move_WISH: loadspritegfx 0x27F9 - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 + loadspritegfx ANIM_TAG_049 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - panse_27 SE_W115, +63, -64, -3, 0x0 + panse_27 SE_W115, +63, -64, -3, 0 createsprite gUnknown_085CE388, 0x28 waitforvisualfinish - delay 0x3C - loopsewithpan SE_W215, -64, 0x10, 0x3 - call Anim_GrantingStarsEffect + delay 60 + loopsewithpan SE_W215, -64, 16, 3 + call GrantingStarsEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK waitforvisualfinish end Move_STOCKPILE: loadspritegfx 0x27FB playsewithpan SE_W025, -64 - createvisualtask sub_8115A04, 0x2, 2, 8, 1, 0, 12, RGB_WHITE - createvisualtask sub_815B65C, 0x5 - call Anim_Stockpile1 - call Anim_Stockpile1 + createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE + createvisualtask sub_815B65C, 5 + call Stockpile1 + call Stockpile1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 12, 0, RGB_WHITE end - -Anim_Stockpile1: - createsprite gUnknown_08592244, 0x2, 55, 55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, -55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 0, 55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 0, -55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 55, -34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 55, 34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, -34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, 34, 13 - delay 0x1 +Stockpile1: + createsprite gUnknown_08592244, 2, 55, 55, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, -55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 0, 55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 0, -55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 55, -34, 13 + delay 1 + createsprite gUnknown_08592244, 2, 55, 34, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, -34, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, 34, 13 + delay 1 return Move_SPIT_UP: loadspritegfx 0x27FD - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W036, -64 - createvisualtask sub_815B6B4, 0x5 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 + createvisualtask sub_815B6B4, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 0x2D playsewithpan SE_W255, -64 - delay 0x3 - createsprite gUnknown_08593A50, 0x2, 0, 12 - createsprite gUnknown_08593A50, 0x2, 32, 12 - createsprite gUnknown_08593A50, 0x2, 64, 12 - createsprite gUnknown_08593A50, 0x2, 96, 12 - createsprite gUnknown_08593A50, 0x2, 128, 12 - createsprite gUnknown_08593A50, 0x2, 160, 12 - createsprite gUnknown_08593A50, 0x2, 192, 12 - createsprite gUnknown_08593A50, 0x2, 224, 12 - delay 0x5 - jumpifmoveturn 0x2, Anim_SpitUpStrong - jumpifmoveturn 0x3, Anim_SpitUpStrongest -Anim_SpitUpContinue: - delay 0x5 - createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 + delay 3 + createsprite gUnknown_08593A50, 2, 0, 12 + createsprite gUnknown_08593A50, 2, 32, 12 + createsprite gUnknown_08593A50, 2, 64, 12 + createsprite gUnknown_08593A50, 2, 96, 12 + createsprite gUnknown_08593A50, 2, 128, 12 + createsprite gUnknown_08593A50, 2, 160, 12 + createsprite gUnknown_08593A50, 2, 192, 12 + createsprite gUnknown_08593A50, 2, 224, 12 + delay 5 + jumpifmoveturn 2, SpitUpStrong + jumpifmoveturn 3, SpitUpStrongest +SpitUpContinue: + delay 5 + createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 playsewithpan SE_W003, +63 - createsprite gUnknown_085973E8, 0x83, -12, 10, 1, 1 - delay 0x5 + createsprite gUnknown_085973E8, 131, -12, 10, 1, 1 + delay 5 playsewithpan SE_W003, +63 - createsprite gUnknown_085973E8, 0x83, 12, -10, 1, 1 + createsprite gUnknown_085973E8, 131, 12, -10, 1, 1 waitforvisualfinish end - -Anim_SpitUpStrong: - createsprite gUnknown_08593A50, 0x2, 16 - createsprite gUnknown_08593A50, 0x2, 80 - createsprite gUnknown_08593A50, 0x2, 144 - createsprite gUnknown_08593A50, 0x2, 208 - goto Anim_SpitUpContinue - -Anim_SpitUpStrongest: - createsprite gUnknown_08593A50, 0x2, 16 - createsprite gUnknown_08593A50, 0x2, 48 - createsprite gUnknown_08593A50, 0x2, 80 - createsprite gUnknown_08593A50, 0x2, 112 - createsprite gUnknown_08593A50, 0x2, 144 - createsprite gUnknown_08593A50, 0x2, 176 - createsprite gUnknown_08593A50, 0x2, 208 - createsprite gUnknown_08593A50, 0x2, 240 - goto Anim_SpitUpContinue +SpitUpStrong: + createsprite gUnknown_08593A50, 2, 16 + createsprite gUnknown_08593A50, 2, 80 + createsprite gUnknown_08593A50, 2, 144 + createsprite gUnknown_08593A50, 2, 208 + goto SpitUpContinue +SpitUpStrongest: + createsprite gUnknown_08593A50, 2, 16 + createsprite gUnknown_08593A50, 2, 48 + createsprite gUnknown_08593A50, 2, 80 + createsprite gUnknown_08593A50, 2, 112 + createsprite gUnknown_08593A50, 2, 144 + createsprite gUnknown_08593A50, 2, 176 + createsprite gUnknown_08593A50, 2, 208 + createsprite gUnknown_08593A50, 2, 240 + goto SpitUpContinue Move_SWALLOW: loadspritegfx 0x27FC - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 playsewithpan SE_W036, -64 - createvisualtask sub_815B778, 0x5 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 + createvisualtask sub_815B778, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 0x26 playsewithpan SE_W255, -64 - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 12, 1 - call Anim_SwallowEffect - jumpifmoveturn 0x2, Anim_SwallowGood - jumpifmoveturn 0x3, Anim_SwallowBest -Anim_SwallowContinue: + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 + call SwallowEffect + jumpifmoveturn 2, SwallowGood + jumpifmoveturn 3, SwallowBest +SwallowContinue: waitforvisualfinish - call Anim_HealingEffect + call HealingEffect end - -Anim_SwallowEffect: - createsprite gUnknown_085CE418, 0x2, 0, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, -24, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, 16, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, -16, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, 24, -8 - delay 0x1 +SwallowEffect: + createsprite gUnknown_085CE418, 2, 0, -8 + delay 1 + createsprite gUnknown_085CE418, 2, -24, -8 + delay 1 + createsprite gUnknown_085CE418, 2, 16, -8 + delay 1 + createsprite gUnknown_085CE418, 2, -16, -8 + delay 1 + createsprite gUnknown_085CE418, 2, 24, -8 + delay 1 return - -Anim_SwallowGood: - call Anim_SwallowEffect - goto Anim_SwallowContinue - -Anim_SwallowBest: - call Anim_SwallowEffect - call Anim_SwallowEffect - goto Anim_SwallowContinue +SwallowGood: + call SwallowEffect + goto SwallowContinue +SwallowBest: + call SwallowEffect + call SwallowEffect + goto SwallowContinue Move_TRANSFORM: monbg ANIM_ATTACKER playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 0x30 - createvisualtask sub_815B7D0, 0x2, 0 + waitplaysewithpan SE_W107, -64, 48 + createvisualtask sub_815B7D0, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER end Move_MORNING_SUN: loadspritegfx 0x2801 - loadspritegfx 0x272F - createvisualtask sub_815BB84, 0x5 - delay 0x8 - createvisualtask sub_8116620, 0xA, 0x781, 8, 0, 12, RGB_WHITE - delay 0xE - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - createvisualtask sub_8116620, 0xA, 0x781, 3, 12, 0, RGB_WHITE + loadspritegfx ANIM_TAG_031 + createvisualtask sub_815BB84, 5 + delay 8 + createvisualtask sub_8116620, 10, 0x781, 8, 0, 12, RGB_WHITE + delay 14 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + createvisualtask sub_8116620, 10, 0x781, 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound - call Anim_HealingEffect + call HealingEffect end -Anim_MorningSun1: - createsprite gUnknown_085CE48C, 0x2, 30, 640 - delay 0x5 +MorningSun1: + createsprite gUnknown_085CE48C, 2, 30, 640 + delay 5 return Move_SWEET_SCENT: loadspritegfx 0x27FE playsewithpan SE_W230, -64 - createsprite gUnknown_085CE544, 0x2, 100, 0, 100 - delay 0x19 + createsprite gUnknown_085CE544, 2, 100, 0, 100 + delay 25 setpan 0 - call Anim_SweetScentEffect - createsprite gUnknown_085CE544, 0x2, 55, 0 + call SweetScentEffect + createsprite gUnknown_085CE544, 2, 55, 0 setpan +63 - createvisualtask sub_8115A04, 0x2, 20, 1, 5, 5, 13, RGB(31, 21, 21) - call Anim_SweetScentEffect + createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21) + call SweetScentEffect waitforvisualfinish end -Anim_SweetScentEffect: - createsprite gUnknown_085CE544, 0x2, 70, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 60, 0, 64 - delay 0x5 - createsprite gUnknown_085CE544, 0x2, 80, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 58, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 100, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 90, 0, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 48, 0, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 95, 1, 80 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 100, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 75, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 85, 0, 120 - delay 0x2 +SweetScentEffect: + createsprite gUnknown_085CE544, 2, 70, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 60, 0, 64 + delay 5 + createsprite gUnknown_085CE544, 2, 80, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 58, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 100, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 90, 0, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 48, 0, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 95, 1, 80 + delay 2 + createsprite gUnknown_085CE544, 2, 100, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 75, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 85, 0, 120 + delay 2 return Move_HYPER_BEAM: loadspritegfx 0x27A3 - createsprite gUnknown_08597274, 0x2, 1, 4, 0, 16, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W063, -64 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 4, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1 waitforvisualfinish - delay 0x1E + delay 30 createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5 - createvisualtask sub_80D51AC, 0x2, 0, 0, 4, 50, 1 - createvisualtask sub_8115D94, 0x2, 10147, 1, 12, 31, 16, 0, 0 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 50, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 11, RGB(25, 25, 25) - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - createvisualtask sub_8116620, 0xA, 4, 2, 11, 0, RGB(25, 25, 25) + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 + createvisualtask sub_8115D94, 2, 10147, 1, 12, 31, 16, 0, 0 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 11, RGB(25, 25, 25) + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + createvisualtask sub_8116620, 10, 4, 2, 11, 0, RGB(25, 25, 25) waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 16, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 16, 0, RGB_BLACK end -Anim_HyperBeam1: - createsprite gUnknown_08592288, 0x82 - createsprite gUnknown_08592288, 0x82 - delay 0x1 +HyperBeam1: + createsprite gUnknown_08592288, 130 + createsprite gUnknown_08592288, 130 + delay 1 return Move_FLATTER: loadspritegfx 0x27F3 loadspritegfx 0x2800 - createvisualtask sub_8159244, 0x5, 223, 63 - createvisualtask sub_815ABEC, 0x2 - createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0 + createvisualtask sub_8159244, 5, 223, 63 + createvisualtask sub_815ABEC, 2 + createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_085CE5C0, 0x82, 0, -8, 80 - delay 0x0 - createsprite gUnknown_0857FE40, 0x2, 5, 2, 1 - delay 0xA - createsprite gUnknown_0857FE40, 0x2, 5, 2, 1 - delay 0x0 - createvisualtask sub_8159210, 0x5, 229, -64 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - delay 0x5 - createvisualtask sub_8159210, 0x5, 229, 63 + createsprite gUnknown_085CE5C0, 130, 0, -8, 80 + delay 0 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + delay 10 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + delay 0 + createvisualtask sub_8159210, 5, 229, -64 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + delay 5 + createvisualtask sub_8159210, 5, 229, 63 waitforvisualfinish - createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1 + createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 waitforvisualfinish - createvisualtask sub_815AC8C, 0x2 + createvisualtask sub_815AC8C, 2 end -Anim_Flatter1: +Flatter1: createsprite gUnknown_085CE5A8, 0x28, 0 createsprite gUnknown_085CE5A8, 0x28, 1 return Move_ROLE_PLAY: monbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, RGB_WHITE - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 10, 0 + createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W161, -64 - waitplaysewithpan SE_W197, -64, 0x1E - createvisualtask sub_815CED8, 0x2 + waitplaysewithpan SE_W197, -64, 30 + createvisualtask sub_815CED8, 2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, RGB_WHITE - delay 0x8 - createsprite gUnknown_08597274, 0x2, 1, 2, 10, 0, 0 + createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE + delay 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 10, 0, RGB_BLACK end Move_REFRESH: - loadspritegfx 0x27DB - loadspritegfx 0x2741 + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 playsewithpan SE_W287, -64 - createvisualtask sub_815DFCC, 0x2, 0 + createvisualtask sub_815DFCC, 2, 0 waitforvisualfinish playsewithpan SE_W234, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 end Move_BLAZE_KICK: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 loadspritegfx 0x272D monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W172, +63 - createsprite gUnknown_08595F14, 0x83, 0, 0, 1, 30 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE - delay 0x1E + createsprite gUnknown_08595F14, 131, 0, 0, 1, 30 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 30 playsewithpan SE_W007, +63 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 14, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 - call Anim_FireMoveEffect + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 + call FireMoveEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_HYPER_VOICE: - loadspritegfx 0x27DB - createvisualtask sub_81590B8, 0x5, 0 - call Anim_HyperVoiceEffect + loadspritegfx ANIM_TAG_203 + createvisualtask sub_81590B8, 5, 0 + call HyperVoiceEffect waitforvisualfinish - delay 0x8 - createvisualtask sub_81590B8, 0x5, 1 - call Anim_HyperVoiceEffect + delay 8 + createvisualtask sub_81590B8, 5, 1 + call HyperVoiceEffect waitforvisualfinish end -Anim_HyperVoiceEffect: - createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, RGB_YELLOW - createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0 - createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 6, 1 - createvisualtask sub_81162A4, 0x2, 1, 0, 6, 1 - createvisualtask sub_8159078, 0x5 +HyperVoiceEffect: + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 8, 0, RGB_YELLOW + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 + createsprite gUnknown_08593880, 0, 45, 0, 0, 0, 0, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1 + createvisualtask sub_81162A4, 2, 1, 0, 6, 1 + createvisualtask sub_8159078, 5 return Move_SAND_TOMB: - loadspritegfx 0x275A - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1 + loadspritegfx ANIM_TAG_074 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 playsewithpan SE_W328, +63 - call Anim_SandTombEffect - call Anim_SandTombEffect - call Anim_SandTombEffect + call SandTombEffect + call SandTombEffect + call SandTombEffect delay 0x16 - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish end -Anim_SandTombEffect: - createsprite gUnknown_08596B34, 0x82, 0, 32, 528, 30, 10, 50, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 36, 480, 20, 13, -46, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 37, 576, 20, 5, 42, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 35, 400, 25, 8, -42, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 32, 512, 25, 13, 46, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 37, 464, 30, 12, -50, 1 - delay 0x2 +SandTombEffect: + createsprite gUnknown_08596B34, 130, 0, 32, 528, 30, 10, 50, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 36, 480, 20, 13, -46, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 37, 576, 20, 5, 42, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 35, 400, 25, 8, -42, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 32, 512, 25, 13, 46, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 37, 464, 30, 12, -50, 1 + delay 2 return Move_SHEER_COLD: @@ -8643,9 +8583,9 @@ Move_SHEER_COLD: loadspritegfx 0x271A monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80A9EF4, 0x2 - waitplaysewithpan SE_W258, +63, 0x11 + setalpha 12, 8 + createvisualtask sub_80A9EF4, 2 + waitplaysewithpan SE_W258, +63, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8654,181 +8594,179 @@ Move_SHEER_COLD: end Move_ARM_THRUST: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D6134, 0x5, 8, 5, 0, 0 - delay 0x6 - createsprite gUnknown_0857FE28, 0x2, 4, 3 - delay 0x4 + setalpha 12, 8 + createvisualtask sub_80D6134, 5, 8, 5, 0, 0 + delay 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08596034, 0x82, 10, -8, 14, 3 + createsprite gUnknown_08596034, 130, 10, -8, 14, 3 waitforvisualfinish - createvisualtask sub_80D6134, 0x5, 8, 5, 0, 1 + createvisualtask sub_80D6134, 5, 8, 5, 0, 1 playsewithpan SE_W003, +63 - choosetwoturnanim Anim_ArmThrustRight, Anim_ArmThrustLeft -Anim_ArmThrustContinue: - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + choosetwoturnanim ArmThrustRight, ArmThrustLeft +ArmThrustContinue: + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish blendoff end - -Anim_ArmThrustRight: - createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 - goto Anim_ArmThrustContinue - -Anim_ArmThrustLeft: - createsprite gUnknown_08597358, 0x82, -8, 0, 1, 2 - goto Anim_ArmThrustContinue +ArmThrustRight: + createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 + goto ArmThrustContinue +ArmThrustLeft: + createsprite gBasicHitSplatSpriteTemplate, 130, -8, 0, 1, 2 + goto ArmThrustContinue Move_MUDDY_WATER: - panse_1B SE_W250, -64, +63, +2, 0x0 - createvisualtask sub_8107954, 0x2, 1 + panse_1B SE_W250, -64, +63, +2, 0 + createvisualtask sub_8107954, 2, 1 waitforvisualfinish end Move_BULLET_SEED: loadspritegfx 0x2716 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 30, 1 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 waitforvisualfinish end Move_DRAGON_CLAW: loadspritegfx 0x272D - loadspritegfx 0x2737 + loadspritegfx ANIM_TAG_039 playsewithpan SE_W221B, -64 - createvisualtask sub_8116620, 0xA, 2, 4, 0, 8, RGB(31, 19, 0) - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 15, 1 - call Anim_DragonClawEffect - call Anim_DragonClawEffect - createsprite gUnknown_0857FE28, 0x2, 6, 4 - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createvisualtask sub_8159210, 0x5, 136, 63 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createvisualtask sub_8159210, 0x5, 136, 63 - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - createvisualtask sub_8116620, 0xA, 2, 4, 8, 0, RGB(31, 19, 0) + createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 + call DragonClawEffect + call DragonClawEffect + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + delay 2 + createvisualtask sub_8159210, 5, 136, 63 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createvisualtask sub_8159210, 5, 136, 63 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createvisualtask sub_8116620, 10, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end -Anim_DragonClawEffect: - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - delay 0x2 +DragonClawEffect: + createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + delay 2 return -Anim_End: +End: end Move_MUD_SHOT: loadspritegfx 0x2813 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 - delay 0x6 - createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W250, -64, +63, +1, 0x0 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 + delay 6 + createvisualtask sub_81076C8, 5, 100 + panse_1B SE_W250, -64, +63, +1, 0 + call MudShot1 + call MudShot1 + call MudShot1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_MudShot1: - createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 - delay 0x2 - createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 - delay 0x2 +MudShot1: + createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + delay 2 + createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + delay 2 return Move_METEOR_MASH: loadspritegfx 0x27F9 - loadspritegfx 0x2797 - loadspritegfx 0x279F - panse_1B SE_W112, -64, +63, +3, 0x0 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + panse_1B SE_W112, -64, +63, +3, 0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish - createsprite gUnknown_085CE8DC, 0x83, -48, -64, 72, 32, 30 - delay 0xA - createsprite gUnknown_085CE8DC, 0x83, -112, -64, 8, 32, 30 + createsprite gUnknown_085CE8DC, 131, -48, -64, 72, 32, 30 + delay 10 + createsprite gUnknown_085CE8DC, 131, -112, -64, 8, 32, 30 delay 0x28 - createsprite gUnknown_08595F14, 0x83, 0, 0, 0, 30 - createsprite gUnknown_085CE8DC, 0x83, -80, -64, 40, 32, 30 - delay 0x14 + createsprite gUnknown_08595F14, 131, 0, 0, 0, 30 + createsprite gUnknown_085CE8DC, 131, -80, -64, 40, 32, 30 + delay 20 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 5, 0, 20, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 waitforvisualfinish - delay 0xA + delay 10 restorebg waitbgfadein waitforvisualfinish @@ -8837,26 +8775,26 @@ Move_METEOR_MASH: Move_REVENGE: loadspritegfx 0x2805 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, -64 - createsprite gUnknown_08596088, 0x2, 10, -10 + createsprite gUnknown_08596088, 2, 10, -10 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 2, 0, 4, 2, 8, RGB_RED + createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish unloadspritegfx 0x2805 loadspritegfx 0x2806 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_085960D0, 0x82, 10, -10 + createsprite gUnknown_085960D0, 130, 10, -10 waitforvisualfinish unloadspritegfx 0x2806 - loadspritegfx 0x2797 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 10, 1 - createsprite gUnknown_08597400, 0x83, -10, -8, 1, 1, 8 + loadspritegfx ANIM_TAG_135 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 + createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597400, 0x83, 10, 8, 1, 1, 8 + delay 8 + createsprite gUnknown_08597400, 131, 10, 8, 1, 1, 8 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -8867,75 +8805,75 @@ Move_POISON_FANG: loadspritegfx 0x27D0 loadspritegfx 0x27A6 playsewithpan SE_W044, +63 - createsprite gUnknown_085CE1DC, 0x82 - delay 0xA - createvisualtask sub_80D51AC, 0x3, 1, 3, 0, 10, 1 + createsprite gUnknown_085CE1DC, 130 + delay 10 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, 0, 4, 0, 12, RGB(26, 0, 26) - call Anim_PoisonEffect + createvisualtask sub_8115A04, 2, 4, 0, 4, 0, 12, RGB(26, 0, 26) + call PoisonBubblesEffect waitforvisualfinish end Move_SUBSTITUTE: playsewithpan SE_W213, -64 - createvisualtask sub_815F20C, 0x2 + createvisualtask sub_815F20C, 2 end Move_FRENZY_PLANT: loadspritegfx 0x27EF - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x0, 1, 2, 0, 5, 0 + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592564, 0x2, 10, 8, 2, 0, 0, 100 + createsprite gUnknown_08592564, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, -64 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 20, -8, -2, 0, 1, 95 + delay 5 + createsprite gUnknown_08592564, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 30, 8, -4, 0, 0, 90 + delay 5 + createsprite gUnknown_08592564, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 40, -8, 4, 0, 1, 85 + delay 5 + createsprite gUnknown_08592564, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 50, 8, 0, 0, 0, 85 + delay 5 + createsprite gUnknown_08592564, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 60, -8, -2, 0, 1, 85 + delay 5 + createsprite gUnknown_08592564, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 75, 8, 0, 0, 0, 85 + delay 5 + createsprite gUnknown_08592564, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, +63 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 85, 16, 6, 0, 3, 80 + delay 5 + createsprite gUnknown_08592564, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, +63 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 85, -16, -6, 0, 2, 75 + delay 5 + createsprite gUnknown_08592564, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -10, 1, 3 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3 playsewithpan SE_W003, +63 - createvisualtask sub_80D51AC, 0x3, 1, 8, 0, 20, 1 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 10, 8, 1, 3 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3 playsewithpan SE_W003, +63 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 10, -3, 1, 2 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2 playsewithpan SE_W003, +63 - delay 0x3 - createsprite gUnknown_08597358, 0x2, -3, 1, 1, 2 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2 playsewithpan SE_W003, +63 - delay 0x2 - createsprite gUnknown_08597358, 0x2, -10, 1, 1, 1 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1 playsewithpan SE_W003, +63 - delay 0x2 - createsprite gUnknown_08597358, 0x2, 0, 10, 1, 1 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1 playsewithpan SE_W003, +63 waitforvisualfinish - createsprite gUnknown_08597274, 0x0, 1, 2, 5, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -8945,528 +8883,519 @@ Move_METAL_SOUND: loadspritegfx 0x2814 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call Anim_MetalSound1 - call Anim_MetalSound1 - call Anim_MetalSound1 - call Anim_MetalSound1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + call MetalSound1 + call MetalSound1 + call MetalSound1 + call MetalSound1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 waitforvisualfinish end -Anim_MetalSound1: - panse_1B SE_W103, -64, +63, +2, 0x0 - createsprite gUnknown_08593458, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 +MetalSound1: + panse_1B SE_W103, -64, +63, +2, 0 + createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_FOCUS_PUNCH: - goto Anim_FocusPunch + goto FocusPunch -Anim_FocusPunchEnd: +FocusPunchEnd: waitforvisualfinish end -Anim_FocusPunch: - loadspritegfx 0x2797 - loadspritegfx 0x279F - delay 0x1 - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_FocusPunchInContest - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_FocusPunchOnOpponent - jumprettrue Anim_FocusPunchOnPlayer -Anim_FocusPunchContinue: +FocusPunch: + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + delay 1 + createvisualtask AnimTask_IsContest, 2 + jumprettrue FocusPunchInContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse FocusPunchOnOpponent + jumprettrue FocusPunchOnPlayer +FocusPunchContinue: waitbgfadein monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W207, +63 - createsprite gUnknown_08596104, 0x82 - delay 0xA - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, 2, 1, 0 + createsprite gUnknown_08596104, 130 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, -6, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 0, 8, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0 playsewithpan SE_W025B, +63 waitforvisualfinish restorebg waitbgfadein clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_FocusPunchEnd + goto FocusPunchEnd -Anim_FocusPunchOnOpponent: +FocusPunchOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto Anim_FocusPunchContinue + goto FocusPunchContinue -Anim_FocusPunchOnPlayer: +FocusPunchOnPlayer: fadetobg BG_IMPACT_PLAYER - goto Anim_FocusPunchContinue + goto FocusPunchContinue -Anim_FocusPunchInContest: +FocusPunchInContest: fadetobg BG_IMPACT_CONTESTS - goto Anim_FocusPunchContinue + goto FocusPunchContinue Move_RETURN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask AnimTask_GetHappinessPowerLevel2, 0x2 - delay 0x2 - jumpreteq 0x0, Anim_ReturnWeak - jumpreteq 0x1, Anim_ReturnMedium - jumpreteq 0x2, Anim_ReturnStrong - jumpreteq 0x3, Anim_ReturnStrongest -Anim_ReturnContinue: + setalpha 12, 8 + createvisualtask AnimTask_GetReturnPowerLevel, 2 + delay 2 + jumpreteq 0, ReturnWeak + jumpreteq 1, ReturnMedium + jumpreteq 2, ReturnStrong + jumpreteq 3, ReturnStrongest +ReturnContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_ReturnWeak: - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 +ReturnWeak: + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 139, 63 - goto Anim_ReturnContinue - -Anim_ReturnMedium: - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 139, 63 + goto ReturnContinue +ReturnMedium: + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 waitforvisualfinish - delay 0xB - createsprite gUnknown_0857FE28, 0x2, 5, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_8159210, 0x5, 141, 63 - goto Anim_ReturnContinue - -Anim_ReturnStrong: - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 + delay 11 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 141, 63 + goto ReturnContinue +ReturnStrong: + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 waitforvisualfinish - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, 10, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, -5, 3, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto Anim_ReturnContinue - -Anim_ReturnStrongest: - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 6, 0 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + goto ReturnContinue +ReturnStrongest: + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 12, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 + createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish - delay 0x4 - createsprite gUnknown_0857FE40, 0x2, 8, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 + delay 4 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish - delay 0x2 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 - createsprite gUnknown_0857FE40, 0x2, 4, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 + delay 2 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 + createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 4, 2, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 + createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish - call Anim_ReturnStrongest1 - call Anim_ReturnStrongest1 - call Anim_ReturnStrongest1 - call Anim_ReturnStrongest1 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 10, 10, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x6 - createsprite gUnknown_08597358, 0x2, -5, 3, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 + call ReturnStrongest1 + call ReturnStrongest1 + call ReturnStrongest1 + call ReturnStrongest1 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 6, 0, 0 - goto Anim_ReturnContinue - -Anim_ReturnStrongest1: - createsprite gUnknown_0857FE40, 0x2, 4, 3, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 6, 0, RGB_BLACK + goto ReturnContinue +ReturnStrongest1: + createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish return Move_COSMIC_POWER: - loadspritegfx 0x2741 - createvisualtask sub_8159244, 0x5, 243, 0 + loadspritegfx ANIM_TAG_049 + createvisualtask sub_8159244, 5, 243, 0 playsewithpan SE_W322, 0 - createvisualtask sub_8117610, 0x2, 0, 0, 15, 0 + createvisualtask sub_8117610, 2, 0, 0, 15, 0 waitforvisualfinish fadetobg BG_COSMIC waitbgfadeout - createvisualtask sub_8117660, 0x2, 0, 128, 0, -1 + createvisualtask sub_8117660, 2, 0, 128, 0, -1 waitbgfadein - delay 0x46 - createvisualtask sub_8159210, 0x5, 228, -64 - createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60 - delay 0x8 - createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60 + delay 70 + createvisualtask sub_8159210, 5, 228, -64 + createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + delay 8 + createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 delay 0x28 - createvisualtask sub_8117610, 0x2, 0, 15, 0, 0 + createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein waitforvisualfinish end Move_BLAST_BURN: - loadspritegfx 0x2733 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W221, -64 - createsprite gUnknown_08595428, 0x2, -32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 0, -16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 20, 10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -20, 10, 24, 0, 0, 0 - delay 0x19 + createsprite gUnknown_08595428, 2, -32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 0, -16, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 20, 10, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, 0, 16, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -20, 10, 24, 0, 0, 0 + delay 25 playsewithpan SE_W172B, -64 - createsprite gUnknown_08595428, 0x2, -64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x6, -40, -20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 0, -32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 40, -20, 24, 0, 0, 0 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createsprite gUnknown_08595428, 0x42, 64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 40, 20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -40, 20, 24, 0, 0, 0 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x19 + createsprite gUnknown_08595428, 2, -64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 6, -40, -20, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 0, -32, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 40, -20, 24, 0, 0, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createsprite gUnknown_08595428, 66, 64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 40, 20, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, 0, 32, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -40, 20, 24, 0, 0, 0 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 25 playsewithpan SE_W172B, -64 - createsprite gUnknown_08595428, 0x2, -96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x6, -60, -30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 0, -48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 60, -30, 24, 0, 0, 0 - createsprite gUnknown_08597358, 0x82, -4, 3, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 12, 0, 20, 1 - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 - createsprite gUnknown_08595428, 0x42, 96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 60, 30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -60, 30, 24, 0, 0, 0 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_08595428, 2, -96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 6, -60, -30, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 0, -48, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 60, -30, 24, 0, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, -4, 3, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 12, 0, 20, 1 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 + createsprite gUnknown_08595428, 66, 96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 60, 30, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, 0, 48, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -60, 30, 24, 0, 0, 0 + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ROCK_TOMB: - loadspritegfx 0x280A - loadspritegfx 0x274A - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 + loadspritegfx ANIM_TAG_250 + loadspritegfx ANIM_TAG_058 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish - createsprite gUnknown_08596C58, 0x82, 20, 12, 64, 114, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x8 - createsprite gUnknown_08596C58, 0x82, -20, 12, 64, 98, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createsprite gUnknown_08596C58, 130, -20, 12, 64, 98, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x8 + delay 8 createsprite gUnknown_08596C58, 0xC2, 3, 6, 64, 82, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x8 - createsprite gUnknown_08596C58, 0x82, -3, 13, 64, 66, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createsprite gUnknown_08596C58, 130, -3, 13, 64, 66, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x18 + delay 24 playsewithpan SE_W063, +63 createsprite gUnknown_085967AC, 0x85, 1, 50 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 20, 1 - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish end Move_SILVER_WIND: loadspritegfx 0x281F - panse_1B SE_W016, -64, +63, +2, 0x0 + panse_1B SE_W016, -64, +63, +2, 0 playsewithpan SE_W234, 0 - delay 0x0 + delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 - delay 0x0 - createvisualtask sub_8116664, 0xA, 1, 0, 0, 4, 0 - createvisualtask AnimTask_IsTargetOpponentSide, 0x2 - jumprettrue Anim_SilverWindOnPlayer + delay 0 + createvisualtask sub_8116664, 10, 1, 0, 0, 4, 0 + createvisualtask AnimTask_IsTargetOpponentSide, 2 + jumprettrue SilverWindOnPlayer fadetobg BG_BUG_OPPONENT waitbgfadeout - createvisualtask sub_8117660, 0x5, 1536, 0, 0, -1 -Anim_SilverWindContinue: - delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 4, 4, RGB_BLACK + createvisualtask sub_8117660, 5, 1536, 0, 0, -1 +SilverWindContinue: + delay 0 + createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein createsprite gUnknown_08592830, 0xC2, -32, 16, 0, 6, 2, 3, 1 createsprite gUnknown_08592830, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592830, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592830, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x0 + createsprite gUnknown_08592830, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592830, 120, -40, 14, 128, 4, 1, 2, 1 + delay 0 createsprite gUnknown_08592848, 0xC2, -32, 16, 0, 6, 2, 3, 1 createsprite gUnknown_08592848, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592848, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592848, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x0 + createsprite gUnknown_08592848, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592848, 120, -40, 14, 128, 4, 1, 2, 1 + delay 0 createsprite gUnknown_08592860, 0xC2, -32, 16, 0, 6, 2, 3, 1 createsprite gUnknown_08592860, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592860, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592860, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x6 + createsprite gUnknown_08592860, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592860, 120, -40, 14, 128, 4, 1, 2, 1 + delay 6 createsprite gUnknown_08592830, 0xC2, -4, 16, 0, 6, 1, 2, 1 createsprite gUnknown_08592830, 0xC2, -16, 12, 192, 5, 2, 3, 1 - delay 0x0 + delay 0 createsprite gUnknown_08592848, 0xC2, -4, 16, 0, 6, 1, 2, 1 createsprite gUnknown_08592848, 0xC2, -16, 12, 192, 5, 2, 3, 1 - delay 0x0 + delay 0 createsprite gUnknown_08592860, 0xC2, -4, 16, 0, 6, 1, 2, 1 createsprite gUnknown_08592860, 0xC2, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, +63 clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 restorebg waitbgfadeout - createvisualtask sub_8116664, 0xA, 1, 0, 4, 0, 0 - setarg 0x7, 0xFFFF + createvisualtask sub_8116664, 10, 1, 0, 4, 0, 0 + setarg 7, 0xFFFF waitbgfadein end -Anim_SilverWindOnPlayer: +SilverWindOnPlayer: fadetobg BG_BUG_PLAYER waitbgfadeout - createvisualtask sub_8117660, 0x5, -1536, 0, 0, -1 - goto Anim_SilverWindContinue + createvisualtask sub_8117660, 5, -1536, 0, 0, -1 + goto SilverWindContinue Move_SNATCH: playsewithpan SE_W036, -64 - createvisualtask sub_80D5C50, 0x5, 0, -12, 4, 10, 10, 12, 6 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 end Move_DIVE: loadspritegfx 0x2820 loadspritegfx 0x2821 - choosetwoturnanim Anim_DiveSetUp, Anim_DiveAttack - -Anim_DiveSetUp: + choosetwoturnanim DiveSetUp, DiveAttack +DiveSetUp: loadspritegfx 0x27AC playsewithpan SE_W029, -64 - createsprite gUnknown_08596490, 0x2, 0, 0, 13, 336 + createsprite gUnknown_08596490, 2, 0, 0, 13, 336 waitforvisualfinish playsewithpan SE_W291, -64 - createsprite gUnknown_085964CC, 0x3, 0 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 + createsprite gUnknown_085964CC, 3, 0 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 end - -Anim_DiveSetUp1: - createsprite gUnknown_085964E4, 0x5, 0, 0 - createsprite gUnknown_085964E4, 0x5, 1, 0 +DiveSetUp1: + createsprite gUnknown_085964E4, 5, 0, 0 + createsprite gUnknown_085964E4, 5, 1, 0 return - -Anim_DiveAttack: +DiveAttack: loadspritegfx 0x27A4 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W153, +63 - createsprite gUnknown_085964CC, 0x83, 1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - delay 0xC - call Anim_UnderWaterAttack1 + createsprite gUnknown_085964CC, 131, 1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + delay 12 + call UnderWaterAttack1 waitforvisualfinish visible ANIM_ATTACKER clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_DiveAttack1: +DiveAttack1: createsprite gUnknown_085964E4, 0x85, 0, 1 createsprite gUnknown_085964E4, 0x85, 1, 1 return Move_ROCK_BLAST: - loadspritegfx 0x274A - loadspritegfx 0x2797 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x3 + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 3 playsewithpan SE_W207, -64 - createsprite gUnknown_08596C98, 0x82, 16, 0, 0, 0, 25, 257 + createsprite gUnknown_08596C98, 130, 16, 0, 0, 0, 25, 257 waitforvisualfinish - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 playsewithpan SE_W088, +63 - createsprite gUnknown_08596B1C, 0x82, 0, 0, 20, 24, 14, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 - createsprite gUnknown_08596B1C, 0x82, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 0x82, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x82, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, 130, 0, 0, 20, 24, 14, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 + createsprite gUnknown_08596B1C, 130, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, 130, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, 130, -5, 0, -20, -24, 14, 2 waitforvisualfinish end Move_OVERHEAT: loadspritegfx 0x272D - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x120C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, RGB(28, 0, 0) + setalpha 12, 18 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0) waitforvisualfinish - createvisualtask sub_8117C44, 0x5 + createvisualtask sub_8117C44, 5 waitforvisualfinish - createvisualtask sub_8117CA0, 0x5, 0, 1 - delay 0x1 - createvisualtask sub_8117DD8, 0x5, 0 - delay 0x1 + createvisualtask sub_8117CA0, 5, 0, 1 + delay 1 + createvisualtask sub_8117DD8, 5, 0 + delay 1 playsewithpan SE_W082, -64 - createvisualtask sub_8117CA0, 0x5, 1, 0 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, RGB(28, 0, 0) - createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 + createvisualtask sub_8117CA0, 5, 1, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 1, 0, 13, RGB(28, 0, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish playsewithpan SE_W172B, -64 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, -20 - delay 0x5 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 0 - delay 0x5 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 10 - delay 0x5 + createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, -20 + createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, -20 + createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, -20 + createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, -20 + delay 5 + createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 0 + createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 0 + createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 0 + createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 0 + delay 5 + createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 10 + createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 10 + createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 10 + createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 10 + delay 5 waitforvisualfinish - createsprite gUnknown_08597358, 0x83, -5, 3, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0 playsewithpan SE_W007, +63 - createvisualtask sub_80D51AC, 0x2, 1, 10, 0, 25, 1 - delay 0x6 - createsprite gUnknown_08597358, 0x83, 8, -5, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0 playsewithpan SE_W007, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x83, 10, 10, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0 playsewithpan SE_W007, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0 playsewithpan SE_W007, +63 - createvisualtask sub_8117DD8, 0x5, 1 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, RGB(18, 18, 18) - createvisualtask sub_80D51AC, 0x5, 0, 3, 0, 15, 1 + createvisualtask sub_8117DD8, 5, 1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, -1, 0, 13, RGB(18, 18, 18) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 3, 0, 15, 1 waitforvisualfinish - createvisualtask sub_8117D3C, 0x5, 0, 1 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, RGB(28, 0, 0) + createvisualtask sub_8117D3C, 5, 0, 1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 5, 0, RGB(28, 0, 0) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish - delay 0xF - createvisualtask sub_8117D3C, 0x5, 1, 0 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, RGB(18, 18, 18) + delay 15 + createvisualtask sub_8117D3C, 5, 1, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 13, 0, RGB(18, 18, 18) waitforvisualfinish - createvisualtask sub_8117C70, 0x5 + createvisualtask sub_8117C70, 5 waitforvisualfinish end @@ -9474,167 +9403,161 @@ Move_HYDRO_CANNON: loadspritegfx 0x27A5 loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W057, -64 - createsprite gUnknown_085951C0, 0x82 - delay 0xA - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1E - panse_1B SE_W056, -64, +63, +2, 0x0 - call Anim_HydroCannon1 - createvisualtask sub_80D51AC, 0x5, 1, 10, 0, 40, 1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 + createsprite gUnknown_085951C0, 130 + delay 10 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 30 + panse_1B SE_W056, -64, +63, +2, 0 + call HydroCannon1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 waitforvisualfinish - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_HydroCannon1: - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 +HydroCannon1: + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 return Move_ASTONISH: loadspritegfx 0x2821 playsewithpan SE_W227, -64 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x19 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 25 createsprite gUnknown_085964E4, 0x85, 0, 1 playsewithpan SE_W166, +63 createsprite gUnknown_085964E4, 0x85, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - createvisualtask sub_8106020, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask sub_8106020, 3 waitforvisualfinish end Move_SEISMIC_TOSS: - loadspritegfx 0x2797 - loadspritegfx 0x274A - setarg 0x7, 0x0 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_058 + setarg 7, 0 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 waitforvisualfinish - createvisualtask sub_81114EC, 0x3 - delay 0x1 + createvisualtask AnimTask_GetSeismicTossDamageLevel, 3 + delay 1 fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - createvisualtask sub_811152C, 0x3 + createvisualtask sub_811152C, 3 playsewithpan SE_W327, 0 waitbgfadein waitforvisualfinish - createvisualtask sub_8111590, 0x3 - jumpreteq 0x0, Anim_SeismicTossAnim1 - jumpreteq 0x1, Anim_SeismicTossAnim2 - jumpreteq 0x2, Anim_SeismicTossAnim3 -Anim_SeismicTossContinue: + createvisualtask sub_8111590, 3 + jumpreteq 0, SeismicTossWeak + jumpreteq 1, SeismicTossMedium + jumpreteq 2, SeismicTossStrong +SeismicTossContinue: restorebg waitbgfadeout - setarg 0x7, 0xFFF + setarg 7, 0xFFF waitbgfadein clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_SeismicTossAnim1: - call Anim_SeismicToss1 - delay 0x10 - call Anim_SeismicToss2 - goto Anim_SeismicTossContinue - -Anim_SeismicTossAnim2: - call Anim_SeismicToss1 - delay 0xE - call Anim_SeismicToss2 - delay 0xE - call Anim_SeismicToss1 - goto Anim_SeismicTossContinue - -Anim_SeismicTossAnim3: - call Anim_SeismicToss2 - delay 0xA - call Anim_SeismicToss1 - delay 0xA - call Anim_SeismicToss2 - delay 0xA - call Anim_SeismicToss1 - goto Anim_SeismicTossContinue - -Anim_SeismicToss1: - createsprite gUnknown_08597358, 0x83, -10, -8, 1, 1 +SeismicTossWeak: + call SeismicToss1 + delay 16 + call SeismicToss2 + goto SeismicTossContinue +SeismicTossMedium: + call SeismicToss1 + delay 14 + call SeismicToss2 + delay 14 + call SeismicToss1 + goto SeismicTossContinue +SeismicTossStrong: + call SeismicToss2 + delay 10 + call SeismicToss1 + delay 10 + call SeismicToss2 + delay 10 + call SeismicToss1 + goto SeismicTossContinue +SeismicToss1: + createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1 playsewithpan SE_W070, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 + createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 return - -Anim_SeismicToss2: - createsprite gUnknown_08597358, 0x83, 10, -8, 1, 1 +SeismicToss2: + createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1 playsewithpan SE_W088, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 0x82, -12, 32, 3, 4 - createsprite gUnknown_08596CB0, 0x82, 8, 31, 2, 2 - createsprite gUnknown_08596CB0, 0x82, -4, 28, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 30, 4, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 + createsprite gUnknown_08596CB0, 130, -12, 32, 3, 4 + createsprite gUnknown_08596CB0, 130, 8, 31, 2, 2 + createsprite gUnknown_08596CB0, 130, -4, 28, 2, 3 + createsprite gUnknown_08596CB0, 130, 12, 30, 4, 3 return Move_MAGIC_COAT: loadspritegfx 0x27BA - setalpha 0x1000 - waitplaysewithpan SE_W112, -64, 0xF - createsprite gUnknown_085965C0, 0x3, 40, 0, 10170 + setalpha 0, 16 + waitplaysewithpan SE_W112, -64, 15 + createsprite gUnknown_085965C0, 3, 40, 0, 10170 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_WATER_PULSE: - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 loadspritegfx 0x2830 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, -64 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, RGB(0, 25, 28) - delay 0xA - createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0 - createsprite gUnknown_085952F8, 0x42, 20, 100, 16, 2, 10, 35, 1 - createsprite gUnknown_085952F8, 0x42, 200, 80, 8, 1, 40, 20, 0 - createsprite gUnknown_085952F8, 0x42, 80, 60, 10, 3, 20, 50, 0 - createsprite gUnknown_085952F8, 0x42, 140, 100, 16, 1, 20, 30, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 7, RGB(0, 25, 28) + delay 10 + createsprite gUnknown_085952F8, 66, 100, 100, 8, 1, 20, 40, 0 + createsprite gUnknown_085952F8, 66, 20, 100, 16, 2, 10, 35, 1 + createsprite gUnknown_085952F8, 66, 200, 80, 8, 1, 40, 20, 0 + createsprite gUnknown_085952F8, 66, 80, 60, 10, 3, 20, 50, 0 + createsprite gUnknown_085952F8, 66, 140, 100, 16, 1, 20, 30, 1 playsewithpan SE_W145C, +63 waitforvisualfinish playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 - delay 0x5 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + delay 5 playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 - delay 0x5 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + delay 5 playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 delay 0xD - createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, RGB(0, 25, 28) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB(0, 25, 28) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -9644,165 +9567,165 @@ Move_PSYCHO_BOOST: monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A5C8, 0x5 + createvisualtask sub_815A5C8, 5 waitbgfadein - delay 0x6 - createvisualtask sub_8115A04, 0x2, 1, 2, 8, 0, 10, RGB_BLACK - delay 0x0 + delay 6 + createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK + delay 0 monbgprio_28 ANIM_ATTACKER - setalpha 0x808 - delay 0xA - createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 240, 0 - loopsewithpan SE_W060B, -64, 0xE, 0xA - createsprite gUnknown_08596920, 0x2 + setalpha 8, 8 + delay 10 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 + loopsewithpan SE_W060B, -64, 14, 10 + createsprite gUnknown_08596920, 2 delay 0x6E - loopsewithpan SE_W060B, -64, 0x7, 0xA + loopsewithpan SE_W060B, -64, 7, 10 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, -8, 1, 24, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 playsewithpan SE_W043, +63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_KNOCK_OFF: loadspritegfx 0x2825 - loadspritegfx 0x2797 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x4 + loadspritegfx ANIM_TAG_135 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 4 playsewithpan SE_W233, +63 - createsprite gUnknown_085CE984, 0x82, -16, -16 - delay 0x8 - createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 + createsprite gUnknown_085CE984, 130, -16, -16 + delay 8 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 5, 1, 0x7FFF, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 playsewithpan SE_W004, +63 - createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 - delay 0xA + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + delay 10 waitforvisualfinish end Move_DOOM_DESIRE: - createvisualtask sub_8114960, 0x2 - delay 0x1 + createvisualtask sub_8114960, 2 + delay 1 monbg ANIM_ATK_PARTNER - createvisualtask sub_811489C, 0x5, 1, 0 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 0 + createvisualtask sub_811489C, 5, 1, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W060, -64 - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish - delay 0x14 - createvisualtask sub_811489C, 0x5, 1, 1 - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 0 + delay 20 + createvisualtask sub_811489C, 5, 1, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end Move_SKY_UPPERCUT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout playsewithpan SE_W327, -64 - createvisualtask sub_810DABC, 0x5, 55 + createvisualtask sub_810DABC, 5, 55 waitbgfadein - setalpha 0x80C + setalpha 12, 8 delay 0x26 - createsprite gUnknown_0857FE70, 0x2, 0, 28, 0, 0, 5 - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 6, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, -28, 28, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, -15, 8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1 playsewithpan SE_W233B, +63 - delay 0x1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, -5, -12, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, 0, -32, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, 5, -52, 1, 1 - createsprite gUnknown_0857FE70, 0x2, 1, -26, 16, 1, 4 - delay 0x4 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 - delay 0x1E - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 - delay 0x4 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4 + delay 4 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + delay 30 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + delay 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end Move_SECRET_POWER: - createvisualtask sub_8117C24, 0x5 - jumpargeq 0x0, 0x0, Move_NEEDLE_ARM - jumpargeq 0x0, 0x1, Move_MAGICAL_LEAF - jumpargeq 0x0, 0x2, Move_MUD_SHOT - jumpargeq 0x0, 0x3, Move_WATERFALL - jumpargeq 0x0, 0x4, Move_SURF - jumpargeq 0x0, 0x5, Move_BUBBLE_BEAM - jumpargeq 0x0, 0x6, Move_ROCK_THROW - jumpargeq 0x0, 0x7, Move_BITE - jumpargeq 0x0, 0x8, Move_STRENGTH + createvisualtask AnimTask_GetBattleTerrain, 5 + jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM + jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF + jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT + jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL + jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF + jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM + jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW + jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE + jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH goto Move_SLAM Move_TWISTER: loadspritegfx 0x274F - loadspritegfx 0x2797 - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET playsewithpan SE_W239, +63 - createsprite gUnknown_085923A8, 0x82, 120, 70, 5, 70, 30 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 55, 6, 60, 25 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 60, 7, 60, 30 - createsprite gUnknown_085923A8, 0x82, 115, 55, 10, 60, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 100, 50, 4, 50, 26 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 105, 25, 8, 60, 20 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 40, 10, 48, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 120, 30, 6, 45, 25 - createsprite gUnknown_085923A8, 0x82, 115, 35, 10, 60, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 105, 20, 8, 40, 0 - delay 0x3 - createsprite gUnknown_085923A8, 0x82, 20, 255, 15, 32, 0 - createsprite gUnknown_085923A8, 0x82, 110, 10, 8, 32, 20 + createsprite gUnknown_085923A8, 130, 120, 70, 5, 70, 30 + delay 1 + createsprite gUnknown_085923A8, 130, 115, 55, 6, 60, 25 + delay 1 + createsprite gUnknown_085923A8, 130, 115, 60, 7, 60, 30 + createsprite gUnknown_085923A8, 130, 115, 55, 10, 60, 30 + delay 3 + createsprite gUnknown_08596CC8, 130, 100, 50, 4, 50, 26 + delay 1 + createsprite gUnknown_085923A8, 130, 105, 25, 8, 60, 20 + delay 1 + createsprite gUnknown_085923A8, 130, 115, 40, 10, 48, 30 + delay 3 + createsprite gUnknown_08596CC8, 130, 120, 30, 6, 45, 25 + createsprite gUnknown_085923A8, 130, 115, 35, 10, 60, 30 + delay 3 + createsprite gUnknown_08596CC8, 130, 105, 20, 8, 40, 0 + delay 3 + createsprite gUnknown_085923A8, 130, 20, 255, 15, 32, 0 + createsprite gUnknown_085923A8, 130, 110, 10, 8, 32, 20 waitforvisualfinish - createsprite gUnknown_08597358, 0x83, -32, -16, 1, 3 + createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3 playsewithpan SE_W004, +63 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 12, 1 - createvisualtask sub_80D5484, 0x2, 3, 3, 0, 12, 1 - delay 0x4 - createsprite gUnknown_085973A0, 0x83, 1, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 + delay 4 + createsprite gUnknown_085973A0, 131, 1, 3 playsewithpan SE_W004, +63 - delay 0x4 - createsprite gUnknown_085973A0, 0x83, 1, 3 + delay 4 + createsprite gUnknown_085973A0, 131, 1, 3 playsewithpan SE_W004, +63 - delay 0x4 - createsprite gUnknown_08597358, 0x83, 32, 20, 1, 3 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -9812,42 +9735,42 @@ Move_TWISTER: Move_MAGICAL_LEAF: loadspritegfx 0x274F loadspritegfx 0x27B0 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - loopsewithpan SE_W077, -64, 0xA, 0x5 - createvisualtask sub_81007C4, 0x5 - createsprite gUnknown_08592390, 0x2, -3, -2, 10 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -1, 15 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -4, -4, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 3, -3, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -6, 8 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -1, 12 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -4, 13 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 4, -5, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -6, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -5, 8 - delay 0x3C + setalpha 12, 8 + delay 1 + loopsewithpan SE_W077, -64, 10, 5 + createvisualtask sub_81007C4, 5 + createsprite gUnknown_08592390, 2, -3, -2, 10 + delay 2 + createsprite gUnknown_08592390, 2, -1, -1, 15 + delay 2 + createsprite gUnknown_08592390, 2, -4, -4, 7 + delay 2 + createsprite gUnknown_08592390, 2, 3, -3, 11 + delay 2 + createsprite gUnknown_08592390, 2, -1, -6, 8 + delay 2 + createsprite gUnknown_08592390, 2, 2, -1, 12 + delay 2 + createsprite gUnknown_08592390, 2, -3, -4, 13 + delay 2 + createsprite gUnknown_08592390, 2, 4, -5, 7 + delay 2 + createsprite gUnknown_08592390, 2, 2, -6, 11 + delay 2 + createsprite gUnknown_08592390, 2, -3, -5, 8 + delay 60 playsewithpan SE_W013B, -64 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, 20, 0 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, -20, 0 - delay 0x1E + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, 20, 0 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, -20, 0 + delay 30 playsewithpan SE_W013, +63 - createsprite gUnknown_08597358, 0x84, -10, -4, 1, 2 - createsprite gUnknown_08597358, 0x84, 10, 4, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - delay 0x14 - setarg 0x7, 0xFFFF + createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + delay 20 + setarg 7, 0xFFFF waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9855,547 +9778,531 @@ Move_MAGICAL_LEAF: Move_ICE_BALL: loadspritegfx 0x273B - loadspritegfx 0x279D - createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 - jumpargeq 0x0, 0x4, Anim_IceBallSetIceBg -Anim_IceBallContinue: + loadspritegfx ANIM_TAG_141 + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 4, IceBallSetIceBg +IceBallContinue: playsewithpan SE_W196, -64 - createsprite gUnknown_08595DE4, 0x82, 15, 0, -12, -16, 30, -40 + createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40 delay 0x1C playsewithpan SE_W280, +63 - createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 - jumpargeq 0x0, 0x0, Anim_IceBallWeakest - jumpargeq 0x0, 0x1, Anim_IceBallWeak - jumpargeq 0x0, 0x2, Anim_IceBallMediun - jumpargeq 0x0, 0x3, Anim_IceBallStrong - jumpargeq 0x0, 0x4, Anim_IceBallStrongest -Anim_IceBallContinue2: - createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 - jumpargeq 0x0, 0x4, Anim_IceBallUnsetIceBg -Anim_IceBallEnd: + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 0, IceBallWeakest + jumpargeq 0, 1, IceBallWeak + jumpargeq 0, 2, IceBallMediun + jumpargeq 0, 3, IceBallStrong + jumpargeq 0, 4, IceBallStrongest +IceBallContinue2: + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 4, IceBallUnsetIceBg +IceBallEnd: end - -Anim_IceBallSetIceBg: +IceBallSetIceBg: fadetobg BG_ICE - goto Anim_IceBallContinue - -Anim_IceBallUnsetIceBg: + goto IceBallContinue +IceBallUnsetIceBg: waitbgfadein delay 0x2D restorebg waitbgfadein - goto Anim_IceBallEnd - -Anim_IceBallWeakest: - createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallWeak: - createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallMediun: - createvisualtask sub_80D6388, 0x2, 0, 1, 14, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallStrong: - createvisualtask sub_80D6388, 0x2, 0, 1, 18, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallStrongest: - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBall1: - createsprite gUnknown_08595DFC, 0x84, -12, -16 + goto IceBallEnd +IceBallWeakest: + createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallWeak: + createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallMediun: + createvisualtask sub_80D6388, 2, 0, 1, 14, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallStrong: + createvisualtask sub_80D6388, 2, 0, 1, 18, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallStrongest: + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBall1: + createsprite gUnknown_08595DFC, 132, -12, -16 return Move_WEATHER_BALL: - loadspritegfx 0x282B - createsprite gUnknown_0857FE40, 0x2, 8, 1, 0 - delay 0x8 + loadspritegfx ANIM_TAG_283 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + delay 8 playsewithpan SE_W207, -64 - createsprite gUnknown_0853EE38, 0x2 + createsprite gUnknown_0853EE38, 2 waitforvisualfinish - delay 0xF + delay 15 playsewithpan SE_W197, 0 - createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 5, 1, 0x7FFF, 10, 0, 0 waitforvisualfinish - createvisualtask AnimTask_GetWeather, 0x2 - delay 0x1 - jumpreteq ANIM_WEATHER_NONE, Anim_WeatherBallNormal - jumpreteq ANIM_WEATHER_SUN, Anim_WeatherBallFire - jumpreteq ANIM_WEATHER_RAIN, Anim_WeatherBallWater - jumpreteq ANIM_WEATHER_SANDSTORM, Anim_WeatherBallSandstorm - jumpreteq ANIM_WEATHER_HAIL, Anim_WeatherBallIce - -Anim_WeatherBallNormal: - loadspritegfx 0x2797 - createsprite gUnknown_0853EE50, 0x82, -30, -100, 25, 1, 0, 0 + createvisualtask AnimTask_GetWeather, 2 + delay 1 + jumpreteq ANIM_WEATHER_NONE, WeatherBallNormal + jumpreteq ANIM_WEATHER_SUN, WeatherBallFire + jumpreteq ANIM_WEATHER_RAIN, WeatherBallWater + jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm + jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce +WeatherBallNormal: + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x84, -10, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end - -Anim_WeatherBallFire: +WeatherBallFire: loadspritegfx 0x272D - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 40, 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, +63 - delay 0xA - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, -40, 20 + delay 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, -40, 20 playsewithpan SE_W172, +63 - delay 0xA - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 0, 0 + delay 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W172, +63 waitforvisualfinish playsewithpan SE_W172B, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end - -Anim_WeatherBallWater: - loadspritegfx 0x27AB - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 50, 10 +WeatherBallWater: + loadspritegfx ANIM_TAG_155 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, +63 - delay 0x8 - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, -20, 20 + delay 8 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20 playsewithpan SE_W152, +63 delay 0xD - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 0, 0 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W152, +63 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 playsewithpan SE_W202, +63 waitforvisualfinish end - -Anim_WeatherBallSandstorm: - loadspritegfx 0x274A - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 30, 0 +WeatherBallSandstorm: + loadspritegfx ANIM_TAG_058 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, +63 - delay 0x5 - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, -40, 20 + delay 5 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, -40, 20 playsewithpan SE_W088, +63 - delay 0xE - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 0, 0 + delay 14 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W088, +63 waitforvisualfinish playsewithpan SE_W070, +63 - createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish end - -Anim_WeatherBallIce: - loadspritegfx 0x2817 - loadspritegfx 0x279D - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, -40, 20 +WeatherBallIce: + loadspritegfx ANIM_TAG_263 + loadspritegfx ANIM_TAG_141 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, +63 - delay 0xA - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 40, 0 + delay 10 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 40, 0 playsewithpan SE_W258, +63 - delay 0xA - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 0, 0 + delay 10 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, +63 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W196, +63 - call Anim_FreezeEffect1 + call FreezeEffect1 waitforvisualfinish end Move_COUNT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_FreezeEffect1: - createsprite gUnknown_08595B68, 0x82, -10, -10, 0 +FreezeEffect1: + createsprite gUnknown_08595B68, 130, -10, -10, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 10, 20, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 10, 20, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -5, 10, 0 + delay 4 + createsprite gUnknown_08595B68, 130, -5, 10, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 17, -12, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 17, -12, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, -15, 15, 0 + delay 4 + createsprite gUnknown_08595B80, 130, -15, 15, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 0, 0, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 0, 0, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, 20, 2, 0 + delay 4 + createsprite gUnknown_08595B68, 130, 20, 2, 0 playsewithpan SE_W196, +63 return -Anim_FreezeEffect2: - createsprite gUnknown_08595B68, 0x82, -10, -10, 1 +FreezeEffect2: + createsprite gUnknown_08595B68, 130, -10, -10, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 10, 20, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 10, 20, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -29, 0, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -29, 0, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 29, -20, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 29, -20, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -5, 10, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -5, 10, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 17, -12, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 17, -12, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -20, 0, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -20, 0, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, -15, 15, 1 + delay 4 + createsprite gUnknown_08595B80, 130, -15, 15, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 26, -5, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 26, -5, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 0, 0, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 0, 0, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, 20, 2, 1 + delay 4 + createsprite gUnknown_08595B68, 130, 20, 2, 1 playsewithpan SE_W196, +63 return -Anim_IcyWindEffect1: @ Unused - loopsewithpan SE_W196, +63, 0x6, 0x4 - createsprite gUnknown_08595C04, 0x82, 0, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 8, 24, 0 - createsprite gUnknown_08595C04, 0x82, -8, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 16, 24, 0 - createsprite gUnknown_08595C04, 0x82, -16, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 24, 24, 0 - createsprite gUnknown_08595C04, 0x82, -24, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 32, 24, 0 - createsprite gUnknown_08595C04, 0x82, -32, 24, 0 +IcyWindEffect1: @ Unused + loopsewithpan SE_W196, +63, 6, 4 + createsprite gUnknown_08595C04, 130, 0, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 8, 24, 0 + createsprite gUnknown_08595C04, 130, -8, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 16, 24, 0 + createsprite gUnknown_08595C04, 130, -16, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 24, 24, 0 + createsprite gUnknown_08595C04, 130, -24, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 32, 24, 0 + createsprite gUnknown_08595C04, 130, -32, 24, 0 return -Anim_IcyWindEffect2: - loopsewithpan SE_W196, +63, 0x6, 0x4 - createsprite gUnknown_08595C04, 0x82, 0, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 8, 24, 1 - createsprite gUnknown_08595C04, 0x82, -8, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 16, 24, 1 - createsprite gUnknown_08595C04, 0x82, -16, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 24, 24, 1 - createsprite gUnknown_08595C04, 0x82, -24, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 32, 24, 1 - createsprite gUnknown_08595C04, 0x82, -32, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 40, 24, 1 - createsprite gUnknown_08595C04, 0x82, -40, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 48, 24, 1 - createsprite gUnknown_08595C04, 0x82, -48, 24, 1 +IcyWindEffect2: + loopsewithpan SE_W196, +63, 6, 4 + createsprite gUnknown_08595C04, 130, 0, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 8, 24, 1 + createsprite gUnknown_08595C04, 130, -8, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 16, 24, 1 + createsprite gUnknown_08595C04, 130, -16, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 24, 24, 1 + createsprite gUnknown_08595C04, 130, -24, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 32, 24, 1 + createsprite gUnknown_08595C04, 130, -32, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 40, 24, 1 + createsprite gUnknown_08595C04, 130, -40, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 48, 24, 1 + createsprite gUnknown_08595C04, 130, -48, 24, 1 return -Anim_GrantingStarsEffect: - createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60 - delay 0x8 - createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60 - delay 0x8 +GrantingStarsEffect: + createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + delay 8 + createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + delay 8 return -Anim_HealingEffect: +HealingEffect: playsewithpan SE_W071B, -64 - createsprite gUnknown_08592F2C, 0x2, 0, -5, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, -15, 10, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, -15, -15, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, 10, -5, 0, 0 - delay 0x7 + createsprite gUnknown_08592F2C, 2, 0, -5, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, -15, 10, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, -15, -15, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, 10, -5, 0, 0 + delay 7 return -Anim_HealingEffect2: +HealingEffect2: playsewithpan SE_W071B, +63 - createsprite gUnknown_08592F2C, 0x82, 0, -5, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, -15, 10, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, -15, -15, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, 10, -5, 1, 0 - delay 0x7 + createsprite gUnknown_08592F2C, 130, 0, -5, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, -15, 10, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, -15, -15, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, 10, -5, 1, 0 + delay 7 return -Anim_PoisonEffect: - createsprite gUnknown_08596240, 0x82, 10, 10, 0 +PoisonBubblesEffect: + createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, 20, -20, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, -20, 15, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, 0, 0, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, -20, -20, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, 16, -8, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0 playsewithpan SE_W092, +63 return -Anim_BulbblebeamEffect: - createsprite gUnknown_08596258, 0x2, 10, 10, 0 +WaterBubbleEffect: + createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 20, -20, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, 15, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 0, 0, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, -20, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 16, -8, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0 playsewithpan SE_W145C, +63 return -Anim_BulbbleEffect: - createsprite gUnknown_08596258, 0x2, 10, 10, 1 +WaterBubbleEffect2: + createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -28, -10, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 20, -20, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, 15, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 0, 0, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 27, 8, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, -20, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 16, -8, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1 playsewithpan SE_W145C, +63 return -Anim_ParalysisEffect: +ElectricityEffect: playsewithpan SE_W085B, +63 - createsprite gUnknown_08595810, 0x82, 5, 0, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -5, 10, 5, 1 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 15, 20, 5, 2 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -15, -10, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 25, 0, 5, 1 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -8, 8, 5, 2 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 2, -8, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -20, 15, 5, 1 + createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 15, 20, 5, 2 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -15, -10, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 25, 0, 5, 1 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -8, 8, 5, 2 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 2, -8, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -20, 15, 5, 1 return -Anim_ConfusionEffect: - loopsewithpan SE_W146, +63, 0xD, 0x6 - createsprite gUnknown_0859725C, 0x82, 0, -15, 0, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 51, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 102, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 153, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 204, 3, 90 +ConfusionEffect: + loopsewithpan SE_W146, +63, 0xD, 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 + createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 153, 3, 90 + createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 204, 3, 90 return -Anim_SetPsychicBackground: +SetPsychicBackground: fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A504, 0x5 + createvisualtask sub_815A504, 5 waitbgfadein return -Anim_UnsetPsychicBackground: +UnsetPsychicBackground: restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein return -Anim_SetFlyingBg: - jumpifcontest Anim_SetBgFlyingContest +SetFlyingBg: + jumpifcontest SetBgFlyingContest fadetobg BG_FLYING waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 -Anim_SetBgFlyingContinue: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +SetBgFlyingContinue: waitbgfadein return -Anim_SetBgFlyingContest: +SetBgFlyingContest: fadetobg BG_FLYING_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto Anim_SetBgFlyingContinue + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto SetBgFlyingContinue -Anim_UnsetFlyingBg: +UnsetFlyingBg: restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein return -Anim_SetSolarbeamBg: - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_SetSolarbeamBgContest - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_SetSolarbeamBgOpponent - goto Anim_SetSolarbeamBgPlayer -Anim_SetSolarbeamBgContinue: +SetSolarbeamBg: + createvisualtask AnimTask_IsContest, 2 + jumprettrue SetSolarbeamBgContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse SetSolarbeamBgOpponent + goto SetSolarbeamBgPlayer +SetSolarbeamBgContinue: waitbgfadein return - -Anim_SetSolarbeamBgContest: +SetSolarbeamBgContest: fadetobg BG_SOLARBEAM_CONTESTS - goto Anim_SetSolarbeamBgContinue - -Anim_SetSolarbeamBgPlayer: + goto SetSolarbeamBgContinue +SetSolarbeamBgPlayer: fadetobg BG_SOLARBEAM_PLAYER - goto Anim_SetSolarbeamBgContinue - -Anim_SetSolarbeamBgOpponent: + goto SetSolarbeamBgContinue +SetSolarbeamBgOpponent: fadetobg BG_SOLARBEAM_OPPONENT - goto Anim_SetSolarbeamBgContinue + goto SetSolarbeamBgContinue -Anim_UnsetSolarbeamBg: +UnsetSolarbeamBg: restorebg waitbgfadein return Status_Poison: - loopsewithpan SE_W092, +63, 0xD, 0x6 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 18, 2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 12, RGB(30, 0, 31) + loopsewithpan SE_W092, +63, 0xD, 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end Status_Confusion: - loadspritegfx 0x2759 - call Anim_ConfusionEffect + loadspritegfx ANIM_TAG_073 + call ConfusionEffect end Status_Burn: loadspritegfx 0x272D playsewithpan SE_W172, +63 - call Anim_Burn1 - call Anim_Burn1 - call Anim_Burn1 + call Burn1 + call Burn1 + call Burn1 waitforvisualfinish end -Anim_Burn1: - createsprite gUnknown_08595504, 0x82, -24, 24, 24, 24, 20, 1, 1 - delay 0x4 +Burn1: + createsprite gUnknown_08595504, 130, -24, 24, 24, 24, 20, 1, 1 + delay 4 return Status_Infatuation: loadspritegfx 0x27E2 playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 0x3, 0, 20 - delay 0xF + createsprite gUnknown_08593970, 3, 0, 20 + delay 15 playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 0x3, -20, 20 - delay 0xF + createsprite gUnknown_08593970, 3, -20, 20 + delay 15 playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 0x3, 20, 20 + createsprite gUnknown_08593970, 3, 20, 20 end Status_Sleep: loadspritegfx 0x27F4 playsewithpan SE_W173, -64 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x1E - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 30 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 end Status_Paralysis: - loadspritegfx 0x271B - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - call Anim_ParalysisEffect + loadspritegfx ANIM_TAG_011 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + call ElectricityEffect end Status_Freeze: @@ -10403,8 +10310,8 @@ Status_Freeze: loadspritegfx 0x271A monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - waitplaysewithpan SE_W258, +63, 0x11 - createvisualtask sub_80A9EF4, 0x2 + waitplaysewithpan SE_W258, +63, 17 + createvisualtask sub_80A9EF4, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -10413,8 +10320,8 @@ Status_Curse: loadspritegfx 0x27D8 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 - createsprite gUnknown_08596DE8, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -10423,478 +10330,463 @@ Status_Nightmare: loadspritegfx 0x27ED monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 - createsprite gUnknown_08596E00, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596E00, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_CastformTransform: - createvisualtask sub_815BB18, 0x2 - jumpreteq 0x1, AnimScript_82D7ECA +General_CastformChange: + createvisualtask sub_815BB18, 2 + jumpreteq 1, AnimScript_82D7ECA goto AnimScript_82D7EB2 - AnimScript_82D7EB2: monbg ANIM_ATTACKER playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 0x30 - createvisualtask sub_815B7D0, 0x2, 1 + waitplaysewithpan SE_W107, -64, 48 + createvisualtask sub_815B7D0, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER end - AnimScript_82D7ECA: - createvisualtask sub_815BB58, 0x2, 1 + createvisualtask sub_815BB58, 2, 1 end -Anim_StatChange: - createvisualtask AnimTask_StatsChange, 0x5 +General_StatsChange: + createvisualtask AnimTask_StatsChange, 5 waitforvisualfinish end -Anim_SubsituteOff: +General_SubstituteFade: monbg ANIM_ATTACKER - createvisualtask sub_8172D98, 0x5 - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, RGB_WHITE + createvisualtask sub_8172D98, 5 + createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_ATTACKER - delay 0x2 + delay 2 blendoff - createvisualtask sub_8116620, 0xA, 2, 0, 0, 0, RGB_WHITE - createvisualtask sub_8172BF0, 0x2, 1 + createvisualtask sub_8116620, 10, 2, 0, 0, 0, RGB_WHITE + createvisualtask sub_8172BF0, 2, 1 end -Anim_SubsituteOn: - createvisualtask sub_815F20C, 0x2 +General_SubstituteAppear: + createvisualtask sub_815F20C, 2 end -Anim_PokeblockThrow: - createvisualtask sub_817345C, 0x2, 0 - createvisualtask sub_81732B0, 0x2 - delay 0x0 +General_PokeblockThrow: + createvisualtask sub_817345C, 2, 0 + createvisualtask sub_81732B0, 2 + delay 0 waitplaysewithpan SE_W026, -64, 0x16 - createsprite gUnknown_085E5338, 0x83, -18, 12, 0, 32 - delay 0x32 - loopsewithpan SE_W039, +63, 0x13, 0x2 - createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 2, 1 + createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32 + delay 50 + loopsewithpan SE_W039, +63, 19, 2 + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish - createvisualtask sub_81732E4, 0x2 + createvisualtask sub_81732E4, 2 end -Anim_ItemKnockOff: +General_ItemKnockoff: loadspritegfx 0x27F0 - createsprite gUnknown_08592628, 0x82 + createsprite gBattleAnimSpriteTemplate_8592628, 130 end -Status_Wrap: - createvisualtask sub_81734B4, 0x5 - jumpargeq 0x0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin - jumpargeq 0x0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool - jumpargeq 0x0, TRAP_ANIM_CLAMP, Status_Clamp - jumpargeq 0x0, TRAP_ANIM_SAND_TOMB, Status_SandTomb +General_TurnTrap: + createvisualtask AnimTask_GetTrappedMoveAnimId, 5 + jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin + jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool + jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp + jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap - Status_BindWrap: loadspritegfx 0x27CA - loopsewithpan SE_W010, +63, 0x6, 0x2 - createsprite gUnknown_08592494, 0x84, 0, 16, 0, 1 - delay 0x7 - createsprite gUnknown_08592494, 0x82, 0, 8, 1, 1 - delay 0x3 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - delay 0x14 - setarg 0x7, 0xFFFF + loopsewithpan SE_W010, +63, 6, 2 + createsprite gUnknown_08592494, 132, 0, 16, 0, 1 + delay 7 + createsprite gUnknown_08592494, 130, 0, 8, 1, 1 + delay 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + delay 20 + setarg 7, 0xFFFF playsewithpan SE_W020, +63 waitforvisualfinish end - Status_FireSpin: loadspritegfx 0x272D playsewithpan SE_W221B, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call Anim_FireSpinEffect - call Anim_FireSpinEffect + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + call FireSpinEffect + call FireSpinEffect waitforvisualfinish stopsound end - Status_Whrilpool: loadspritegfx 0x27A5 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x0 - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) + setalpha 12, 8 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call Anim_WhirlpoolEffect - call Anim_WhirlpoolEffect - delay 0xC - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + call WhirlpoolEffect + call WhirlpoolEffect + delay 12 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish stopsound clearmonbg ANIM_DEF_PARTNER end - Status_Clamp: loadspritegfx 0x27A1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, +63 - createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 + createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff waitforvisualfinish end - Status_SandTomb: - loadspritegfx 0x275A - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 + loadspritegfx ANIM_TAG_074 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 playsewithpan SE_W328, +63 - call Anim_SandTombEffect - call Anim_SandTombEffect + call SandTombEffect + call SandTombEffect delay 0x16 - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish stopsound end -Anim_ItemEffect: - loadspritegfx 0x27DB - loadspritegfx 0x2741 - delay 0x0 +General_ItemEffect: + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 + delay 0 playsewithpan SE_W036, -64 - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W036, -64 - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W036, -64 - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W234, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25) - createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, RGB(17, 31, 25) + createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 waitforvisualfinish end -Anim_SmokeBallEscape: +General_SmokeballEscape: loadspritegfx 0x2802 monbg ANIM_ATTACKER - setalpha 0x40C - delay 0x0 + setalpha 12, 4 + delay 0 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x80, 0, 32, 28, 30 - delay 0x4 + delay 4 playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 0x7F, 2, 12, 20, 30 - delay 0xC + createsprite gUnknown_085CE734, 127, 2, 12, 20, 30 + delay 12 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30 - delay 0xC + delay 12 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30 - delay 0x4 + delay 4 playsewithpan SE_BOWA2, +63 - createvisualtask sub_81136E8, 0x2, 2 + createvisualtask sub_81136E8, 2, 2 createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30 - delay 0xE + delay 14 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46 - delay 0x0 + delay 0 createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46 - delay 0x0 - createsprite gUnknown_085CE734, 0x78, 3, -12, -10, 46 - delay 0x0 + delay 0 + createsprite gUnknown_085CE734, 120, 3, -12, -10, 46 + delay 0 createsprite gUnknown_085CE734, 0x77, 3, 14, 14, 46 - delay 0x0 + delay 0 createsprite gUnknown_085CE734, 0x76, 3, 0, 0, 46 waitforvisualfinish clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER - delay 0x0 + delay 0 blendoff end -Anim_HangedOn: - createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, RGB_RED +General_HangedOn: + createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, RGB_RED playsewithpan SE_W082, -64 - createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1 + createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, RGB_RED waitforvisualfinish - delay 0x6 - createsprite gUnknown_0857FE58, 0x0, 0, 0, 15 + delay 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 0, 0, 0, 15 end -Anim_Rain: +General_Rain: loadspritegfx 0x2783 playsewithpan SE_W240, -64 - createvisualtask sub_8116620, 0xA, 0x781, 2, 0, 4, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_8107188, 0x2, 0, 3, 60 - createvisualtask sub_8107188, 0x2, 0, 3, 60 - delay 0x32 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 + delay 50 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 0x781, 2, 4, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end -Anim_Sun: +General_Sun: goto Move_SUNNY_DAY -Anim_Sandstorm: +General_Sandstorm: goto Move_SANDSTORM -Anim_Hail: +General_Hail: goto Move_HAIL -Status_LeechSeed: - createvisualtask sub_817351C, 0x5 - delay 0x0 +General_LeechSeedDrain: + createvisualtask sub_817351C, 5 + delay 0 goto Move_ABSORB -Anim_Hit: - loadspritegfx 0x2797 +General_MonHit: + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_ItemSteal: +General_ItemSteal: loadspritegfx 0x27F0 - createvisualtask sub_8117F30, 0x2 - createvisualtask sub_8172ED0, 0x2 - delay 0x1 - createsprite gUnknown_08592670, 0x2, 0, -5, 10, 2, -1 + createvisualtask sub_8117F30, 2 + createvisualtask sub_8172ED0, 2 + delay 1 + createsprite gUnknown_08592670, 2, 0, -5, 10, 2, -1 end -Anim_SnatchMove: +General_SnatchMove: loadspritegfx 0x27F0 - createvisualtask sub_8117E94, 0x2 + createvisualtask sub_8117E94, 2 call AnimScript_82D85A3 - delay 0x1 - createvisualtask sub_80D5EB8, 0x2, 0, 5, 5120, 4, 1 + delay 1 + createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET waitforvisualfinish - createvisualtask sub_8117EC4, 0x2 - jumpreteq 0x0, AnimScript_82D839F - goto AnimScript_82D83AF - -AnimScript_82D8398: + createvisualtask AnimTask_IsTargetSameSide, 2 + jumpretfalse SnatchOpposingMonMove + goto SnatchPartnerMonMove +SnatchMoveContinue: waitforvisualfinish call AnimScript_82D85C3 end - -AnimScript_82D839F: +SnatchOpposingMonMove: playsewithpan SE_W104, -64 - createvisualtask sub_815F8F4, 0x2 - goto AnimScript_82D8398 - -AnimScript_82D83AF: + createvisualtask sub_815F8F4, 2 + goto SnatchMoveContinue +SnatchPartnerMonMove: playsewithpan SE_W104, -64 - createvisualtask sub_815FFC4, 0x2 - goto AnimScript_82D8398 + createvisualtask sub_815FFC4, 2 + goto SnatchMoveContinue -Anim_FutureSightHit: - createvisualtask sub_8117F10, 0x2 +General_FutureSightHit: + createvisualtask sub_8117F10, 2 monbg ANIM_DEF_PARTNER playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W048, +63 - waitplaysewithpan SE_W048, +63, 0x8 - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -5, -5, 15, 1, 1 + waitplaysewithpan SE_W048, +63, 8 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 24, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 24, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end -Anim_DoomDesireHit: - createvisualtask sub_8117F10, 0x2 +General_DoomDesireHit: + createvisualtask sub_8117F10, 2 loadspritegfx 0x27D6 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish - delay 0xA - createvisualtask sub_815C0A4, 0x5 + delay 10 + createvisualtask sub_815C0A4, 5 delay 0x9 playsewithpan SE_W109, -64 delay 0x9 playsewithpan SE_W109, 0 delay 0x9 playsewithpan SE_W109, +63 - delay 0x19 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 20, 1 + delay 25 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end -Anim_FocusPunchSetUp: +General_FocusPunchSetUp: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call Anim_EndureEffect - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call Anim_EndureEffect - delay 0x8 - call Anim_EndureEffect + call EndureEffect + delay 8 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + call EndureEffect + delay 8 + call EndureEffect waitforvisualfinish end -Status_Ingrain: +General_IngrainHeal: loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish - delay 0x3 - call Anim_AbsorbEffect + delay 3 + call AbsorbEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_WishHeal: - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 +General_WishHeal: + loadspritegfx ANIM_TAG_049 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish - unloadspritegfx 0x2741 - loadspritegfx 0x272F - call Anim_HealingEffect + unloadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_031 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK end AnimScript_82D85A3: - createvisualtask sub_8172E9C, 0x2 - jumpreteq 0x1, AnimScript_82D85B4 - + createvisualtask sub_8172E9C, 2 + jumpreteq 1, AnimScript_82D85B4 AnimScript_82D85B2: waitforvisualfinish return - AnimScript_82D85B4: - createvisualtask sub_8172BF0, 0x2, 1 + createvisualtask sub_8172BF0, 2, 1 waitforvisualfinish goto AnimScript_82D85B2 AnimScript_82D85C3: - createvisualtask sub_8172E9C, 0x2 - jumpreteq 0x1, AnimScript_82D85D4 - + createvisualtask sub_8172E9C, 2 + jumpreteq 1, AnimScript_82D85D4 AnimScript_82D85D2: waitforvisualfinish return - AnimScript_82D85D4: - createvisualtask sub_8172BF0, 0x2, 0 + createvisualtask sub_8172BF0, 2, 0 waitforvisualfinish goto AnimScript_82D85D2 -Anim_LevelUp: +Special_LevelUp: playsewithpan SE_EXPMAX, 0 - createvisualtask sub_8170920, 0x2 - delay 0x0 - createvisualtask sub_8170A0C, 0x5, 0, 0 + createvisualtask sub_8170920, 2 + delay 0 + createvisualtask sub_8170A0C, 5, 0, 0 waitforvisualfinish - createvisualtask sub_81709EC, 0x2 + createvisualtask sub_81709EC, 2 end -Anim_SwitchOutPlayer: - createvisualtask sub_8170BB0, 0x2 - delay 0xA - createvisualtask sub_8170B04, 0x2 +Special_SwitchOutPlayerMon: + createvisualtask sub_8170BB0, 2 + delay 10 + createvisualtask sub_8170B04, 2 end -Anim_SwitchOutOpponent: - createvisualtask sub_8170BB0, 0x2 - delay 0xA - createvisualtask sub_8170B04, 0x2 +Special_SwitchOutOpponentMon: + createvisualtask sub_8170BB0, 2 + delay 10 + createvisualtask sub_8170B04, 2 end -Anim_BallThrow: - createvisualtask sub_8170CFC, 0x2 - delay 0x0 +Special_BallThrow: + createvisualtask sub_8170CFC, 2 + delay 0 playsewithpan SE_NAGERU, 0 - createvisualtask sub_8170E04, 0x2 - createvisualtask AnimTask_IsBallBlockedByTrainer, 0x2 - jumpreteq 0xFFFF, Anim_BallThrowTrainerBlock -Anim_BallThrowEnd: + createvisualtask sub_8170E04, 2 + createvisualtask AnimTask_IsBallBlockedByTrainer, 2 + jumpreteq 0xFFFF, BallThrowTrainerBlock +BallThrowEnd: waitforvisualfinish - createvisualtask sub_8170D24, 0x2 + createvisualtask sub_8170D24, 2 end - -Anim_BallThrowTrainerBlock: - loadspritegfx 0x2797 - delay 0x19 +BallThrowTrainerBlock: + loadspritegfx ANIM_TAG_135 + delay 25 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x0 + setalpha 12, 8 + delay 0 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x82, -4, -20, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_BallThrowEnd + goto BallThrowEnd -Anim_SafariBallThrow: - createvisualtask sub_8170CFC, 0x2 - delay 0x0 - createvisualtask sub_8170F2C, 0x2 +Special_SafariBallThrow: + createvisualtask sub_8170CFC, 2 + delay 0 + createvisualtask sub_8170F2C, 2 waitforvisualfinish - createvisualtask sub_8170D24, 0x2 + createvisualtask sub_8170D24, 2 end -Anim_SubstituteToMon: - createvisualtask sub_8172BF0, 0x2, 1 +Special_SubstituteToMon: + createvisualtask sub_8172BF0, 2, 1 end -Anim_MonToSubstitute: - createvisualtask sub_8172BF0, 0x2, 0 +Special_MonToSubstitute: + createvisualtask sub_8172BF0, 2, 0 end diff --git a/include/battle.h b/include/battle.h index a69047cf0..497faaeb6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -38,17 +38,6 @@ #define MAX_TRAINER_ITEMS 4 #define MAX_MON_MOVES 4 -#define BATTLE_TERRAIN_GRASS 0 -#define BATTLE_TERRAIN_LONG_GRASS 1 -#define BATTLE_TERRAIN_SAND 2 -#define BATTLE_TERRAIN_UNDERWATER 3 -#define BATTLE_TERRAIN_WATER 4 -#define BATTLE_TERRAIN_POND 5 -#define BATTLE_TERRAIN_MOUNTAIN 6 -#define BATTLE_TERRAIN_CAVE 7 -#define BATTLE_TERRAIN_BUILDING 8 -#define BATTLE_TERRAIN_PLAIN 9 - // array entries for battle communication #define MULTIUSE_STATE 0x0 #define CURSOR_POSITION 0x1 diff --git a/include/constants/battle.h b/include/constants/battle.h index e5ca9d7ae..bbdc54a8e 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -281,4 +281,16 @@ #define MOVE_EFFECT_AFFECTS_USER 0x40 #define MOVE_EFFECT_CERTAIN 0x80 +// Battle terrain defines for gBattleTerrain. +#define BATTLE_TERRAIN_GRASS 0 +#define BATTLE_TERRAIN_LONG_GRASS 1 +#define BATTLE_TERRAIN_SAND 2 +#define BATTLE_TERRAIN_UNDERWATER 3 +#define BATTLE_TERRAIN_WATER 4 +#define BATTLE_TERRAIN_POND 5 +#define BATTLE_TERRAIN_MOUNTAIN 6 +#define BATTLE_TERRAIN_CAVE 7 +#define BATTLE_TERRAIN_BUILDING 8 +#define BATTLE_TERRAIN_PLAIN 9 + #endif // GUARD_CONSTANTS_BATTLE_H diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index c33c3ac29..96f2259b3 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -1,6 +1,312 @@ #ifndef GUARD_CONSTANTS_BATTLE_ANIM_H #define GUARD_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 - ANIM_SPRITES_START)) + +// Particle ids. +#define ANIM_SPRITES_START 10000 + +#define ANIM_TAG_000 (ANIM_SPRITES_START + 0) +#define ANIM_TAG_001 (ANIM_SPRITES_START + 1) +#define ANIM_TAG_002 (ANIM_SPRITES_START + 2) +#define ANIM_TAG_003 (ANIM_SPRITES_START + 3) +#define ANIM_TAG_004 (ANIM_SPRITES_START + 4) +#define ANIM_TAG_005 (ANIM_SPRITES_START + 5) +#define ANIM_TAG_006 (ANIM_SPRITES_START + 6) +#define ANIM_TAG_007 (ANIM_SPRITES_START + 7) +#define ANIM_TAG_008 (ANIM_SPRITES_START + 8) +#define ANIM_TAG_009 (ANIM_SPRITES_START + 9) +#define ANIM_TAG_010 (ANIM_SPRITES_START + 10) +#define ANIM_TAG_011 (ANIM_SPRITES_START + 11) +#define ANIM_TAG_012 (ANIM_SPRITES_START + 12) +#define ANIM_TAG_013 (ANIM_SPRITES_START + 13) +#define ANIM_TAG_014 (ANIM_SPRITES_START + 14) +#define ANIM_TAG_015 (ANIM_SPRITES_START + 15) +#define ANIM_TAG_016 (ANIM_SPRITES_START + 16) +#define ANIM_TAG_017 (ANIM_SPRITES_START + 17) +#define ANIM_TAG_018 (ANIM_SPRITES_START + 18) +#define ANIM_TAG_019 (ANIM_SPRITES_START + 19) +#define ANIM_TAG_020 (ANIM_SPRITES_START + 20) +#define ANIM_TAG_021 (ANIM_SPRITES_START + 21) +#define ANIM_TAG_022 (ANIM_SPRITES_START + 22) +#define ANIM_TAG_023 (ANIM_SPRITES_START + 23) +#define ANIM_TAG_024 (ANIM_SPRITES_START + 24) +#define ANIM_TAG_025 (ANIM_SPRITES_START + 25) +#define ANIM_TAG_026 (ANIM_SPRITES_START + 26) +#define ANIM_TAG_027 (ANIM_SPRITES_START + 27) +#define ANIM_TAG_028 (ANIM_SPRITES_START + 28) +#define ANIM_TAG_029 (ANIM_SPRITES_START + 29) +#define ANIM_TAG_030 (ANIM_SPRITES_START + 30) +#define ANIM_TAG_031 (ANIM_SPRITES_START + 31) +#define ANIM_TAG_032 (ANIM_SPRITES_START + 32) +#define ANIM_TAG_033 (ANIM_SPRITES_START + 33) +#define ANIM_TAG_034 (ANIM_SPRITES_START + 34) +#define ANIM_TAG_035 (ANIM_SPRITES_START + 35) +#define ANIM_TAG_036 (ANIM_SPRITES_START + 36) +#define ANIM_TAG_037 (ANIM_SPRITES_START + 37) +#define ANIM_TAG_038 (ANIM_SPRITES_START + 38) +#define ANIM_TAG_039 (ANIM_SPRITES_START + 39) +#define ANIM_TAG_040 (ANIM_SPRITES_START + 40) +#define ANIM_TAG_041 (ANIM_SPRITES_START + 41) +#define ANIM_TAG_042 (ANIM_SPRITES_START + 42) +#define ANIM_TAG_043 (ANIM_SPRITES_START + 43) +#define ANIM_TAG_044 (ANIM_SPRITES_START + 44) +#define ANIM_TAG_045 (ANIM_SPRITES_START + 45) +#define ANIM_TAG_046 (ANIM_SPRITES_START + 46) +#define ANIM_TAG_047 (ANIM_SPRITES_START + 47) +#define ANIM_TAG_048 (ANIM_SPRITES_START + 48) +#define ANIM_TAG_049 (ANIM_SPRITES_START + 49) +#define ANIM_TAG_050 (ANIM_SPRITES_START + 50) +#define ANIM_TAG_051 (ANIM_SPRITES_START + 51) +#define ANIM_TAG_052 (ANIM_SPRITES_START + 52) +#define ANIM_TAG_053 (ANIM_SPRITES_START + 53) +#define ANIM_TAG_054 (ANIM_SPRITES_START + 54) +#define ANIM_TAG_055 (ANIM_SPRITES_START + 55) +#define ANIM_TAG_056 (ANIM_SPRITES_START + 56) +#define ANIM_TAG_057 (ANIM_SPRITES_START + 57) +#define ANIM_TAG_058 (ANIM_SPRITES_START + 58) +#define ANIM_TAG_059 (ANIM_SPRITES_START + 59) +#define ANIM_TAG_060 (ANIM_SPRITES_START + 60) +#define ANIM_TAG_061 (ANIM_SPRITES_START + 61) +#define ANIM_TAG_062 (ANIM_SPRITES_START + 62) +#define ANIM_TAG_063 (ANIM_SPRITES_START + 63) +#define ANIM_TAG_064 (ANIM_SPRITES_START + 64) +#define ANIM_TAG_065 (ANIM_SPRITES_START + 65) +#define ANIM_TAG_066 (ANIM_SPRITES_START + 66) +#define ANIM_TAG_067 (ANIM_SPRITES_START + 67) +#define ANIM_TAG_068 (ANIM_SPRITES_START + 68) +#define ANIM_TAG_069 (ANIM_SPRITES_START + 69) +#define ANIM_TAG_070 (ANIM_SPRITES_START + 70) +#define ANIM_TAG_071 (ANIM_SPRITES_START + 71) +#define ANIM_TAG_072 (ANIM_SPRITES_START + 72) +#define ANIM_TAG_073 (ANIM_SPRITES_START + 73) +#define ANIM_TAG_074 (ANIM_SPRITES_START + 74) +#define ANIM_TAG_075 (ANIM_SPRITES_START + 75) +#define ANIM_TAG_076 (ANIM_SPRITES_START + 76) +#define ANIM_TAG_077 (ANIM_SPRITES_START + 77) +#define ANIM_TAG_078 (ANIM_SPRITES_START + 78) +#define ANIM_TAG_079 (ANIM_SPRITES_START + 79) +#define ANIM_TAG_080 (ANIM_SPRITES_START + 80) +#define ANIM_TAG_081 (ANIM_SPRITES_START + 81) +#define ANIM_TAG_082 (ANIM_SPRITES_START + 82) +#define ANIM_TAG_083 (ANIM_SPRITES_START + 83) +#define ANIM_TAG_084 (ANIM_SPRITES_START + 84) +#define ANIM_TAG_085 (ANIM_SPRITES_START + 85) +#define ANIM_TAG_086 (ANIM_SPRITES_START + 86) +#define ANIM_TAG_087 (ANIM_SPRITES_START + 87) +#define ANIM_TAG_088 (ANIM_SPRITES_START + 88) +#define ANIM_TAG_089 (ANIM_SPRITES_START + 89) +#define ANIM_TAG_090 (ANIM_SPRITES_START + 90) +#define ANIM_TAG_091 (ANIM_SPRITES_START + 91) +#define ANIM_TAG_092 (ANIM_SPRITES_START + 92) +#define ANIM_TAG_093 (ANIM_SPRITES_START + 93) +#define ANIM_TAG_094 (ANIM_SPRITES_START + 94) +#define ANIM_TAG_095 (ANIM_SPRITES_START + 95) +#define ANIM_TAG_096 (ANIM_SPRITES_START + 96) +#define ANIM_TAG_097 (ANIM_SPRITES_START + 97) +#define ANIM_TAG_098 (ANIM_SPRITES_START + 98) +#define ANIM_TAG_099 (ANIM_SPRITES_START + 99) +#define ANIM_TAG_100 (ANIM_SPRITES_START + 100) +#define ANIM_TAG_101 (ANIM_SPRITES_START + 101) +#define ANIM_TAG_102 (ANIM_SPRITES_START + 102) +#define ANIM_TAG_103 (ANIM_SPRITES_START + 103) +#define ANIM_TAG_104 (ANIM_SPRITES_START + 104) +#define ANIM_TAG_105 (ANIM_SPRITES_START + 105) +#define ANIM_TAG_106 (ANIM_SPRITES_START + 106) +#define ANIM_TAG_107 (ANIM_SPRITES_START + 107) +#define ANIM_TAG_108 (ANIM_SPRITES_START + 108) +#define ANIM_TAG_109 (ANIM_SPRITES_START + 109) +#define ANIM_TAG_110 (ANIM_SPRITES_START + 110) +#define ANIM_TAG_111 (ANIM_SPRITES_START + 111) +#define ANIM_TAG_112 (ANIM_SPRITES_START + 112) +#define ANIM_TAG_113 (ANIM_SPRITES_START + 113) +#define ANIM_TAG_114 (ANIM_SPRITES_START + 114) +#define ANIM_TAG_115 (ANIM_SPRITES_START + 115) +#define ANIM_TAG_116 (ANIM_SPRITES_START + 116) +#define ANIM_TAG_117 (ANIM_SPRITES_START + 117) +#define ANIM_TAG_118 (ANIM_SPRITES_START + 118) +#define ANIM_TAG_119 (ANIM_SPRITES_START + 119) +#define ANIM_TAG_120 (ANIM_SPRITES_START + 120) +#define ANIM_TAG_121 (ANIM_SPRITES_START + 121) +#define ANIM_TAG_122 (ANIM_SPRITES_START + 122) +#define ANIM_TAG_123 (ANIM_SPRITES_START + 123) +#define ANIM_TAG_124 (ANIM_SPRITES_START + 124) +#define ANIM_TAG_125 (ANIM_SPRITES_START + 125) +#define ANIM_TAG_126 (ANIM_SPRITES_START + 126) +#define ANIM_TAG_127 (ANIM_SPRITES_START + 127) +#define ANIM_TAG_128 (ANIM_SPRITES_START + 128) +#define ANIM_TAG_129 (ANIM_SPRITES_START + 129) +#define ANIM_TAG_130 (ANIM_SPRITES_START + 130) +#define ANIM_TAG_131 (ANIM_SPRITES_START + 131) +#define ANIM_TAG_132 (ANIM_SPRITES_START + 132) +#define ANIM_TAG_133 (ANIM_SPRITES_START + 133) +#define ANIM_TAG_134 (ANIM_SPRITES_START + 134) +#define ANIM_TAG_135 (ANIM_SPRITES_START + 135) +#define ANIM_TAG_136 (ANIM_SPRITES_START + 136) +#define ANIM_TAG_137 (ANIM_SPRITES_START + 137) +#define ANIM_TAG_138 (ANIM_SPRITES_START + 138) +#define ANIM_TAG_139 (ANIM_SPRITES_START + 139) +#define ANIM_TAG_140 (ANIM_SPRITES_START + 140) +#define ANIM_TAG_141 (ANIM_SPRITES_START + 141) +#define ANIM_TAG_142 (ANIM_SPRITES_START + 142) +#define ANIM_TAG_143 (ANIM_SPRITES_START + 143) +#define ANIM_TAG_144 (ANIM_SPRITES_START + 144) +#define ANIM_TAG_145 (ANIM_SPRITES_START + 145) +#define ANIM_TAG_146 (ANIM_SPRITES_START + 146) +#define ANIM_TAG_147 (ANIM_SPRITES_START + 147) +#define ANIM_TAG_148 (ANIM_SPRITES_START + 148) +#define ANIM_TAG_149 (ANIM_SPRITES_START + 149) +#define ANIM_TAG_150 (ANIM_SPRITES_START + 150) +#define ANIM_TAG_151 (ANIM_SPRITES_START + 151) +#define ANIM_TAG_152 (ANIM_SPRITES_START + 152) +#define ANIM_TAG_153 (ANIM_SPRITES_START + 153) +#define ANIM_TAG_154 (ANIM_SPRITES_START + 154) +#define ANIM_TAG_155 (ANIM_SPRITES_START + 155) +#define ANIM_TAG_156 (ANIM_SPRITES_START + 156) +#define ANIM_TAG_157 (ANIM_SPRITES_START + 157) +#define ANIM_TAG_158 (ANIM_SPRITES_START + 158) +#define ANIM_TAG_159 (ANIM_SPRITES_START + 159) +#define ANIM_TAG_160 (ANIM_SPRITES_START + 160) +#define ANIM_TAG_161 (ANIM_SPRITES_START + 161) +#define ANIM_TAG_162 (ANIM_SPRITES_START + 162) +#define ANIM_TAG_163 (ANIM_SPRITES_START + 163) +#define ANIM_TAG_164 (ANIM_SPRITES_START + 164) +#define ANIM_TAG_165 (ANIM_SPRITES_START + 165) +#define ANIM_TAG_166 (ANIM_SPRITES_START + 166) +#define ANIM_TAG_167 (ANIM_SPRITES_START + 167) +#define ANIM_TAG_168 (ANIM_SPRITES_START + 168) +#define ANIM_TAG_169 (ANIM_SPRITES_START + 169) +#define ANIM_TAG_170 (ANIM_SPRITES_START + 170) +#define ANIM_TAG_171 (ANIM_SPRITES_START + 171) +#define ANIM_TAG_172 (ANIM_SPRITES_START + 172) +#define ANIM_TAG_173 (ANIM_SPRITES_START + 173) +#define ANIM_TAG_174 (ANIM_SPRITES_START + 174) +#define ANIM_TAG_175 (ANIM_SPRITES_START + 175) +#define ANIM_TAG_176 (ANIM_SPRITES_START + 176) +#define ANIM_TAG_177 (ANIM_SPRITES_START + 177) +#define ANIM_TAG_178 (ANIM_SPRITES_START + 178) +#define ANIM_TAG_179 (ANIM_SPRITES_START + 179) +#define ANIM_TAG_180 (ANIM_SPRITES_START + 180) +#define ANIM_TAG_181 (ANIM_SPRITES_START + 181) +#define ANIM_TAG_182 (ANIM_SPRITES_START + 182) +#define ANIM_TAG_183 (ANIM_SPRITES_START + 183) +#define ANIM_TAG_184 (ANIM_SPRITES_START + 184) +#define ANIM_TAG_185 (ANIM_SPRITES_START + 185) +#define ANIM_TAG_186 (ANIM_SPRITES_START + 186) +#define ANIM_TAG_187 (ANIM_SPRITES_START + 187) +#define ANIM_TAG_188 (ANIM_SPRITES_START + 188) +#define ANIM_TAG_189 (ANIM_SPRITES_START + 189) +#define ANIM_TAG_190 (ANIM_SPRITES_START + 190) +#define ANIM_TAG_191 (ANIM_SPRITES_START + 191) +#define ANIM_TAG_192 (ANIM_SPRITES_START + 192) +#define ANIM_TAG_193 (ANIM_SPRITES_START + 193) +#define ANIM_TAG_194 (ANIM_SPRITES_START + 194) +#define ANIM_TAG_195 (ANIM_SPRITES_START + 195) +#define ANIM_TAG_196 (ANIM_SPRITES_START + 196) +#define ANIM_TAG_197 (ANIM_SPRITES_START + 197) +#define ANIM_TAG_198 (ANIM_SPRITES_START + 198) +#define ANIM_TAG_199 (ANIM_SPRITES_START + 199) +#define ANIM_TAG_200 (ANIM_SPRITES_START + 200) +#define ANIM_TAG_201 (ANIM_SPRITES_START + 201) +#define ANIM_TAG_202 (ANIM_SPRITES_START + 202) +#define ANIM_TAG_203 (ANIM_SPRITES_START + 203) +#define ANIM_TAG_204 (ANIM_SPRITES_START + 204) +#define ANIM_TAG_205 (ANIM_SPRITES_START + 205) +#define ANIM_TAG_206 (ANIM_SPRITES_START + 206) +#define ANIM_TAG_207 (ANIM_SPRITES_START + 207) +#define ANIM_TAG_208 (ANIM_SPRITES_START + 208) +#define ANIM_TAG_209 (ANIM_SPRITES_START + 209) +#define ANIM_TAG_210 (ANIM_SPRITES_START + 210) +#define ANIM_TAG_211 (ANIM_SPRITES_START + 211) +#define ANIM_TAG_212 (ANIM_SPRITES_START + 212) +#define ANIM_TAG_213 (ANIM_SPRITES_START + 213) +#define ANIM_TAG_214 (ANIM_SPRITES_START + 214) +#define ANIM_TAG_215 (ANIM_SPRITES_START + 215) +#define ANIM_TAG_216 (ANIM_SPRITES_START + 216) +#define ANIM_TAG_217 (ANIM_SPRITES_START + 217) +#define ANIM_TAG_218 (ANIM_SPRITES_START + 218) +#define ANIM_TAG_219 (ANIM_SPRITES_START + 219) +#define ANIM_TAG_220 (ANIM_SPRITES_START + 220) +#define ANIM_TAG_221 (ANIM_SPRITES_START + 221) +#define ANIM_TAG_222 (ANIM_SPRITES_START + 222) +#define ANIM_TAG_223 (ANIM_SPRITES_START + 223) +#define ANIM_TAG_224 (ANIM_SPRITES_START + 224) +#define ANIM_TAG_225 (ANIM_SPRITES_START + 225) +#define ANIM_TAG_226 (ANIM_SPRITES_START + 226) +#define ANIM_TAG_227 (ANIM_SPRITES_START + 227) +#define ANIM_TAG_228 (ANIM_SPRITES_START + 228) +#define ANIM_TAG_229 (ANIM_SPRITES_START + 229) +#define ANIM_TAG_230 (ANIM_SPRITES_START + 230) +#define ANIM_TAG_231 (ANIM_SPRITES_START + 231) +#define ANIM_TAG_232 (ANIM_SPRITES_START + 232) +#define ANIM_TAG_233 (ANIM_SPRITES_START + 233) +#define ANIM_TAG_234 (ANIM_SPRITES_START + 234) +#define ANIM_TAG_235 (ANIM_SPRITES_START + 235) +#define ANIM_TAG_236 (ANIM_SPRITES_START + 236) +#define ANIM_TAG_237 (ANIM_SPRITES_START + 237) +#define ANIM_TAG_238 (ANIM_SPRITES_START + 238) +#define ANIM_TAG_239 (ANIM_SPRITES_START + 239) +#define ANIM_TAG_240 (ANIM_SPRITES_START + 240) +#define ANIM_TAG_241 (ANIM_SPRITES_START + 241) +#define ANIM_TAG_242 (ANIM_SPRITES_START + 242) +#define ANIM_TAG_243 (ANIM_SPRITES_START + 243) +#define ANIM_TAG_244 (ANIM_SPRITES_START + 244) +#define ANIM_TAG_245 (ANIM_SPRITES_START + 245) +#define ANIM_TAG_246 (ANIM_SPRITES_START + 246) +#define ANIM_TAG_247 (ANIM_SPRITES_START + 247) +#define ANIM_TAG_248 (ANIM_SPRITES_START + 248) +#define ANIM_TAG_249 (ANIM_SPRITES_START + 249) +#define ANIM_TAG_250 (ANIM_SPRITES_START + 250) +#define ANIM_TAG_251 (ANIM_SPRITES_START + 251) +#define ANIM_TAG_252 (ANIM_SPRITES_START + 252) +#define ANIM_TAG_253 (ANIM_SPRITES_START + 253) +#define ANIM_TAG_254 (ANIM_SPRITES_START + 254) +#define ANIM_TAG_255 (ANIM_SPRITES_START + 255) +#define ANIM_TAG_256 (ANIM_SPRITES_START + 256) +#define ANIM_TAG_257 (ANIM_SPRITES_START + 257) +#define ANIM_TAG_258 (ANIM_SPRITES_START + 258) +#define ANIM_TAG_259 (ANIM_SPRITES_START + 259) +#define ANIM_TAG_260 (ANIM_SPRITES_START + 260) +#define ANIM_TAG_261 (ANIM_SPRITES_START + 261) +#define ANIM_TAG_262 (ANIM_SPRITES_START + 262) +#define ANIM_TAG_263 (ANIM_SPRITES_START + 263) +#define ANIM_TAG_264 (ANIM_SPRITES_START + 264) +#define ANIM_TAG_265 (ANIM_SPRITES_START + 265) +#define ANIM_TAG_266 (ANIM_SPRITES_START + 266) +#define ANIM_TAG_267 (ANIM_SPRITES_START + 267) +#define ANIM_TAG_268 (ANIM_SPRITES_START + 268) +#define ANIM_TAG_269 (ANIM_SPRITES_START + 269) +#define ANIM_TAG_270 (ANIM_SPRITES_START + 270) +#define ANIM_TAG_271 (ANIM_SPRITES_START + 271) +#define ANIM_TAG_272 (ANIM_SPRITES_START + 272) +#define ANIM_TAG_273 (ANIM_SPRITES_START + 273) +#define ANIM_TAG_274 (ANIM_SPRITES_START + 274) +#define ANIM_TAG_275 (ANIM_SPRITES_START + 275) +#define ANIM_TAG_276 (ANIM_SPRITES_START + 276) +#define ANIM_TAG_277 (ANIM_SPRITES_START + 277) +#define ANIM_TAG_278 (ANIM_SPRITES_START + 278) +#define ANIM_TAG_279 (ANIM_SPRITES_START + 279) +#define ANIM_TAG_280 (ANIM_SPRITES_START + 280) +#define ANIM_TAG_281 (ANIM_SPRITES_START + 281) +#define ANIM_TAG_282 (ANIM_SPRITES_START + 282) +#define ANIM_TAG_283 (ANIM_SPRITES_START + 283) +#define ANIM_TAG_284 (ANIM_SPRITES_START + 284) +#define ANIM_TAG_285 (ANIM_SPRITES_START + 285) +#define ANIM_TAG_286 (ANIM_SPRITES_START + 286) +#define ANIM_TAG_287 (ANIM_SPRITES_START + 287) +#define ANIM_TAG_288 (ANIM_SPRITES_START + 288) +#define ANIM_TAG_289 (ANIM_SPRITES_START + 289) +#define ANIM_TAG_290 (ANIM_SPRITES_START + 290) +#define ANIM_TAG_291 (ANIM_SPRITES_START + 291) +#define ANIM_TAG_292 (ANIM_SPRITES_START + 292) +#define ANIM_TAG_293 (ANIM_SPRITES_START + 293) +#define ANIM_TAG_294 (ANIM_SPRITES_START + 294) +#define ANIM_TAG_295 (ANIM_SPRITES_START + 295) +#define ANIM_TAG_296 (ANIM_SPRITES_START + 296) +#define ANIM_TAG_297 (ANIM_SPRITES_START + 297) +#define ANIM_TAG_298 (ANIM_SPRITES_START + 298) + // battlers #define ANIM_ATTACKER 0 #define ANIM_TARGET 1 diff --git a/src/battle_anim.c b/src/battle_anim.c index 8f9b60b60..36aa803fe 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -16,9 +16,6 @@ #include "palette.h" #include "main.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 extern u16 gBattle_WIN0H; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 23ed8a19f..6cb5ef070 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -29,7 +29,7 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const u8 gUnknown_0831C604[]; -extern const u8 * const gBattleAnims_VariousTable[]; +extern const u8 * const gBattleAnims_General[]; extern const u8 * const gBattleAnims_Special[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonBackPicTable[]; @@ -437,7 +437,7 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 de gBattleAnimAttacker = atkBattler; gBattleAnimTarget = defBattler; gBattleSpritesDataPtr->animationData->animArg = argument; - LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE); + LaunchBattleAnimation(gBattleAnims_General, tableId, FALSE); taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10); gTasks[taskId].tBattlerId = activeBattler; gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 1; diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index f12bb454e..1684e9b3d 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -414,7 +414,7 @@ static const struct SpriteTemplate gUnknown_0857FE10 = .callback = SpriteCallbackDummy, }; -const struct SpriteTemplate gUnknown_0857FE28 = +const struct SpriteTemplate gHorizontalLungeSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -425,7 +425,7 @@ const struct SpriteTemplate gUnknown_0857FE28 = .callback = sub_80D5860, }; -const struct SpriteTemplate gUnknown_0857FE40 = +const struct SpriteTemplate gVerticalDipSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -436,7 +436,7 @@ const struct SpriteTemplate gUnknown_0857FE40 = .callback = sub_80D58F8, }; -const struct SpriteTemplate gUnknown_0857FE58 = +const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -447,7 +447,7 @@ const struct SpriteTemplate gUnknown_0857FE58 = .callback = sub_80D5968, }; -const struct SpriteTemplate gUnknown_0857FE70 = +const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = { .tileTag = 0, .paletteTag = 0,