diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:22:25 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:22:25 +0100 |
| commit | 8380fc63dc15a6874a2bdc5b5a4b08caeb3d4731 (patch) | |
| tree | c0eb7780f0fb51ca9395eefbb119de34f36af538 /include/gba/types.h | |
| parent | 38af0f78ea73dc1eec582aff9a5bc37cd06412e0 (diff) | |
| parent | 7e6a68a99a832383e7cbf3c91aef321dd46ed61f (diff) | |
Merge branch 'master' into kobold_fixes
Diffstat (limited to 'include/gba/types.h')
| -rw-r--r-- | include/gba/types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gba/types.h b/include/gba/types.h index e9a380023..9f63489aa 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -49,7 +49,7 @@ struct OamData u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode u32 size:2; - /*0x04*/ u16 tileNum:10; // 0x33F + /*0x04*/ u16 tileNum:10; // 0x3FF u16 priority:2; // 0x400, 0x800 -> 0xC00 u16 paletteNum:4; /*0x06*/ u16 affineParam; |