diff --git a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_0.h b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_0.h
index 720419fc5a..011d79c8ec 100644
--- a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_0.h
+++ b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_0.h
@@ -1,5 +1,5 @@
 #ifndef SWAMP_SPIDER_HOUSE_ROOM_0_H
-#define SWAMP_SPIDER_HOUSE_ROOM_0_H 1
+#define SWAMP_SPIDER_HOUSE_ROOM_0_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_1.h b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_1.h
index 295f69f676..f48d6e4c25 100644
--- a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_1.h
+++ b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_1.h
@@ -1,5 +1,5 @@
 #ifndef SWAMP_SPIDER_HOUSE_ROOM_1_H
-#define SWAMP_SPIDER_HOUSE_ROOM_1_H 1
+#define SWAMP_SPIDER_HOUSE_ROOM_1_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_2.h b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_2.h
index cabe90b674..67f2305a74 100644
--- a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_2.h
+++ b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_2.h
@@ -1,5 +1,5 @@
 #ifndef SWAMP_SPIDER_HOUSE_ROOM_2_H
-#define SWAMP_SPIDER_HOUSE_ROOM_2_H 1
+#define SWAMP_SPIDER_HOUSE_ROOM_2_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_3.h b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_3.h
index 778faaaa54..0413ccfc00 100644
--- a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_3.h
+++ b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_3.h
@@ -1,5 +1,5 @@
 #ifndef SWAMP_SPIDER_HOUSE_ROOM_3_H
-#define SWAMP_SPIDER_HOUSE_ROOM_3_H 1
+#define SWAMP_SPIDER_HOUSE_ROOM_3_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_4.h b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_4.h
index 61bb8e4e59..7df5298403 100644
--- a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_4.h
+++ b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_4.h
@@ -1,5 +1,5 @@
 #ifndef SWAMP_SPIDER_HOUSE_ROOM_4_H
-#define SWAMP_SPIDER_HOUSE_ROOM_4_H 1
+#define SWAMP_SPIDER_HOUSE_ROOM_4_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_5.h b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_5.h
index 4d12b326f3..f18a4de108 100644
--- a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_5.h
+++ b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_5.h
@@ -1,5 +1,5 @@
 #ifndef SWAMP_SPIDER_HOUSE_ROOM_5_H
-#define SWAMP_SPIDER_HOUSE_ROOM_5_H 1
+#define SWAMP_SPIDER_HOUSE_ROOM_5_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_scene.h b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_scene.h
index acd9ff8c98..131868b5ad 100644
--- a/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_scene.h
+++ b/assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_scene.h
@@ -1,5 +1,5 @@
 #ifndef SWAMP_SPIDER_HOUSE_SCENE_H
-#define SWAMP_SPIDER_HOUSE_SCENE_H 1
+#define SWAMP_SPIDER_HOUSE_SCENE_H
 
 #include "bgcheck.h"
 #include "cutscene.h"
diff --git a/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_room_0.h b/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_room_0.h
index bb9e447faf..e57d466dfa 100644
--- a/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_room_0.h
+++ b/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_room_0.h
@@ -1,5 +1,5 @@
 #ifndef GROTTO_SHORTCUTS_ROOM_0_H
-#define GROTTO_SHORTCUTS_ROOM_0_H 1
+#define GROTTO_SHORTCUTS_ROOM_0_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.c b/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.c
index f1aab02cfa..8fe27859a4 100644
--- a/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.c
+++ b/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.c
@@ -14,7 +14,7 @@
 #include "ultra64.h"
 
 SceneCmd grotto_shortcuts_sceneCommands[] = {
-    SCENE_CMD_SOUND_SETTINGS(4, 19, 28),
+    SCENE_CMD_SOUND_SETTINGS(4, NATURE_ID_NONE, NA_BGM_INSIDE_DEKU_TREE),
     SCENE_CMD_ROOM_LIST(2, grotto_shortcuts_sceneRoomList0x000198),
     SCENE_CMD_MISC_SETTINGS(0x00, 0x00000016),
     SCENE_CMD_COL_HEADER(&grotto_shortcuts_sceneCollisionHeader_00AC9C),
diff --git a/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.h b/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.h
index 096c482455..a8466bb342 100644
--- a/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.h
+++ b/assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.h
@@ -1,5 +1,5 @@
 #ifndef GROTTO_SHORTCUTS_SCENE_H
-#define GROTTO_SHORTCUTS_SCENE_H 1
+#define GROTTO_SHORTCUTS_SCENE_H
 
 #include "bgcheck.h"
 #include "cutscene.h"
diff --git a/assets/scenes/overworld/roadtofortress/roadtofortress_room_0.h b/assets/scenes/overworld/roadtofortress/roadtofortress_room_0.h
index b19097ad43..7f6b6951de 100644
--- a/assets/scenes/overworld/roadtofortress/roadtofortress_room_0.h
+++ b/assets/scenes/overworld/roadtofortress/roadtofortress_room_0.h
@@ -1,5 +1,5 @@
 #ifndef ROADTOFORTRESS_ROOM_0_H
-#define ROADTOFORTRESS_ROOM_0_H 1
+#define ROADTOFORTRESS_ROOM_0_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/overworld/roadtofortress/roadtofortress_scene.h b/assets/scenes/overworld/roadtofortress/roadtofortress_scene.h
index 5f269e0126..6219b6b3ab 100644
--- a/assets/scenes/overworld/roadtofortress/roadtofortress_scene.h
+++ b/assets/scenes/overworld/roadtofortress/roadtofortress_scene.h
@@ -1,5 +1,5 @@
 #ifndef ROADTOFORTRESS_SCENE_H
-#define ROADTOFORTRESS_SCENE_H 1
+#define ROADTOFORTRESS_SCENE_H
 
 #include "bgcheck.h"
 #include "cutscene.h"
diff --git a/assets/scenes/overworld/roadtolake/roadtolake_room_0.h b/assets/scenes/overworld/roadtolake/roadtolake_room_0.h
index 552a0dc0bc..5766469f12 100644
--- a/assets/scenes/overworld/roadtolake/roadtolake_room_0.h
+++ b/assets/scenes/overworld/roadtolake/roadtolake_room_0.h
@@ -1,5 +1,5 @@
 #ifndef ROADTOLAKE_ROOM_0_H
-#define ROADTOLAKE_ROOM_0_H 1
+#define ROADTOLAKE_ROOM_0_H
 
 #include "room.h"
 #include "scene.h"
diff --git a/assets/scenes/overworld/roadtolake/roadtolake_scene.h b/assets/scenes/overworld/roadtolake/roadtolake_scene.h
index e14258a071..d424d70c3d 100644
--- a/assets/scenes/overworld/roadtolake/roadtolake_scene.h
+++ b/assets/scenes/overworld/roadtolake/roadtolake_scene.h
@@ -1,5 +1,5 @@
 #ifndef ROADTOLAKE_SCENE_H
-#define ROADTOLAKE_SCENE_H 1
+#define ROADTOLAKE_SCENE_H
 
 #include "bgcheck.h"
 #include "cutscene.h"
diff --git a/assets/scenes/overworld/spot12/cq/actors/room0_actor.inc.c b/assets/scenes/overworld/spot12/cq/actors/room0_actor.inc.c
new file mode 100644
index 0000000000..338c630824
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/actors/room0_actor.inc.c
@@ -0,0 +1,180 @@
+    {
+        ACTOR_EN_A_OBJ,
+        {   -730,      2,    -70 }, // pos
+        {  0x0000, -0x560B,  0x0000 }, // rot
+         0x190A, // params
+    }, // 0
+    {
+        ACTOR_EN_HATA,
+        {  -3720,    -18,  -3363 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 1
+    {
+        ACTOR_EN_HATA,
+        {  -3720,    -18,  -3246 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 2
+    {
+        ACTOR_EN_HATA,
+        {  -1666,     13,  -3422 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 3
+    {
+        ACTOR_EN_HATA,
+        {   -382,    480,  -2237 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 4
+    {
+        ACTOR_EN_WONDER_ITEM,
+        {   -814,    245,   -810 }, // pos
+        {  0x0000,  0x0000,  0x0006 }, // rot
+         0x1ABF, // params
+    }, // 5
+    {
+        ACTOR_EN_WONDER_ITEM,
+        {   1094,    876,   -412 }, // pos
+        {  0x0000,  0x0000,  0x0006 }, // rot
+         0x1ABF, // params
+    }, // 6
+    {
+        ACTOR_EN_KANBAN,
+        {     14,    333,  -1159 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+         0x031B, // params
+    }, // 7
+    {
+        ACTOR_EN_KANBAN,
+        {  -1850,      9,  -3250 }, // pos
+        {  0x0000,  0x4000,  0x0000 }, // rot
+         0x031C, // params
+    }, // 8
+    {
+        ACTOR_EN_GE1,
+        {   -857,    112,  -3123 }, // pos
+        {  0x0000, -0xFA5,  0x0000 }, // rot
+         0x0004, // params
+    }, // 9
+    {
+        ACTOR_EN_GE1,
+        {    682,    602,   -307 }, // pos
+        {  0x0000, -0x8000,  0x0000 }, // rot
+         0x0004, // params
+    }, // 10
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {  -4051,    -20,  -3429 }, // pos
+        { -0x001,  0x0000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 11
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   -120,    333,  -2210 }, // pos
+        { -0x001,  0x0000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 12
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {    -60,    333,  -2210 }, // pos
+        { -0x001,  0x0000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 13
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {    310,    333,  -1842 }, // pos
+        { -0x001, -0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 14
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {    310,    333,  -1782 }, // pos
+        { -0x001, -0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 15
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {    315,    333,  -1594 }, // pos
+        { -0x001,  0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 16
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {    315,    333,  -1534 }, // pos
+        { -0x001,  0x4000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 17
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {     51,   1113,  -2997 }, // pos
+        {  0x0014,  0x038E,  0x001F }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 18
+    {
+        ACTOR_DOOR_ANA,
+        {    376,    333,  -1564 }, // pos
+        {  0x0000,  0x4000,  0x0000 }, // rot
+         0x11FF, // params
+    }, // 19
+    {
+        ACTOR_EN_BOX,
+        {    926,   1042,  -2512 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+         0x07C0, // params
+    }, // 20
+    {
+        ACTOR_EN_GE1,
+        {   -950,    622,  -3253 }, // pos
+        {  0x0000,  0x0000,  0x0000 }, // rot
+         0x0301, // params
+    }, // 21
+    {
+        ACTOR_BG_SPOT12_GATE,
+        {  -1134,    112,  -3075 }, // pos
+        {  0x0000,  0x2444,  0x0000 }, // rot
+         0x0003, // params
+    }, // 22
+    {
+        ACTOR_EN_GE2,
+        {     56,    333,  -2238 }, // pos
+        {  0x0000,  0x0000,  0x0002 }, // rot
+         0x0500, // params
+    }, // 23
+    {
+        ACTOR_EN_GE2,
+        {    237,    572,   -949 }, // pos
+        {  0x0000,  0x0000,  0x0002 }, // rot
+         0x0500, // params
+    }, // 24
+    {
+        ACTOR_EN_GE2,
+        {   -452,    333,  -1868 }, // pos
+        {  0x0000,  0x4000,  0x0002 }, // rot
+         0x0A00, // params
+    }, // 25
+    {
+        ACTOR_EN_GE2,
+        {     60,    333,  -1428 }, // pos
+        {  0x0000, -0x4000,  0x0002 }, // rot
+         0x0A00, // params
+    }, // 26
+    {
+        ACTOR_EN_KAKASI2,
+        {   1298,   1042,  -2279 }, // pos
+        {  0x0000,  0x0000,  0x0014 }, // rot
+         0x0538, // params
+    }, // 27
+    {
+        ACTOR_EN_GE1,
+        {     38,    333,  -1097 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+         0x3A46, // params
+    }, // 28
+    {
+        ACTOR_BG_SPOT12_SAKU,
+        {     86,    337,  -1035 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+         0x003A, // params
+    }, // 29
diff --git a/assets/scenes/overworld/spot12/cq/actors/room1_actor.inc.c b/assets/scenes/overworld/spot12/cq/actors/room1_actor.inc.c
new file mode 100644
index 0000000000..13794f0334
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/actors/room1_actor.inc.c
@@ -0,0 +1,90 @@
+    {
+        ACTOR_EN_KANBAN,
+        {   3635,   1413,   -360 }, // pos
+        {  0x0000, -0x4000,  0x0000 }, // rot
+         0x031A, // params
+    }, // 0
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   3303,   1441,  -5018 }, // pos
+        { -0x001, -0x222,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 1
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   3330,   1441,    406 }, // pos
+        { -0x001,  0x0B61,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 2
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   3406,   1441,    414 }, // pos
+        { -0x001,  0x09F5,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 3
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   3446,   1441,  -4875 }, // pos
+        { -0x001,  0x2666,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 4
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   3667,   1413,   -243 }, // pos
+        { -0x001,  0x0000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 5
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   3727,   1413,   -243 }, // pos
+        { -0x001,  0x0000,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 6
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   4090,   1413,  -2980 }, // pos
+        { -0x001, -0x1555,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 7
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   4090,   1413,  -2740 }, // pos
+        { -0x001,  0x0E39,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 8
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   4090,   1413,  -2500 }, // pos
+        { -0x001,  0x438E,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 9
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   4090,   1413,  -2260 }, // pos
+        { -0x001, -0x1E94,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 10
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   4090,   1413,  -2020 }, // pos
+        { -0x001,  0x13E9,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 11
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   4090,   1413,  -1780 }, // pos
+        { -0x001, -0x149F,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 12
+    {
+        ACTOR_OBJ_KIBAKO2,
+        {   4090,   1413,  -1540 }, // pos
+        { -0x001, -0x22D8,  0x0000 }, // rot
+        -0x001 /* 0xFFFF */, // params
+    }, // 13
+    {
+        ACTOR_EN_SW,
+        {   3377,   1734,  -4935 }, // pos
+        {  0x4000,  0x0000,  0x0000 }, // rot
+        -0x4AFF /* 0xB501 */, // params
+    }, // 14
diff --git a/assets/scenes/overworld/spot12/cq/headers/room0.inc.c b/assets/scenes/overworld/spot12/cq/headers/room0.inc.c
new file mode 100644
index 0000000000..50fa5ea902
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/headers/room0.inc.c
@@ -0,0 +1,9 @@
+    SCENE_CMD_ALTERNATE_HEADER_LIST(cq_altHeaders),
+    SCENE_CMD_ECHO_SETTINGS(10),
+    SCENE_CMD_ROOM_BEHAVIOR(ROOM_TYPE_NORMAL, ROOM_ENV_WARM, LENS_MODE_SHOW_ACTORS, false /* warp songs enabled */),
+    SCENE_CMD_SKYBOX_DISABLES(false /* skybox enabled */, false /* sun/moon enabled */),
+    SCENE_CMD_TIME_SETTINGS(/* don't set time */ 0xFF, 0xFF, 0 /* time doesn't move */),
+    SCENE_CMD_ROOM_SHAPE(&spot12_room_0_030001D0_RoomShapeCullable),
+    SCENE_CMD_OBJECT_LIST(ARRAY_COUNT(cq_objects), cq_objects),
+    SCENE_CMD_ACTOR_LIST(ARRAY_COUNT(cq_actors), cq_actors),
+    SCENE_CMD_END(),
diff --git a/assets/scenes/overworld/spot12/cq/headers/room0_altHeaders.inc.c b/assets/scenes/overworld/spot12/cq/headers/room0_altHeaders.inc.c
new file mode 100644
index 0000000000..481cc63924
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/headers/room0_altHeaders.inc.c
@@ -0,0 +1,6 @@
+    spot12_room_0_03000048_AltHeaders_03000540_Cmds, // 0
+    spot12_room_0_03000048_AltHeaders_03000300_Cmds, // 1
+    spot12_room_0_03000048_AltHeaders_03000540_Cmds, // 2
+    spot12_room_0_03000048_AltHeaders_03000790_Cmds, // 3
+    spot12_room_0_03000048_AltHeaders_03000860_Cmds, // 4
+    spot12_room_0_03000048_AltHeaders_030008C0_Cmds, // 5
diff --git a/assets/scenes/overworld/spot12/cq/headers/room1.inc.c b/assets/scenes/overworld/spot12/cq/headers/room1.inc.c
new file mode 100644
index 0000000000..e0bf6d2474
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/headers/room1.inc.c
@@ -0,0 +1,9 @@
+    SCENE_CMD_ALTERNATE_HEADER_LIST(cq_altHeaders),
+    SCENE_CMD_ECHO_SETTINGS(10),
+    SCENE_CMD_ROOM_BEHAVIOR(ROOM_TYPE_NORMAL, ROOM_ENV_WARM, LENS_MODE_SHOW_ACTORS, false /* warp songs enabled */),
+    SCENE_CMD_SKYBOX_DISABLES(false /* skybox enabled */, false /* sun/moon enabled */),
+    SCENE_CMD_TIME_SETTINGS(/* don't set time */ 0xFF, 0xFF, 0 /* time doesn't move */),
+    SCENE_CMD_ROOM_SHAPE(&spot12_room_1_03000150_RoomShapeCullable),
+    SCENE_CMD_OBJECT_LIST(ARRAY_COUNT(cq_objects), cq_objects),
+    SCENE_CMD_ACTOR_LIST(ARRAY_COUNT(cq_actors), cq_actors),
+    SCENE_CMD_END(),
diff --git a/assets/scenes/overworld/spot12/cq/headers/room1_altHeaders.inc.c b/assets/scenes/overworld/spot12/cq/headers/room1_altHeaders.inc.c
new file mode 100644
index 0000000000..2c195cd622
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/headers/room1_altHeaders.inc.c
@@ -0,0 +1,6 @@
+    spot12_room_1_03000048_AltHeaders_030003B0_Cmds, // 0
+    spot12_room_1_03000048_AltHeaders_03000200_Cmds, // 1
+    spot12_room_1_03000048_AltHeaders_030003B0_Cmds, // 2
+    spot12_room_1_03000048_AltHeaders_03000500_Cmds, // 3
+    spot12_room_1_03000048_AltHeaders_03000720_Cmds, // 4
+    spot12_room_1_03000048_AltHeaders_030007F0_Cmds, // 5
diff --git a/assets/scenes/overworld/spot12/cq/objects/room0_obj.inc.c b/assets/scenes/overworld/spot12/cq/objects/room0_obj.inc.c
new file mode 100644
index 0000000000..73a023944c
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/objects/room0_obj.inc.c
@@ -0,0 +1,10 @@
+    OBJECT_GE1, // 0
+    OBJECT_KIBAKO2, // 1
+    OBJECT_HORSE, // 2
+    OBJECT_HNI, // 3
+    OBJECT_SPOT12_OBJ, // 4
+    OBJECT_BOX, // 5
+    OBJECT_HATA, // 6
+    OBJECT_GLA, // 7
+    OBJECT_KANBAN, // 8
+    OBJECT_KA, // 9
diff --git a/assets/scenes/overworld/spot12/cq/objects/room1_obj.inc.c b/assets/scenes/overworld/spot12/cq/objects/room1_obj.inc.c
new file mode 100644
index 0000000000..d936879a35
--- /dev/null
+++ b/assets/scenes/overworld/spot12/cq/objects/room1_obj.inc.c
@@ -0,0 +1,10 @@
+    OBJECT_GE1, // 0
+    OBJECT_KIBAKO2, // 1
+    OBJECT_HORSE, // 2
+    OBJECT_SPOT12_OBJ, // 3
+    OBJECT_BOX, // 4
+    OBJECT_HATA, // 5
+    OBJECT_GLA, // 6
+    OBJECT_KANBAN, // 7
+    OBJECT_KA, // 8
+    OBJECT_ST, // 9
diff --git a/assets/scenes/overworld/spot12/spot12_cq_room_0.c b/assets/scenes/overworld/spot12/spot12_cq_room_0.c
new file mode 100644
index 0000000000..449536e263
--- /dev/null
+++ b/assets/scenes/overworld/spot12/spot12_cq_room_0.c
@@ -0,0 +1,29 @@
+#include "assets/scenes/overworld/spot12/spot12_scene.h"
+
+extern SceneCmd* questHeaders_spot12_room0[];
+
+static SceneCmd start[] = {
+    SCENE_CMD_QUEST_HEADER_LIST(questHeaders_spot12_room0),
+};
+
+#include "assets/scenes/overworld/spot12/spot12_room_0.c"
+
+static s16 cq_objects[] = {
+#include "assets/scenes/overworld/spot12/cq/objects/room0_obj.inc.c"
+};
+
+static ActorEntry cq_actors[] = {
+#include "assets/scenes/overworld/spot12/cq/actors/room0_actor.inc.c"
+};
+
+static SceneCmd* cq_altHeaders[] = {
+#include "assets/scenes/overworld/spot12/cq/headers/room0_altHeaders.inc.c"
+};
+
+static SceneCmd cq_header[] = {
+#include "assets/scenes/overworld/spot12/cq/headers/room0.inc.c"
+};
+
+SceneCmd* questHeaders_spot12_room0[] = {
+#include "assets/scenes/overworld/questHeaders.inc.c"
+};
diff --git a/assets/scenes/overworld/spot12/spot12_cq_room_1.c b/assets/scenes/overworld/spot12/spot12_cq_room_1.c
new file mode 100644
index 0000000000..ddf3892c9e
--- /dev/null
+++ b/assets/scenes/overworld/spot12/spot12_cq_room_1.c
@@ -0,0 +1,29 @@
+#include "assets/scenes/overworld/spot12/spot12_scene.h"
+
+extern SceneCmd* questHeaders_spot12_room1[];
+
+static SceneCmd start[] = {
+    SCENE_CMD_QUEST_HEADER_LIST(questHeaders_spot12_room1),
+};
+
+#include "assets/scenes/overworld/spot12/spot12_room_1.c"
+
+static s16 cq_objects[] = {
+#include "assets/scenes/overworld/spot12/cq/objects/room1_obj.inc.c"
+};
+
+static ActorEntry cq_actors[] = {
+#include "assets/scenes/overworld/spot12/cq/actors/room1_actor.inc.c"
+};
+
+static SceneCmd* cq_altHeaders[] = {
+#include "assets/scenes/overworld/spot12/cq/headers/room1_altHeaders.inc.c"
+};
+
+static SceneCmd cq_header[] = {
+#include "assets/scenes/overworld/spot12/cq/headers/room1.inc.c"
+};
+
+SceneCmd* questHeaders_spot12_room1[] = {
+#include "assets/scenes/overworld/questHeaders.inc.c"
+};
diff --git a/assets/scenes/overworld/spot12/spot12_cq_scene.c b/assets/scenes/overworld/spot12/spot12_cq_scene.c
index 71c4a88212..fdd3e02dfe 100644
--- a/assets/scenes/overworld/spot12/spot12_cq_scene.c
+++ b/assets/scenes/overworld/spot12/spot12_cq_scene.c
@@ -1,10 +1,10 @@
 #include "assets/scenes/overworld/spot12/spot12_scene.h"
-#include "save.h"
+#include "versions.h"
 
-static SceneCmd* questHeaders[QUEST_MAX];
+extern SceneCmd* questHeaders_spot12_scene[];
 
 static SceneCmd start[] = {
-#include "assets/scenes/overworld/start.inc.c"
+    SCENE_CMD_QUEST_HEADER_LIST(questHeaders_spot12_scene),
 };
 
 #include "assets/scenes/overworld/spot12/spot12_scene.c"
@@ -47,6 +47,6 @@ static SceneCmd cq_header[] = {
 #include "assets/scenes/overworld/spot12/cq/scene/header.inc.c"
 };
 
-static SceneCmd* questHeaders[] = {
+SceneCmd* questHeaders_spot12_scene[] = {
 #include "assets/scenes/overworld/questHeaders.inc.c"
 };
diff --git a/spec/scenes_n64.inc b/spec/scenes_n64.inc
index f0b5cd55a1..d0464571cd 100644
--- a/spec/scenes_n64.inc
+++ b/spec/scenes_n64.inc
@@ -400,14 +400,14 @@ endseg
 beginseg
     name "spot12_room_0"
     compress
-    include "$(BUILD_DIR)/assets/scenes/overworld/spot12/spot12_room_0.o"
+    include "$(BUILD_DIR)/assets/scenes/overworld/spot12/spot12_cq_room_0.o"
     number 3
 endseg
 
 beginseg
     name "spot12_room_1"
     compress
-    include "$(BUILD_DIR)/assets/scenes/overworld/spot12/spot12_room_1.o"
+    include "$(BUILD_DIR)/assets/scenes/overworld/spot12/spot12_cq_room_1.o"
     number 3
 endseg