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

Merge pull request #1989 from NTx86/fix-poison-anim-array

Browse source 
Fix poison projectile array being incorrectly combined into three separate arrays
This commit is contained in:
GriffinR 2024-04-19 14:11:22 -04:00 committed by GitHub
commit 8c4b1a37d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/battle_anim_poison.c
View file

@ -59,15 +59,7 @@ static const union AnimCmd sAnim_SludgeBombHit[] =
static const union AnimCmd *const sAnims_PoisonProjectile[] = static const union AnimCmd *const sAnims_PoisonProjectile[] =
{ {
sAnim_PoisonProjectile, sAnim_PoisonProjectile,
};
static const union AnimCmd *const sAnims_AcidPoisonDroplet[] =
{
sAnim_AcidPoisonDroplet, sAnim_AcidPoisonDroplet,
};
static const union AnimCmd *const sAnims_SludgeBombHit[] =
{
sAnim_SludgeBombHit, sAnim_SludgeBombHit,
}; };
@ -122,7 +114,7 @@ const struct SpriteTemplate gSludgeBombHitParticleSpriteTemplate =
.tileTag = ANIM_TAG_POISON_BUBBLE, .tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = sAnims_SludgeBombHit, .anims = &sAnims_PoisonProjectile[2],
.images = NULL, .images = NULL,
.affineAnims = sAffineAnims_SludgeBombHit, .affineAnims = sAffineAnims_SludgeBombHit,
.callback = AnimSludgeBombHitParticle, .callback = AnimSludgeBombHitParticle,
@ -145,7 +137,7 @@ const struct SpriteTemplate gAcidPoisonDropletSpriteTemplate =
.tileTag = ANIM_TAG_POISON_BUBBLE, .tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_AffineDouble_ObjNormal_16x16, .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = sAnims_AcidPoisonDroplet, .anims = &sAnims_PoisonProjectile[1],
.images = NULL, .images = NULL,
.affineAnims = gAffineAnims_Droplet, .affineAnims = gAffineAnims_Droplet,
.callback = AnimAcidPoisonDroplet, .callback = AnimAcidPoisonDroplet,