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

160
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h
View File

@@ -3,71 +3,104 @@
#include "align_asset_macro.h"
#define djyasinzou_room_5DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_001850"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_001850[] = djyasinzou_room_5DL_001850;
#define djyasinzou_room_5Tex_00CBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CBC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CBC8[] = djyasinzou_room_5Tex_00CBC8;
#define djyasinzou_room_5Tex_00CFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CFC8[] = djyasinzou_room_5Tex_00CFC8;
#define djyasinzou_room_5Tex_00D7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00D7C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00D7C8[] = djyasinzou_room_5Tex_00D7C8;
#define djyasinzou_room_5Tex_00DBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DBC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DBC8[] = djyasinzou_room_5Tex_00DBC8;
#define djyasinzou_room_5Tex_00DFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DFC8[] = djyasinzou_room_5Tex_00DFC8;
#define djyasinzou_room_5Tex_00E7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00E7C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00E7C8[] = djyasinzou_room_5Tex_00E7C8;
#define djyasinzou_room_5Tex_00EFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00EFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00EFC8[] = djyasinzou_room_5Tex_00EFC8;
#define djyasinzou_room_5Tex_00F3C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F3C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F3C8[] = djyasinzou_room_5Tex_00F3C8;
#define djyasinzou_room_5Tex_00F7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F7C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F7C8[] = djyasinzou_room_5Tex_00F7C8;
#define djyasinzou_room_5Tex_00FFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00FFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00FFC8[] = djyasinzou_room_5Tex_00FFC8;
#define djyasinzou_room_5Tex_0100C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0100C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0100C8[] = djyasinzou_room_5Tex_0100C8;
#define djyasinzou_room_5Tex_0108C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0108C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0108C8[] = djyasinzou_room_5Tex_0108C8;
#define djyasinzou_room_5Tex_010CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_010CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_010CC8[] = djyasinzou_room_5Tex_010CC8;
#define djyasinzou_room_5Tex_0110C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0110C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0110C8[] = djyasinzou_room_5Tex_0110C8;
#define djyasinzou_room_5Tex_0114C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0114C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0114C8[] = djyasinzou_room_5Tex_0114C8;
#define djyasinzou_room_5Tex_0118C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0118C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0118C8[] = djyasinzou_room_5Tex_0118C8;
#define djyasinzou_room_5Tex_011CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_011CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_011CC8[] = djyasinzou_room_5Tex_011CC8;
#define djyasinzou_room_5Tex_0124C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0124C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0124C8[] = djyasinzou_room_5Tex_0124C8;
#define djyasinzou_room_5Tex_012CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_012CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_012CC8[] = djyasinzou_room_5Tex_012CC8;
#define djyasinzou_room_5Tex_0134C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0134C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0134C8[] = djyasinzou_room_5Tex_0134C8;
#define djyasinzou_room_5Tex_0138C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0138C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0138C8[] = djyasinzou_room_5Tex_0138C8;
#define djyasinzou_room_5Tex_0140C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0140C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0140C8[] = djyasinzou_room_5Tex_0140C8;
#define djyasinzou_room_5Tex_0148C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0148C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0148C8[] = djyasinzou_room_5Tex_0148C8;
#define djyasinzou_room_5Tex_0150C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0150C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0150C8[] = djyasinzou_room_5Tex_0150C8;
#define djyasinzou_room_5Tex_0158C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0158C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0158C8[] = djyasinzou_room_5Tex_0158C8;
#define djyasinzou_room_5Tex_015CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_015CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_015CC8[] = djyasinzou_room_5Tex_015CC8;
#define djyasinzou_room_5Tex_0140C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0140C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0140C8[] = djyasinzou_room_5Tex_0140C8;
#define djyasinzou_room_5Tex_016808 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_016808"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_016808[] = djyasinzou_room_5Tex_016808;
#define djyasinzou_room_5Tex_0134C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0134C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0134C8[] = djyasinzou_room_5Tex_0134C8;
#define djyasinzou_room_5Tex_00DFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DFC8[] = djyasinzou_room_5Tex_00DFC8;
#define djyasinzou_room_5Tex_0150C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0150C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0150C8[] = djyasinzou_room_5Tex_0150C8;
#define djyasinzou_room_5Tex_012CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_012CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_012CC8[] = djyasinzou_room_5Tex_012CC8;
#define djyasinzou_room_5Tex_0124C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0124C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0124C8[] = djyasinzou_room_5Tex_0124C8;
#define djyasinzou_room_5Tex_00CFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CFC8[] = djyasinzou_room_5Tex_00CFC8;
#define djyasinzou_room_5Tex_00E7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00E7C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00E7C8[] = djyasinzou_room_5Tex_00E7C8;
#define djyasinzou_room_5Tex_0148C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0148C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0148C8[] = djyasinzou_room_5Tex_0148C8;
#define djyasinzou_room_5DL_0034C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0034C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0034C8[] = djyasinzou_room_5DL_0034C8;
#define djyasinzou_room_5Tex_00EFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00EFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00EFC8[] = djyasinzou_room_5Tex_00EFC8;
#define djyasinzou_room_5DL_003C50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_003C50"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_003C50[] = djyasinzou_room_5DL_003C50;
#define djyasinzou_room_5Tex_00DBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DBC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DBC8[] = djyasinzou_room_5Tex_00DBC8;
#define djyasinzou_room_5Tex_017008 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_017008"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008;
#define djyasinzou_room_5TLUT_00C9B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00C9B0"
static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00C9B0[] = djyasinzou_room_5TLUT_00C9B0;
#define djyasinzou_room_5Tex_00FFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00FFC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00FFC8[] = djyasinzou_room_5Tex_00FFC8;
#define djyasinzou_room_5TLUT_00CBA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00CBA8"
static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00CBA8[] = djyasinzou_room_5TLUT_00CBA8;
#define djyasinzou_room_5Tex_0108C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0108C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0108C8[] = djyasinzou_room_5Tex_0108C8;
#define djyasinzou_room_5DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_001850"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_001850[] = djyasinzou_room_5DL_001850;
#define djyasinzou_room_5Tex_0118C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0118C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0118C8[] = djyasinzou_room_5Tex_0118C8;
#define djyasinzou_room_5DL_0034C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0034C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0034C8[] = djyasinzou_room_5DL_0034C8;
#define djyasinzou_room_5Tex_0114C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0114C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0114C8[] = djyasinzou_room_5Tex_0114C8;
#define djyasinzou_room_5DL_003C50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_003C50"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_003C50[] = djyasinzou_room_5DL_003C50;
#define djyasinzou_room_5DL_004480 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_004480"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_004480[] = djyasinzou_room_5DL_004480;
@@ -75,39 +108,18 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_004480[] = djyasinzou_room_5
#define djyasinzou_room_5DL_005070 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_005070"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_005070[] = djyasinzou_room_5DL_005070;
#define djyasinzou_room_5Tex_00F3C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F3C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F3C8[] = djyasinzou_room_5Tex_00F3C8;
#define djyasinzou_room_5Tex_0100C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0100C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0100C8[] = djyasinzou_room_5Tex_0100C8;
#define djyasinzou_room_5DL_005B30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_005B30"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_005B30[] = djyasinzou_room_5DL_005B30;
#define djyasinzou_room_5Tex_011CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_011CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_011CC8[] = djyasinzou_room_5Tex_011CC8;
#define djyasinzou_room_5TLUT_00CBA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00CBA8"
static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00CBA8[] = djyasinzou_room_5TLUT_00CBA8;
#define djyasinzou_room_5DL_0165B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0165B0"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0165B0[] = djyasinzou_room_5DL_0165B0;
#define djyasinzou_room_5Tex_016808 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_016808"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_016808[] = djyasinzou_room_5Tex_016808;
#define djyasinzou_room_5DL_0060E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0060E8"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0060E8[] = djyasinzou_room_5DL_0060E8;
#define djyasinzou_room_5DL_006F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_006F48"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_006F48[] = djyasinzou_room_5DL_006F48;
#define djyasinzou_room_5Tex_00F7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F7C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F7C8[] = djyasinzou_room_5Tex_00F7C8;
#define djyasinzou_room_5Tex_0110C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0110C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0110C8[] = djyasinzou_room_5Tex_0110C8;
#define djyasinzou_room_5DL_007E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_007E18"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_007E18[] = djyasinzou_room_5DL_007E18;
@@ -132,9 +144,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0093B8[] = djyasinzou_room_5
#define djyasinzou_room_5DL_009688 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_009688"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_009688[] = djyasinzou_room_5DL_009688;
#define djyasinzou_room_5Tex_0138C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0138C8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0138C8[] = djyasinzou_room_5Tex_0138C8;
#define djyasinzou_room_5DL_00A018 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00A018"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00A018[] = djyasinzou_room_5DL_00A018;
@@ -147,12 +156,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00B428[] = djyasinzou_room_5
#define djyasinzou_room_5DL_00BC70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00BC70"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00BC70[] = djyasinzou_room_5DL_00BC70;
#define djyasinzou_room_5Tex_010CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_010CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_010CC8[] = djyasinzou_room_5Tex_010CC8;
#define djyasinzou_room_5Tex_00CBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CBC8"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CBC8[] = djyasinzou_room_5Tex_00CBC8;
#define djyasinzou_room_5DL_00C0E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00C0E8"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00C0E8[] = djyasinzou_room_5DL_00C0E8;
@@ -162,8 +165,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00C638[] = djyasinzou_room_5
#define djyasinzou_room_5DL_016730 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_016730"
static const ALIGN_ASSET(2) char jyasinzou_room_5DL_016730[] = djyasinzou_room_5DL_016730;
#define djyasinzou_room_5Tex_017008 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_017008"
static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008;
#endif // DUNGEONS_JYASINZOU_ROOM_5_H