[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,29 +3,29 @@
#include "align_asset_macro.h"
#define dbesitu_room_0DL_001C80 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0DL_001C80"
static const ALIGN_ASSET(2) char besitu_room_0DL_001C80[] = dbesitu_room_0DL_001C80;
#define dbesitu_room_0Tex_001CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_001CD8"
#define dbesitu_room_0Tex_001CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_001CD8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_001CD8[] = dbesitu_room_0Tex_001CD8;
#define dbesitu_room_0Tex_004CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_004CD8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_004CD8[] = dbesitu_room_0Tex_004CD8;
#define dbesitu_room_0Tex_002CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_002CD8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8;
#define dbesitu_room_0TLUT_001CB8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0TLUT_001CB8"
static const ALIGN_ASSET(2) char besitu_room_0TLUT_001CB8[] = dbesitu_room_0TLUT_001CB8;
#define dbesitu_room_0Tex_003CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_003CD8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_003CD8[] = dbesitu_room_0Tex_003CD8;
#define dbesitu_room_0Tex_0034D8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_0034D8"
#define dbesitu_room_0Tex_0034D8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_0034D8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_0034D8[] = dbesitu_room_0Tex_0034D8;
#define dbesitu_room_0Tex_0044D8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_0044D8"
#define dbesitu_room_0Tex_003CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_003CD8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_003CD8[] = dbesitu_room_0Tex_003CD8;
#define dbesitu_room_0Tex_0044D8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_0044D8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_0044D8[] = dbesitu_room_0Tex_0044D8;
#define dbesitu_room_0Tex_002CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_002CD8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8;
#define dbesitu_room_0Tex_004CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_004CD8"
static const ALIGN_ASSET(2) char besitu_room_0Tex_004CD8[] = dbesitu_room_0Tex_004CD8;
#define dbesitu_room_0TLUT_001CB8 "__OTR__scenes/shared/besitu_scene/besitu_room_0TLUT_001CB8"
static const ALIGN_ASSET(2) char besitu_room_0TLUT_001CB8[] = dbesitu_room_0TLUT_001CB8;
#define dbesitu_room_0DL_001C80 "__OTR__scenes/shared/besitu_scene/besitu_room_0DL_001C80"
static const ALIGN_ASSET(2) char besitu_room_0DL_001C80[] = dbesitu_room_0DL_001C80;
#endif // TEST_LEVELS_BESITU_ROOM_0_H