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_9.h
View File

@@ -3,44 +3,44 @@
#include "align_asset_macro.h"
#define dkakusiana_room_9DL_005640 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005640"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_005640[] = dkakusiana_room_9DL_005640;
#define dkakusiana_room_9Tex_002340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_002340"
static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340;
#define dkakusiana_room_9DL_000AC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_000AC8"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_000AC8[] = dkakusiana_room_9DL_000AC8;
#define dkakusiana_room_9Tex_003340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_003340"
#define dkakusiana_room_9Tex_003340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_003340"
static const ALIGN_ASSET(2) char kakusiana_room_9Tex_003340[] = dkakusiana_room_9Tex_003340;
#define dkakusiana_room_9DL_001DD0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_001DD0"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_001DD0[] = dkakusiana_room_9DL_001DD0;
#define dkakusiana_room_9Tex_004B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_004B40"
static const ALIGN_ASSET(2) char kakusiana_room_9Tex_004B40[] = dkakusiana_room_9Tex_004B40;
#define dkakusiana_room_9Tex_003B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_003B40"
#define dkakusiana_room_9Tex_003B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_003B40"
static const ALIGN_ASSET(2) char kakusiana_room_9Tex_003B40[] = dkakusiana_room_9Tex_003B40;
#define dkakusiana_room_9DL_005870 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005870"
#define dkakusiana_room_9Tex_004B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_004B40"
static const ALIGN_ASSET(2) char kakusiana_room_9Tex_004B40[] = dkakusiana_room_9Tex_004B40;
#define dkakusiana_room_9DL_005640 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005640"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_005640[] = dkakusiana_room_9DL_005640;
#define dkakusiana_room_9DL_000AC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_000AC8"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_000AC8[] = dkakusiana_room_9DL_000AC8;
#define dkakusiana_room_9DL_001DD0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_001DD0"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_001DD0[] = dkakusiana_room_9DL_001DD0;
#define dkakusiana_room_9DL_005870 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005870"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_005870[] = dkakusiana_room_9DL_005870;
#define dkakusiana_room_9DL_0011C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_0011C8"
#define dkakusiana_room_9DL_0011C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_0011C8"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_0011C8[] = dkakusiana_room_9DL_0011C8;
#define dkakusiana_room_9DL_002260 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_002260"
#define dkakusiana_room_9DL_002260 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_002260"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_002260[] = dkakusiana_room_9DL_002260;
#define dkakusiana_room_9DL_005A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005A20"
#define dkakusiana_room_9DL_005A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005A20"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_005A20[] = dkakusiana_room_9DL_005A20;
#define dkakusiana_room_9DL_000F80 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_000F80"
#define dkakusiana_room_9DL_000F80 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_000F80"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_000F80[] = dkakusiana_room_9DL_000F80;
#define dkakusiana_room_9DL_0006E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_0006E0"
#define dkakusiana_room_9DL_0006E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_0006E0"
static const ALIGN_ASSET(2) char kakusiana_room_9DL_0006E0[] = dkakusiana_room_9DL_0006E0;
#define dkakusiana_room_9Tex_002340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_002340"
static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340;
#endif // MISC_KAKUSIANA_ROOM_9_H