diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-08-25 22:13:55 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-08-25 22:13:55 -0500 |
| commit | b40b8dd1bbeb196231ca24a16553bd75490edce5 (patch) | |
| tree | 49e1fd92499e77a2d74af6885c1c7ec4a83a2cdb /include/gba/types.h | |
| parent | 406ced34a1db5a700a542eb2b7a629b0e31c992d (diff) | |
| parent | 4df36cd814d6bf045d56bc4c30b611838333b705 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
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 |