diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-13 16:15:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-13 16:15:11 -0400 |
| commit | c2a07276ae095a2345f68e34fcd76cdaffd889ea (patch) | |
| tree | 9daf711e52915bee634e3a051f5a4f88db1d4a8f /src/battle_anim_rock.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/battle_anim_rock.c')
| -rw-r--r-- | src/battle_anim_rock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index 1f22d2976..436ac60a3 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -182,10 +182,6 @@ static const union AnimCmd *const sAnims_BasicRock[] = { sAnim_BasicRock_0, sAnim_BasicRock_1, -}; - -static const union AnimCmd *const sAnims_WeatherBallRockDown[] = -{ sAnim_WeatherBallRockDown_0, sAnim_WeatherBallRockDown_1, }; @@ -296,7 +292,7 @@ const struct SpriteTemplate gWeatherBallRockDownSpriteTemplate = .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = sAnims_WeatherBallRockDown, + .anims = &sAnims_BasicRock[2], .images = NULL, .affineAnims = sAffineAnims_BasicRock, .callback = AnimWeatherBallDown, |