summaryrefslogtreecommitdiff
path: root/src/poison.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-12-07 20:20:57 -0500
committerGitHub <noreply@github.com>2019-12-07 20:20:57 -0500
commitf21b113bc6caee136d696aadfe8dc13d6e8f3622 (patch)
treedfa380ca2de409279e0ee0c7ecc06d704a84858a /src/poison.c
parent22a73c654b33878d8861109a3898bddc0d30c6b3 (diff)
parent88fae7ed40e47eff562b70cd0a504aeed5bb7102 (diff)
Merge pull request #177 from ghoulslash/battle-anim
battle_anim*
Diffstat (limited to 'src/poison.c')
-rw-r--r--src/poison.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/poison.c b/src/poison.c
index 7a0788c29..af7f8ee86 100644
--- a/src/poison.c
+++ b/src/poison.c
@@ -30,7 +30,7 @@ const struct SpriteTemplate gUnknown_83E69AC =
{
.tileTag = ANIM_TAG_TOXIC_BUBBLE,
.paletteTag = ANIM_TAG_TOXIC_BUBBLE,
- .oam = &gOamData_83ACA18,
+ .oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gUnknown_83E69A8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -98,7 +98,7 @@ const struct SpriteTemplate gUnknown_83E6A20 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
- .oam = &gOamData_83ACA90,
+ .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69DC,
.images = NULL,
.affineAnims = gUnknown_83E6A18,
@@ -109,7 +109,7 @@ const struct SpriteTemplate gUnknown_83E6A38 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
- .oam = &gOamData_83ACA90,
+ .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69DC,
.images = NULL,
.affineAnims = gUnknown_83E6A18,
@@ -120,7 +120,7 @@ const struct SpriteTemplate gUnknown_83E6A50 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
- .oam = &gOamData_83ACA30,
+ .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gUnknown_83E69E4,
.images = NULL,
.affineAnims = gUnknown_83E6A1C,
@@ -143,7 +143,7 @@ const struct SpriteTemplate gUnknown_83E6A84 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
- .oam = &gOamData_83ACA90,
+ .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69E0,
.images = NULL,
.affineAnims = gUnknown_83E6A80,
@@ -166,7 +166,7 @@ const struct SpriteTemplate gPoisonBubbleSpriteTemplate =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
- .oam = &gOamData_83ACA30,
+ .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gUnknown_83E69DC,
.images = NULL,
.affineAnims = gUnknown_83E6AB4,
@@ -177,7 +177,7 @@ const struct SpriteTemplate gWaterBubbleSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
- .oam = &gOamData_83ACB50,
+ .oam = &gOamData_AffineNormal_ObjBlend_16x16,
.anims = gUnknown_83E5A78,
.images = NULL,
.affineAnims = gUnknown_83E6AB4,