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

28
soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h
View File

@@ -3,32 +3,32 @@
#include "align_asset_macro.h"
#define dkakusiana_room_8DL_0033C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0033C0"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_0033C0[] = dkakusiana_room_8DL_0033C0;
#define dkakusiana_room_8Tex_0019C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8Tex_0019C0"
static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0;
#define dkakusiana_room_8DL_0014B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0014B8"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_0014B8[] = dkakusiana_room_8DL_0014B8;
#define dkakusiana_room_8Tex_0029C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8Tex_0029C0"
#define dkakusiana_room_8Tex_0029C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8Tex_0029C0"
static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0029C0[] = dkakusiana_room_8Tex_0029C0;
#define dkakusiana_room_8DL_001720 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_001720"
#define dkakusiana_room_8DL_0033C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0033C0"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_0033C0[] = dkakusiana_room_8DL_0033C0;
#define dkakusiana_room_8DL_0014B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0014B8"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_0014B8[] = dkakusiana_room_8DL_0014B8;
#define dkakusiana_room_8DL_001720 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_001720"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_001720[] = dkakusiana_room_8DL_001720;
#define dkakusiana_room_8DL_0018E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0018E8"
#define dkakusiana_room_8DL_0018E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0018E8"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_0018E8[] = dkakusiana_room_8DL_0018E8;
#define dkakusiana_room_8DL_003588 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_003588"
#define dkakusiana_room_8DL_003588 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_003588"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_003588[] = dkakusiana_room_8DL_003588;
#define dkakusiana_room_8DL_001048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_001048"
#define dkakusiana_room_8DL_001048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_001048"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_001048[] = dkakusiana_room_8DL_001048;
#define dkakusiana_room_8DL_000B20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_000B20"
#define dkakusiana_room_8DL_000B20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_000B20"
static const ALIGN_ASSET(2) char kakusiana_room_8DL_000B20[] = dkakusiana_room_8DL_000B20;
#define dkakusiana_room_8Tex_0019C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8Tex_0019C0"
static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0;
#endif // MISC_KAKUSIANA_ROOM_8_H