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

battle_anim_effects_3 (2)

Browse Source
This commit is contained in:
Sewef 2019-10-21 18:29:59 +02:00
parent c8e0e89f8e
commit b24e7a5933
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
data/battle_anim_scripts.s
View File

@ -1657,9 +1657,9 @@ Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
createvisualtask sub_815B338, 5 createvisualtask AnimTask_DefenseCurlDeformMon, 5
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1 createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
waitforvisualfinish waitforvisualfinish
@ -7915,7 +7915,7 @@ Move_BATON_PASS:
loadspritegfx ANIM_TAG_POKEBALL loadspritegfx ANIM_TAG_POKEBALL
playsewithpan SE_W226, SOUND_PAN_ATTACKER playsewithpan SE_W226, SOUND_PAN_ATTACKER
createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30)
createsprite gUnknown_085CE370, ANIM_ATTACKER, 2 createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2
end end
Move_PERISH_SONG: Move_PERISH_SONG:
@ -8146,7 +8146,7 @@ Move_WISH:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK
waitforvisualfinish waitforvisualfinish
panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
createsprite gUnknown_085CE388, ANIM_ATTACKER, 40 createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40
waitforvisualfinish waitforvisualfinish
delay 60 delay 60
loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3
@ -8160,7 +8160,7 @@ Move_STOCKPILE:
loadspritegfx ANIM_TAG_GRAY_ORB loadspritegfx ANIM_TAG_GRAY_ORB
playsewithpan SE_W025, SOUND_PAN_ATTACKER playsewithpan SE_W025, SOUND_PAN_ATTACKER
createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE
createvisualtask sub_815B65C, 5 createvisualtask AnimTask_StockpileDeformMon, 5
call Stockpile1 call Stockpile1
call Stockpile1 call Stockpile1
waitforvisualfinish waitforvisualfinish
@ -8189,7 +8189,7 @@ Move_SPIT_UP:
loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_RED_ORB_2
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
createvisualtask sub_815B6B4, 5 createvisualtask AnimTask_SpitUpDeformMon, 5
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
delay 45 delay 45
playsewithpan SE_W255, SOUND_PAN_ATTACKER playsewithpan SE_W255, SOUND_PAN_ATTACKER
@ -8236,7 +8236,7 @@ Move_SWALLOW:
loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_ORB
loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_BLUE_STAR
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
createvisualtask sub_815B778, 5 createvisualtask AnimTask_SwallowDeformMon, 5
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
delay 38 delay 38
playsewithpan SE_W255, SOUND_PAN_ATTACKER playsewithpan SE_W255, SOUND_PAN_ATTACKER
@ -8249,15 +8249,15 @@ SwallowContinue:
call HealingEffect call HealingEffect
end end
SwallowEffect: SwallowEffect:
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 0, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -24, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, -24, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 16, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 16, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -16, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, -16, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 24, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 24, -8
delay 1 delay 1
return return
SwallowGood: SwallowGood:

58
src/battle_anim_effects_3.c
View File

@ -39,10 +39,10 @@ void AnimClappingHand(struct Sprite *);
void AnimClappingHand2(struct Sprite *); void AnimClappingHand2(struct Sprite *);
void AnimRapidSpin(struct Sprite *); void AnimRapidSpin(struct Sprite *);
void sub_815B27C(struct Sprite *); void sub_815B27C(struct Sprite *);
void sub_815B394(struct Sprite *); void AnimBatonPassPokeball(struct Sprite *);
void sub_815B49C(struct Sprite *); void AnimWishStar(struct Sprite *);
void AnimMiniTwinklingStar(struct Sprite *); void AnimMiniTwinklingStar(struct Sprite *);
void sub_815B70C(struct Sprite *); void AnimSwallowBlueOrb(struct Sprite *);
void sub_815BE04(struct Sprite *); void sub_815BE04(struct Sprite *);
void AnimWeakFrustrationAngerMark(struct Sprite *); void AnimWeakFrustrationAngerMark(struct Sprite *);
void AnimSweetScentPetal(struct Sprite *); void AnimSweetScentPetal(struct Sprite *);
@ -476,7 +476,7 @@ const struct SpriteTemplate gTriForceTriangleSpriteTemplate =
.callback = sub_815B27C, .callback = sub_815B27C,
}; };
const union AnimCmd gUnknown_085CE310[] = const union AnimCmd gEclipsingOrbAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@ -489,23 +489,23 @@ const union AnimCmd gUnknown_085CE310[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_085CE334[] = const union AnimCmd *const gEclipsingOrbAnimTable[] =
{ {
gUnknown_085CE310, gEclipsingOrbAnimCmds,
}; };
const struct SpriteTemplate gUnknown_085CE338 = const struct SpriteTemplate gEclipsingOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ECLIPSING_ORB, .tileTag = ANIM_TAG_ECLIPSING_ORB,
.paletteTag = ANIM_TAG_ECLIPSING_ORB, .paletteTag = ANIM_TAG_ECLIPSING_ORB,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_085CE334, .anims = gEclipsingOrbAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
const union AffineAnimCmd gUnknown_085CE350[] = const union AffineAnimCmd DefenseCurlDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-12, 20, 0, 8), AFFINEANIMCMD_FRAME(-12, 20, 0, 8),
AFFINEANIMCMD_FRAME(12, -20, 0, 8), AFFINEANIMCMD_FRAME(12, -20, 0, 8),
@ -513,7 +513,7 @@ const union AffineAnimCmd gUnknown_085CE350[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const struct SpriteTemplate gUnknown_085CE370 = const struct SpriteTemplate gBatonPassPokeballSpriteTemplate =
{ {
.tileTag = ANIM_TAG_POKEBALL, .tileTag = ANIM_TAG_POKEBALL,
.paletteTag = ANIM_TAG_POKEBALL, .paletteTag = ANIM_TAG_POKEBALL,
@ -521,10 +521,10 @@ const struct SpriteTemplate gUnknown_085CE370 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_815B394, .callback = AnimBatonPassPokeball,
}; };
const struct SpriteTemplate gUnknown_085CE388 = const struct SpriteTemplate gWishStarSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GOLD_STARS, .tileTag = ANIM_TAG_GOLD_STARS,
.paletteTag = ANIM_TAG_GOLD_STARS, .paletteTag = ANIM_TAG_GOLD_STARS,
@ -532,7 +532,7 @@ const struct SpriteTemplate gUnknown_085CE388 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_815B49C, .callback = AnimWishStar,
}; };
const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate = const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate =
@ -546,7 +546,7 @@ const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate =
.callback = AnimMiniTwinklingStar, .callback = AnimMiniTwinklingStar,
}; };
const union AffineAnimCmd gUnknown_085CE3B8[] = const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(8, -8, 0, 12), AFFINEANIMCMD_FRAME(8, -8, 0, 12),
AFFINEANIMCMD_FRAME(-16, 16, 0, 12), AFFINEANIMCMD_FRAME(-16, 16, 0, 12),
@ -555,7 +555,7 @@ const union AffineAnimCmd gUnknown_085CE3B8[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gUnknown_085CE3E0[] = const union AffineAnimCmd gSpitUpDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 6, 0, 20), AFFINEANIMCMD_FRAME(0, 6, 0, 20),
AFFINEANIMCMD_FRAME(0, 0, 0, 20), AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@ -566,7 +566,7 @@ const union AffineAnimCmd gUnknown_085CE3E0[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const struct SpriteTemplate gUnknown_085CE418 = const struct SpriteTemplate gSwallowBlueOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BLUE_ORB, .tileTag = ANIM_TAG_BLUE_ORB,
.paletteTag = ANIM_TAG_BLUE_ORB, .paletteTag = ANIM_TAG_BLUE_ORB,
@ -574,10 +574,10 @@ const struct SpriteTemplate gUnknown_085CE418 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_815B70C, .callback = AnimSwallowBlueOrb,
}; };
const union AffineAnimCmd gUnknown_085CE430[] = const union AffineAnimCmd gSwallowDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 6, 0, 20), AFFINEANIMCMD_FRAME(0, 6, 0, 20),
AFFINEANIMCMD_FRAME(0, 0, 0, 20), AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@ -2044,12 +2044,12 @@ void sub_815B27C(struct Sprite *sprite)
} }
} }
void sub_815B338(u8 taskId) void AnimTask_DefenseCurlDeformMon(u8 taskId)
{ {
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 0: case 0:
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gUnknown_085CE350); PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), DefenseCurlDeformMonAffineAnimCmds);
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 1: case 1:
@ -2059,7 +2059,7 @@ void sub_815B338(u8 taskId)
} }
} }
void sub_815B394(struct Sprite *sprite) void AnimBatonPassPokeball(struct Sprite *sprite)
{ {
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
@ -2102,7 +2102,7 @@ void sub_815B394(struct Sprite *sprite)
} }
} }
void sub_815B49C(struct Sprite *sprite) void AnimWishStar(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
sprite->pos1.x = -16; sprite->pos1.x = -16;
@ -2187,11 +2187,11 @@ static void sub_815B5D0(struct Sprite *sprite)
DestroySprite(sprite); DestroySprite(sprite);
} }
void sub_815B65C(u8 taskId) void AnimTask_StockpileDeformMon(u8 taskId)
{ {
if (!gTasks[taskId].data[0]) if (!gTasks[taskId].data[0])
{ {
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gUnknown_085CE3B8); PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gStockpileDeformMonAffineAnimCmds);
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
} }
else else
@ -2201,11 +2201,11 @@ void sub_815B65C(u8 taskId)
} }
} }
void sub_815B6B4(u8 taskId) void AnimTask_SpitUpDeformMon(u8 taskId)
{ {
if (!gTasks[taskId].data[0]) if (!gTasks[taskId].data[0])
{ {
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gUnknown_085CE3E0); PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gSpitUpDeformMonAffineAnimCmds);
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
} }
else else
@ -2215,7 +2215,7 @@ void sub_815B6B4(u8 taskId)
} }
} }
void sub_815B70C(struct Sprite *sprite) void AnimSwallowBlueOrb(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {
@ -2234,11 +2234,11 @@ void sub_815B70C(struct Sprite *sprite)
} }
} }
void sub_815B778(u8 taskId) void AnimTask_SwallowDeformMon(u8 taskId)
{ {
if (!gTasks[taskId].data[0]) if (!gTasks[taskId].data[0])
{ {
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gUnknown_085CE430); PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gSwallowDeformMonAffineAnimCmds);
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
} }
else else

4
src/battle_anim_special.c
View File

@ -403,7 +403,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_085E535C =
.callback = sub_817330C, .callback = sub_817330C,
}; };
extern const struct SpriteTemplate gUnknown_085CE388; extern const struct SpriteTemplate gWishStarSpriteTemplate;
extern const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate; extern const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate;
void unref_sub_8170478(u8 taskId) void unref_sub_8170478(u8 taskId)
@ -2081,7 +2081,7 @@ static void sub_8172FEC(u8 taskId)
state = gTasks[taskId].data[11]; state = gTasks[taskId].data[11];
if (state == 0) if (state == 0)
{ {
spriteId = CreateSprite(&gUnknown_085CE388, x, y, 5); spriteId = CreateSprite(&gWishStarSpriteTemplate, x, y, 5);
} }
else if (state >= 0 && gTasks[taskId].data[11] < 4) else if (state >= 0 && gTasks[taskId].data[11] < 4)
{ {