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

20
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h
View File

@@ -3,14 +3,17 @@
#include "align_asset_macro.h"
#define djyasinzou_room_9DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_0014E0"
static const ALIGN_ASSET(2) char jyasinzou_room_9DL_0014E0[] = djyasinzou_room_9DL_0014E0;
#define djyasinzou_room_9Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_002DC8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_002DC8[] = djyasinzou_room_9Tex_002DC8;
#define djyasinzou_room_9Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_003DC8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_003DC8[] = djyasinzou_room_9Tex_003DC8;
#define djyasinzou_room_9Tex_0045C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0045C8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0045C8[] = djyasinzou_room_9Tex_0045C8;
#define djyasinzou_room_9Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_003DC8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_003DC8[] = djyasinzou_room_9Tex_003DC8;
#define djyasinzou_room_9Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_004DC8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_004DC8[] = djyasinzou_room_9Tex_004DC8;
#define djyasinzou_room_9Tex_0051C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0051C8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0051C8[] = djyasinzou_room_9Tex_0051C8;
@@ -18,15 +21,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0051C8[] = djyasinzou_room_
#define djyasinzou_room_9Tex_0055C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0055C8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0055C8[] = djyasinzou_room_9Tex_0055C8;
#define djyasinzou_room_9DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_0014E0"
static const ALIGN_ASSET(2) char jyasinzou_room_9DL_0014E0[] = djyasinzou_room_9DL_0014E0;
#define djyasinzou_room_9DL_001FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_001FE8"
static const ALIGN_ASSET(2) char jyasinzou_room_9DL_001FE8[] = djyasinzou_room_9DL_001FE8;
#define djyasinzou_room_9Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_002DC8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_002DC8[] = djyasinzou_room_9Tex_002DC8;
#define djyasinzou_room_9Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_004DC8"
static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_004DC8[] = djyasinzou_room_9Tex_004DC8;
#define djyasinzou_room_9DL_002268 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_002268"
static const ALIGN_ASSET(2) char jyasinzou_room_9DL_002268[] = djyasinzou_room_9DL_002268;