Merge branch 'master' into battle

include/bg.h

@@ -13,20 +13,6 @@ struct BGCntrlBitfield // for the I/O registers
     volatile u16 screenSize:2;
 };
 
-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,
@@ -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,

include/map_preview_screen.h

@@ -1,6 +1,51 @@
 #ifndef GUARD_MAP_PREVIEW_SCREEN_H
 #define GUARD_MAP_PREVIEW_SCREEN_H
 
+enum MapPreviewScreenId
+{
+    MPS_VIRIDIAN_FOREST = 0u,
+    MPS_MT_MOON,
+    MPS_DIGLETTS_CAVE,
+    MPS_ROCK_TUNNEL,
+    MPS_POKEMON_TOWER,
+    MPS_SAFARI_ZONE,
+    MPS_SEAFOAM_ISLANDS,
+    MPS_POKEMON_MANSION,
+    MPS_ROCKET_HIDEOUT,
+    MPS_SILPH_CO,
+    MPS_VICTORY_ROAD,
+    MPS_CERULEAN_CAVE,
+    MPS_POWER_PLANT,
+    MPS_MT_EMBER,
+    MPS_ROCKET_WAREHOUSE,
+    MPS_MONEAN_CHAMBER,
+    MPS_DOTTED_HOLE,
+    MPS_BERRY_FOREST,
+    MPS_ICEFALL_CAVE,
+    MPS_LOST_CAVE,
+    MPS_ALTERING_CAVE,
+    MPS_PATTERN_BUSH,
+    MPS_LIPTOO_CHAMBER,
+    MPS_WEEPTH_CHAMBER,
+    MPS_TDILFORD_CHAMBER,
+    MPS_SCUFIB_CHAMBER,
+    MPS_RIXY_CHAMBER,
+    MPS_VIAPOIS_CHAMBER,
+    MPS_COUNT
+};
+
+struct MapPreviewScreen
+{
+    u8 mapsec;
+    bool8 forceFirstTime;
+    u16 flagId;
+    const void * tilesptr;
+    const void * tilemapptr;
+    const void * palptr;
+};
+
+u16 sub_80F8318(u8 id);
 void sub_80F85BC(u16 a0);
+u16 sub_80F856C(u8 id);
 
 #endif //GUARD_MAP_PREVIEW_SCREEN_H