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

44
soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h
View File

@@ -3,18 +3,36 @@
#include "align_asset_macro.h"
#define dHAKAdan_room_9DL_005AF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_005AF0"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_005AF0[] = dHAKAdan_room_9DL_005AF0;
#define dHAKAdan_room_9Tex_009090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009090"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009090[] = dHAKAdan_room_9Tex_009090;
#define dHAKAdan_room_9Tex_00C890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C890"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C890[] = dHAKAdan_room_9Tex_00C890;
#define dHAKAdan_room_9Tex_009890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009890"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009890[] = dHAKAdan_room_9Tex_009890;
#define dHAKAdan_room_9Tex_00A090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A090"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A090[] = dHAKAdan_room_9Tex_00A090;
#define dHAKAdan_room_9Tex_00A290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A290"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A290[] = dHAKAdan_room_9Tex_00A290;
#define dHAKAdan_room_9Tex_00B290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00B290"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00B290[] = dHAKAdan_room_9Tex_00B290;
#define dHAKAdan_room_9Tex_00BA90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BA90"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BA90[] = dHAKAdan_room_9Tex_00BA90;
#define dHAKAdan_room_9Tex_00BE90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BE90"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90;
#define dHAKAdan_room_9Tex_00C690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C690"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C690[] = dHAKAdan_room_9Tex_00C690;
#define dHAKAdan_room_9Tex_00C890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C890"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C890[] = dHAKAdan_room_9Tex_00C890;
#define dHAKAdan_room_9DL_005AF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_005AF0"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_005AF0[] = dHAKAdan_room_9DL_005AF0;
#define dHAKAdan_room_9DL_008E68 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_008E68"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_008E68[] = dHAKAdan_room_9DL_008E68;
@@ -27,30 +45,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_9DL_000470[] = dHAKAdan_room_9DL_0
#define dHAKAdan_room_9DL_006600 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_006600"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_006600[] = dHAKAdan_room_9DL_006600;
#define dHAKAdan_room_9Tex_00B290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00B290"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00B290[] = dHAKAdan_room_9Tex_00B290;
#define dHAKAdan_room_9DL_008910 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_008910"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_008910[] = dHAKAdan_room_9DL_008910;
#define dHAKAdan_room_9DL_002248 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_002248"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_002248[] = dHAKAdan_room_9DL_002248;
#define dHAKAdan_room_9Tex_009890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009890"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009890[] = dHAKAdan_room_9Tex_009890;
#define dHAKAdan_room_9DL_003E30 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_003E30"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_003E30[] = dHAKAdan_room_9DL_003E30;
#define dHAKAdan_room_9Tex_009090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009090"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009090[] = dHAKAdan_room_9Tex_009090;
#define dHAKAdan_room_9Tex_00C690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C690"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C690[] = dHAKAdan_room_9Tex_00C690;
#define dHAKAdan_room_9Tex_00A290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A290"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A290[] = dHAKAdan_room_9Tex_00A290;
#define dHAKAdan_room_9DL_0085F8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_0085F8"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_0085F8[] = dHAKAdan_room_9DL_0085F8;
@@ -60,8 +63,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_9DL_000868[] = dHAKAdan_room_9DL_0
#define dHAKAdan_room_9DL_007620 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_007620"
static const ALIGN_ASSET(2) char HAKAdan_room_9DL_007620[] = dHAKAdan_room_9DL_007620;
#define dHAKAdan_room_9Tex_00BE90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BE90"
static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90;
#endif // DUNGEONS_HAKADAN_ROOM_9_H