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

64
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h
View File

@@ -3,17 +3,8 @@
#include "align_asset_macro.h"
#define djyasinzou_room_10DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000460"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000460[] = djyasinzou_room_10DL_000460;
#define djyasinzou_room_10Tex_0051A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0051A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0051A0[] = djyasinzou_room_10Tex_0051A0;
#define djyasinzou_room_10DL_0008F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0008F8"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0008F8[] = djyasinzou_room_10DL_0008F8;
#define djyasinzou_room_10Tex_007DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_007DA0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_007DA0[] = djyasinzou_room_10Tex_007DA0;
#define djyasinzou_room_10Tex_0031A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0031A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0031A0[] = djyasinzou_room_10Tex_0031A0;
#define djyasinzou_room_10Tex_0041A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0041A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0041A0[] = djyasinzou_room_10Tex_0041A0;
@@ -21,30 +12,45 @@ static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0041A0[] = djyasinzou_room
#define djyasinzou_room_10Tex_0049A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0049A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0049A0[] = djyasinzou_room_10Tex_0049A0;
#define djyasinzou_room_10DL_002DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_002DE0"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_002DE0[] = djyasinzou_room_10DL_002DE0;
#define djyasinzou_room_10Tex_0051A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0051A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0051A0[] = djyasinzou_room_10Tex_0051A0;
#define djyasinzou_room_10Tex_0079A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0079A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0079A0[] = djyasinzou_room_10Tex_0079A0;
#define djyasinzou_room_10Tex_0059A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0059A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0;
#define djyasinzou_room_10DL_000CC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000CC0"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000CC0[] = djyasinzou_room_10DL_000CC0;
#define djyasinzou_room_10Tex_0069A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0069A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0069A0[] = djyasinzou_room_10Tex_0069A0;
#define djyasinzou_room_10DL_001270 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001270"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001270[] = djyasinzou_room_10DL_001270;
#define djyasinzou_room_10Tex_005DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_005DA0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_005DA0[] = djyasinzou_room_10Tex_005DA0;
#define djyasinzou_room_10Tex_0065A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0065A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0065A0[] = djyasinzou_room_10Tex_0065A0;
#define djyasinzou_room_10Tex_0069A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0069A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0069A0[] = djyasinzou_room_10Tex_0069A0;
#define djyasinzou_room_10Tex_0079A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0079A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0079A0[] = djyasinzou_room_10Tex_0079A0;
#define djyasinzou_room_10Tex_007DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_007DA0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_007DA0[] = djyasinzou_room_10Tex_007DA0;
#define djyasinzou_room_10DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000460"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000460[] = djyasinzou_room_10DL_000460;
#define djyasinzou_room_10DL_0008F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0008F8"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0008F8[] = djyasinzou_room_10DL_0008F8;
#define djyasinzou_room_10DL_002DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_002DE0"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_002DE0[] = djyasinzou_room_10DL_002DE0;
#define djyasinzou_room_10DL_000CC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000CC0"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000CC0[] = djyasinzou_room_10DL_000CC0;
#define djyasinzou_room_10DL_001270 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001270"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001270[] = djyasinzou_room_10DL_001270;
#define djyasinzou_room_10DL_001AA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001AA0"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001AA0[] = djyasinzou_room_10DL_001AA0;
#define djyasinzou_room_10Tex_005DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_005DA0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_005DA0[] = djyasinzou_room_10Tex_005DA0;
#define djyasinzou_room_10DL_000E80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000E80"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000E80[] = djyasinzou_room_10DL_000E80;
@@ -54,11 +60,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001720[] = djyasinzou_room_
#define djyasinzou_room_10DL_0020C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0020C8"
static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0020C8[] = djyasinzou_room_10DL_0020C8;
#define djyasinzou_room_10Tex_0031A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0031A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0031A0[] = djyasinzou_room_10Tex_0031A0;
#define djyasinzou_room_10Tex_0059A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0059A0"
static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0;
#endif // DUNGEONS_JYASINZOU_ROOM_10_H