Correct CQ v4 scenes #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Admentus64 wants to merge 2 commits into master from correct-cq-v4-scenes

assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_0.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_1.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_2.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_3.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_4.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_room_5.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/dungeons/swamp_spider_house/swamp_spider_house_scene.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_room_0.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -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),
@@ Expand Down @@

assets/scenes/misc/grotto_shortcuts/grotto_shortcuts_scene.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/overworld/roadtofortress/roadtofortress_room_0.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/overworld/roadtofortress/roadtofortress_scene.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     #ifndef ROADTOFORTRESS_SCENE_H
-    #define ROADTOFORTRESS_SCENE_H 1
+    #define ROADTOFORTRESS_SCENE_H
     #include "bgcheck.h"
     #include "cutscene.h"
@@ Expand Down @@

assets/scenes/overworld/roadtolake/roadtolake_room_0.h

-Original file line number
+Diff line change
@@ -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"
@@ Expand Down @@

assets/scenes/overworld/roadtolake/roadtolake_scene.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     #ifndef ROADTOLAKE_SCENE_H
-    #define ROADTOLAKE_SCENE_H 1
+    #define ROADTOLAKE_SCENE_H
     #include "bgcheck.h"
     #include "cutscene.h"
@@ Expand Down @@

assets/scenes/overworld/spot12/cq/actors/room0_actor.inc.c

-Original file line number
+Diff line change
@@ -0,0 +1,180 @@
+        {
+            ACTOR_EN_A_OBJ,
+            {   -730,      2,    -70 }, // pos
+            {  0x0000, -0x560B,  0x0000 }, // rot
+x190A, // 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
+x1ABF, // params
+        }, // 5
+        {
+            ACTOR_EN_WONDER_ITEM,
+            {   1094,    876,   -412 }, // pos
+            {  0x0000,  0x0000,  0x0006 }, // rot
+x1ABF, // params
+        }, // 6
+        {
+            ACTOR_EN_KANBAN,
+            {     14,    333,  -1159 }, // pos
+            {  0x0000, -0x4000,  0x0000 }, // rot
+x031B, // params
+        }, // 7
+        {
+            ACTOR_EN_KANBAN,
+            {  -1850,      9,  -3250 }, // pos
+            {  0x0000,  0x4000,  0x0000 }, // rot
+x031C, // params
+        }, // 8
+        {
+            ACTOR_EN_GE1,
+            {   -857,    112,  -3123 }, // pos
+            {  0x0000, -0xFA5,  0x0000 }, // rot
+x0004, // params
+        }, // 9
+        {
+            ACTOR_EN_GE1,
+            {    682,    602,   -307 }, // pos
+            {  0x0000, -0x8000,  0x0000 }, // rot
+x0004, // 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
+x11FF, // params
+        }, // 19
+        {
+            ACTOR_EN_BOX,
+            {    926,   1042,  -2512 }, // pos
+            {  0x0000, -0x4000,  0x0000 }, // rot
+x07C0, // params
+        }, // 20
+        {
+            ACTOR_EN_GE1,
+            {   -950,    622,  -3253 }, // pos
+            {  0x0000,  0x0000,  0x0000 }, // rot
+x0301, // params
+        }, // 21
+        {
+            ACTOR_BG_SPOT12_GATE,
+            {  -1134,    112,  -3075 }, // pos
+            {  0x0000,  0x2444,  0x0000 }, // rot
+x0003, // params
+        }, // 22
+        {
+            ACTOR_EN_GE2,
+            {     56,    333,  -2238 }, // pos
+            {  0x0000,  0x0000,  0x0002 }, // rot
+x0500, // params
+        }, // 23
+        {
+            ACTOR_EN_GE2,
+            {    237,    572,   -949 }, // pos
+            {  0x0000,  0x0000,  0x0002 }, // rot
+x0500, // params
+        }, // 24
+        {
+            ACTOR_EN_GE2,
+            {   -452,    333,  -1868 }, // pos
+            {  0x0000,  0x4000,  0x0002 }, // rot
+x0A00, // params
+        }, // 25
+        {
+            ACTOR_EN_GE2,
+            {     60,    333,  -1428 }, // pos
+            {  0x0000, -0x4000,  0x0002 }, // rot
+x0A00, // params
+        }, // 26
+        {
+            ACTOR_EN_KAKASI2,
+            {   1298,   1042,  -2279 }, // pos
+            {  0x0000,  0x0000,  0x0014 }, // rot
+x0538, // params
+        }, // 27
+        {
+            ACTOR_EN_GE1,
+            {     38,    333,  -1097 }, // pos
+            {  0x0000, -0x4000,  0x0000 }, // rot
+x3A46, // params
+        }, // 28
+        {
+            ACTOR_BG_SPOT12_SAKU,
+            {     86,    337,  -1035 }, // pos
+            {  0x0000, -0x4000,  0x0000 }, // rot
+x003A, // params
+        }, // 29

assets/scenes/overworld/spot12/cq/actors/room1_actor.inc.c

-Original file line number
+Diff line change
@@ -0,0 +1,90 @@
+        {
+            ACTOR_EN_KANBAN,
+            {   3635,   1413,   -360 }, // pos
+            {  0x0000, -0x4000,  0x0000 }, // rot
+x031A, // 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

assets/scenes/overworld/spot12/cq/headers/room0.inc.c

-Original file line number
+Diff line change
@@ -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(),

assets/scenes/overworld/spot12/cq/headers/room0_altHeaders.inc.c

-Original file line number
+Diff line change
@@ -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

assets/scenes/overworld/spot12/cq/headers/room1.inc.c

-Original file line number
+Diff line change
@@ -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(),

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Correct CQ v4 scenes #187

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Correct CQ v4 scenes #187

Are you sure you want to change the base?

Uh oh!

Correct CQ v4 scenes #187

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!