Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1075 from Sierraffinity/master 

Fix out of bounds array access in intro Groudon segment
This commit is contained in:
Sierra A 2020-06-10 17:16:04 -07:00 committed by GitHub
parent a7815857ad 452f1e0047
commit a05eea9312
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_anim_rock.c
View File

@ -182,10 +182,6 @@ static const union AnimCmd *const sAnims_BasicRock[] =
{ {
sAnim_BasicRock_0, sAnim_BasicRock_0,
sAnim_BasicRock_1, sAnim_BasicRock_1,
};
static const union AnimCmd *const sAnims_WeatherBallRockDown[] =
{
sAnim_WeatherBallRockDown_0, sAnim_WeatherBallRockDown_0,
sAnim_WeatherBallRockDown_1, sAnim_WeatherBallRockDown_1,
}; };
@ -296,7 +292,7 @@ const struct SpriteTemplate gWeatherBallRockDownSpriteTemplate =
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = sAnims_WeatherBallRockDown, .anims = &sAnims_BasicRock[2],
.images = NULL, .images = NULL,
.affineAnims = sAffineAnims_BasicRock, .affineAnims = sAffineAnims_BasicRock,
.callback = AnimWeatherBallDown, .callback = AnimWeatherBallDown,