ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #394 from ghoulslash/battle_engine

Browse Source 
fix a bunch of anims
This commit is contained in:
DizzyEggg 2020-05-31 11:26:01 +02:00 committed by GitHub
commit dd8879ca7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_anim_scripts.s
View File

@ -4482,7 +4482,7 @@ Move_WIDE_GUARD:
Move_GUARD_SPLIT::
loadspritegfx ANIM_TAG_BLUEGREEN_ORB
createsprite AnimTask_BlendBattleAnimPal, ANIM_ATTACKER, 10, ANIM_PAL_BG, 0x1, 0x0, 0xC, 0x0
createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 0x1, 0x0, 0xC, 0x0
loopsewithpan SE_W199, SOUND_PAN_ATTACKER, 0x18, 0x3
call GuardSplitLaunch
call GuardSplitLaunch
@ -4495,7 +4495,7 @@ Move_GUARD_SPLIT::
call GuardSplitLaunch
call GuardSplitLaunch
waitforvisualfinish
createsprite AnimTask_BlendBattleAnimPal, ANIM_ATTACKER 10, ANIM_PAL_BG, 0x1, 0xC, 0x0, 0x0
createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 0x1, 0xC, 0x0, 0x0
waitforvisualfinish
end
GuardSplitLaunch:
@ -6208,7 +6208,7 @@ Move_DRILL_RUN:
waitforvisualfinish
delay 0x2
launchtemplate gBowMonSpriteTemplate 0x2 0x1 0x1
launchtemplate gHealingBlueStarSpriteTemplate 0x84 0x3 0x0 0x0 0xc
launchtemplate gHornHitSpriteTemplate 0x84 0x3 0x0 0x0 0xc
waitforvisualfinish
playse 0x14
launchtask AnimTask_ShakeMonInPlace 0x2 0x5 0x0 0x2 0x0 0x28 0x1
@ -7305,9 +7305,9 @@ Move_GLACIATE:
launchtemplate gGlaciateSmokeTemplate 0x84 0x5 0x0 0x12 0x50 0x0 0x4b
launchtemplate gGlaciateSmokeTemplate 0x84 0x5 0x0 0x12 0x48 0x1 0x4b
waitforvisualfinish
createsprite AnimTask_BlendBattleAnimPal, ANIM_ATTACKER, 0xA, (ANIM_PAL_DEF | ANIM_PAL_DEF_PARTNER), 0x2, 0x0, 0xA, 0x7FFF
createvisualtask AnimTask_BlendBattleAnimPal, 10, (ANIM_PAL_DEF | ANIM_PAL_DEF_PARTNER), 0x2, 0x0, 0xA, 0x7FFF
call IceCrystalEffectLong
createsprite AnimTask_BlendBattleAnimPal, ANIM_ATTACKER, 0xA, (ANIM_PAL_DEF | ANIM_PAL_DEF_PARTNER), 0x2, 0xA, 0x0, 0x7FFF
createvisualtask AnimTask_BlendBattleAnimPal, 10, (ANIM_PAL_DEF | ANIM_PAL_DEF_PARTNER), 0x2, 0xA, 0x0, 0x7FFF
waitforvisualfinish
blendoff
clearmonbg ANIM_DEF_PARTNER
@ -13303,7 +13303,7 @@ Move_BOLT_BEAK::
launchtask AnimTask_BlendColorCycle 0x2 0x6 0x3 0xffe1 0x1 0x0 0x0 0x5bff
launchtemplate gHorizontalLungeSpriteTemplate 0x2 0x2 0x4 0x4
delay 0x4
launchtemplate gHealingBlueStarSpriteTemplate 0x84 0x3 0x8 0x8 0xa
launchtemplate gHornHitSpriteTemplate 0x84 0x3 0x8 0x8 0xa
waitforvisualfinish
launchtemplate gFlashingHitSplatSpriteTemplate 0x83 0x4 0x0 0x0 0x1 0x1
playsewithpan SE_W030, SOUND_PAN_TARGET

6
src/battle_anim.c
View File

@ -1500,7 +1500,6 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] =
{gBattleAnimSpriteGfx_WaterGun, 0x180, ANIM_TAG_WATER_GUN},
{gBattleAnimSpriteGfx_Punishment, 0xa00, ANIM_TAG_PUNISHMENT_BLADES},
{gBattleAnimSpriteGfx_QuickGuard, 0x200, ANIM_TAG_QUICK_GUARD_HAND},
{gBattleAnimSpriteGfx_ShellRight, 0x800, ANIM_TAG_SHELL_RIGHT},
{gBattleAnimSpriteGfx_ShellLeft, 0x800, ANIM_TAG_SHELL_LEFT},
{gBattleAnimSpriteGfx_RazorShell, 0x200, ANIM_TAG_RAZOR_SHELL},
@ -1920,6 +1919,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
{gBattleAnimSpritePal_BlueRing2, ANIM_TAG_BLUE_RING_2},
{gBattleAnimSpritePal_WhiteStreak, ANIM_TAG_WHITE_STREAK},
{gBattleAnimSpritePal_PurpleJab, ANIM_TAG_PURPLE_JAB},
//new particles
{gBattleAnimSpritePal_ToxicSpikes, ANIM_TAG_TOXIC_SPIKES},
{gBattleAnimSpritePal_EnergyBall, ANIM_TAG_ENERGY_BALL},
{gBattleAnimSpritePal_SeedBrown, ANIM_TAG_SEED_BROWN},
@ -1947,7 +1947,6 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
{gBattleAnimSpritePal_WaterGun, ANIM_TAG_WATER_GUN},
{gBattleAnimSpritePal_Punishment, ANIM_TAG_PUNISHMENT_BLADES},
{gBattleAnimSpritePal_QuickGuard, ANIM_TAG_QUICK_GUARD_HAND},
{gBattleAnimSpritePal_ShellLeft, ANIM_TAG_SHELL_RIGHT},
{gBattleAnimSpritePal_ShellLeft, ANIM_TAG_SHELL_LEFT},
{gBattleAnimSpritePal_RazorShell, ANIM_TAG_RAZOR_SHELL},
@ -1976,12 +1975,11 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
{gBattleAnimSpritePal_HorseshoeFist, ANIM_TAG_HORSESHOE_SIDE_FIST},
{gBattleAnimSpritePal_AvalancheRocks, ANIM_TAG_DRAGON_ASCENT_FOE},
{gBattleAnimSpritePal_CraftyShield, ANIM_TAG_CRAFTY_SHIELD},
{gBattleAnimSpritePal_QuickGuard, ANIM_TAG_QUICK_GUARD_HAND},
{gBattleAnimSpritePal_BlacephalonHead, ANIM_TAG_BLACEPHALON_HEAD},
{gBattleAnimSpritePal_DracoMeteor, ANIM_TAG_FAIRY_LOCK_CHAINS},
{gBattleAnimSpritePal_LightningRain, ANIM_TAG_IONS},
{gBattleAnimSpritePal_Chop, ANIM_TAG_CHOP},
{gBattleAnimSpritePal_HeartStamp, ANIM_TAG_HEART_STAMP},
[ANIM_TAG_HEART_STAMP - ANIM_SPRITES_START] = {gBattleAnimSpritePal_HeartStamp, ANIM_TAG_HEART_STAMP},
{gBattleAnimSpritePal_HornLeech, ANIM_TAG_HORN_LEECH},
{gBattleAnimSpritePal_Steamroller, ANIM_TAG_STEAMROLLER},
{gBattleAnimSpritePal_HoopaHand, ANIM_TAG_HOOPA_HAND},

7
src/battle_anim_electric.c
View File

@ -844,10 +844,11 @@ void AnimThunderWave(struct Sprite *sprite)
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
if (gAnimMoveIndex == MOVE_ANCHOR_SHOT)
spriteId = CreateSprite(&gAnchorShotChainTemplate, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority);
else
if (gAnimMoveIndex == MOVE_THUNDER_WAVE)
spriteId = CreateSprite(&gThunderWaveSpriteTemplate, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority);
else
spriteId = CreateSprite(&gAnchorShotChainTemplate, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority);
gSprites[spriteId].oam.tileNum += 8;
gAnimVisualTaskCount++;