diff options
author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
---|---|---|
committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
tree | 70220c06025360d7089011f5d80239b61ac183af /include/bg.h | |
parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) |
fix merge conflicts
Diffstat (limited to 'include/bg.h')
-rw-r--r-- | include/bg.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/bg.h b/include/bg.h index 0dcb84a34..0c6b4ac26 100644 --- a/include/bg.h +++ b/include/bg.h @@ -1,6 +1,16 @@ #ifndef GUARD_BG_H #define GUARD_BG_H +struct BGCntrlBitfield // for the I/O registers +{ + volatile u16 priority:2; + volatile u16 charBaseBlock:2; + volatile u16 field_0_2:4; + volatile u16 field_1_0:5; + volatile u16 areaOverflowMode:1; + volatile u16 screenSize:2; +}; + enum { BG_CTRL_ATTR_VISIBLE = 1, |