diff options
| author | Sierra A <6080951+Sierraffinity@users.noreply.github.com> | 2020-06-10 17:16:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 17:16:04 -0700 |
| commit | a05eea93122f04e4aa3580e0e505376ead0d6e19 (patch) | |
| tree | 44f2fe4f674d0048af604bdda1ee8edea643f6aa /src | |
| parent | a7815857ad8af1a35e69692e6eee3e854421b790 (diff) | |
| parent | 452f1e0047d1b3b7f1e992048f7933b515145a0c (diff) | |
Merge pull request #1075 from Sierraffinity/master
Fix out of bounds array access in intro Groudon segment
Diffstat (limited to 'src')
| -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, |