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

36
soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h
View File

@@ -3,23 +3,20 @@
#include "align_asset_macro.h"
#define dHAKAdan_room_18DL_0032A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_0032A0"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_0032A0[] = dHAKAdan_room_18DL_0032A0;
#define dHAKAdan_room_18Tex_00C708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C708"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C708[] = dHAKAdan_room_18Tex_00C708;
#define dHAKAdan_room_18Tex_00B908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00B908"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00B908[] = dHAKAdan_room_18Tex_00B908;
#define dHAKAdan_room_18Tex_00BB08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BB08"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BB08[] = dHAKAdan_room_18Tex_00BB08;
#define dHAKAdan_room_18Tex_00CF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CF08"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CF08[] = dHAKAdan_room_18Tex_00CF08;
#define dHAKAdan_room_18Tex_00BF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BF08"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BF08[] = dHAKAdan_room_18Tex_00BF08;
#define dHAKAdan_room_18DL_000560 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_000560"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_000560[] = dHAKAdan_room_18DL_000560;
#define dHAKAdan_room_18Tex_00C708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C708"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C708[] = dHAKAdan_room_18Tex_00C708;
#define dHAKAdan_room_18DL_001298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_001298"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_001298[] = dHAKAdan_room_18DL_001298;
#define dHAKAdan_room_18Tex_00C908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C908"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C908[] = dHAKAdan_room_18Tex_00C908;
#define dHAKAdan_room_18Tex_00CB08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CB08"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CB08[] = dHAKAdan_room_18Tex_00CB08;
@@ -27,11 +24,17 @@ static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CB08[] = dHAKAdan_room_18T
#define dHAKAdan_room_18Tex_00CD08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CD08"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CD08[] = dHAKAdan_room_18Tex_00CD08;
#define dHAKAdan_room_18Tex_00C908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C908"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C908[] = dHAKAdan_room_18Tex_00C908;
#define dHAKAdan_room_18Tex_00CF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CF08"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CF08[] = dHAKAdan_room_18Tex_00CF08;
#define dHAKAdan_room_18Tex_00B908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00B908"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00B908[] = dHAKAdan_room_18Tex_00B908;
#define dHAKAdan_room_18DL_0032A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_0032A0"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_0032A0[] = dHAKAdan_room_18DL_0032A0;
#define dHAKAdan_room_18DL_000560 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_000560"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_000560[] = dHAKAdan_room_18DL_000560;
#define dHAKAdan_room_18DL_001298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_001298"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_001298[] = dHAKAdan_room_18DL_001298;
#define dHAKAdan_room_18DL_004928 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_004928"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_004928[] = dHAKAdan_room_18DL_004928;
@@ -51,9 +54,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_18DL_009D28[] = dHAKAdan_room_18DL
#define dHAKAdan_room_18DL_003BD0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_003BD0"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_003BD0[] = dHAKAdan_room_18DL_003BD0;
#define dHAKAdan_room_18Tex_00BF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BF08"
static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BF08[] = dHAKAdan_room_18Tex_00BF08;
#define dHAKAdan_room_18DL_002708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_002708"
static const ALIGN_ASSET(2) char HAKAdan_room_18DL_002708[] = dHAKAdan_room_18DL_002708;