diff options
author | Akira Akashi <rubenru09@aol.com> | 2021-05-31 23:37:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-31 23:37:33 +0100 |
commit | 6cffcf0ee5f4e04ce4e79f30645938e0b58f4650 (patch) | |
tree | 5afeb1fde81971ba32843e7119c8d9c3c9f8eb56 /arm9/lib/include/gx.h | |
parent | b6ac07c654c6071067fc4b7c839c17fbe3f4b1ac (diff) | |
parent | 901807cd6f693ffa9941ddd167ef0ad9a5cf3d51 (diff) |
Merge branch 'master' into make_naix
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 |