[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)

* share common scenes between mq and nonmq

* move shared scenes under shared folder and bring back thieves hideout mq handling

* update headers for shared scenes

* bump submodules

* remove mq handling for mirror world song patch

* only have unique dungeons be nomq/mq variants

* bump submodules
This commit is contained in:
Adam Bird
2023-11-06 17:44:49 -05:00
committed by GitHub
parent 8b78cb832a
commit 460b3d02f5
602 changed files with 14934 additions and 15000 deletions

View File

@@ -3,23 +3,23 @@
#include "align_asset_macro.h"
#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8;
#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60"
#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_006C60[] = dganontikasonogo_room_1Tex_006C60;
#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460"
#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_007460[] = dganontikasonogo_room_1Tex_007460;
#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460"
#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_008460[] = dganontikasonogo_room_1Tex_008460;
#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710;
#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720"
#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_009720[] = dganontikasonogo_room_1Tex_009720;
#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8;
#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710;
#endif // DUNGEONS_GANONTIKASONOGO_ROOM_1_H