Merge branch 'master' into secret_base

1 files changed, 12 insertions, 10 deletions

diff --git a/include/sprite.h b/include/sprite.h
index a65e71bd9..769e1584d 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -19,7 +19,7 @@ struct CompressedSpriteSheet
 
 struct SpriteFrameImage
 {
-    u8 *data;
+    const u8 *data;
     u16 size;
 };
 
@@ -204,14 +204,14 @@ struct Sprite
     /*0x3A*/ s16 data6;
     /*0x3C*/ s16 data7;
 
-    /*0x3E*/ u16 inUse:1;
-             u16 coordOffsetEnabled:1;
-             u16 invisible:1;
-             u16 flags_3:1;
-             u16 flags_4:1;
-             u16 flags_5:1;
-             u16 flags_6:1;
-             u16 flags_7:1;
+    /*0x3E*/ u16 inUse:1;               //1
+             u16 coordOffsetEnabled:1;  //2
+             u16 invisible:1;           //4
+             u16 flags_3:1;             //8
+             u16 flags_4:1;             //0x10
+             u16 flags_5:1;             //0x20
+             u16 flags_6:1;             //0x40
+             u16 flags_7:1;             //0x80
     /*0x3F*/ u16 hFlip:1;
              u16 vFlip:1;
              u16 animBeginning:1;
@@ -257,7 +257,7 @@ void FreeSpriteTiles(struct Sprite *sprite);
 void FreeSpritePalette(struct Sprite *sprite);
 void FreeSpriteOamMatrix(struct Sprite *sprite);
 void DestroySpriteAndFreeResources(struct Sprite *sprite);
-void sub_800142C(u32 a1, u32 a2, u16 *a3, u16 a4, u32 a5);
+void DrawPartyMenuMonText(u32 a1, u32 a2, const u16 *a3, u16 a4, u32 a5);
 void AnimateSprite(struct Sprite *sprite);
 void StartSpriteAnim(struct Sprite *sprite, u8 animNum);
 void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum);
@@ -299,4 +299,6 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
 
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
 
+extern const struct SpriteTemplate gDummySpriteTemplate;
+
 #endif // GUARD_SPRITE_H