Move Bitmap struct and clear sprite/text files

3 files changed, 13 insertions, 11 deletions

diff --git a/include/blit.h b/include/blit.h
index e7f384cc8..2fe99d7bd 100644
--- a/include/blit.h
+++ b/include/blit.h
@@ -1,6 +1,13 @@
 #ifndef GUARD_BLIT_H
 #define GUARD_BLIT_H
 
+struct Bitmap
+{
+    u8* pixels;
+    u32 width:16;
+    u32 height:16;
+};
+
 void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height);
 void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey);
 void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
diff --git a/include/global.h b/include/global.h
index 027065481..b92f1097f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -976,13 +976,4 @@ struct UnkStruct_8054FF8
     u16 field_C;
 };
 
-struct Bitmap           // TODO: Find a better spot for this
-{
-    u8* pixels;
-    u32 width:16;
-    u32 height:16;
-};
-
-extern u8 gReservedSpritePaletteCount;
-
 #endif // GUARD_GLOBAL_H
diff --git a/include/sprite.h b/include/sprite.h
index 8fc45d501..4ffcd2884 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -235,11 +235,15 @@ extern const struct OamData gDummyOamData;
 extern const union AnimCmd *const gDummySpriteAnimTable[];
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
 extern const struct SpriteTemplate gDummySpriteTemplate;
-extern s16 gSpriteCoordOffsetX;
-extern s16 gSpriteCoordOffsetY;
 
+extern u8 gReservedSpritePaletteCount;
 extern struct Sprite gSprites[];
+extern u8 gOamLimit;
+extern u16 gReservedSpriteTileCount;
+extern s16 gSpriteCoordOffsetX;
+extern s16 gSpriteCoordOffsetY;
 extern struct OamMatrix gOamMatrices[];
+extern bool8 gAffineAnimsDisabled;
 
 void ResetSpriteData(void);
 void AnimateSprites(void);