diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-12-19 15:34:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 15:34:54 -0600 |
| commit | 02b5cf028f7636ec0bd303b46e0fef180a1d12dd (patch) | |
| tree | c82c5959ec3e9147a8045ddc3b5e66713cb80999 /include/gba/types.h | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
| parent | 4949411f3e5c7eece80cf3e89188627b82a4c3be (diff) | |
Merge pull request #139 from DizzyEggg/decompile_battle1
Decompile and split battle_1
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; |