dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

battle_anims_effects_2

Browse Source 
Fixes
This commit is contained in:
Sewef
2019-10-20 19:03:34 +02:00
committed by huderlem
parent e9675bdd24
commit 41e952a668
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_scripts.s
+5 -5
View File
@@ -3047,8 +3047,8 @@ Move_STRUGGLE:
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
createsprite gMovmentWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2
createsprite gMovmentWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2
loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4
waitforvisualfinish waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2
@@ -4473,13 +4473,13 @@ Move_CALM_MIND:
waitforvisualfinish waitforvisualfinish
createvisualtask sub_81177E4, 5, 1 createvisualtask sub_81177E4, 5, 1
waitforvisualfinish waitforvisualfinish
createsprite gThingRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0
playsewithpan SE_W048, SOUND_PAN_ATTACKER playsewithpan SE_W048, SOUND_PAN_ATTACKER
delay 14 delay 14
createsprite gThingRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0
playsewithpan SE_W048, SOUND_PAN_ATTACKER playsewithpan SE_W048, SOUND_PAN_ATTACKER
delay 14 delay 14
createsprite gThingRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0
playsewithpan SE_W048, SOUND_PAN_ATTACKER playsewithpan SE_W048, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createvisualtask sub_81177E4, 5, 0 createvisualtask sub_81177E4, 5, 0
src/battle_anim_effects_2.c
+14 -14
View File
@@ -704,14 +704,14 @@ const struct SpriteTemplate gSoftBoiledEggSpriteTemplate =
.callback = AnimSoftBoiledEgg, .callback = AnimSoftBoiledEgg,
}; };
const union AffineAnimCmd gThingRingExpandingAffineAnimCmds1[] = const union AffineAnimCmd gThinRingExpandingAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 30), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 30),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd gThingRingExpandingAffineAnimCmds2[] = const union AffineAnimCmd gThinRingExpandingAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 15), AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 15),
@@ -725,10 +725,10 @@ const union AffineAnimCmd gHyperVoiceRingAffineAnimCmds[] =
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd *const gThingRingExpandingAffineAnimTable[] = const union AffineAnimCmd *const gThinRingExpandingAffineAnimTable[] =
{ {
gThingRingExpandingAffineAnimCmds1, gThinRingExpandingAffineAnimCmds1,
gThingRingExpandingAffineAnimCmds2, gThinRingExpandingAffineAnimCmds2,
}; };
const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] = const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] =
@@ -743,30 +743,30 @@ const struct SpriteTemplate gThinRingExpandingSpriteTemplate =
.oam = &gOamData_AffineDouble_ObjNormal_64x64, .oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gThingRingExpandingAffineAnimTable, .affineAnims = gThinRingExpandingAffineAnimTable,
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
const union AffineAnimCmd gThingRingShrinkingAffineAnimCmds[] = const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
AFFINEANIMCMD_FRAME(0xFFF0, 0xFFF0, 0, 30), AFFINEANIMCMD_FRAME(0xFFF0, 0xFFF0, 0, 30),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd *const gThingRingShrinkingAffineAnimTable[] = const union AffineAnimCmd *const gThinRingShrinkingAffineAnimTable[] =
{ {
gThingRingShrinkingAffineAnimCmds, gThinRingShrinkingAffineAnimCmds,
}; };
const struct SpriteTemplate gThingRingShrinkingSpriteTemplate = const struct SpriteTemplate gThinRingShrinkingSpriteTemplate =
{ {
.tileTag = ANIM_TAG_THIN_RING, .tileTag = ANIM_TAG_THIN_RING,
.paletteTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_THIN_RING,
.oam = &gOamData_AffineDouble_ObjBlend_64x64, .oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gThingRingShrinkingAffineAnimTable, .affineAnims = gThinRingShrinkingAffineAnimTable,
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
@@ -777,7 +777,7 @@ const struct SpriteTemplate gBlendThinRingExpandingSpriteTemplate =
.oam = &gOamData_AffineDouble_ObjBlend_64x64, .oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gThingRingExpandingAffineAnimTable, .affineAnims = gThinRingExpandingAffineAnimTable,
.callback = AnimBlendThinRing, .callback = AnimBlendThinRing,
}; };
@@ -799,7 +799,7 @@ const struct SpriteTemplate gUproarRingSpriteTemplate =
.oam = &gOamData_AffineDouble_ObjBlend_64x64, .oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gThingRingExpandingAffineAnimTable, .affineAnims = gThinRingExpandingAffineAnimTable,
.callback = AnimUproarRing, .callback = AnimUproarRing,
}; };
@@ -1150,7 +1150,7 @@ const union AnimCmd *const gMovementWavesAnimTable[] =
gMovementWavesAnimCmds2, gMovementWavesAnimCmds2,
}; };
const struct SpriteTemplate gMovmentWavesSpriteTemplate = const struct SpriteTemplate gMovementWavesSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MOVEMENT_WAVES, .tileTag = ANIM_TAG_MOVEMENT_WAVES,
.paletteTag = ANIM_TAG_MOVEMENT_WAVES, .paletteTag = ANIM_TAG_MOVEMENT_WAVES,