Merge pull request #5 from pret/master

Take files

1 files changed, 44 insertions, 8 deletions

diff --git a/include/gba/types.h b/include/gba/types.h
index 480619d21..9f2594703 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -28,29 +28,42 @@ typedef u8  bool8;
 typedef u16 bool16;
 typedef u32 bool32;
 
+struct BgCnt
+{
+    u16 priority:2;
+    u16 charBaseBlock:2;
+    u16 dummy:2;
+    u16 mosaic:1;
+    u16 palettes:1;
+    u16 screenBaseBlock:5;
+    u16 areaOverflowMode:1;
+    u16 screenSize:2;
+};
+typedef volatile struct BgCnt vBgCnt;
+
 struct PlttData
 {
     u16 r:5; // red
     u16 g:5; // green
     u16 b:5; // blue
     u16 unused_15:1;
-} /*__attribute__((packed))*/;
+};
 
 struct OamData
 {
     /*0x00*/ u32 y:8;
-    /*0x01*/ u32 affineMode:2;  // 0x1, 0x2 = 0x3
-             u32 objMode:2;     // 0x4, 0x8 = 0xC
+    /*0x01*/ u32 affineMode:2;  // 0x1, 0x2 -> 0x4
+             u32 objMode:2;     // 0x4, 0x8 -> 0xC
              u32 mosaic:1;      // 0x10
              u32 bpp:1;         // 0x20
-             u32 shape:2;       // 0x40, 0x80
+             u32 shape:2;       // 0x40, 0x80 -> 0xC0
 
     /*0x02*/ u32 x:9;
-             u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
-             u32 size:2;
+             u32 matrixNum:5;   // bits 3/4 are h-flip/v-flip if not in affine mode
+             u32 size:2;        // 0x4000, 0x8000 -> 0xC000
 
-    /*0x04*/ u16 tileNum:10;
-             u16 priority:2;
+    /*0x04*/ u16 tileNum:10;    // 0x3FF
+             u16 priority:2;    // 0x400, 0x800 -> 0xC00
              u16 paletteNum:4;
     /*0x06*/ u16 affineParam;
 };
@@ -74,6 +87,29 @@ struct OamData
 #define ST_OAM_H_RECTANGLE 1
 #define ST_OAM_V_RECTANGLE 2
 
+#define ST_OAM_SIZE_0   0
+#define ST_OAM_SIZE_1   1
+#define ST_OAM_SIZE_2   2
+#define ST_OAM_SIZE_3   3
+
+#define SPRITE_SIZE_8x8     ((ST_OAM_SIZE_0 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_16x16   ((ST_OAM_SIZE_1 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_32x32   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_64x64   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_SQUARE))
+
+#define SPRITE_SIZE_16x8    ((ST_OAM_SIZE_0 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_32x8    ((ST_OAM_SIZE_1 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_32x16   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_64x32   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_H_RECTANGLE))
+
+#define SPRITE_SIZE_8x16    ((ST_OAM_SIZE_0 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_8x32    ((ST_OAM_SIZE_1 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_16x32   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_32x64   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE))
+
+#define SPRITE_SIZE(dim)  ((SPRITE_SIZE_##dim >> 2) & 0x03)
+#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0x03)
+
 struct BgAffineSrcData
 {
     s32 texX;