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

26
soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h
View File

@@ -3,43 +3,43 @@
#include "align_asset_macro.h"
#define dhairal_niwa_room_0DL_000390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_000390"
#define dhairal_niwa_room_0DL_000390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_000390"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_000390[] = dhairal_niwa_room_0DL_000390;
#define dhairal_niwa_room_0DL_0095E0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0095E0"
#define dhairal_niwa_room_0DL_0095E0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0095E0"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0095E0[] = dhairal_niwa_room_0DL_0095E0;
#define dhairal_niwa_room_0DL_001D98 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_001D98"
#define dhairal_niwa_room_0DL_001D98 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_001D98"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_001D98[] = dhairal_niwa_room_0DL_001D98;
#define dhairal_niwa_room_0DL_009958 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_009958"
#define dhairal_niwa_room_0DL_009958 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_009958"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_009958[] = dhairal_niwa_room_0DL_009958;
#define dhairal_niwa_room_0DL_002DE8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_002DE8"
#define dhairal_niwa_room_0DL_002DE8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_002DE8"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_002DE8[] = dhairal_niwa_room_0DL_002DE8;
#define dhairal_niwa_room_0DL_003CE0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_003CE0"
#define dhairal_niwa_room_0DL_003CE0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_003CE0"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_003CE0[] = dhairal_niwa_room_0DL_003CE0;
#define dhairal_niwa_room_0DL_00A2E8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A2E8"
#define dhairal_niwa_room_0DL_00A2E8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A2E8"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A2E8[] = dhairal_niwa_room_0DL_00A2E8;
#define dhairal_niwa_room_0DL_005188 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_005188"
#define dhairal_niwa_room_0DL_005188 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_005188"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_005188[] = dhairal_niwa_room_0DL_005188;
#define dhairal_niwa_room_0DL_006330 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_006330"
#define dhairal_niwa_room_0DL_006330 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_006330"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_006330[] = dhairal_niwa_room_0DL_006330;
#define dhairal_niwa_room_0DL_00A630 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A630"
#define dhairal_niwa_room_0DL_00A630 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A630"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A630[] = dhairal_niwa_room_0DL_00A630;
#define dhairal_niwa_room_0DL_0082C8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0082C8"
#define dhairal_niwa_room_0DL_0082C8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0082C8"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0082C8[] = dhairal_niwa_room_0DL_0082C8;
#define dhairal_niwa_room_0DL_0090A8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0090A8"
#define dhairal_niwa_room_0DL_0090A8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0090A8"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0090A8[] = dhairal_niwa_room_0DL_0090A8;
#define dhairal_niwa_room_0DL_00A7E0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A7E0"
#define dhairal_niwa_room_0DL_00A7E0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A7E0"
static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A7E0[] = dhairal_niwa_room_0DL_00A7E0;

131
soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h
View File

@@ -3,73 +3,74 @@
#include "align_asset_macro.h"
#define dhairal_niwa_sceneCollisionHeader_0030B0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneCollisionHeader_0030B0"
static const ALIGN_ASSET(2) char hairal_niwa_sceneCollisionHeader_0030B0[] = dhairal_niwa_sceneCollisionHeader_0030B0;
#define dhairal_niwa_sceneTex_007390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_007390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007390[] = dhairal_niwa_sceneTex_007390;
#define dhairal_niwa_sceneTex_003390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_003390"
#define dhairal_niwa_sceneTex_003390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_003390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003390[] = dhairal_niwa_sceneTex_003390;
#define dhairal_niwa_sceneTex_008B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_008B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_008B90[] = dhairal_niwa_sceneTex_008B90;
#define dhairal_niwa_sceneTex_005390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_005390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005390[] = dhairal_niwa_sceneTex_005390;
#define dhairal_niwa_sceneTex_00D390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00D390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00D390[] = dhairal_niwa_sceneTex_00D390;
#define dhairal_niwa_sceneTex_004B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_004B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_004B90[] = dhairal_niwa_sceneTex_004B90;
#define dhairal_niwa_sceneTex_00EB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00EB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00EB90[] = dhairal_niwa_sceneTex_00EB90;
#define dhairal_niwa_sceneTex_00F390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00F390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00F390[] = dhairal_niwa_sceneTex_00F390;
#define dhairal_niwa_sceneTex_010390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_010390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_010390[] = dhairal_niwa_sceneTex_010390;
#define dhairal_niwa_sceneTex_00FB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00FB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00FB90[] = dhairal_niwa_sceneTex_00FB90;
#define dhairal_niwa_sceneTex_009390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_009390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009390[] = dhairal_niwa_sceneTex_009390;
#define dhairal_niwa_sceneTex_007B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_007B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007B90[] = dhairal_niwa_sceneTex_007B90;
#define dhairal_niwa_sceneTex_006390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_006390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_006390[] = dhairal_niwa_sceneTex_006390;
#define dhairal_niwa_sceneTex_00CB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00CB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00CB90[] = dhairal_niwa_sceneTex_00CB90;
#define dhairal_niwa_sceneTex_00B390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00B390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00B390[] = dhairal_niwa_sceneTex_00B390;
#define dhairal_niwa_sceneTex_00AB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00AB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00AB90[] = dhairal_niwa_sceneTex_00AB90;
#define dhairal_niwa_sceneTex_00DB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00DB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00DB90[] = dhairal_niwa_sceneTex_00DB90;
#define dhairal_niwa_sceneTex_00C390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00C390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00C390[] = dhairal_niwa_sceneTex_00C390;
#define dhairal_niwa_sceneTex_00BB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00BB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00BB90[] = dhairal_niwa_sceneTex_00BB90;
#define dhairal_niwa_sceneTex_009B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_009B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009B90[] = dhairal_niwa_sceneTex_009B90;
#define dhairal_niwa_sceneTex_005B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_005B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005B90[] = dhairal_niwa_sceneTex_005B90;
#define dhairal_niwa_sceneTex_003B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_003B90"
#define dhairal_niwa_sceneTex_003B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_003B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003B90[] = dhairal_niwa_sceneTex_003B90;
#define dhairal_niwa_sceneTex_004B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_004B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_004B90[] = dhairal_niwa_sceneTex_004B90;
#define dhairal_niwa_sceneTex_005390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_005390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005390[] = dhairal_niwa_sceneTex_005390;
#define dhairal_niwa_sceneTex_005B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_005B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005B90[] = dhairal_niwa_sceneTex_005B90;
#define dhairal_niwa_sceneTex_006390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_006390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_006390[] = dhairal_niwa_sceneTex_006390;
#define dhairal_niwa_sceneTex_007390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_007390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007390[] = dhairal_niwa_sceneTex_007390;
#define dhairal_niwa_sceneTex_007B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_007B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007B90[] = dhairal_niwa_sceneTex_007B90;
#define dhairal_niwa_sceneTex_008B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_008B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_008B90[] = dhairal_niwa_sceneTex_008B90;
#define dhairal_niwa_sceneTex_009390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_009390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009390[] = dhairal_niwa_sceneTex_009390;
#define dhairal_niwa_sceneTex_009B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_009B90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009B90[] = dhairal_niwa_sceneTex_009B90;
#define dhairal_niwa_sceneTex_00AB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00AB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00AB90[] = dhairal_niwa_sceneTex_00AB90;
#define dhairal_niwa_sceneTex_00B390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00B390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00B390[] = dhairal_niwa_sceneTex_00B390;
#define dhairal_niwa_sceneTex_00BB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00BB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00BB90[] = dhairal_niwa_sceneTex_00BB90;
#define dhairal_niwa_sceneTex_00C390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00C390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00C390[] = dhairal_niwa_sceneTex_00C390;
#define dhairal_niwa_sceneTex_00CB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00CB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00CB90[] = dhairal_niwa_sceneTex_00CB90;
#define dhairal_niwa_sceneTex_00D390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00D390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00D390[] = dhairal_niwa_sceneTex_00D390;
#define dhairal_niwa_sceneTex_00DB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00DB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00DB90[] = dhairal_niwa_sceneTex_00DB90;
#define dhairal_niwa_sceneTex_00EB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00EB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00EB90[] = dhairal_niwa_sceneTex_00EB90;
#define dhairal_niwa_sceneTex_00F390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00F390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00F390[] = dhairal_niwa_sceneTex_00F390;
#define dhairal_niwa_sceneTex_00FB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00FB90"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00FB90[] = dhairal_niwa_sceneTex_00FB90;
#define dhairal_niwa_sceneTex_010390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_010390"
static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_010390[] = dhairal_niwa_sceneTex_010390;
#define dhairal_niwa_sceneCollisionHeader_0030B0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneCollisionHeader_0030B0"
static const ALIGN_ASSET(2) char hairal_niwa_sceneCollisionHeader_0030B0[] = dhairal_niwa_sceneCollisionHeader_0030B0;
#endif // INDOORS_HAIRAL_NIWA_SCENE_H