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

16
soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h
View File

@@ -3,28 +3,28 @@
#include "align_asset_macro.h"
#define dyousei_izumi_yoko_room_0DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_002B88"
#define dyousei_izumi_yoko_room_0DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_002B88"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0DL_002B88[] = dyousei_izumi_yoko_room_0DL_002B88;
#define dyousei_izumi_yoko_room_0DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_003FF8"
#define dyousei_izumi_yoko_room_0DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_003FF8"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0DL_003FF8[] = dyousei_izumi_yoko_room_0DL_003FF8;
#define dyousei_izumi_yoko_room_0Set_0000D0DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_002B88"
#define dyousei_izumi_yoko_room_0Set_0000D0DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_002B88"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_0000D0DL_002B88[] = dyousei_izumi_yoko_room_0Set_0000D0DL_002B88;
#define dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_003FF8"
#define dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_003FF8"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_0000D0DL_003FF8[] = dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8;
#define dyousei_izumi_yoko_room_0Set_000170DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_002B88"
#define dyousei_izumi_yoko_room_0Set_000170DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_002B88"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000170DL_002B88[] = dyousei_izumi_yoko_room_0Set_000170DL_002B88;
#define dyousei_izumi_yoko_room_0Set_000170DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_003FF8"
#define dyousei_izumi_yoko_room_0Set_000170DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_003FF8"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000170DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000170DL_003FF8;
#define dyousei_izumi_yoko_room_0Set_000210DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_002B88"
#define dyousei_izumi_yoko_room_0Set_000210DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_002B88"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_002B88[] = dyousei_izumi_yoko_room_0Set_000210DL_002B88;
#define dyousei_izumi_yoko_room_0Set_000210DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_003FF8"
#define dyousei_izumi_yoko_room_0Set_000210DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_003FF8"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000210DL_003FF8;

96
soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h
View File

@@ -3,62 +3,62 @@
#include "align_asset_macro.h"
#define dgGreatFairyFaroresWindCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyFaroresWindCs"
static const ALIGN_ASSET(2) char gGreatFairyFaroresWindCs[] = dgGreatFairyFaroresWindCs;
#define dgGreatFairyDinsFireCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyDinsFireCs"
static const ALIGN_ASSET(2) char gGreatFairyDinsFireCs[] = dgGreatFairyDinsFireCs;
#define dgGreatFairyNayrusLoveCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyNayrusLoveCs"
static const ALIGN_ASSET(2) char gGreatFairyNayrusLoveCs[] = dgGreatFairyNayrusLoveCs;
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneCollisionHeader_0039A8[] = dyousei_izumi_yoko_sceneCollisionHeader_0039A8;
#define dyousei_izumi_yoko_sceneTex_00C5A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00C5A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00C5A0[] = dyousei_izumi_yoko_sceneTex_00C5A0;
#define dyousei_izumi_yoko_sceneTex_0085A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0085A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0085A0[] = dyousei_izumi_yoko_sceneTex_0085A0;
#define dyousei_izumi_yoko_sceneTex_0075A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0075A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0075A0[] = dyousei_izumi_yoko_sceneTex_0075A0;
#define dyousei_izumi_yoko_sceneTex_0065A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0065A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0065A0[] = dyousei_izumi_yoko_sceneTex_0065A0;
#define dyousei_izumi_yoko_sceneTex_0045A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0045A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0045A0[] = dyousei_izumi_yoko_sceneTex_0045A0;
#define dyousei_izumi_yoko_sceneTex_009DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_009DA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_009DA0[] = dyousei_izumi_yoko_sceneTex_009DA0;
#define dyousei_izumi_yoko_sceneTex_00BDA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00BDA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00BDA0[] = dyousei_izumi_yoko_sceneTex_00BDA0;
#define dyousei_izumi_yoko_sceneTex_0095A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0095A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0095A0[] = dyousei_izumi_yoko_sceneTex_0095A0;
#define dyousei_izumi_yoko_sceneTex_004DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_004DA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_004DA0[] = dyousei_izumi_yoko_sceneTex_004DA0;
#define dyousei_izumi_yoko_sceneTex_003DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_003DA0"
#define dyousei_izumi_yoko_sceneTex_003DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_003DA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_003DA0[] = dyousei_izumi_yoko_sceneTex_003DA0;
#define dyousei_izumi_yoko_sceneTex_00ADA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00ADA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00ADA0[] = dyousei_izumi_yoko_sceneTex_00ADA0;
#define dyousei_izumi_yoko_sceneTex_0045A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0045A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0045A0[] = dyousei_izumi_yoko_sceneTex_0045A0;
#define dyousei_izumi_yoko_sceneTex_00B5A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00B5A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00B5A0[] = dyousei_izumi_yoko_sceneTex_00B5A0;
#define dyousei_izumi_yoko_sceneTex_004DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_004DA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_004DA0[] = dyousei_izumi_yoko_sceneTex_004DA0;
#define dyousei_izumi_yoko_sceneTex_0055A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0055A0"
#define dyousei_izumi_yoko_sceneTex_0055A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0055A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0055A0[] = dyousei_izumi_yoko_sceneTex_0055A0;
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
#define dyousei_izumi_yoko_sceneTex_0065A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0065A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0065A0[] = dyousei_izumi_yoko_sceneTex_0065A0;
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
#define dyousei_izumi_yoko_sceneTex_0075A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0075A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0075A0[] = dyousei_izumi_yoko_sceneTex_0075A0;
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
#define dyousei_izumi_yoko_sceneTex_0085A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0085A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0085A0[] = dyousei_izumi_yoko_sceneTex_0085A0;
#define dyousei_izumi_yoko_sceneTex_0095A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0095A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0095A0[] = dyousei_izumi_yoko_sceneTex_0095A0;
#define dyousei_izumi_yoko_sceneTex_009DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_009DA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_009DA0[] = dyousei_izumi_yoko_sceneTex_009DA0;
#define dyousei_izumi_yoko_sceneTex_00ADA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00ADA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00ADA0[] = dyousei_izumi_yoko_sceneTex_00ADA0;
#define dyousei_izumi_yoko_sceneTex_00B5A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00B5A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00B5A0[] = dyousei_izumi_yoko_sceneTex_00B5A0;
#define dyousei_izumi_yoko_sceneTex_00BDA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00BDA0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00BDA0[] = dyousei_izumi_yoko_sceneTex_00BDA0;
#define dyousei_izumi_yoko_sceneTex_00C5A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00C5A0"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00C5A0[] = dyousei_izumi_yoko_sceneTex_00C5A0;
#define dgGreatFairyFaroresWindCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyFaroresWindCs"
static const ALIGN_ASSET(2) char gGreatFairyFaroresWindCs[] = dgGreatFairyFaroresWindCs;
#define dgGreatFairyDinsFireCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyDinsFireCs"
static const ALIGN_ASSET(2) char gGreatFairyDinsFireCs[] = dgGreatFairyDinsFireCs;
#define dgGreatFairyNayrusLoveCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyNayrusLoveCs"
static const ALIGN_ASSET(2) char gGreatFairyNayrusLoveCs[] = dgGreatFairyNayrusLoveCs;
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneCollisionHeader_0039A8[] = dyousei_izumi_yoko_sceneCollisionHeader_0039A8;
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
#endif // INDOORS_YOUSEI_IZUMI_YOKO_SCENE_H