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/dungeons/jyasinzou/jyasinzou_room_20.h
View File

@@ -3,17 +3,8 @@
#include "align_asset_macro.h"
#define djyasinzou_room_20DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000460"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000460[] = djyasinzou_room_20DL_000460;
#define djyasinzou_room_20Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0051B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0051B8[] = djyasinzou_room_20Tex_0051B8;
#define djyasinzou_room_20DL_000908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000908"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000908[] = djyasinzou_room_20DL_000908;
#define djyasinzou_room_20Tex_007DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_007DB8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_007DB8[] = djyasinzou_room_20Tex_007DB8;
#define djyasinzou_room_20Tex_0031B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0031B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0031B8[] = djyasinzou_room_20Tex_0031B8;
#define djyasinzou_room_20Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0041B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0041B8[] = djyasinzou_room_20Tex_0041B8;
@@ -21,44 +12,53 @@ static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0041B8[] = djyasinzou_room
#define djyasinzou_room_20Tex_0049B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0049B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0049B8[] = djyasinzou_room_20Tex_0049B8;
#define djyasinzou_room_20DL_000CD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000CD8"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000CD8[] = djyasinzou_room_20DL_000CD8;
#define djyasinzou_room_20Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0051B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0051B8[] = djyasinzou_room_20Tex_0051B8;
#define djyasinzou_room_20Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0059B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0059B8[] = djyasinzou_room_20Tex_0059B8;
#define djyasinzou_room_20Tex_005DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_005DB8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_005DB8[] = djyasinzou_room_20Tex_005DB8;
#define djyasinzou_room_20Tex_0065B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0065B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0065B8[] = djyasinzou_room_20Tex_0065B8;
#define djyasinzou_room_20Tex_0069B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0069B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0069B8[] = djyasinzou_room_20Tex_0069B8;
#define djyasinzou_room_20Tex_0079B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0079B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8;
#define djyasinzou_room_20Tex_007DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_007DB8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_007DB8[] = djyasinzou_room_20Tex_007DB8;
#define djyasinzou_room_20DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000460"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000460[] = djyasinzou_room_20DL_000460;
#define djyasinzou_room_20DL_000908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000908"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000908[] = djyasinzou_room_20DL_000908;
#define djyasinzou_room_20DL_000CD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000CD8"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000CD8[] = djyasinzou_room_20DL_000CD8;
#define djyasinzou_room_20DL_000E98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000E98"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000E98[] = djyasinzou_room_20DL_000E98;
#define djyasinzou_room_20DL_001278 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001278"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001278[] = djyasinzou_room_20DL_001278;
#define djyasinzou_room_20Tex_0065B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0065B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0065B8[] = djyasinzou_room_20Tex_0065B8;
#define djyasinzou_room_20DL_001738 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001738"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001738[] = djyasinzou_room_20DL_001738;
#define djyasinzou_room_20DL_001AB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001AB8"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001AB8[] = djyasinzou_room_20DL_001AB8;
#define djyasinzou_room_20Tex_005DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_005DB8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_005DB8[] = djyasinzou_room_20Tex_005DB8;
#define djyasinzou_room_20DL_0020E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_0020E0"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_0020E0[] = djyasinzou_room_20DL_0020E0;
#define djyasinzou_room_20Tex_0031B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0031B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0031B8[] = djyasinzou_room_20Tex_0031B8;
#define djyasinzou_room_20Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0059B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0059B8[] = djyasinzou_room_20Tex_0059B8;
#define djyasinzou_room_20DL_002DF8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_002DF8"
static const ALIGN_ASSET(2) char jyasinzou_room_20DL_002DF8[] = djyasinzou_room_20DL_002DF8;
#define djyasinzou_room_20Tex_0079B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0079B8"
static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8;
#endif // DUNGEONS_JYASINZOU_ROOM_20_H