[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 dganon_room_1DL_005360 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1DL_005360"
static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360;
#define dganon_room_1Tex_006370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006370"
static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370;
#define dganon_room_1Tex_005F70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005F70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70;
#define dganon_room_1Tex_005B70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005B70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70;
#define dganon_room_1Tex_005370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005370"
#define dganon_room_1Tex_005370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005370"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005370[] = dganon_room_1Tex_005370;
#define dganon_room_1Tex_006770 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006770"
#define dganon_room_1Tex_005B70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005B70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70;
#define dganon_room_1Tex_005F70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005F70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70;
#define dganon_room_1Tex_006370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006370"
static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370;
#define dganon_room_1Tex_006770 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006770"
static const ALIGN_ASSET(2) char ganon_room_1Tex_006770[] = dganon_room_1Tex_006770;
#define dganon_room_1DL_005360 "__OTR__scenes/shared/ganon_scene/ganon_room_1DL_005360"
static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360;
#endif // DUNGEONS_GANON_ROOM_1_H