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

34
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h
View File

@@ -3,14 +3,14 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_14DL_0009E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_0009E0"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_0009E0[] = dMIZUsin_room_14DL_0009E0;
#define dMIZUsin_room_14Tex_003680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003680"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003680[] = dMIZUsin_room_14Tex_003680;
#define dMIZUsin_room_14DL_002548 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_002548"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_002548[] = dMIZUsin_room_14DL_002548;
#define dMIZUsin_room_14Tex_003E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003E80"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003E80[] = dMIZUsin_room_14Tex_003E80;
#define dMIZUsin_room_14Tex_006680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_006680"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_006680[] = dMIZUsin_room_14Tex_006680;
#define dMIZUsin_room_14Tex_004680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004680"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004680[] = dMIZUsin_room_14Tex_004680;
#define dMIZUsin_room_14Tex_004E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004E80"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004E80[] = dMIZUsin_room_14Tex_004E80;
@@ -18,27 +18,27 @@ static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004E80[] = dMIZUsin_room_14T
#define dMIZUsin_room_14Tex_005680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005680"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005680[] = dMIZUsin_room_14Tex_005680;
#define dMIZUsin_room_14Tex_004680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004680"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004680[] = dMIZUsin_room_14Tex_004680;
#define dMIZUsin_room_14Tex_005E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005E80"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005E80[] = dMIZUsin_room_14Tex_005E80;
#define dMIZUsin_room_14Tex_006680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_006680"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_006680[] = dMIZUsin_room_14Tex_006680;
#define dMIZUsin_room_14DL_0009E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_0009E0"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_0009E0[] = dMIZUsin_room_14DL_0009E0;
#define dMIZUsin_room_14DL_002548 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_002548"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_002548[] = dMIZUsin_room_14DL_002548;
#define dMIZUsin_room_14DL_000FB0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000FB0"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000FB0[] = dMIZUsin_room_14DL_000FB0;
#define dMIZUsin_room_14Tex_003E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003E80"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003E80[] = dMIZUsin_room_14Tex_003E80;
#define dMIZUsin_room_14DL_003520 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_003520"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_003520[] = dMIZUsin_room_14DL_003520;
#define dMIZUsin_room_14Tex_005E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005E80"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005E80[] = dMIZUsin_room_14Tex_005E80;
#define dMIZUsin_room_14DL_000E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000E38"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000E38[] = dMIZUsin_room_14DL_000E38;
#define dMIZUsin_room_14Tex_003680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003680"
static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003680[] = dMIZUsin_room_14Tex_003680;
#define dMIZUsin_room_14DL_000C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000C68"
static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000C68[] = dMIZUsin_room_14DL_000C68;