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

44
soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h
View File

@@ -3,44 +3,44 @@
#include "align_asset_macro.h"
#define dkakusiana_room_6DL_0055E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0055E0"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_0055E0[] = dkakusiana_room_6DL_0055E0;
#define dkakusiana_room_6Tex_0022E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_0022E0"
static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0;
#define dkakusiana_room_6DL_000A98 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_000A98"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_000A98[] = dkakusiana_room_6DL_000A98;
#define dkakusiana_room_6Tex_0032E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_0032E0"
#define dkakusiana_room_6Tex_0032E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_0032E0"
static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0032E0[] = dkakusiana_room_6Tex_0032E0;
#define dkakusiana_room_6DL_001D78 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_001D78"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_001D78[] = dkakusiana_room_6DL_001D78;
#define dkakusiana_room_6Tex_004AE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_004AE0"
static const ALIGN_ASSET(2) char kakusiana_room_6Tex_004AE0[] = dkakusiana_room_6Tex_004AE0;
#define dkakusiana_room_6Tex_003AE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_003AE0"
#define dkakusiana_room_6Tex_003AE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_003AE0"
static const ALIGN_ASSET(2) char kakusiana_room_6Tex_003AE0[] = dkakusiana_room_6Tex_003AE0;
#define dkakusiana_room_6DL_005810 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_005810"
#define dkakusiana_room_6Tex_004AE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_004AE0"
static const ALIGN_ASSET(2) char kakusiana_room_6Tex_004AE0[] = dkakusiana_room_6Tex_004AE0;
#define dkakusiana_room_6DL_0055E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0055E0"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_0055E0[] = dkakusiana_room_6DL_0055E0;
#define dkakusiana_room_6DL_000A98 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_000A98"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_000A98[] = dkakusiana_room_6DL_000A98;
#define dkakusiana_room_6DL_001D78 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_001D78"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_001D78[] = dkakusiana_room_6DL_001D78;
#define dkakusiana_room_6DL_005810 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_005810"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_005810[] = dkakusiana_room_6DL_005810;
#define dkakusiana_room_6DL_001190 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_001190"
#define dkakusiana_room_6DL_001190 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_001190"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_001190[] = dkakusiana_room_6DL_001190;
#define dkakusiana_room_6DL_002200 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_002200"
#define dkakusiana_room_6DL_002200 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_002200"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_002200[] = dkakusiana_room_6DL_002200;
#define dkakusiana_room_6DL_0059C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0059C0"
#define dkakusiana_room_6DL_0059C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0059C0"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_0059C0[] = dkakusiana_room_6DL_0059C0;
#define dkakusiana_room_6DL_000F48 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_000F48"
#define dkakusiana_room_6DL_000F48 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_000F48"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_000F48[] = dkakusiana_room_6DL_000F48;
#define dkakusiana_room_6DL_0006B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0006B0"
#define dkakusiana_room_6DL_0006B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0006B0"
static const ALIGN_ASSET(2) char kakusiana_room_6DL_0006B0[] = dkakusiana_room_6DL_0006B0;
#define dkakusiana_room_6Tex_0022E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_0022E0"
static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0;
#endif // MISC_KAKUSIANA_ROOM_6_H