atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

battle_anims_effects_2

Browse source
This commit is contained in:
Sewef 2019-10-20 11:01:12 +02:00 committed by huderlem
parent 49ad6da8fb
commit 3b0d9e134f
6 changed files with 110 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
data/battle_anim_scripts.s
View file

@ -1469,19 +1469,19 @@ Move_SELF_DESTRUCT:
end end
SelfDestruct1: SelfDestruct1:
playsewithpan SE_W120, SOUND_PAN_ATTACKER playsewithpan SE_W120, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_ATTACKER playsewithpan SE_W120, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_ATTACKER playsewithpan SE_W120, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_ATTACKER playsewithpan SE_W120, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_ATTACKER playsewithpan SE_W120, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1
delay 6 delay 6
return return
@ -1637,19 +1637,19 @@ Move_EXPLOSION:
end end
Explosion1: Explosion1:
playsewithpan SE_W153, SOUND_PAN_ATTACKER playsewithpan SE_W153, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1
delay 6 delay 6
playsewithpan SE_W153, SOUND_PAN_ATTACKER playsewithpan SE_W153, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1
delay 6 delay 6
playsewithpan SE_W153, SOUND_PAN_ATTACKER playsewithpan SE_W153, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1
delay 6 delay 6
playsewithpan SE_W153, SOUND_PAN_ATTACKER playsewithpan SE_W153, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1
delay 6 delay 6
playsewithpan SE_W153, SOUND_PAN_ATTACKER playsewithpan SE_W153, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1
delay 6 delay 6
return return
@ -2531,7 +2531,7 @@ HornDrillInContest:
Move_THRASH: Move_THRASH:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_HANDS_AND_FEET
createvisualtask sub_8104C38, 2 createvisualtask AnimTask_ThrashMoveMon, 2
createvisualtask sub_8104CA4, 2 createvisualtask sub_8104CA4, 2
createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 0 createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 0
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
@ -3063,7 +3063,7 @@ Move_SKETCH:
loadspritegfx ANIM_TAG_PENCIL loadspritegfx ANIM_TAG_PENCIL
monbg ANIM_TARGET monbg ANIM_TARGET
createvisualtask sub_8104E74, 2 createvisualtask sub_8104E74, 2
createsprite gUnknown_085936D4, ANIM_TARGET, 2 createsprite gPencilSpriteTemplate, ANIM_TARGET, 2
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
createvisualtask AnimTask_Splash, 2, 0, 2 createvisualtask AnimTask_Splash, 2, 0, 2
@ -5010,9 +5010,9 @@ Snore1:
createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0
createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0
createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0
createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0
return return
Move_LIGHT_SCREEN: Move_LIGHT_SCREEN:
@ -6580,19 +6580,19 @@ Move_DYNAMIC_PUNCH:
waitsound waitsound
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@ -7323,19 +7323,19 @@ Move_EGG_BOMB:
createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 6, 5, 1, 0 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -16, -15, 1, 0 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 16, -5, 1, 0 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -12, 18, 1, 0 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 0, 5, 1, 0 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
delay 3 delay 3
waitforvisualfinish waitforvisualfinish
@ -7870,19 +7870,19 @@ Move_PRESENT:
PresentDamage: PresentDamage:
loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_EXPLOSION
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 24, -24, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -16, 16, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -24, -12, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 16, 16, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1
end end
PresentHeal: PresentHeal:
@ -10599,19 +10599,19 @@ General_DoomDesireHit:
delay 25 delay 25
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1
delay 6 delay 6
playsewithpan SE_W120, SOUND_PAN_TARGET playsewithpan SE_W120, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish

2
include/battle_anim.h
View file

@ -101,7 +101,7 @@ void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 a2);
s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 a2); s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 a2);
u8 GetBattlerYCoordWithElevation(u8 battlerId); u8 GetBattlerYCoordWithElevation(u8 battlerId);
void WaitAnimForDuration(struct Sprite *sprite); void WaitAnimForDuration(struct Sprite *sprite);
void sub_80A7938(struct Sprite *sprite); void AnimSnoreZ(struct Sprite *sprite);
void InitAnimLinearTranslation(struct Sprite *sprite); void InitAnimLinearTranslation(struct Sprite *sprite);
void sub_80A6F98(struct Sprite *sprite); void sub_80A6F98(struct Sprite *sprite);
u8 GetBattlerSpriteBGPriority(u8 battlerId); u8 GetBattlerSpriteBGPriority(u8 battlerId);

140
src/battle_anim_effects_2.c
View file

@ -28,12 +28,12 @@ void sub_8103FE8(struct Sprite *);
void AnimCoinThrow(struct Sprite *); void AnimCoinThrow(struct Sprite *);
void AnimFallingCoin(struct Sprite *); void AnimFallingCoin(struct Sprite *);
void AnimBulletSeed(struct Sprite *); void AnimBulletSeed(struct Sprite *);
void Anim_RazorWindTornado(struct Sprite *); void AnimRazorWindTornado(struct Sprite *);
void Anim_ViceGripPincer(struct Sprite *); void AnimViceGripPincer(struct Sprite *);
void Anim_GuillotinePincer(struct Sprite *); void AnimGuillotinePincer(struct Sprite *);
void Anim_BreathPuff(struct Sprite *); void AnimBreathPuff(struct Sprite *);
void Anim_AngerMark(struct Sprite *); void AnimAngerMark(struct Sprite *);
void sub_810501C(struct Sprite *); void AnimPencil(struct Sprite *);
void sub_81051C4(struct Sprite *); void sub_81051C4(struct Sprite *);
void sub_81052A4(struct Sprite *); void sub_81052A4(struct Sprite *);
void sub_81054E8(struct Sprite *); void sub_81054E8(struct Sprite *);
@ -66,20 +66,20 @@ static void sub_8104018(struct Sprite *);
static void AnimFallingCoin_Step(struct Sprite *); static void AnimFallingCoin_Step(struct Sprite *);
static void AnimBulletSeed_Step1(struct Sprite *); static void AnimBulletSeed_Step1(struct Sprite *);
static void AnimBulletSeed_Step2(struct Sprite *); static void AnimBulletSeed_Step2(struct Sprite *);
static void Anim_ViceGripPincerStep(struct Sprite *); static void AnimViceGripPincerStep(struct Sprite *);
static void Anim_GuillotinePincerStep1(struct Sprite *); static void AnimGuillotinePincerStep1(struct Sprite *);
static void Anim_GuillotinePincerStep2(struct Sprite *); static void AnimGuillotinePincerStep2(struct Sprite *);
static void Anim_GuillotinePincerStep3(struct Sprite *); static void AnimGuillotinePincerStep3(struct Sprite *);
static void AnimTask_GrowAndGreyscaleStep(u8); static void AnimTask_GrowAndGreyscaleStep(u8);
static void AnimTask_MinimizeStep1(u8); static void AnimTask_MinimizeStep1(u8);
static void CreateMinimizeSprite(struct Task *, u8); static void CreateMinimizeSprite(struct Task *, u8);
static void ClonedMinizeSprite_Step(struct Sprite *); static void ClonedMinizeSprite_Step(struct Sprite *);
static void AnimTask_SplashStep(u8); static void AnimTask_SplashStep(u8);
static void AnimTask_GrowAndShrinkStep(u8); static void AnimTask_GrowAndShrinkStep(u8);
static void sub_8104C78(u8); static void ThrashMoveMonStep(u8);
static void sub_8104D28(u8); static void sub_8104D28(u8);
static void sub_8104F54(u8); static void sub_8104F54(u8);
static void sub_8105078(struct Sprite *); static void AnimPencil_Step(struct Sprite *);
static void sub_810557C(struct Sprite *); static void sub_810557C(struct Sprite *);
static void sub_81055F4(struct Sprite *); static void sub_81055F4(struct Sprite *);
static void sub_810561C(struct Sprite *); static void sub_810561C(struct Sprite *);
@ -460,10 +460,10 @@ const struct SpriteTemplate gRazorWindTornadoSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gRazorWindTornadoAffineAnimTable, .affineAnims = gRazorWindTornadoAffineAnimTable,
.callback = Anim_RazorWindTornado, .callback = AnimRazorWindTornado,
}; };
const union AnimCmd gUnknown_08593568[] = const union AnimCmd gViceGripAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@ -471,7 +471,7 @@ const union AnimCmd gUnknown_08593568[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08593578[] = const union AnimCmd gViceGripAnimCmds2[] =
{ {
ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE),
@ -479,10 +479,10 @@ const union AnimCmd gUnknown_08593578[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593588[] = const union AnimCmd *const gViceGripAnimTable[] =
{ {
gUnknown_08593568, gViceGripAnimCmds1,
gUnknown_08593578, gViceGripAnimCmds2,
}; };
const struct SpriteTemplate gViceGripSpriteTemplate = const struct SpriteTemplate gViceGripSpriteTemplate =
@ -490,13 +490,13 @@ const struct SpriteTemplate gViceGripSpriteTemplate =
.tileTag = ANIM_TAG_CUT, .tileTag = ANIM_TAG_CUT,
.paletteTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT,
.oam = &gOamData_AffineOff_ObjBlend_32x32, .oam = &gOamData_AffineOff_ObjBlend_32x32,
.anims = gUnknown_08593588, .anims = gViceGripAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = Anim_ViceGripPincer, .callback = AnimViceGripPincer,
}; };
const union AnimCmd gUnknown_085935A8[] = const union AnimCmd gGuillotineAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(16, 2), ANIMCMD_FRAME(16, 2),
@ -504,7 +504,7 @@ const union AnimCmd gUnknown_085935A8[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_085935B8[] = const union AnimCmd gGuillotineAnimCmds2[] =
{ {
ANIMCMD_FRAME(0, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(0, 2, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(16, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 2, .vFlip = TRUE, .hFlip = TRUE),
@ -512,10 +512,10 @@ const union AnimCmd gUnknown_085935B8[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_085935C8[] = const union AnimCmd *const gGuillotineAnimTable[] =
{ {
gUnknown_085935A8, gGuillotineAnimCmds1,
gUnknown_085935B8, gGuillotineAnimCmds2,
}; };
const struct SpriteTemplate gGuillotineSpriteTemplate = const struct SpriteTemplate gGuillotineSpriteTemplate =
@ -523,10 +523,10 @@ const struct SpriteTemplate gGuillotineSpriteTemplate =
.tileTag = ANIM_TAG_CUT, .tileTag = ANIM_TAG_CUT,
.paletteTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT,
.oam = &gOamData_AffineOff_ObjBlend_32x32, .oam = &gOamData_AffineOff_ObjBlend_32x32,
.anims = gUnknown_085935C8, .anims = gGuillotineAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = Anim_GuillotinePincer, .callback = AnimGuillotinePincer,
}; };
const union AffineAnimCmd gSplashEffectAffineAnimCmds[] = const union AffineAnimCmd gSplashEffectAffineAnimCmds[] =
@ -545,7 +545,7 @@ const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AnimCmd gUnknown_08593628[] = const union AnimCmd gBreathPuffAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
ANIMCMD_FRAME(4, 40, .hFlip = TRUE), ANIMCMD_FRAME(4, 40, .hFlip = TRUE),
@ -554,7 +554,7 @@ const union AnimCmd gUnknown_08593628[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_0859363C[] = const union AnimCmd gBreathPuffAnimCmds2[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(4, 40), ANIMCMD_FRAME(4, 40),
@ -563,10 +563,10 @@ const union AnimCmd gUnknown_0859363C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593650[] = const union AnimCmd *const gBreathPuffAnimTable[] =
{ {
gUnknown_08593628, gBreathPuffAnimCmds1,
gUnknown_0859363C, gBreathPuffAnimCmds2,
}; };
const struct SpriteTemplate gBreathPuffSpriteTemplate = const struct SpriteTemplate gBreathPuffSpriteTemplate =
@ -574,22 +574,22 @@ const struct SpriteTemplate gBreathPuffSpriteTemplate =
.tileTag = ANIM_TAG_BREATH, .tileTag = ANIM_TAG_BREATH,
.paletteTag = ANIM_TAG_BREATH, .paletteTag = ANIM_TAG_BREATH,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_08593650, .anims = gBreathPuffAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = Anim_BreathPuff, .callback = AnimBreathPuff,
}; };
const union AffineAnimCmd gUnknown_08593670[] = const union AffineAnimCmd gAngerMarkAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0xB, 0xB, 0, 8), AFFINEANIMCMD_FRAME(0xB, 0xB, 0, 8),
AFFINEANIMCMD_FRAME(0xFFF5, 0xFFF5, 0, 8), AFFINEANIMCMD_FRAME(0xFFF5, 0xFFF5, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gUnknown_08593688[] = const union AffineAnimCmd *const gAngerMarkAffineAnimTable[] =
{ {
gUnknown_08593670, gAngerMarkAffineAnimCmds,
}; };
const struct SpriteTemplate gAngerMarkSpriteTemplate = const struct SpriteTemplate gAngerMarkSpriteTemplate =
@ -599,11 +599,11 @@ const struct SpriteTemplate gAngerMarkSpriteTemplate =
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593688, .affineAnims = gAngerMarkAffineAnimTable,
.callback = Anim_AngerMark, .callback = AnimAngerMark,
}; };
const union AffineAnimCmd gUnknown_085936A4[] = const union AffineAnimCmd gThrashMoveMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-10, 9, 0, 7), AFFINEANIMCMD_FRAME(-10, 9, 0, 7),
AFFINEANIMCMD_FRAME(20, -20, 0, 7), AFFINEANIMCMD_FRAME(20, -20, 0, 7),
@ -613,7 +613,7 @@ const union AffineAnimCmd gUnknown_085936A4[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const struct SpriteTemplate gUnknown_085936D4 = const struct SpriteTemplate gPencilSpriteTemplate =
{ {
.tileTag = ANIM_TAG_PENCIL, .tileTag = ANIM_TAG_PENCIL,
.paletteTag = ANIM_TAG_PENCIL, .paletteTag = ANIM_TAG_PENCIL,
@ -621,10 +621,10 @@ const struct SpriteTemplate gUnknown_085936D4 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810501C, .callback = AnimPencil,
}; };
const struct SpriteTemplate gUnknown_085936EC = const struct SpriteTemplate gSnoreZSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SNORE_Z, .tileTag = ANIM_TAG_SNORE_Z,
.paletteTag = ANIM_TAG_SNORE_Z, .paletteTag = ANIM_TAG_SNORE_Z,
@ -632,10 +632,10 @@ const struct SpriteTemplate gUnknown_085936EC =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A7938, .callback = AnimSnoreZ,
}; };
const union AnimCmd gUnknown_08593704[] = const union AnimCmd gExplosionAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
@ -644,17 +644,17 @@ const union AnimCmd gUnknown_08593704[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593718[] = const union AnimCmd *const gExplosionAnimTable[] =
{ {
gUnknown_08593704, gExplosionAnimCmds,
}; };
//*
const struct SpriteTemplate gBattleAnimSpriteTemplate_859371C = const struct SpriteTemplate gExplosionSpriteTemplate =
{ {
.tileTag = ANIM_TAG_EXPLOSION, .tileTag = ANIM_TAG_EXPLOSION,
.paletteTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_EXPLOSION,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_08593718, .anims = gExplosionAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSparklingParticle, .callback = AnimSparklingParticle,
@ -1867,7 +1867,7 @@ static void AnimBulletSeed_Step2(struct Sprite *sprite)
// arg 4: initial wave offset // arg 4: initial wave offset
// arg 5: wave period (higher means faster wave) // arg 5: wave period (higher means faster wave)
// arg 6: duration // arg 6: duration
void Anim_RazorWindTornado(struct Sprite *sprite) void AnimRazorWindTornado(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, FALSE); InitSpritePosToAnimAttacker(sprite, FALSE);
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
@ -1885,7 +1885,7 @@ void Anim_RazorWindTornado(struct Sprite *sprite)
// Animates a single pincer line that extends towards the center of the target mon. // Animates a single pincer line that extends towards the center of the target mon.
// arg 0: invert // arg 0: invert
void Anim_ViceGripPincer(struct Sprite *sprite) void AnimViceGripPincer(struct Sprite *sprite)
{ {
s16 startXOffset = 32; s16 startXOffset = 32;
s16 startYOffset = -32; s16 startYOffset = -32;
@ -1906,10 +1906,10 @@ void Anim_ViceGripPincer(struct Sprite *sprite)
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + endXOffset; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + endXOffset;
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + endYOffset; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + endYOffset;
sprite->callback = StartAnimLinearTranslation; sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, Anim_ViceGripPincerStep); StoreSpriteCallbackInData6(sprite, AnimViceGripPincerStep);
} }
static void Anim_ViceGripPincerStep(struct Sprite *sprite) static void AnimViceGripPincerStep(struct Sprite *sprite)
{ {
if (sprite->animEnded) if (sprite->animEnded)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
@ -1917,7 +1917,7 @@ static void Anim_ViceGripPincerStep(struct Sprite *sprite)
// Animates a single pincer line that extends towards the center of the target mon, and then back out. // Animates a single pincer line that extends towards the center of the target mon, and then back out.
// arg 0: animation id // arg 0: animation id
void Anim_GuillotinePincer(struct Sprite *sprite) void AnimGuillotinePincer(struct Sprite *sprite)
{ {
s16 startXOffset = 32; s16 startXOffset = 32;
s16 startYOffset = -32; s16 startYOffset = -32;
@ -1942,10 +1942,10 @@ void Anim_GuillotinePincer(struct Sprite *sprite)
InitAnimLinearTranslation(sprite); InitAnimLinearTranslation(sprite);
sprite->data[5] = gBattleAnimArgs[0]; sprite->data[5] = gBattleAnimArgs[0];
sprite->data[6] = sprite->data[0]; sprite->data[6] = sprite->data[0];
sprite->callback = Anim_GuillotinePincerStep1; sprite->callback = AnimGuillotinePincerStep1;
} }
static void Anim_GuillotinePincerStep1(struct Sprite *sprite) static void AnimGuillotinePincerStep1(struct Sprite *sprite)
{ {
if (AnimTranslateLinear(sprite) && sprite->animEnded) if (AnimTranslateLinear(sprite) && sprite->animEnded)
{ {
@ -1960,11 +1960,11 @@ static void Anim_GuillotinePincerStep1(struct Sprite *sprite)
sprite->data[2] ^= 1; sprite->data[2] ^= 1;
sprite->data[4] = 0; sprite->data[4] = 0;
sprite->data[3] = 0; sprite->data[3] = 0;
sprite->callback = Anim_GuillotinePincerStep2; sprite->callback = AnimGuillotinePincerStep2;
} }
} }
static void Anim_GuillotinePincerStep2(struct Sprite *sprite) static void AnimGuillotinePincerStep2(struct Sprite *sprite)
{ {
if (sprite->data[3]) if (sprite->data[3])
{ {
@ -1981,11 +1981,11 @@ static void Anim_GuillotinePincerStep2(struct Sprite *sprite)
sprite->data[3] = 0; sprite->data[3] = 0;
sprite->animPaused = 0; sprite->animPaused = 0;
StartSpriteAnim(sprite, sprite->data[5] ^ 1); StartSpriteAnim(sprite, sprite->data[5] ^ 1);
sprite->callback = Anim_GuillotinePincerStep3; sprite->callback = AnimGuillotinePincerStep3;
} }
} }
static void Anim_GuillotinePincerStep3(struct Sprite *sprite) static void AnimGuillotinePincerStep3(struct Sprite *sprite)
{ {
if (AnimTranslateLinear(sprite)) if (AnimTranslateLinear(sprite))
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
@ -2235,7 +2235,7 @@ static void AnimTask_GrowAndShrinkStep(u8 taskId)
// Animates a little puff of the mon's breath. // Animates a little puff of the mon's breath.
// Used by MOVE_SWAGGER and MOVE_BULK_UP // Used by MOVE_SWAGGER and MOVE_BULK_UP
// No args. // No args.
void Anim_BreathPuff(struct Sprite *sprite) void AnimBreathPuff(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{ {
@ -2263,7 +2263,7 @@ void Anim_BreathPuff(struct Sprite *sprite)
// arg 0: target mon (0 = attacker, 1 = target) // arg 0: target mon (0 = attacker, 1 = target)
// arg 1: x pixel offset // arg 1: x pixel offset
// arg 2: y pixel offset // arg 2: y pixel offset
void Anim_AngerMark(struct Sprite *sprite) void AnimAngerMark(struct Sprite *sprite)
{ {
u8 battler; u8 battler;
if (!gBattleAnimArgs[0]) if (!gBattleAnimArgs[0])
@ -2284,17 +2284,17 @@ void Anim_AngerMark(struct Sprite *sprite)
} }
// left/right movements // left/right movements
void sub_8104C38(u8 taskId) void AnimTask_ThrashMoveMon(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[0] = spriteId; task->data[0] = spriteId;
task->data[1] = 0; task->data[1] = 0;
PrepareAffineAnimInTaskData(task, spriteId, gUnknown_085936A4); PrepareAffineAnimInTaskData(task, spriteId, gThrashMoveMonAffineAnimCmds);
task->func = sub_8104C78; task->func = ThrashMoveMonStep;
} }
static void sub_8104C78(u8 taskId) static void ThrashMoveMonStep(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
if (!RunAffineAnimFromTaskData(task)) if (!RunAffineAnimFromTaskData(task))
@ -2460,7 +2460,7 @@ static void sub_8104F54(u8 taskId)
} }
} }
void sub_810501C(struct Sprite *sprite) void AnimPencil(struct Sprite *sprite)
{ {
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16; sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16;
sprite->pos1.y = GetBattlerYCoordWithElevation(gBattleAnimTarget) + 16; sprite->pos1.y = GetBattlerYCoordWithElevation(gBattleAnimTarget) + 16;
@ -2471,10 +2471,10 @@ void sub_810501C(struct Sprite *sprite)
sprite->data[4] = 0; sprite->data[4] = 0;
sprite->data[5] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_HEIGHT) + 2; sprite->data[5] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_HEIGHT) + 2;
sprite->data[6] = BattleAnimAdjustPanning(63); sprite->data[6] = BattleAnimAdjustPanning(63);
sprite->callback = sub_8105078; sprite->callback = AnimPencil_Step;
} }
static void sub_8105078(struct Sprite *sprite) static void AnimPencil_Step(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {

2
src/battle_anim_mons.c
View file

@ -1532,7 +1532,7 @@ static void AnimThrowProjectile_Step(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80A7938(struct Sprite *sprite) void AnimSnoreZ(struct Sprite *sprite)
{ {
bool8 r4; bool8 r4;
u8 battlerId, coordType; u8 battlerId, coordType;

2
src/fight.c
View file

@ -433,7 +433,7 @@ void sub_810CE68(struct Sprite *sprite)
StartSpriteAnim(sprite, gBattleAnimArgs[6]); StartSpriteAnim(sprite, gBattleAnimArgs[6]);
gBattleAnimArgs[6] = 0; gBattleAnimArgs[6] = 0;
sub_80A7938(sprite); AnimSnoreZ(sprite);
} }
void sub_810CEB4(struct Sprite *sprite) void sub_810CEB4(struct Sprite *sprite)

4
src/fire.c
View file

@ -622,7 +622,7 @@ static void AnimEmberFlare(struct Sprite *sprite)
|| gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) || gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)))
gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->callback = sub_80A7938; sprite->callback = AnimSnoreZ;
sprite->callback(sprite); sprite->callback(sprite);
} }
@ -631,7 +631,7 @@ static void sub_8109200(struct Sprite *sprite)
gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[0] = -gBattleAnimArgs[0];
gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->callback = sub_80A7938; sprite->callback = AnimSnoreZ;
} }
// Animates the a fire sprite in the first-half of the MOVE_FIRE_BLAST // Animates the a fire sprite in the first-half of the MOVE_FIRE_BLAST