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_16.h
View File

@@ -3,21 +3,33 @@
#include "align_asset_macro.h"
#define djyasinzou_room_16DL_0003F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0003F0"
static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0003F0[] = djyasinzou_room_16DL_0003F0;
#define djyasinzou_room_16Tex_0029B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0029B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0029B8[] = djyasinzou_room_16Tex_0029B8;
#define djyasinzou_room_16Tex_0039B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0039B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0039B8[] = djyasinzou_room_16Tex_0039B8;
#define djyasinzou_room_16Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0041B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0041B8[] = djyasinzou_room_16Tex_0041B8;
#define djyasinzou_room_16Tex_0045B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0045B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0045B8[] = djyasinzou_room_16Tex_0045B8;
#define djyasinzou_room_16Tex_004DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_004DB8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_004DB8[] = djyasinzou_room_16Tex_004DB8;
#define djyasinzou_room_16Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0051B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8;
#define djyasinzou_room_16Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0059B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0059B8[] = djyasinzou_room_16Tex_0059B8;
#define djyasinzou_room_16DL_0003F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0003F0"
static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0003F0[] = djyasinzou_room_16DL_0003F0;
#define djyasinzou_room_16DL_0007E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0007E0"
static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0007E0[] = djyasinzou_room_16DL_0007E0;
#define djyasinzou_room_16Tex_0039B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0039B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0039B8[] = djyasinzou_room_16Tex_0039B8;
#define djyasinzou_room_16DL_000D90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_000D90"
static const ALIGN_ASSET(2) char jyasinzou_room_16DL_000D90[] = djyasinzou_room_16DL_000D90;
@@ -30,12 +42,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0017D0[] = djyasinzou_room_
#define djyasinzou_room_16DL_001B40 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_001B40"
static const ALIGN_ASSET(2) char jyasinzou_room_16DL_001B40[] = djyasinzou_room_16DL_001B40;
#define djyasinzou_room_16Tex_0029B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0029B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0029B8[] = djyasinzou_room_16Tex_0029B8;
#define djyasinzou_room_16Tex_004DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_004DB8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_004DB8[] = djyasinzou_room_16Tex_004DB8;
#define djyasinzou_room_16DL_001DC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_001DC0"
static const ALIGN_ASSET(2) char jyasinzou_room_16DL_001DC0[] = djyasinzou_room_16DL_001DC0;
@@ -48,11 +54,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0022C0[] = djyasinzou_room_
#define djyasinzou_room_16DL_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_002660"
static const ALIGN_ASSET(2) char jyasinzou_room_16DL_002660[] = djyasinzou_room_16DL_002660;
#define djyasinzou_room_16Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0041B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0041B8[] = djyasinzou_room_16Tex_0041B8;
#define djyasinzou_room_16Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0051B8"
static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8;
#endif // DUNGEONS_JYASINZOU_ROOM_16_H