diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
| commit | 4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch) | |
| tree | 47bfb4286c03f021d48ffadde5da675a9f903f61 /include/gba/types.h | |
| parent | aaa09d735451cced915bc6bacfce45ced8e33fa1 (diff) | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'include/gba/types.h')
| -rw-r--r-- | include/gba/types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/gba/types.h b/include/gba/types.h index 96e057ab7..480619d21 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -39,11 +39,11 @@ 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 = 0x3 + u32 objMode:2; // 0x4, 0x8 = 0xC + u32 mosaic:1; // 0x10 + u32 bpp:1; // 0x20 + u32 shape:2; // 0x40, 0x80 /*0x02*/ u32 x:9; u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode |