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

74
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h
View File

@@ -3,14 +3,47 @@
#include "align_asset_macro.h"
#define djyasinzou_room_26DL_005468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005468"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005468[] = djyasinzou_room_26DL_005468;
#define djyasinzou_room_26Tex_006CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_006CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_006CC8[] = djyasinzou_room_26Tex_006CC8;
#define djyasinzou_room_26Tex_0070C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0070C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0070C8[] = djyasinzou_room_26Tex_0070C8;
#define djyasinzou_room_26Tex_0080C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0080C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0080C8[] = djyasinzou_room_26Tex_0080C8;
#define djyasinzou_room_26Tex_0082C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0082C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0082C8[] = djyasinzou_room_26Tex_0082C8;
#define djyasinzou_room_26Tex_008AC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008AC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008AC8[] = djyasinzou_room_26Tex_008AC8;
#define djyasinzou_room_26Tex_008CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008CC8[] = djyasinzou_room_26Tex_008CC8;
#define djyasinzou_room_26Tex_0094C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0094C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0094C8[] = djyasinzou_room_26Tex_0094C8;
#define djyasinzou_room_26Tex_009CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_009CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_009CC8[] = djyasinzou_room_26Tex_009CC8;
#define djyasinzou_room_26Tex_00A0C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A0C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A0C8[] = djyasinzou_room_26Tex_00A0C8;
#define djyasinzou_room_26Tex_00A8C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A8C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A8C8[] = djyasinzou_room_26Tex_00A8C8;
#define djyasinzou_room_26Tex_008CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008CC8[] = djyasinzou_room_26Tex_008CC8;
#define djyasinzou_room_26Tex_00ACC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00ACC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00ACC8[] = djyasinzou_room_26Tex_00ACC8;
#define djyasinzou_room_26Tex_00B4C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00B4C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00B4C8[] = djyasinzou_room_26Tex_00B4C8;
#define djyasinzou_room_26Tex_00C2F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00C2F8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00C2F8[] = djyasinzou_room_26Tex_00C2F8;
#define djyasinzou_room_26DL_005468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005468"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005468[] = djyasinzou_room_26DL_005468;
#define djyasinzou_room_26DL_001AD0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_001AD0"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_001AD0[] = djyasinzou_room_26DL_001AD0;
@@ -18,9 +51,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_001AD0[] = djyasinzou_room_
#define djyasinzou_room_26DL_002290 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_002290"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_002290[] = djyasinzou_room_26DL_002290;
#define djyasinzou_room_26Tex_008AC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008AC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008AC8[] = djyasinzou_room_26Tex_008AC8;
#define djyasinzou_room_26DL_0028C0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_0028C0"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0028C0[] = djyasinzou_room_26DL_0028C0;
@@ -48,39 +78,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0035B0[] = djyasinzou_room_
#define djyasinzou_room_26DL_0046A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_0046A8"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0046A8[] = djyasinzou_room_26DL_0046A8;
#define djyasinzou_room_26Tex_00A0C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A0C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A0C8[] = djyasinzou_room_26Tex_00A0C8;
#define djyasinzou_room_26Tex_0080C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0080C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0080C8[] = djyasinzou_room_26Tex_0080C8;
#define djyasinzou_room_26Tex_00ACC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00ACC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00ACC8[] = djyasinzou_room_26Tex_00ACC8;
#define djyasinzou_room_26Tex_0082C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0082C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0082C8[] = djyasinzou_room_26Tex_0082C8;
#define djyasinzou_room_26Tex_00B4C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00B4C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00B4C8[] = djyasinzou_room_26Tex_00B4C8;
#define djyasinzou_room_26Tex_0094C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0094C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0094C8[] = djyasinzou_room_26Tex_0094C8;
#define djyasinzou_room_26Tex_009CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_009CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_009CC8[] = djyasinzou_room_26Tex_009CC8;
#define djyasinzou_room_26DL_00C200 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_00C200"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_00C200[] = djyasinzou_room_26DL_00C200;
#define djyasinzou_room_26Tex_00C2F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00C2F8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00C2F8[] = djyasinzou_room_26Tex_00C2F8;
#define djyasinzou_room_26DL_005A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005A80"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005A80[] = djyasinzou_room_26DL_005A80;
#define djyasinzou_room_26Tex_006CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_006CC8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_006CC8[] = djyasinzou_room_26Tex_006CC8;
#define djyasinzou_room_26DL_005D20 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005D20"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005D20[] = djyasinzou_room_26DL_005D20;
@@ -90,9 +93,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005FF0[] = djyasinzou_room_
#define djyasinzou_room_26DL_006560 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_006560"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_006560[] = djyasinzou_room_26DL_006560;
#define djyasinzou_room_26Tex_0070C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0070C8"
static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0070C8[] = djyasinzou_room_26Tex_0070C8;
#define djyasinzou_room_26DL_006A98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_006A98"
static const ALIGN_ASSET(2) char jyasinzou_room_26DL_006A98[] = djyasinzou_room_26DL_006A98;