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

56
soh/assets/scenes/indoors/takaraya/takaraya_room_0.h
View File

@@ -3,41 +3,41 @@
#include "align_asset_macro.h"
#define dtakaraya_room_0DL_003B98 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_003B98"
static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98;
#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0083E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0;
#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_005BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0;
#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0073E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0;
#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_006BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0;
#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_004BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0;
#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0043E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0;
#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_003BE0"
#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_003BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_003BE0[] = dtakaraya_room_0Tex_003BE0;
#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_007BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0;
#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0043E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0;
#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0063E0"
#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_004BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0;
#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_005BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0;
#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0063E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0063E0[] = dtakaraya_room_0Tex_0063E0;
#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_0095B0"
static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0;
#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_006BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0;
#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0095C0"
#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0073E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0;
#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_007BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0;
#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0083E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0;
#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0095C0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0095C0[] = dtakaraya_room_0Tex_0095C0;
#define dtakaraya_room_0DL_003B98 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_003B98"
static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98;
#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_0095B0"
static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0;
#endif // INDOORS_TAKARAYA_ROOM_0_H

8
soh/assets/scenes/indoors/takaraya/takaraya_room_1.h
View File

@@ -3,11 +3,11 @@
#include "align_asset_macro.h"
#define dtakaraya_room_1DL_0017D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_1DL_0017D0"
static const ALIGN_ASSET(2) char takaraya_room_1DL_0017D0[] = dtakaraya_room_1DL_0017D0;
#define dtakaraya_room_1Tex_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_1Tex_0017F8"
#define dtakaraya_room_1Tex_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_1Tex_0017F8"
static const ALIGN_ASSET(2) char takaraya_room_1Tex_0017F8[] = dtakaraya_room_1Tex_0017F8;
#define dtakaraya_room_1DL_0017D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_1DL_0017D0"
static const ALIGN_ASSET(2) char takaraya_room_1DL_0017D0[] = dtakaraya_room_1DL_0017D0;
#endif // INDOORS_TAKARAYA_ROOM_1_H

8
soh/assets/scenes/indoors/takaraya/takaraya_room_2.h
View File

@@ -3,11 +3,11 @@
#include "align_asset_macro.h"
#define dtakaraya_room_2DL_001800 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_2DL_001800"
static const ALIGN_ASSET(2) char takaraya_room_2DL_001800[] = dtakaraya_room_2DL_001800;
#define dtakaraya_room_2Tex_001828 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_2Tex_001828"
#define dtakaraya_room_2Tex_001828 "__OTR__scenes/shared/takaraya_scene/takaraya_room_2Tex_001828"
static const ALIGN_ASSET(2) char takaraya_room_2Tex_001828[] = dtakaraya_room_2Tex_001828;
#define dtakaraya_room_2DL_001800 "__OTR__scenes/shared/takaraya_scene/takaraya_room_2DL_001800"
static const ALIGN_ASSET(2) char takaraya_room_2DL_001800[] = dtakaraya_room_2DL_001800;
#endif // INDOORS_TAKARAYA_ROOM_2_H

10
soh/assets/scenes/indoors/takaraya/takaraya_room_3.h
View File

@@ -3,14 +3,14 @@
#include "align_asset_macro.h"
#define dtakaraya_room_3DL_0017F0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3DL_0017F0"
static const ALIGN_ASSET(2) char takaraya_room_3DL_0017F0[] = dtakaraya_room_3DL_0017F0;
#define dtakaraya_room_3Tex_001818 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3Tex_001818"
static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818;
#define dtakaraya_room_3Tex_002018 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3Tex_002018"
#define dtakaraya_room_3Tex_002018 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3Tex_002018"
static const ALIGN_ASSET(2) char takaraya_room_3Tex_002018[] = dtakaraya_room_3Tex_002018;
#define dtakaraya_room_3Tex_001818 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3Tex_001818"
static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818;
#define dtakaraya_room_3DL_0017F0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3DL_0017F0"
static const ALIGN_ASSET(2) char takaraya_room_3DL_0017F0[] = dtakaraya_room_3DL_0017F0;
#endif // INDOORS_TAKARAYA_ROOM_3_H

12
soh/assets/scenes/indoors/takaraya/takaraya_room_4.h
View File

@@ -3,17 +3,17 @@
#include "align_asset_macro.h"
#define dtakaraya_room_4DL_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4DL_0017F8"
static const ALIGN_ASSET(2) char takaraya_room_4DL_0017F8[] = dtakaraya_room_4DL_0017F8;
#define dtakaraya_room_4Tex_001820 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_001820"
static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820;
#define dtakaraya_room_4Tex_002020 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_002020"
#define dtakaraya_room_4Tex_002020 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_002020"
static const ALIGN_ASSET(2) char takaraya_room_4Tex_002020[] = dtakaraya_room_4Tex_002020;
#define dtakaraya_room_4Tex_002820 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_002820"
#define dtakaraya_room_4Tex_002820 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_002820"
static const ALIGN_ASSET(2) char takaraya_room_4Tex_002820[] = dtakaraya_room_4Tex_002820;
#define dtakaraya_room_4Tex_001820 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_001820"
static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820;
#define dtakaraya_room_4DL_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4DL_0017F8"
static const ALIGN_ASSET(2) char takaraya_room_4DL_0017F8[] = dtakaraya_room_4DL_0017F8;
#endif // INDOORS_TAKARAYA_ROOM_4_H

16
soh/assets/scenes/indoors/takaraya/takaraya_room_5.h
View File

@@ -3,17 +3,17 @@
#include "align_asset_macro.h"
#define dtakaraya_room_5DL_0017D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5DL_0017D0"
static const ALIGN_ASSET(2) char takaraya_room_5DL_0017D0[] = dtakaraya_room_5DL_0017D0;
#define dtakaraya_room_5Tex_001FF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_001FF8"
static const ALIGN_ASSET(2) char takaraya_room_5Tex_001FF8[] = dtakaraya_room_5Tex_001FF8;
#define dtakaraya_room_5Tex_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_0017F8"
#define dtakaraya_room_5Tex_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_0017F8"
static const ALIGN_ASSET(2) char takaraya_room_5Tex_0017F8[] = dtakaraya_room_5Tex_0017F8;
#define dtakaraya_room_5Tex_0027F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_0027F8"
#define dtakaraya_room_5Tex_001FF8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_001FF8"
static const ALIGN_ASSET(2) char takaraya_room_5Tex_001FF8[] = dtakaraya_room_5Tex_001FF8;
#define dtakaraya_room_5Tex_0027F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_0027F8"
static const ALIGN_ASSET(2) char takaraya_room_5Tex_0027F8[] = dtakaraya_room_5Tex_0027F8;
#define dtakaraya_room_5DL_0017D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5DL_0017D0"
static const ALIGN_ASSET(2) char takaraya_room_5DL_0017D0[] = dtakaraya_room_5DL_0017D0;
#endif // INDOORS_TAKARAYA_ROOM_5_H

16
soh/assets/scenes/indoors/takaraya/takaraya_room_6.h
View File

@@ -3,17 +3,17 @@
#include "align_asset_macro.h"
#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6DL_0012D0"
static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0;
#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0022F8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8;
#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0012F8"
#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0012F8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_0012F8[] = dtakaraya_room_6Tex_0012F8;
#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_001AF8"
#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_001AF8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_001AF8[] = dtakaraya_room_6Tex_001AF8;
#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0022F8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8;
#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6DL_0012D0"
static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0;
#endif // INDOORS_TAKARAYA_ROOM_6_H

21
soh/assets/scenes/indoors/takaraya/takaraya_scene.h
View File

@@ -3,19 +3,20 @@
#include "align_asset_macro.h"
#define dtakaraya_sceneCollisionHeader_005178 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneCollisionHeader_005178"
static const ALIGN_ASSET(2) char takaraya_sceneCollisionHeader_005178[] = dtakaraya_sceneCollisionHeader_005178;
#define dtakaraya_sceneTex_0059B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0059B0"
static const ALIGN_ASSET(2) char takaraya_sceneTex_0059B0[] = dtakaraya_sceneTex_0059B0;
#define dtakaraya_sceneTex_0051B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0051B0"
#define dtakaraya_sceneTex_0051B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0051B0"
static const ALIGN_ASSET(2) char takaraya_sceneTex_0051B0[] = dtakaraya_sceneTex_0051B0;
#define dtakaraya_sceneTex_0069B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0069B0"
static const ALIGN_ASSET(2) char takaraya_sceneTex_0069B0[] = dtakaraya_sceneTex_0069B0;
#define dtakaraya_sceneTex_0059B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0059B0"
static const ALIGN_ASSET(2) char takaraya_sceneTex_0059B0[] = dtakaraya_sceneTex_0059B0;
#define dtakaraya_sceneTex_0061B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0061B0"
#define dtakaraya_sceneTex_0061B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0061B0"
static const ALIGN_ASSET(2) char takaraya_sceneTex_0061B0[] = dtakaraya_sceneTex_0061B0;
#define dtakaraya_sceneTex_0069B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0069B0"
static const ALIGN_ASSET(2) char takaraya_sceneTex_0069B0[] = dtakaraya_sceneTex_0069B0;
#define dtakaraya_sceneCollisionHeader_005178 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneCollisionHeader_005178"
static const ALIGN_ASSET(2) char takaraya_sceneCollisionHeader_005178[] = dtakaraya_sceneCollisionHeader_005178;
#endif // INDOORS_TAKARAYA_SCENE_H