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

42
soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h
View File

@@ -3,41 +3,41 @@
#include "align_asset_macro.h"
#define dkakusiana_room_3DL_003A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003A20"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_003A20[] = dkakusiana_room_3DL_003A20;
#define dkakusiana_room_3Tex_001818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_001818"
static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818;
#define dkakusiana_room_3DL_0012A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_0012A0"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_0012A0[] = dkakusiana_room_3DL_0012A0;
#define dkakusiana_room_3Tex_002818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_002818"
#define dkakusiana_room_3Tex_002818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_002818"
static const ALIGN_ASSET(2) char kakusiana_room_3Tex_002818[] = dkakusiana_room_3Tex_002818;
#define dkakusiana_room_3DL_004008 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_004008"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_004008[] = dkakusiana_room_3DL_004008;
#define dkakusiana_room_3Tex_004130 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_004130"
#define dkakusiana_room_3Tex_004130 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_004130"
static const ALIGN_ASSET(2) char kakusiana_room_3Tex_004130[] = dkakusiana_room_3Tex_004130;
#define dkakusiana_room_3DL_003BC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003BC8"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_003BC8[] = dkakusiana_room_3DL_003BC8;
#define dkakusiana_room_3Tex_004930 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_004930"
#define dkakusiana_room_3Tex_004930 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_004930"
static const ALIGN_ASSET(2) char kakusiana_room_3Tex_004930[] = dkakusiana_room_3Tex_004930;
#define dkakusiana_room_3DL_001580 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_001580"
#define dkakusiana_room_3DL_003A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003A20"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_003A20[] = dkakusiana_room_3DL_003A20;
#define dkakusiana_room_3DL_0012A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_0012A0"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_0012A0[] = dkakusiana_room_3DL_0012A0;
#define dkakusiana_room_3DL_004008 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_004008"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_004008[] = dkakusiana_room_3DL_004008;
#define dkakusiana_room_3DL_003BC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003BC8"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_003BC8[] = dkakusiana_room_3DL_003BC8;
#define dkakusiana_room_3DL_001580 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_001580"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_001580[] = dkakusiana_room_3DL_001580;
#define dkakusiana_room_3DL_001748 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_001748"
#define dkakusiana_room_3DL_001748 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_001748"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_001748[] = dkakusiana_room_3DL_001748;
#define dkakusiana_room_3DL_003D80 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003D80"
#define dkakusiana_room_3DL_003D80 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003D80"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_003D80[] = dkakusiana_room_3DL_003D80;
#define dkakusiana_room_3DL_000AF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_000AF0"
#define dkakusiana_room_3DL_000AF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_000AF0"
static const ALIGN_ASSET(2) char kakusiana_room_3DL_000AF0[] = dkakusiana_room_3DL_000AF0;
#define dkakusiana_room_3Tex_001818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_001818"
static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818;
#endif // MISC_KAKUSIANA_ROOM_3_H