diff --git a/include/battle/battle.h b/include/battle/battle.h
index 3d43f37a2..a52432817 100644
--- a/include/battle/battle.h
+++ b/include/battle/battle.h
@@ -626,8 +626,11 @@ struct BattleSystem {
     u16 unk2454[4];
     u16 unk245C[4];
     int unk2464[4];
-    u32 isRecordingPaused : 1, unk2474_1 : 1, unk2474_2 : 1, unk2474_3 : 1,
-        unk2474_4 : 28;
+    u32 isRecordingPaused : 1;
+    u32 unk2474_1         : 1;
+    u32 unk2474_2         : 1;
+    u32 unk2474_3         : 1;
+    u32 unk2474_4         : 28;
     u32 unk2478;
     SysTask *unk247C;
     u8 chatotVoiceParam[4];
diff --git a/src/map_preview_graphic.c b/src/map_preview_graphic.c
index e2db632e7..e1a884cb2 100644
--- a/src/map_preview_graphic.c
+++ b/src/map_preview_graphic.c
@@ -54,9 +54,9 @@ typedef struct UnkStruct_0206A388 {
 } UnkStruct_0206A388;
 
 static MapPreviewGraphicData sMapPreviewGraphicData[] = {
+    // Dark Cave, North Side
     {
-     // Dark Cave, North Side
-        .mapId   = MAP_D42R0101,
+     .mapId   = MAP_D42R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -82,9 +82,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 0,
      },
+    // Dark Cave, South Side
     {
-     // Dark Cave, South Side
-        .mapId   = MAP_D42R0102,
+     .mapId   = MAP_D42R0102,
      .unused4 = 0,
      .files   = {
             {
@@ -110,9 +110,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 0,
      },
+    // Sprout Tower
     {
-     // Sprout Tower
-        .mapId   = MAP_D15R0101,
+     .mapId   = MAP_D15R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -138,9 +138,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 1,
      },
+    // Ruins of Alph 1
     {
-     // Ruins of Alph 1
-        .mapId   = MAP_D24R0211,
+     .mapId   = MAP_D24R0211,
      .unused4 = 0,
      .files   = {
             {
@@ -166,9 +166,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 2,
      },
+    // Ruins of Alph 2
     {
-     // Ruins of Alph 2
-        .mapId   = MAP_D24R0217,
+     .mapId   = MAP_D24R0217,
      .unused4 = 0,
      .files   = {
             {
@@ -194,9 +194,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 2,
      },
+    // Union Cave
     {
-     // Union Cave
-        .mapId   = MAP_D25R0101,
+     .mapId   = MAP_D25R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -222,9 +222,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 3,
      },
+    // Slowpoke Well
     {
-     // Slowpoke Well
-        .mapId   = MAP_D26R0101,
+     .mapId   = MAP_D26R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -250,9 +250,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 4,
      },
+    // Ilex Forest
     {
-     // Ilex Forest
-        .mapId   = MAP_D36R0101,
+     .mapId   = MAP_D36R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -278,9 +278,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 5,
      },
+    // National Park
     {
-     // National Park
-        .mapId   = MAP_D22R0101,
+     .mapId   = MAP_D22R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -306,9 +306,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 6,
      },
+    // Burned Tower
     {
-     // Burned Tower
-        .mapId   = MAP_D18R0101,
+     .mapId   = MAP_D18R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -334,9 +334,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 7,
      },
+    // Bell Tower
     {
-     // Bell Tower
-        .mapId   = MAP_D17R0101,
+     .mapId   = MAP_D17R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -362,9 +362,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 8,
      },
+    // Whirl Islands
     {
-     // Whirl Islands
-        .mapId   = MAP_D40R0101,
+     .mapId   = MAP_D40R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -390,9 +390,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 9,
      },
+    // Mt Mortar
     {
-     // Mt Mortar
-        .mapId   = MAP_D38R0101,
+     .mapId   = MAP_D38R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -418,9 +418,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 11,
      },
+    // Ice Path
     {
-     // Ice Path
-        .mapId   = MAP_D39R0101,
+     .mapId   = MAP_D39R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -446,9 +446,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 12,
      },
+    // Dragon's Den
     {
-     // Dragon's Den
-        .mapId   = MAP_D44R0101,
+     .mapId   = MAP_D44R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -474,9 +474,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 13,
      },
+    // Tohjo Falls
     {
-     // Tohjo Falls
-        .mapId   = MAP_D45R0101,
+     .mapId   = MAP_D45R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -502,9 +502,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 14,
      },
+    // Victory Road South
     {
-     // Victory Road South
-        .mapId   = MAP_D43R0101,
+     .mapId   = MAP_D43R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -530,9 +530,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 15,
      },
+    // Victory Road North
     {
-     // Victory Road North
-        .mapId   = MAP_D43R0103,
+     .mapId   = MAP_D43R0103,
      .unused4 = 0,
      .files   = {
             {
@@ -558,9 +558,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 15,
      },
+    // Viridian Forest
     {
-     // Viridian Forest
-        .mapId   = MAP_D46R0101,
+     .mapId   = MAP_D46R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -586,9 +586,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 16,
      },
+    // Diglett Cave
     {
-     // Diglett Cave
-        .mapId   = MAP_D01R0101,
+     .mapId   = MAP_D01R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -614,9 +614,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 17,
      },
+    // Rock Tunnel
     {
-     // Rock Tunnel
-        .mapId   = MAP_D05R0101,
+     .mapId   = MAP_D05R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -642,9 +642,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 18,
      },
+    // Mt Moon
     {
-     // Mt Moon
-        .mapId   = MAP_D02R0101,
+     .mapId   = MAP_D02R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -670,9 +670,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 20,
      },
+    // Seafoam Islands
     {
-     // Seafoam Islands
-        .mapId   = MAP_D11R0101,
+     .mapId   = MAP_D11R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -698,9 +698,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 21,
      },
+    // Mt Silver
     {
-     // Mt Silver
-        .mapId   = MAP_D41R0101,
+     .mapId   = MAP_D41R0101,
      .unused4 = 0,
      .files   = {
             {
@@ -726,9 +726,9 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = {
         },
      .unused3C = 22,
      },
+    // Cerulean Cave
     {
-     // Cerulean Cave
-        .mapId   = MAP_D03R0101,
+     .mapId   = MAP_D03R0101,
      .unused4 = 0,
      .files   = {
             {