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

58
soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h
View File

@@ -3,41 +3,41 @@
#include "align_asset_macro.h"
#define dkakusiana_room_7DL_003D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_003D60"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_003D60[] = dkakusiana_room_7DL_003D60;
#define dkakusiana_room_7Tex_001D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_001D60"
static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60;
#define dkakusiana_room_7DL_0006C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_0006C8"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_0006C8[] = dkakusiana_room_7DL_0006C8;
#define dkakusiana_room_7Tex_002B60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002B60"
static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002B60[] = dkakusiana_room_7Tex_002B60;
#define dkakusiana_room_7Tex_002160 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002160"
#define dkakusiana_room_7Tex_002160 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002160"
static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002160[] = dkakusiana_room_7Tex_002160;
#define dkakusiana_room_7DL_000960 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000960"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_000960[] = dkakusiana_room_7DL_000960;
#define dkakusiana_room_7DL_000B28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000B28"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_000B28[] = dkakusiana_room_7DL_000B28;
#define dkakusiana_room_7DL_003F28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_003F28"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_003F28[] = dkakusiana_room_7DL_003F28;
#define dkakusiana_room_7DL_000290 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000290"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_000290[] = dkakusiana_room_7DL_000290;
#define dkakusiana_room_7DL_0015C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_0015C0"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_0015C0[] = dkakusiana_room_7DL_0015C0;
#define dkakusiana_room_7Tex_002960 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002960"
#define dkakusiana_room_7Tex_002960 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002960"
static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002960[] = dkakusiana_room_7Tex_002960;
#define dkakusiana_room_7DL_001B88 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_001B88"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_001B88[] = dkakusiana_room_7DL_001B88;
#define dkakusiana_room_7Tex_002B60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002B60"
static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002B60[] = dkakusiana_room_7Tex_002B60;
#define dkakusiana_room_7Tex_001D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_001D60"
static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60;
#define dkakusiana_room_7DL_003D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_003D60"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_003D60[] = dkakusiana_room_7DL_003D60;
#define dkakusiana_room_7DL_0006C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_0006C8"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_0006C8[] = dkakusiana_room_7DL_0006C8;
#define dkakusiana_room_7DL_000960 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000960"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_000960[] = dkakusiana_room_7DL_000960;
#define dkakusiana_room_7DL_000B28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000B28"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_000B28[] = dkakusiana_room_7DL_000B28;
#define dkakusiana_room_7DL_003F28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_003F28"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_003F28[] = dkakusiana_room_7DL_003F28;
#define dkakusiana_room_7DL_000290 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000290"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_000290[] = dkakusiana_room_7DL_000290;
#define dkakusiana_room_7DL_0015C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_0015C0"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_0015C0[] = dkakusiana_room_7DL_0015C0;
#define dkakusiana_room_7DL_001B88 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_001B88"
static const ALIGN_ASSET(2) char kakusiana_room_7DL_001B88[] = dkakusiana_room_7DL_001B88;
#endif // MISC_KAKUSIANA_ROOM_7_H