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

50
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h
View File

@@ -3,32 +3,41 @@
#include "align_asset_macro.h"
#define djyasinzou_room_8DL_0009F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0009F0"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0009F0[] = djyasinzou_room_8DL_0009F0;
#define djyasinzou_room_8Tex_003A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_003A50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_003A50[] = djyasinzou_room_8Tex_003A50;
#define djyasinzou_room_8Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_007250"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_007250[] = djyasinzou_room_8Tex_007250;
#define djyasinzou_room_8Tex_004250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004250"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004250[] = djyasinzou_room_8Tex_004250;
#define djyasinzou_room_8DL_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0018D8"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0018D8[] = djyasinzou_room_8DL_0018D8;
#define djyasinzou_room_8Tex_004A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004A50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004A50[] = djyasinzou_room_8Tex_004A50;
#define djyasinzou_room_8Tex_006A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006A50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006A50[] = djyasinzou_room_8Tex_006A50;
#define djyasinzou_room_8Tex_004E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004E50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004E50[] = djyasinzou_room_8Tex_004E50;
#define djyasinzou_room_8Tex_005650 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_005650"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_005650[] = djyasinzou_room_8Tex_005650;
#define djyasinzou_room_8Tex_006250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006250"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006250[] = djyasinzou_room_8Tex_006250;
#define djyasinzou_room_8DL_0036E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0036E8"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0036E8[] = djyasinzou_room_8DL_0036E8;
#define djyasinzou_room_8Tex_005E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_005E50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_005E50[] = djyasinzou_room_8Tex_005E50;
#define djyasinzou_room_8Tex_004A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004A50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004A50[] = djyasinzou_room_8Tex_004A50;
#define djyasinzou_room_8Tex_006250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006250"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006250[] = djyasinzou_room_8Tex_006250;
#define djyasinzou_room_8Tex_006A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006A50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006A50[] = djyasinzou_room_8Tex_006A50;
#define djyasinzou_room_8Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_007250"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_007250[] = djyasinzou_room_8Tex_007250;
#define djyasinzou_room_8DL_0009F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0009F0"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0009F0[] = djyasinzou_room_8DL_0009F0;
#define djyasinzou_room_8DL_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0018D8"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0018D8[] = djyasinzou_room_8DL_0018D8;
#define djyasinzou_room_8DL_0036E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0036E8"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0036E8[] = djyasinzou_room_8DL_0036E8;
#define djyasinzou_room_8DL_002350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002350"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002350[] = djyasinzou_room_8DL_002350;
@@ -36,24 +45,15 @@ static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002350[] = djyasinzou_room_8
#define djyasinzou_room_8DL_002720 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002720"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002720[] = djyasinzou_room_8DL_002720;
#define djyasinzou_room_8Tex_003A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_003A50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_003A50[] = djyasinzou_room_8Tex_003A50;
#define djyasinzou_room_8DL_0028E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0028E0"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0028E0[] = djyasinzou_room_8DL_0028E0;
#define djyasinzou_room_8Tex_004E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004E50"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004E50[] = djyasinzou_room_8Tex_004E50;
#define djyasinzou_room_8DL_002B90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002B90"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002B90[] = djyasinzou_room_8DL_002B90;
#define djyasinzou_room_8DL_002D70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002D70"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002D70[] = djyasinzou_room_8DL_002D70;
#define djyasinzou_room_8Tex_004250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004250"
static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004250[] = djyasinzou_room_8Tex_004250;
#define djyasinzou_room_8DL_007ED0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_007ED0"
static const ALIGN_ASSET(2) char jyasinzou_room_8DL_007ED0[] = djyasinzou_room_8DL_007ED0;