diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:21:46 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:21:46 +0100 |
| commit | 504363f2a686d3b7381ba0b7917a245ca422f024 (patch) | |
| tree | f9caa860a20c9f8e23a1247b80dfc1748e9d0bb9 /include/gba/types.h | |
| parent | 4abc2eea8aee0efc714df8519533c55fbabae5f1 (diff) | |
| parent | 7e6a68a99a832383e7cbf3c91aef321dd46ed61f (diff) | |
Merge branch 'master' into decompile_trainer_see
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; |