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

102
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h
View File

@@ -3,6 +3,57 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_0Tex_00CDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00CDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00CDF8[] = dMIZUsin_room_0Tex_00CDF8;
#define dMIZUsin_room_0Tex_00D5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00D5F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00D5F8[] = dMIZUsin_room_0Tex_00D5F8;
#define dMIZUsin_room_0Tex_00DDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00DDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00DDF8[] = dMIZUsin_room_0Tex_00DDF8;
#define dMIZUsin_room_0Tex_00E5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00E5F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00E5F8[] = dMIZUsin_room_0Tex_00E5F8;
#define dMIZUsin_room_0Tex_00EDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00EDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00EDF8[] = dMIZUsin_room_0Tex_00EDF8;
#define dMIZUsin_room_0Tex_00F5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00F5F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00F5F8[] = dMIZUsin_room_0Tex_00F5F8;
#define dMIZUsin_room_0Tex_00FDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00FDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00FDF8[] = dMIZUsin_room_0Tex_00FDF8;
#define dMIZUsin_room_0Tex_0105F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0105F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0105F8[] = dMIZUsin_room_0Tex_0105F8;
#define dMIZUsin_room_0Tex_010DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_010DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_010DF8[] = dMIZUsin_room_0Tex_010DF8;
#define dMIZUsin_room_0Tex_0115F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0115F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0115F8[] = dMIZUsin_room_0Tex_0115F8;
#define dMIZUsin_room_0Tex_011DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_011DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_011DF8[] = dMIZUsin_room_0Tex_011DF8;
#define dMIZUsin_room_0Tex_0125F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0125F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0125F8[] = dMIZUsin_room_0Tex_0125F8;
#define dMIZUsin_room_0Tex_012DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_012DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_012DF8[] = dMIZUsin_room_0Tex_012DF8;
#define dMIZUsin_room_0Tex_0135F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0135F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0135F8[] = dMIZUsin_room_0Tex_0135F8;
#define dMIZUsin_room_0Tex_013DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_013DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_013DF8[] = dMIZUsin_room_0Tex_013DF8;
#define dMIZUsin_room_0Tex_0145F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0145F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8;
#define dMIZUsin_room_0Tex_015428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_015428"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_015428[] = dMIZUsin_room_0Tex_015428;
#define dMIZUsin_room_0DL_0051B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0051B8"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0051B8[] = dMIZUsin_room_0DL_0051B8;
@@ -30,30 +81,18 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_015330[] = dMIZUsin_room_0DL_0
#define dMIZUsin_room_0DL_003E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_003E38"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_003E38[] = dMIZUsin_room_0DL_003E38;
#define dMIZUsin_room_0Tex_0125F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0125F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0125F8[] = dMIZUsin_room_0Tex_0125F8;
#define dMIZUsin_room_0DL_0027C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0027C8"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0027C8[] = dMIZUsin_room_0DL_0027C8;
#define dMIZUsin_room_0Tex_00F5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00F5F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00F5F8[] = dMIZUsin_room_0Tex_00F5F8;
#define dMIZUsin_room_0DL_015078 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_015078"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_015078[] = dMIZUsin_room_0DL_015078;
#define dMIZUsin_room_0Tex_015428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_015428"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_015428[] = dMIZUsin_room_0Tex_015428;
#define dMIZUsin_room_0DL_014EC0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_014EC0"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_014EC0[] = dMIZUsin_room_0DL_014EC0;
#define dMIZUsin_room_0DL_007AC0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_007AC0"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007AC0[] = dMIZUsin_room_0DL_007AC0;
#define dMIZUsin_room_0Tex_00DDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00DDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00DDF8[] = dMIZUsin_room_0Tex_00DDF8;
#define dMIZUsin_room_0DL_007620 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_007620"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007620[] = dMIZUsin_room_0DL_007620;
@@ -72,27 +111,15 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007050[] = dMIZUsin_room_0DL_0
#define dMIZUsin_room_0DL_0062E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0062E0"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0062E0[] = dMIZUsin_room_0DL_0062E0;
#define dMIZUsin_room_0Tex_012DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_012DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_012DF8[] = dMIZUsin_room_0Tex_012DF8;
#define dMIZUsin_room_0DL_0067C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0067C8"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0067C8[] = dMIZUsin_room_0DL_0067C8;
#define dMIZUsin_room_0Tex_00E5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00E5F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00E5F8[] = dMIZUsin_room_0Tex_00E5F8;
#define dMIZUsin_room_0DL_006508 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_006508"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_006508[] = dMIZUsin_room_0DL_006508;
#define dMIZUsin_room_0DL_0008F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0008F0"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0008F0[] = dMIZUsin_room_0DL_0008F0;
#define dMIZUsin_room_0Tex_00CDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00CDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00CDF8[] = dMIZUsin_room_0Tex_00CDF8;
#define dMIZUsin_room_0Tex_00D5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00D5F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00D5F8[] = dMIZUsin_room_0Tex_00D5F8;
#define dMIZUsin_room_0DL_005428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_005428"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_005428[] = dMIZUsin_room_0DL_005428;
@@ -126,21 +153,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_009560[] = dMIZUsin_room_0DL_0
#define dMIZUsin_room_0DL_00CB60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00CB60"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00CB60[] = dMIZUsin_room_0DL_00CB60;
#define dMIZUsin_room_0Tex_00EDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00EDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00EDF8[] = dMIZUsin_room_0Tex_00EDF8;
#define dMIZUsin_room_0DL_00C180 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C180"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C180[] = dMIZUsin_room_0DL_00C180;
#define dMIZUsin_room_0Tex_011DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_011DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_011DF8[] = dMIZUsin_room_0Tex_011DF8;
#define dMIZUsin_room_0DL_00B018 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00B018"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B018[] = dMIZUsin_room_0DL_00B018;
#define dMIZUsin_room_0Tex_010DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_010DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_010DF8[] = dMIZUsin_room_0Tex_010DF8;
#define dMIZUsin_room_0DL_00B328 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00B328"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B328[] = dMIZUsin_room_0DL_00B328;
@@ -150,21 +168,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B730[] = dMIZUsin_room_0DL_0
#define dMIZUsin_room_0DL_00ABB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00ABB8"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00ABB8[] = dMIZUsin_room_0DL_00ABB8;
#define dMIZUsin_room_0Tex_00FDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00FDF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00FDF8[] = dMIZUsin_room_0Tex_00FDF8;
#define dMIZUsin_room_0DL_00BCC8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00BCC8"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00BCC8[] = dMIZUsin_room_0DL_00BCC8;
#define dMIZUsin_room_0Tex_0115F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0115F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0115F8[] = dMIZUsin_room_0Tex_0115F8;
#define dMIZUsin_room_0DL_00A550 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00A550"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00A550[] = dMIZUsin_room_0DL_00A550;
#define dMIZUsin_room_0Tex_0105F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0105F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0105F8[] = dMIZUsin_room_0Tex_0105F8;
#define dMIZUsin_room_0DL_001D70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_001D70"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_001D70[] = dMIZUsin_room_0DL_001D70;
@@ -174,20 +183,11 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_004D90[] = dMIZUsin_room_0DL_0
#define dMIZUsin_room_0DL_00C5D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C5D8"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C5D8[] = dMIZUsin_room_0DL_00C5D8;
#define dMIZUsin_room_0Tex_013DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_013DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_013DF8[] = dMIZUsin_room_0Tex_013DF8;
#define dMIZUsin_room_0DL_00C840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C840"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C840[] = dMIZUsin_room_0DL_00C840;
#define dMIZUsin_room_0Tex_0135F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0135F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0135F8[] = dMIZUsin_room_0Tex_0135F8;
#define dMIZUsin_room_0DL_009D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_009D60"
static const ALIGN_ASSET(2) char MIZUsin_room_0DL_009D60[] = dMIZUsin_room_0DL_009D60;
#define dMIZUsin_room_0Tex_0145F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0145F8"
static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8;
#endif // DUNGEONS_MIZUSIN_ROOM_0_H