[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,26 +3,26 @@
#include "align_asset_macro.h"
#define dganon_room_5DL_005AF8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5DL_005AF8"
static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8;
#define dganon_room_5Tex_007F08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007F08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08;
#define dganon_room_5Tex_007B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08;
#define dganon_room_5Tex_005B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_005B08"
#define dganon_room_5Tex_005B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_005B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_005B08[] = dganon_room_5Tex_005B08;
#define dganon_room_5Tex_008308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_008308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308;
#define dganon_room_5Tex_006308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308;
#define dganon_room_5Tex_006B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006B08"
#define dganon_room_5Tex_006B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_006B08[] = dganon_room_5Tex_006B08;
#define dganon_room_5Tex_006308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308;
#define dganon_room_5Tex_007B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08;
#define dganon_room_5Tex_007F08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007F08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08;
#define dganon_room_5Tex_008308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_008308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308;
#define dganon_room_5DL_005AF8 "__OTR__scenes/shared/ganon_scene/ganon_room_5DL_005AF8"
static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8;
#endif // DUNGEONS_GANON_ROOM_5_H