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

102
soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h
View File

@@ -3,65 +3,65 @@
#include "align_asset_macro.h"
#define dganontikasonogo_room_0DL_0091C0 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0DL_0091C0"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_0091C0[] = dganontikasonogo_room_0DL_0091C0;
#define dganontikasonogo_room_0Tex_00B2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00B2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00B2D8[] = dganontikasonogo_room_0Tex_00B2D8;
#define dganontikasonogo_room_0Tex_00D2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00D2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00D2D8[] = dganontikasonogo_room_0Tex_00D2D8;
#define dganontikasonogo_room_0Tex_014AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_014AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_014AD8[] = dganontikasonogo_room_0Tex_014AD8;
#define dganontikasonogo_room_0Tex_0142D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0142D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0142D8[] = dganontikasonogo_room_0Tex_0142D8;
#define dganontikasonogo_room_0Tex_0132D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0132D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0132D8[] = dganontikasonogo_room_0Tex_0132D8;
#define dganontikasonogo_room_0Tex_00F2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00F2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00F2D8[] = dganontikasonogo_room_0Tex_00F2D8;
#define dganontikasonogo_room_0Tex_00E2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00E2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00E2D8[] = dganontikasonogo_room_0Tex_00E2D8;
#define dganontikasonogo_room_0Tex_00A2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00A2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00A2D8[] = dganontikasonogo_room_0Tex_00A2D8;
#define dganontikasonogo_room_0Tex_00FAD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00FAD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00FAD8[] = dganontikasonogo_room_0Tex_00FAD8;
#define dganontikasonogo_room_0Tex_0092D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0092D8"
#define dganontikasonogo_room_0Tex_0092D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0092D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0092D8[] = dganontikasonogo_room_0Tex_0092D8;
#define dganontikasonogo_room_0Tex_012AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_012AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_012AD8[] = dganontikasonogo_room_0Tex_012AD8;
#define dganontikasonogo_room_0Tex_00A2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00A2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00A2D8[] = dganontikasonogo_room_0Tex_00A2D8;
#define dganontikasonogo_room_0TLUT_0092B8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0TLUT_0092B8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0TLUT_0092B8[] = dganontikasonogo_room_0TLUT_0092B8;
#define dganontikasonogo_room_0Tex_00B2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00B2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00B2D8[] = dganontikasonogo_room_0Tex_00B2D8;
#define dganontikasonogo_room_0Tex_0122D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0122D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0122D8[] = dganontikasonogo_room_0Tex_0122D8;
#define dganontikasonogo_room_0Tex_011AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_011AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_011AD8[] = dganontikasonogo_room_0Tex_011AD8;
#define dganontikasonogo_room_0Tex_0112D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0112D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0112D8[] = dganontikasonogo_room_0Tex_0112D8;
#define dganontikasonogo_room_0Tex_010AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_010AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_010AD8[] = dganontikasonogo_room_0Tex_010AD8;
#define dganontikasonogo_room_0Tex_00C2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00C2D8"
#define dganontikasonogo_room_0Tex_00C2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00C2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00C2D8[] = dganontikasonogo_room_0Tex_00C2D8;
#define dganontikasonogo_room_0DL_016B48 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0DL_016B48"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_016B48[] = dganontikasonogo_room_0DL_016B48;
#define dganontikasonogo_room_0Tex_00D2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00D2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00D2D8[] = dganontikasonogo_room_0Tex_00D2D8;
#define dganontikasonogo_room_0Tex_016B78 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_016B78"
#define dganontikasonogo_room_0Tex_00E2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00E2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00E2D8[] = dganontikasonogo_room_0Tex_00E2D8;
#define dganontikasonogo_room_0Tex_00F2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00F2D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00F2D8[] = dganontikasonogo_room_0Tex_00F2D8;
#define dganontikasonogo_room_0Tex_00FAD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00FAD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00FAD8[] = dganontikasonogo_room_0Tex_00FAD8;
#define dganontikasonogo_room_0Tex_010AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_010AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_010AD8[] = dganontikasonogo_room_0Tex_010AD8;
#define dganontikasonogo_room_0Tex_0112D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0112D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0112D8[] = dganontikasonogo_room_0Tex_0112D8;
#define dganontikasonogo_room_0Tex_011AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_011AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_011AD8[] = dganontikasonogo_room_0Tex_011AD8;
#define dganontikasonogo_room_0Tex_0122D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0122D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0122D8[] = dganontikasonogo_room_0Tex_0122D8;
#define dganontikasonogo_room_0Tex_012AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_012AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_012AD8[] = dganontikasonogo_room_0Tex_012AD8;
#define dganontikasonogo_room_0Tex_0132D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0132D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0132D8[] = dganontikasonogo_room_0Tex_0132D8;
#define dganontikasonogo_room_0Tex_0142D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0142D8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0142D8[] = dganontikasonogo_room_0Tex_0142D8;
#define dganontikasonogo_room_0Tex_014AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_014AD8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_014AD8[] = dganontikasonogo_room_0Tex_014AD8;
#define dganontikasonogo_room_0Tex_016B78 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_016B78"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_016B78[] = dganontikasonogo_room_0Tex_016B78;
#define dganontikasonogo_room_0TLUT_0092B8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0TLUT_0092B8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0TLUT_0092B8[] = dganontikasonogo_room_0TLUT_0092B8;
#define dganontikasonogo_room_0DL_0091C0 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0DL_0091C0"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_0091C0[] = dganontikasonogo_room_0DL_0091C0;
#define dganontikasonogo_room_0DL_016B48 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0DL_016B48"
static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_016B48[] = dganontikasonogo_room_0DL_016B48;
#endif // DUNGEONS_GANONTIKASONOGO_ROOM_0_H

20
soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h
View File

@@ -3,23 +3,23 @@
#include "align_asset_macro.h"
#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8;
#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60"
#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_006C60[] = dganontikasonogo_room_1Tex_006C60;
#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460"
#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_007460[] = dganontikasonogo_room_1Tex_007460;
#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460"
#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_008460[] = dganontikasonogo_room_1Tex_008460;
#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710;
#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720"
#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_009720[] = dganontikasonogo_room_1Tex_009720;
#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8;
#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710"
static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710;
#endif // DUNGEONS_GANONTIKASONOGO_ROOM_1_H

11
soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h
View File

@@ -3,13 +3,14 @@
#include "align_asset_macro.h"
#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC;
#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00"
#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_002B00[] = dganontikasonogo_sceneTex_002B00;
#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00"
#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_003B00[] = dganontikasonogo_sceneTex_003B00;
#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC;
#endif // DUNGEONS_GANONTIKASONOGO_SCENE_H