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

76
soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h
View File

@@ -3,47 +3,47 @@
#include "align_asset_macro.h"
#define dkakusiana_room_4DL_004B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_004B40"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_004B40[] = dkakusiana_room_4DL_004B40;
#define dkakusiana_room_4DL_001420 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001420"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001420[] = dkakusiana_room_4DL_001420;
#define dkakusiana_room_4Tex_004138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_004138"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_004138[] = dkakusiana_room_4Tex_004138;
#define dkakusiana_room_4DL_005690 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_005690"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_005690[] = dkakusiana_room_4DL_005690;
#define dkakusiana_room_4Tex_006958 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_006958"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_006958[] = dkakusiana_room_4Tex_006958;
#define dkakusiana_room_4Tex_005958 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_005958"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_005958[] = dkakusiana_room_4Tex_005958;
#define dkakusiana_room_4DL_001660 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001660"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001660[] = dkakusiana_room_4DL_001660;
#define dkakusiana_room_4DL_001828 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001828"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001828[] = dkakusiana_room_4DL_001828;
#define dkakusiana_room_4DL_004D08 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_004D08"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_004D08[] = dkakusiana_room_4DL_004D08;
#define dkakusiana_room_4DL_000FF8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_000FF8"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_000FF8[] = dkakusiana_room_4DL_000FF8;
#define dkakusiana_room_4DL_000BB0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_000BB0"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_000BB0[] = dkakusiana_room_4DL_000BB0;
#define dkakusiana_room_4Tex_002138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_002138"
#define dkakusiana_room_4Tex_002138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_002138"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_002138[] = dkakusiana_room_4Tex_002138;
#define dkakusiana_room_4DL_001F10 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001F10"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001F10[] = dkakusiana_room_4DL_001F10;
#define dkakusiana_room_4Tex_003138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_003138"
#define dkakusiana_room_4Tex_003138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_003138"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_003138[] = dkakusiana_room_4Tex_003138;
#define dkakusiana_room_4Tex_004138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_004138"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_004138[] = dkakusiana_room_4Tex_004138;
#define dkakusiana_room_4Tex_005958 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_005958"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_005958[] = dkakusiana_room_4Tex_005958;
#define dkakusiana_room_4Tex_006958 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_006958"
static const ALIGN_ASSET(2) char kakusiana_room_4Tex_006958[] = dkakusiana_room_4Tex_006958;
#define dkakusiana_room_4DL_004B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_004B40"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_004B40[] = dkakusiana_room_4DL_004B40;
#define dkakusiana_room_4DL_001420 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001420"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001420[] = dkakusiana_room_4DL_001420;
#define dkakusiana_room_4DL_005690 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_005690"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_005690[] = dkakusiana_room_4DL_005690;
#define dkakusiana_room_4DL_001660 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001660"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001660[] = dkakusiana_room_4DL_001660;
#define dkakusiana_room_4DL_001828 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001828"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001828[] = dkakusiana_room_4DL_001828;
#define dkakusiana_room_4DL_004D08 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_004D08"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_004D08[] = dkakusiana_room_4DL_004D08;
#define dkakusiana_room_4DL_000FF8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_000FF8"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_000FF8[] = dkakusiana_room_4DL_000FF8;
#define dkakusiana_room_4DL_000BB0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_000BB0"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_000BB0[] = dkakusiana_room_4DL_000BB0;
#define dkakusiana_room_4DL_001F10 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001F10"
static const ALIGN_ASSET(2) char kakusiana_room_4DL_001F10[] = dkakusiana_room_4DL_001F10;
#endif // MISC_KAKUSIANA_ROOM_4_H