summaryrefslogtreecommitdiff
path: root/include/gba/types.h
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2017-10-20 12:39:55 -0500
committerGitHub <noreply@github.com>2017-10-20 12:39:55 -0500
commit35a96cb0c007545ecc87732f8dc8b2eb93e3ecc2 (patch)
tree79174cee322cfcaac7dec1ac43f668fa747d99c3 /include/gba/types.h
parentae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff)
parentccd7e8b3b1d942b2e1289611639f4e9a188cdc20 (diff)
Merge pull request #88 from DizzyEggg/decompile_battle_interface
decompile battle interface
Diffstat (limited to 'include/gba/types.h')
-rw-r--r--include/gba/types.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/gba/types.h b/include/gba/types.h
index fd8a20a4c..e9a380023 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -39,18 +39,18 @@ 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 -> 0x4
+ u32 objMode:2; // 0x4, 0x8 -> 0xC
+ u32 mosaic:1; // 0x10
+ u32 bpp:1; // 0x20
+ 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;
- /*0x04*/ u16 tileNum:10;
- u16 priority:2;
+ /*0x04*/ u16 tileNum:10; // 0x33F
+ u16 priority:2; // 0x400, 0x800 -> 0xC00
u16 paletteNum:4;
/*0x06*/ u16 affineParam;
};