ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-05 10:52:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

More battle_anim_effects_1 labels

Browse Source
This commit is contained in:
Sewef 2019-10-14 22:51:45 +02:00
parent 00331a644a
commit 5a366e8d72
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/battle_anim_scripts.s
View File

@ -2329,7 +2329,7 @@ Move_CONVERSION:
playsewithpan SE_W112, SOUND_PAN_ATTACKER playsewithpan SE_W112, SOUND_PAN_ATTACKER
createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0
delay 6 delay 6
createvisualtask sub_81022D4, 5 createvisualtask AnimTask_ConversionAlphaBlend, 5
waitforvisualfinish waitforvisualfinish
delay 1 delay 1
clearmonbg ANIM_ATK_PARTNER clearmonbg ANIM_ATK_PARTNER
@ -2359,7 +2359,7 @@ Move_CONVERSION_2:
createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125
createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130
createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135
createvisualtask sub_81023E0, 5 createvisualtask AnimTask_Conversion2AlphaBlend, 5
delay 60 delay 60
playsewithpan SE_W129, SOUND_PAN_TARGET playsewithpan SE_W129, SOUND_PAN_TARGET
delay 10 delay 10
@ -3376,7 +3376,7 @@ Move_MOONLIGHT:
delay 30 delay 30
createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0 createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0
delay 20 delay 20
createvisualtask sub_81025C0, 2 createvisualtask AnimTask_FadeScreenBlue, 2
waitforvisualfinish waitforvisualfinish
call HealingEffect call HealingEffect
waitforvisualfinish waitforvisualfinish

2
include/battle_anim.h
View File

@ -221,7 +221,7 @@ void sub_8116EB4(u8);
void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette); void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
// battle_anim_effects_1.c // battle_anim_effects_1.c
void sub_810310C(u8 battler, struct Sprite* sprite); void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite);
void AnimMoveTwisterParticle(struct Sprite* sprite); void AnimMoveTwisterParticle(struct Sprite* sprite);
// water.c // water.c

20
src/battle_anim_effects_1.c
View File

@ -4850,7 +4850,7 @@ void AnimConversion(struct Sprite* sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_81022D4(u8 taskId) void AnimTask_ConversionAlphaBlend(u8 taskId)
{ {
if (gTasks[taskId].data[2] == 1) if (gTasks[taskId].data[2] == 1)
{ {
@ -4899,7 +4899,7 @@ static void AnimConversion2Step(struct Sprite* sprite)
} }
} }
void sub_81023E0(u8 taskId) void AnimTask_Conversion2AlphaBlend(u8 taskId)
{ {
if (++gTasks[taskId].data[0] == 4) if (++gTasks[taskId].data[0] == 4)
{ {
@ -4988,10 +4988,10 @@ static void AnimMoonlightSparkleStep(struct Sprite* sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_81026A8(u8); void AnimTask_FadeScreenBlueStep(u8);
void sub_81025C0(u8 taskId) void AnimTask_FadeScreenBlue(u8 taskId)
{ {
int a = sub_80A75AC(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; int a = sub_80A75AC(1, 0, 0, 0, 0, 0, 0) & 0xFFFF;
int b; int b;
@ -5014,11 +5014,11 @@ void sub_81025C0(u8 taskId)
b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON)); b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON));
d = IndexOfSpritePaletteTag(ANIM_TAG_GREEN_SPARKLE); d = IndexOfSpritePaletteTag(ANIM_TAG_GREEN_SPARKLE);
BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31)); BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31));
gTasks[taskId].func = sub_81026A8; gTasks[taskId].func = AnimTask_FadeScreenBlueStep;
gTasks[taskId].func(taskId); gTasks[taskId].func(taskId);
} }
void sub_81026A8(u8 taskId) void AnimTask_FadeScreenBlueStep(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
@ -5450,7 +5450,7 @@ static void AnimSlowFlyingMusicNotesStep(struct Sprite* sprite)
} }
} }
void sub_810310C(u8 battler, struct Sprite* sprite) void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite)
{ {
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8; sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8;
@ -5469,7 +5469,7 @@ void AnimThroughtBubble(struct Sprite* sprite)
else else
battler = gBattleAnimTarget; battler = gBattleAnimTarget;
sub_810310C(battler, sprite); SetSpriteNextToMonHead(battler, sprite);
a = (GetBattlerSide(battler) == B_SIDE_PLAYER) ? 0 : 1; a = (GetBattlerSide(battler) == B_SIDE_PLAYER) ? 0 : 1;
sprite->data[0] = gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[1];
sprite->data[1] = a + 2; sprite->data[1] = a + 2;
@ -5496,7 +5496,7 @@ void AnimMetronomeFinger(struct Sprite* sprite)
else else
battler = gBattleAnimTarget; battler = gBattleAnimTarget;
sub_810310C(battler, sprite); SetSpriteNextToMonHead(battler, sprite);
sprite->data[0] = 0; sprite->data[0] = 0;
StoreSpriteCallbackInData6(sprite, AnimMetronomeFingerStep); StoreSpriteCallbackInData6(sprite, AnimMetronomeFingerStep);
sprite->callback = RunStoredCallbackWhenAffineAnimEnds; sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
@ -5578,7 +5578,7 @@ void AnimTauntFinger(struct Sprite* sprite)
else else
battler = gBattleAnimTarget; battler = gBattleAnimTarget;
sub_810310C(battler, sprite); SetSpriteNextToMonHead(battler, sprite);
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
{ {
StartSpriteAnim(sprite, 0); StartSpriteAnim(sprite, 0);

2
src/battle_anim_effects_2.c
View File

@ -1273,7 +1273,7 @@ void sub_8103498(struct Sprite *sprite)
else else
battler = gBattleAnimTarget; battler = gBattleAnimTarget;
sub_810310C(battler, sprite); SetSpriteNextToMonHead(battler, sprite);
sprite->data[0] = 0; sprite->data[0] = 0;
sprite->data[1] = 0; sprite->data[1] = 0;
sprite->callback = sub_81034D8; sprite->callback = sub_81034D8;