Merge branch 'master' into battle

1 files changed, 14 insertions, 14 deletions

diff --git a/include/bg.h b/include/bg.h
index aa26614c3..0f20bf1fd 100644
--- a/include/bg.h
+++ b/include/bg.h
@@ -15,20 +15,6 @@ struct BGCntrlBitfield // for the I/O registers
 
 enum
 {
-    BG_ATTR_CHARBASEINDEX = 1,
-    BG_ATTR_MAPBASEINDEX,
-    BG_ATTR_SCREENSIZE,
-    BG_ATTR_PALETTEMODE,
-    BG_ATTR_MOSAIC,
-    BG_ATTR_WRAPAROUND,
-    BG_ATTR_PRIORITY,
-    BG_ATTR_METRIC,
-    BG_ATTR_TYPE,
-    BG_ATTR_BASETILE,
-};
-
-enum
-{
     BG_CTRL_ATTR_VISIBLE = 1,
     BG_CTRL_ATTR_CHARBASEINDEX = 2,
     BG_CTRL_ATTR_MAPBASEINDEX = 3,
@@ -39,6 +25,20 @@ enum
     BG_CTRL_ATTR_WRAPAROUND = 8,
 };
 
+enum
+{
+    BG_ATTR_CHARBASEINDEX = 1,
+    BG_ATTR_MAPBASEINDEX = 2,
+    BG_ATTR_SCREENSIZE = 3,
+    BG_ATTR_PALETTEMODE = 4,
+    BG_ATTR_MOSAIC = 5,
+    BG_ATTR_WRAPAROUND = 6,
+    BG_ATTR_PRIORITY = 7,
+    BG_ATTR_TEXTORAFFINEMODE = 8,
+    BG_ATTR_BGTYPE = 9,
+    BG_ATTR_BASETILE = 10
+};
+
 enum AdjustBgMosaicMode
 {
     BG_MOSAIC_SET,