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

34
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h
View File

@@ -3,41 +3,41 @@
#include "align_asset_macro.h"
#define djyasinzou_room_14DL_000350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000350"
static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000350[] = djyasinzou_room_14DL_000350;
#define djyasinzou_room_14Tex_001CA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_001CA0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_001CA0[] = djyasinzou_room_14Tex_001CA0;
#define djyasinzou_room_14Tex_0024A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0024A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0024A0[] = djyasinzou_room_14Tex_0024A0;
#define djyasinzou_room_14Tex_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0028A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0028A0[] = djyasinzou_room_14Tex_0028A0;
#define djyasinzou_room_14Tex_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0030A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0030A0[] = djyasinzou_room_14Tex_0030A0;
#define djyasinzou_room_14Tex_0034A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0034A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0;
#define djyasinzou_room_14Tex_0044A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0044A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0044A0[] = djyasinzou_room_14Tex_0044A0;
#define djyasinzou_room_14DL_000350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000350"
static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000350[] = djyasinzou_room_14DL_000350;
#define djyasinzou_room_14DL_000AF8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000AF8"
static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000AF8[] = djyasinzou_room_14DL_000AF8;
#define djyasinzou_room_14Tex_001CA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_001CA0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_001CA0[] = djyasinzou_room_14Tex_001CA0;
#define djyasinzou_room_14Tex_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0028A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0028A0[] = djyasinzou_room_14Tex_0028A0;
#define djyasinzou_room_14DL_001088 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001088"
static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001088[] = djyasinzou_room_14DL_001088;
#define djyasinzou_room_14DL_001340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001340"
static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001340[] = djyasinzou_room_14DL_001340;
#define djyasinzou_room_14Tex_0024A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0024A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0024A0[] = djyasinzou_room_14Tex_0024A0;
#define djyasinzou_room_14DL_0017D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_0017D8"
static const ALIGN_ASSET(2) char jyasinzou_room_14DL_0017D8[] = djyasinzou_room_14DL_0017D8;
#define djyasinzou_room_14Tex_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0030A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0030A0[] = djyasinzou_room_14Tex_0030A0;
#define djyasinzou_room_14DL_001AE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001AE0"
static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001AE0[] = djyasinzou_room_14DL_001AE0;
#define djyasinzou_room_14Tex_0034A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0034A0"
static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0;
#endif // DUNGEONS_JYASINZOU_ROOM_14_H