[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 dsutaru_room_0DL_001B00 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0DL_001B00"
static const ALIGN_ASSET(2) char sutaru_room_0DL_001B00[] = dsutaru_room_0DL_001B00;
#define dsutaru_room_0Tex_0020F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0020F0"
#define dsutaru_room_0Tex_0020F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0020F0"
static const ALIGN_ASSET(2) char sutaru_room_0Tex_0020F0[] = dsutaru_room_0Tex_0020F0;
#define dsutaru_room_0Tex_0028F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0028F0"
#define dsutaru_room_0Tex_0028F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0028F0"
static const ALIGN_ASSET(2) char sutaru_room_0Tex_0028F0[] = dsutaru_room_0Tex_0028F0;
#define dsutaru_room_0Tex_002AF0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_002AF0"
#define dsutaru_room_0Tex_002AF0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_002AF0"
static const ALIGN_ASSET(2) char sutaru_room_0Tex_002AF0[] = dsutaru_room_0Tex_002AF0;
#define dsutaru_room_0Tex_003AF0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_003AF0"
#define dsutaru_room_0Tex_003AF0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_003AF0"
static const ALIGN_ASSET(2) char sutaru_room_0Tex_003AF0[] = dsutaru_room_0Tex_003AF0;
#define dsutaru_room_0Tex_0042F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0042F0"
#define dsutaru_room_0Tex_0042F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0042F0"
static const ALIGN_ASSET(2) char sutaru_room_0Tex_0042F0[] = dsutaru_room_0Tex_0042F0;
#define dsutaru_room_0Tex_0052F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0052F0"
#define dsutaru_room_0Tex_0052F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0052F0"
static const ALIGN_ASSET(2) char sutaru_room_0Tex_0052F0[] = dsutaru_room_0Tex_0052F0;
#define dsutaru_room_0Tex_0062F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0062F0"
#define dsutaru_room_0Tex_0062F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0062F0"
static const ALIGN_ASSET(2) char sutaru_room_0Tex_0062F0[] = dsutaru_room_0Tex_0062F0;
#define dsutaru_room_0DL_001B00 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0DL_001B00"
static const ALIGN_ASSET(2) char sutaru_room_0DL_001B00[] = dsutaru_room_0DL_001B00;
#endif // TEST_LEVELS_SUTARU_ROOM_0_H