diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
| commit | 2d141bc612ffecc984f6b4238c2791ba8419a192 (patch) | |
| tree | 04800ef37ba17134a216c3e679a1d0bb046f0bf8 /include/gba/types.h | |
| parent | e1f2f7d5daee0fead0b8aed8413977e7cad990eb (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (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 |