Merge branch 'master' into flatten_sprite_pos

2021-07-12 01:39:28 -04:00
parent 810ca5f8ff 876a89eba4
commit a274cc6a76
44 changed files with 775 additions and 893 deletions
@@ -244,7 +244,7 @@ static const struct OamData sBerryPicRotatingOamData =
    .affineParam = 0
 };

-static const union AnimCmd sSpriteAnim_857FBD8[] =
+static const union AnimCmd sAnim_BerryPic[] =
 {
    ANIMCMD_FRAME(0, 0),
    ANIMCMD_END
@@ -252,7 +252,7 @@ static const union AnimCmd sSpriteAnim_857FBD8[] =

 static const union AnimCmd *const sBerryPicSpriteAnimTable[] =
 {
-    sSpriteAnim_857FBD8
+    sAnim_BerryPic
 };

 static const struct SpriteFrameImage sBerryPicSpriteImageTable[] =