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

96
soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h
View File

@@ -3,32 +3,65 @@
#include "align_asset_macro.h"
#define dHAKAdanCH_room_0DL_001D30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001D30"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001D30[] = dHAKAdanCH_room_0DL_001D30;
#define dHAKAdanCH_room_0Tex_013320 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013320"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013320[] = dHAKAdanCH_room_0Tex_013320;
#define dHAKAdanCH_room_0Tex_011920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011920"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011920[] = dHAKAdanCH_room_0Tex_011920;
#define dHAKAdanCH_room_0Tex_011120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011120[] = dHAKAdanCH_room_0Tex_011120;
#define dHAKAdanCH_room_0Tex_00D720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00D720"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00D720[] = dHAKAdanCH_room_0Tex_00D720;
#define dHAKAdanCH_room_0Tex_00DF20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00DF20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00DF20[] = dHAKAdanCH_room_0Tex_00DF20;
#define dHAKAdanCH_room_0Tex_00E120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00E120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00E120[] = dHAKAdanCH_room_0Tex_00E120;
#define dHAKAdanCH_room_0Tex_00F120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F120[] = dHAKAdanCH_room_0Tex_00F120;
#define dHAKAdanCH_room_0Tex_00F920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F920"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F920[] = dHAKAdanCH_room_0Tex_00F920;
#define dHAKAdanCH_room_0DL_004018 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004018"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004018[] = dHAKAdanCH_room_0DL_004018;
#define dHAKAdanCH_room_0Tex_010120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_010120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_010120[] = dHAKAdanCH_room_0Tex_010120;
#define dHAKAdanCH_room_0Tex_011120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011120[] = dHAKAdanCH_room_0Tex_011120;
#define dHAKAdanCH_room_0Tex_011920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011920"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011920[] = dHAKAdanCH_room_0Tex_011920;
#define dHAKAdanCH_room_0Tex_011D20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011D20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011D20[] = dHAKAdanCH_room_0Tex_011D20;
#define dHAKAdanCH_room_0Tex_011F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011F20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011F20[] = dHAKAdanCH_room_0Tex_011F20;
#define dHAKAdanCH_room_0Tex_010120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_010120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_010120[] = dHAKAdanCH_room_0Tex_010120;
#define dHAKAdanCH_room_0Tex_012720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012720"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012720[] = dHAKAdanCH_room_0Tex_012720;
#define dHAKAdanCH_room_0Tex_012F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012F20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012F20[] = dHAKAdanCH_room_0Tex_012F20;
#define dHAKAdanCH_room_0Tex_013120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013120[] = dHAKAdanCH_room_0Tex_013120;
#define dHAKAdanCH_room_0Tex_013320 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013320"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013320[] = dHAKAdanCH_room_0Tex_013320;
#define dHAKAdanCH_room_0Tex_013720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013720"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013720[] = dHAKAdanCH_room_0Tex_013720;
#define dHAKAdanCH_room_0Tex_013F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013F20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013F20[] = dHAKAdanCH_room_0Tex_013F20;
#define dHAKAdanCH_room_0Tex_014B20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014B20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014B20[] = dHAKAdanCH_room_0Tex_014B20;
#define dHAKAdanCH_room_0Tex_014F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014F20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014F20[] = dHAKAdanCH_room_0Tex_014F20;
#define dHAKAdanCH_room_0DL_001D30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001D30"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001D30[] = dHAKAdanCH_room_0DL_001D30;
#define dHAKAdanCH_room_0DL_004018 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004018"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004018[] = dHAKAdanCH_room_0DL_004018;
#define dHAKAdanCH_room_0DL_004D18 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004D18"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004D18[] = dHAKAdanCH_room_0DL_004D18;
@@ -36,9 +69,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004D18[] = dHAKAdanCH_room_0
#define dHAKAdanCH_room_0DL_0057C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0057C0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0057C0[] = dHAKAdanCH_room_0DL_0057C0;
#define dHAKAdanCH_room_0Tex_00E120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00E120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00E120[] = dHAKAdanCH_room_0Tex_00E120;
#define dHAKAdanCH_room_0DL_005C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_005C30"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_005C30[] = dHAKAdanCH_room_0DL_005C30;
@@ -54,9 +84,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00D550[] = dHAKAdanCH_room_0
#define dHAKAdanCH_room_0DL_001360 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001360"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001360[] = dHAKAdanCH_room_0DL_001360;
#define dHAKAdanCH_room_0Tex_013720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013720"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013720[] = dHAKAdanCH_room_0Tex_013720;
#define dHAKAdanCH_room_0DL_0079B0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0079B0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0079B0[] = dHAKAdanCH_room_0DL_0079B0;
@@ -84,24 +111,15 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_002C00[] = dHAKAdanCH_room_0
#define dHAKAdanCH_room_0DL_014430 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014430"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014430[] = dHAKAdanCH_room_0DL_014430;
#define dHAKAdanCH_room_0Tex_014B20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014B20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014B20[] = dHAKAdanCH_room_0Tex_014B20;
#define dHAKAdanCH_room_0DL_014868 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014868"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014868[] = dHAKAdanCH_room_0DL_014868;
#define dHAKAdanCH_room_0Tex_014F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014F20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014F20[] = dHAKAdanCH_room_0Tex_014F20;
#define dHAKAdanCH_room_0DL_014A38 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014A38"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014A38[] = dHAKAdanCH_room_0DL_014A38;
#define dHAKAdanCH_room_0DL_006D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_006D58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_006D58[] = dHAKAdanCH_room_0DL_006D58;
#define dHAKAdanCH_room_0Tex_00D720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00D720"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00D720[] = dHAKAdanCH_room_0Tex_00D720;
#define dHAKAdanCH_room_0DL_0007B0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0007B0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0007B0[] = dHAKAdanCH_room_0DL_0007B0;
@@ -114,30 +132,12 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_003518[] = dHAKAdanCH_room_0
#define dHAKAdanCH_room_0DL_006760 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_006760"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_006760[] = dHAKAdanCH_room_0DL_006760;
#define dHAKAdanCH_room_0Tex_011D20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011D20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011D20[] = dHAKAdanCH_room_0Tex_011D20;
#define dHAKAdanCH_room_0Tex_012F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012F20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012F20[] = dHAKAdanCH_room_0Tex_012F20;
#define dHAKAdanCH_room_0Tex_013120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013120[] = dHAKAdanCH_room_0Tex_013120;
#define dHAKAdanCH_room_0Tex_013F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013F20"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013F20[] = dHAKAdanCH_room_0Tex_013F20;
#define dHAKAdanCH_room_0DL_0021C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0021C0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0021C0[] = dHAKAdanCH_room_0DL_0021C0;
#define dHAKAdanCH_room_0Tex_00F120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F120"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F120[] = dHAKAdanCH_room_0Tex_00F120;
#define dHAKAdanCH_room_0DL_00BAB8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_00BAB8"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00BAB8[] = dHAKAdanCH_room_0DL_00BAB8;
#define dHAKAdanCH_room_0Tex_012720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012720"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012720[] = dHAKAdanCH_room_0Tex_012720;
#define dHAKAdanCH_room_0DL_00C178 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_00C178"
static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00C178[] = dHAKAdanCH_room_0DL_00C178;