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

54
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h
View File

@@ -3,6 +3,33 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_1Tex_0059D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0059D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0059D0[] = dMIZUsin_room_1Tex_0059D0;
#define dMIZUsin_room_1Tex_0061D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0061D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0061D0[] = dMIZUsin_room_1Tex_0061D0;
#define dMIZUsin_room_1Tex_0069D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0069D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0069D0[] = dMIZUsin_room_1Tex_0069D0;
#define dMIZUsin_room_1Tex_0071D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0071D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0071D0[] = dMIZUsin_room_1Tex_0071D0;
#define dMIZUsin_room_1Tex_0079D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0079D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0079D0[] = dMIZUsin_room_1Tex_0079D0;
#define dMIZUsin_room_1Tex_0081D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0081D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0081D0[] = dMIZUsin_room_1Tex_0081D0;
#define dMIZUsin_room_1Tex_0089D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0089D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0089D0[] = dMIZUsin_room_1Tex_0089D0;
#define dMIZUsin_room_1Tex_0091D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0091D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0091D0[] = dMIZUsin_room_1Tex_0091D0;
#define dMIZUsin_room_1Tex_0099D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0099D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0099D0[] = dMIZUsin_room_1Tex_0099D0;
#define dMIZUsin_room_1DL_003D70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003D70"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003D70[] = dMIZUsin_room_1DL_003D70;
@@ -12,54 +39,27 @@ static const ALIGN_ASSET(2) char MIZUsin_room_1DL_005818[] = dMIZUsin_room_1DL_0
#define dMIZUsin_room_1DL_004B18 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_004B18"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_004B18[] = dMIZUsin_room_1DL_004B18;
#define dMIZUsin_room_1Tex_0089D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0089D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0089D0[] = dMIZUsin_room_1Tex_0089D0;
#define dMIZUsin_room_1DL_003888 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003888"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003888[] = dMIZUsin_room_1DL_003888;
#define dMIZUsin_room_1Tex_0069D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0069D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0069D0[] = dMIZUsin_room_1Tex_0069D0;
#define dMIZUsin_room_1DL_0045D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_0045D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0045D0[] = dMIZUsin_room_1DL_0045D0;
#define dMIZUsin_room_1Tex_0071D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0071D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0071D0[] = dMIZUsin_room_1Tex_0071D0;
#define dMIZUsin_room_1DL_003030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003030"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003030[] = dMIZUsin_room_1DL_003030;
#define dMIZUsin_room_1Tex_0079D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0079D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0079D0[] = dMIZUsin_room_1Tex_0079D0;
#define dMIZUsin_room_1DL_002C40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_002C40"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_002C40[] = dMIZUsin_room_1DL_002C40;
#define dMIZUsin_room_1Tex_0091D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0091D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0091D0[] = dMIZUsin_room_1Tex_0091D0;
#define dMIZUsin_room_1DL_004DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_004DF8"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_004DF8[] = dMIZUsin_room_1DL_004DF8;
#define dMIZUsin_room_1Tex_0059D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0059D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0059D0[] = dMIZUsin_room_1Tex_0059D0;
#define dMIZUsin_room_1Tex_0061D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0061D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0061D0[] = dMIZUsin_room_1Tex_0061D0;
#define dMIZUsin_room_1DL_005050 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_005050"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_005050[] = dMIZUsin_room_1DL_005050;
#define dMIZUsin_room_1Tex_0099D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0099D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0099D0[] = dMIZUsin_room_1Tex_0099D0;
#define dMIZUsin_room_1DL_001F20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_001F20"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_001F20[] = dMIZUsin_room_1DL_001F20;
#define dMIZUsin_room_1Tex_0081D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0081D0"
static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0081D0[] = dMIZUsin_room_1Tex_0081D0;
#define dMIZUsin_room_1DL_0028D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_0028D8"
static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0028D8[] = dMIZUsin_room_1DL_0028D8;