nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

30
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h
View File

@@ -3,42 +3,42 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_12Tex_0039C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0039C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0039C8[] = dMIZUsin_room_12Tex_0039C8;
#define dMIZUsin_room_12Tex_0041C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0041C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0041C8[] = dMIZUsin_room_12Tex_0041C8;
#define dMIZUsin_room_12Tex_0049C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0049C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0049C8[] = dMIZUsin_room_12Tex_0049C8;
#define dMIZUsin_room_12Tex_0051C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0051C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0051C8[] = dMIZUsin_room_12Tex_0051C8;
#define dMIZUsin_room_12Tex_006628 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_006628"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_006628[] = dMIZUsin_room_12Tex_006628;
#define dMIZUsin_room_12DL_0024F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0024F0"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0024F0[] = dMIZUsin_room_12DL_0024F0;
#define dMIZUsin_room_12DL_0035A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0035A8"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0035A8[] = dMIZUsin_room_12DL_0035A8;
#define dMIZUsin_room_12Tex_0051C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0051C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0051C8[] = dMIZUsin_room_12Tex_0051C8;
#define dMIZUsin_room_12DL_002D30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_002D30"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_002D30[] = dMIZUsin_room_12DL_002D30;
#define dMIZUsin_room_12Tex_0039C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0039C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0039C8[] = dMIZUsin_room_12Tex_0039C8;
#define dMIZUsin_room_12DL_0061C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0061C0"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0061C0[] = dMIZUsin_room_12DL_0061C0;
#define dMIZUsin_room_12Tex_006628 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_006628"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_006628[] = dMIZUsin_room_12Tex_006628;
#define dMIZUsin_room_12DL_006518 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_006518"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_006518[] = dMIZUsin_room_12DL_006518;
#define dMIZUsin_room_12DL_000DF0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_000DF0"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000DF0[] = dMIZUsin_room_12DL_000DF0;
#define dMIZUsin_room_12Tex_0041C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0041C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0041C8[] = dMIZUsin_room_12Tex_0041C8;
#define dMIZUsin_room_12DL_002F68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_002F68"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_002F68[] = dMIZUsin_room_12DL_002F68;
#define dMIZUsin_room_12Tex_0049C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0049C8"
static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0049C8[] = dMIZUsin_room_12Tex_0049C8;
#define dMIZUsin_room_12DL_000AC8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_000AC8"
static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000AC8[] = dMIZUsin_room_12DL_000AC8;