summaryrefslogtreecommitdiff
path: root/include/gba
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-05-30 11:57:24 -0700
committerYamaArashi <shadow962@live.com>2016-05-30 11:57:24 -0700
commitfebe47474996705f3338da4fe90981d2b321d2ee (patch)
treec40675866fc685804da1cb2ef1a939f08e4f24ae /include/gba
parent957c53e49567088fd3c8ffc09f82b1e91439988e (diff)
prep for link code
Diffstat (limited to 'include/gba')
-rw-r--r--include/gba/io_reg.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h
index 44d6b932d..87c167ab6 100644
--- a/include/gba/io_reg.h
+++ b/include/gba/io_reg.h
@@ -335,7 +335,7 @@
// I/O registers
-#define REG_DISPCNT (*(vu32 *)REG_ADDR_DISPCNT)
+#define REG_DISPCNT (*(vu16 *)REG_ADDR_DISPCNT)
#define REG_DISPSTAT (*(vu16 *)REG_ADDR_DISPSTAT)
#define REG_VCOUNT (*(vu16 *)REG_ADDR_VCOUNT)
#define REG_BG0CNT (*(vu16 *)REG_ADDR_BG0CNT)
@@ -453,6 +453,15 @@
#define DISPCNT_MODE_5 0x0005
#define DISPCNT_OBJ_1D_MAP 0x0040
#define DISPCNT_FORCED_BLANK 0x0080
+#define DISPCNT_BG0_ON 0x0100
+#define DISPCNT_BG1_ON 0x0200
+#define DISPCNT_BG2_ON 0x0400
+#define DISPCNT_BG3_ON 0x0800
+#define DISPCNT_BG_ALL_ON 0x0F00
+#define DISPCNT_OBJ_ON 0x1000
+#define DISPCNT_WIN0_ON 0x2000
+#define DISPCNT_WIN1_ON 0x4000
+#define DISPCNT_OBJWIN_ON 0x8000
// DISPSTAT
#define DISPSTAT_VBLANK 0x0001 // in V-Blank