diff options
author | Akira Akashi <rubenru09@aol.com> | 2021-06-01 20:40:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-01 20:40:37 +0100 |
commit | 389b33f7d8499cab5b3b9e2ba21d786b1059c059 (patch) | |
tree | f02042907a117ce618b0a67c0b5cd82fc45cfcd7 /arm9/lib/include/gx.h | |
parent | 5a73f4f645faf368cf8e20cfe4793e2b12672472 (diff) | |
parent | f67d6fe193eeee8058a45934d08c3b883cc08eb9 (diff) |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/lib/include/gx.h')
-rw-r--r-- | arm9/lib/include/gx.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arm9/lib/include/gx.h b/arm9/lib/include/gx.h index 26f6cfaf..11081942 100644 --- a/arm9/lib/include/gx.h +++ b/arm9/lib/include/gx.h @@ -5,6 +5,7 @@ #include "MI_memory.h" #include "MI_dma.h" #include "OS_vramExclusive.h" +#include "registers.h" //temporary while other files aren't decompiled @@ -166,4 +167,18 @@ typedef enum } GXDispSelect; +typedef enum +{ + GX_OBJVRAMMODE_CHAR_2D = (0 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (0 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_32K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (0 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_64K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (1 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_128K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (2 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_256K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (3 << REG_GX_DISPCNT_EXOBJ_SHIFT) +} + GXOBJVRamModeChar; + #endif //GUARD_GX_H |