Merge branch 'master' of github.com:pret/pokeemerald

include/gba/io_reg.h

@@ -527,6 +527,8 @@
 #define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled
 #define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled
 
+// BLDCNT
+
 // SOUNDCNT_H
 #define SOUND_CGB_MIX_QUARTER 0x0000
 #define SOUND_CGB_MIX_HALF    0x0001

include/gba/types.h

@@ -39,18 +39,18 @@ struct PlttData
 struct OamData
 {
     /*0x00*/ u32 y:8;
-    /*0x01*/ u32 affineMode:2;
-             u32 objMode:2;
-             u32 mosaic:1;
-             u32 bpp:1;
-             u32 shape:2;
+    /*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 -> 0xC0
 
     /*0x02*/ u32 x:9;
              u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
              u32 size:2;
 
-    /*0x04*/ u16 tileNum:10;
-             u16 priority:2;
+    /*0x04*/ u16 tileNum:10;    // 0x33F
+             u16 priority:2;    // 0x400, 0x800 -> 0xC00
              u16 paletteNum:4;
     /*0x06*/ u16 affineParam;
 };