diff --git a/data/behavior_data.c b/data/behavior_data.c
index 2a069dc1..b8f8e073 100644
--- a/data/behavior_data.c
+++ b/data/behavior_data.c
@@ -2119,7 +2119,7 @@ const BehaviorScript bhvCheckerboardElevatorGroup[] = {
 
 const BehaviorScript bhvCheckerboardPlatformSub[] = {
     BEGIN(OBJ_LIST_SURFACE),
-    OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)),
+    OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)),
     LOAD_COLLISION_DATA(checkerboard_platform_seg8_collision_0800D710),
     CALL_NATIVE(bhv_checkerboard_platform_init),
     SET_HOME(),
diff --git a/levels/bbh/areas/1/room.inc.c b/levels/bbh/areas/1/room.inc.c
index 29bba9cd..7412fdfe 100644
--- a/levels/bbh/areas/1/room.inc.c
+++ b/levels/bbh/areas/1/room.inc.c
@@ -1,5 +1,5 @@
 // 0x0702605C - 0x070268C2
-const u8 bbh_seg7_rooms[] = {
+const RoomData bbh_seg7_rooms[] = {
     13, 13, 13, 13, 13, 13, 13, 13, // 0-7
     13, 13, 13, 13, 13, 13, 13, 13, // 8-15
     13, 13, 29, 29, 13, 13, 13, 13, // 16-23
diff --git a/levels/castle_inside/areas/1/room.inc.c b/levels/castle_inside/areas/1/room.inc.c
index 055c00c2..1d7e0f97 100644
--- a/levels/castle_inside/areas/1/room.inc.c
+++ b/levels/castle_inside/areas/1/room.inc.c
@@ -1,8 +1,8 @@
 // 0x0707782C - 0x0707808C
-const u8 inside_castle_seg7_area_1_rooms[] = {
+const RoomData inside_castle_seg7_area_1_rooms[] = {
      1,  9,  9,  1,  9,  9,  9,  9, // 0-7
      9,  9,  1,  1,  1,  9,  9, 17, // 8-15
-     1,  9,  9,  9,  9,  9, 17,  9, // 16-23
+     1,  9, 17, 17,  9,  9, 17,  9, // 16-23
      9,  9,  9,  9,  9,  9,  9,  9, // 24-31
      8,  8,  8,  8,  8,  8,  8,  8, // 32-39
      8,  8,  8,  8,  8,  8,  8,  8, // 40-47
diff --git a/levels/castle_inside/areas/2/room.inc.c b/levels/castle_inside/areas/2/room.inc.c
index 4a8af19a..a2b40730 100644
--- a/levels/castle_inside/areas/2/room.inc.c
+++ b/levels/castle_inside/areas/2/room.inc.c
@@ -1,5 +1,5 @@
 // 0x0707808C
-const u8 inside_castle_seg7_area_2_rooms[] = {
+const RoomData inside_castle_seg7_area_2_rooms[] = {
      6,  6,  6,  6,  6,  6,  6,  6, // 2144-2151
      6,  6,  6,  6,  6,  6,  6,  6, // 2152-2159
      6,  6,  6,  6,  6,  6,  6,  6, // 2160-2167
diff --git a/levels/castle_inside/areas/3/room.inc.c b/levels/castle_inside/areas/3/room.inc.c
index 8802cd46..cecf412f 100644
--- a/levels/castle_inside/areas/3/room.inc.c
+++ b/levels/castle_inside/areas/3/room.inc.c
@@ -1,5 +1,5 @@
 // 0x07078870 - 0x07078DE3
-const u8 inside_castle_seg7_area_3_rooms[] = {
+const RoomData inside_castle_seg7_area_3_rooms[] = {
      5,  5,  5,  5,  5,  5,  5,  5, // 0-7
      5,  5,  5,  5,  5,  5,  5,  5, // 8-15
      5,  5,  5,  5,  5,  5,  5,  5, // 16-23
diff --git a/levels/hmc/areas/1/room.inc.c b/levels/hmc/areas/1/room.inc.c
index 3342df39..a3f23161 100644
--- a/levels/hmc/areas/1/room.inc.c
+++ b/levels/hmc/areas/1/room.inc.c
@@ -1,5 +1,5 @@
 // 0x0702ADC4 - 0x0702B5E4
-const u8 hmc_seg7_rooms[] = {
+const RoomData hmc_seg7_rooms[] = {
     17,  8,  8,  8,  8,  8,  8, 17, // 0-7
     17,  8,  8,  8, 17,  8,  8,  8, // 8-15
      8,  8,  8,  8,  8,  8,  8,  8, // 16-23