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

24
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h
View File

@@ -3,15 +3,24 @@
#include "align_asset_macro.h"
#define djyasinzou_room_7DL_000390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000390"
static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000390[] = djyasinzou_room_7DL_000390;
#define djyasinzou_room_7Tex_002908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_002908"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_002908[] = djyasinzou_room_7Tex_002908;
#define djyasinzou_room_7Tex_003908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_003908"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_003908[] = djyasinzou_room_7Tex_003908;
#define djyasinzou_room_7Tex_004108 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004108"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004108[] = djyasinzou_room_7Tex_004108;
#define djyasinzou_room_7Tex_004908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004908"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004908[] = djyasinzou_room_7Tex_004908;
#define djyasinzou_room_7Tex_004D08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004D08"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08;
#define djyasinzou_room_7DL_000390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000390"
static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000390[] = djyasinzou_room_7DL_000390;
#define djyasinzou_room_7DL_000610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000610"
static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000610[] = djyasinzou_room_7DL_000610;
@@ -30,15 +39,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001010[] = djyasinzou_room_7
#define djyasinzou_room_7DL_001310 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001310"
static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001310[] = djyasinzou_room_7DL_001310;
#define djyasinzou_room_7Tex_003908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_003908"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_003908[] = djyasinzou_room_7Tex_003908;
#define djyasinzou_room_7DL_001980 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001980"
static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001980[] = djyasinzou_room_7DL_001980;
#define djyasinzou_room_7Tex_004108 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004108"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004108[] = djyasinzou_room_7Tex_004108;
#define djyasinzou_room_7DL_001FD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001FD8"
static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001FD8[] = djyasinzou_room_7DL_001FD8;
@@ -48,8 +51,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002340[] = djyasinzou_room_7
#define djyasinzou_room_7DL_002630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_002630"
static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002630[] = djyasinzou_room_7DL_002630;
#define djyasinzou_room_7Tex_004D08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004D08"
static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08;
#endif // DUNGEONS_JYASINZOU_ROOM_7_H