diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c
index 62fe271554..40274bd6f0 100644
--- a/src/code_28910_len_5090.c
+++ b/src/code_28910_len_5090.c
@@ -33,7 +33,7 @@ s32 func_8004DA0C(UNK_TYPE arg0) {
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA74);
 
-void func_8004DAA8(UnkStructFor8004DAA8 *arg0) {
+void func_8004DAA8(UnkStructFor8004DAA8* arg0) {
     if (arg0->unk_221 != 0) {
         arg0->unk_221 = 4;
         arg0->unk_010 = 1;
diff --git a/src/world/world.c b/src/world/world.c
index 1ba99a02de..e735380720 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -296,40 +296,40 @@ static Map hos_maps[] = {
 
 /// Bowser's Castle
 static Map kpa_maps[] = {
-    { MAP_UNSPLIT(kpa_01, 0x80240A70), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_03, 0x80241EE0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_04, 0x80240190), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_08, 0x802414C0), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_09, 0x80241310), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_10, 0x80240360), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_11, 0x80240B40), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_12, 0x802404A0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_13, 0x802404A0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_14, 0x802408A0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_15, 0x802405E0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_16, 0x802403B0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_17, 0x80240020), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_32, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_33, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_40, 0x80240040), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_41, 0x80240040), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_50, 0x80241A40), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_51, 0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_52, 0x80241360), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_53, 0x80240190), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_60, 0x80240450), .bgName = "kpa_bg" },
-    { MAP_UNSPLIT(kpa_61, 0x80242360), .bgName = "kpa_bg" },
-    { MAP_UNSPLIT(kpa_62, 0x80240430), .bgName = "kpa_bg" },
-    { MAP_UNSPLIT(kpa_63, 0x802401B0), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_70, 0x80240B10), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_81, 0x80240480), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_82, 0x80240460), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_83, 0x80240090), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_90, 0x80240020), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_91, 0x80241920), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_94, 0x80240020), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_95, 0x80241920), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_96, 0x80240040), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_01,  0x80240A70), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_03,  0x80241EE0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_04,  0x80240190), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_08,  0x802414C0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_09,  0x80241310), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_10,  0x80240360), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_11,  0x80240B40), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_12,  0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_13,  0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_14,  0x802408A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_15,  0x802405E0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_16,  0x802403B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_17,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_32,  0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_33,  0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_40,  0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_41,  0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_50,  0x80241A40), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_51,  0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_52,  0x80241360), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_53,  0x80240190), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_60,  0x80240450), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_61,  0x80242360), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_62,  0x80240430), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_63,  0x802401B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_70,  0x80240B10), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_81,  0x80240480), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_82,  0x80240460), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_83,  0x80240090), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_90,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_91,  0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_94,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_95,  0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_96,  0x80240040), .songVariation = 1, .flags = 1 },
     { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
     { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
     { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .flags = 3 },