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

72
soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h
View File

@@ -3,47 +3,47 @@
#include "align_asset_macro.h"
#define dkakusiana_room_13DL_004350 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004350"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_004350[] = dkakusiana_room_13DL_004350;
#define dkakusiana_room_13DL_000FF8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_000FF8"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_000FF8[] = dkakusiana_room_13DL_000FF8;
#define dkakusiana_room_13Tex_003950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_003950"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_003950[] = dkakusiana_room_13Tex_003950;
#define dkakusiana_room_13DL_004C50 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004C50"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_004C50[] = dkakusiana_room_13DL_004C50;
#define dkakusiana_room_13Tex_005EC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_005EC8"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_005EC8[] = dkakusiana_room_13Tex_005EC8;
#define dkakusiana_room_13Tex_004EC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_004EC8"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_004EC8[] = dkakusiana_room_13Tex_004EC8;
#define dkakusiana_room_13DL_001208 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_001208"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_001208[] = dkakusiana_room_13DL_001208;
#define dkakusiana_room_13DL_0013D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0013D0"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_0013D0[] = dkakusiana_room_13DL_0013D0;
#define dkakusiana_room_13DL_004518 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004518"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_004518[] = dkakusiana_room_13DL_004518;
#define dkakusiana_room_13DL_000C08 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_000C08"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_000C08[] = dkakusiana_room_13DL_000C08;
#define dkakusiana_room_13Tex_001950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_001950"
#define dkakusiana_room_13Tex_001950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_001950"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_001950[] = dkakusiana_room_13Tex_001950;
#define dkakusiana_room_13DL_0006F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0006F0"
#define dkakusiana_room_13Tex_002950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_002950"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950;
#define dkakusiana_room_13Tex_003950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_003950"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_003950[] = dkakusiana_room_13Tex_003950;
#define dkakusiana_room_13Tex_004EC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_004EC8"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_004EC8[] = dkakusiana_room_13Tex_004EC8;
#define dkakusiana_room_13Tex_005EC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_005EC8"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_005EC8[] = dkakusiana_room_13Tex_005EC8;
#define dkakusiana_room_13DL_004350 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004350"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_004350[] = dkakusiana_room_13DL_004350;
#define dkakusiana_room_13DL_000FF8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_000FF8"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_000FF8[] = dkakusiana_room_13DL_000FF8;
#define dkakusiana_room_13DL_004C50 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004C50"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_004C50[] = dkakusiana_room_13DL_004C50;
#define dkakusiana_room_13DL_001208 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_001208"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_001208[] = dkakusiana_room_13DL_001208;
#define dkakusiana_room_13DL_0013D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0013D0"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_0013D0[] = dkakusiana_room_13DL_0013D0;
#define dkakusiana_room_13DL_004518 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004518"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_004518[] = dkakusiana_room_13DL_004518;
#define dkakusiana_room_13DL_000C08 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_000C08"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_000C08[] = dkakusiana_room_13DL_000C08;
#define dkakusiana_room_13DL_0006F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0006F0"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_0006F0[] = dkakusiana_room_13DL_0006F0;
#define dkakusiana_room_13DL_0017B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0017B8"
#define dkakusiana_room_13DL_0017B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0017B8"
static const ALIGN_ASSET(2) char kakusiana_room_13DL_0017B8[] = dkakusiana_room_13DL_0017B8;
#define dkakusiana_room_13Tex_002950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_002950"
static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950;
#endif // MISC_KAKUSIANA_ROOM_13_H