diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
| commit | 30e7ac0dcadc1ca15d56dc24e79489be63527357 (patch) | |
| tree | bb804c19ca84b582f7517af645bfc8665b26a1e1 /include/gba/types.h | |
| parent | 50aa222aff56499aeef1c64c9191f53b9b20a1de (diff) | |
| parent | b471bba55e7e3743fa8cdb796cba57c41f5bfdbc (diff) | |
Fix merge conflicts
Diffstat (limited to 'include/gba/types.h')
| -rw-r--r-- | include/gba/types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gba/types.h b/include/gba/types.h index fff48d437..3d78b5b5e 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -59,8 +59,8 @@ struct OamData u32 shape:2; // 0x40, 0x80 -> 0xC0 /*0x02*/ u32 x:9; - u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode - u32 size:2; + u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode + u32 size:2; // 0x4000, 0x8000 -> 0xC000 /*0x04*/ u16 tileNum:10; // 0x3FF u16 priority:2; // 0x400, 0x800 -> 0xC00 |