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

84
soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h
View File

@@ -3,53 +3,53 @@
#include "align_asset_macro.h"
#define dkakusiana_room_12DL_0079F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0079F0"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_0079F0[] = dkakusiana_room_12DL_0079F0;
#define dkakusiana_room_12DL_0004A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0004A0"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_0004A0[] = dkakusiana_room_12DL_0004A0;
#define dkakusiana_room_12Tex_0047F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0047F0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0047F0[] = dkakusiana_room_12Tex_0047F0;
#define dkakusiana_room_12Tex_001FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_001FF0"
#define dkakusiana_room_12Tex_001FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_001FF0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_001FF0[] = dkakusiana_room_12Tex_001FF0;
#define dkakusiana_room_12DL_000270 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000270"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_000270[] = dkakusiana_room_12DL_000270;
#define dkakusiana_room_12Tex_0027F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0027F0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0;
#define dkakusiana_room_12DL_001C28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_001C28"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_001C28[] = dkakusiana_room_12DL_001C28;
#define dkakusiana_room_12Tex_004FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_004FF0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_004FF0[] = dkakusiana_room_12Tex_004FF0;
#define dkakusiana_room_12Tex_005FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_005FF0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_005FF0[] = dkakusiana_room_12Tex_005FF0;
#define dkakusiana_room_12Tex_006FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_006FF0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_006FF0[] = dkakusiana_room_12Tex_006FF0;
#define dkakusiana_room_12DL_007D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_007D60"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_007D60[] = dkakusiana_room_12DL_007D60;
#define dkakusiana_room_12DL_000ED0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000ED0"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_000ED0[] = dkakusiana_room_12DL_000ED0;
#define dkakusiana_room_12DL_007BB8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_007BB8"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_007BB8[] = dkakusiana_room_12DL_007BB8;
#define dkakusiana_room_12DL_0011C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0011C8"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_0011C8[] = dkakusiana_room_12DL_0011C8;
#define dkakusiana_room_12DL_000BA8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000BA8"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_000BA8[] = dkakusiana_room_12DL_000BA8;
#define dkakusiana_room_12Tex_0037F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0037F0"
#define dkakusiana_room_12Tex_0037F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0037F0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0037F0[] = dkakusiana_room_12Tex_0037F0;
#define dkakusiana_room_12Tex_0027F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0027F0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0;
#define dkakusiana_room_12Tex_0047F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0047F0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0047F0[] = dkakusiana_room_12Tex_0047F0;
#define dkakusiana_room_12Tex_004FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_004FF0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_004FF0[] = dkakusiana_room_12Tex_004FF0;
#define dkakusiana_room_12Tex_005FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_005FF0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_005FF0[] = dkakusiana_room_12Tex_005FF0;
#define dkakusiana_room_12Tex_006FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_006FF0"
static const ALIGN_ASSET(2) char kakusiana_room_12Tex_006FF0[] = dkakusiana_room_12Tex_006FF0;
#define dkakusiana_room_12DL_0079F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0079F0"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_0079F0[] = dkakusiana_room_12DL_0079F0;
#define dkakusiana_room_12DL_0004A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0004A0"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_0004A0[] = dkakusiana_room_12DL_0004A0;
#define dkakusiana_room_12DL_000270 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000270"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_000270[] = dkakusiana_room_12DL_000270;
#define dkakusiana_room_12DL_001C28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_001C28"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_001C28[] = dkakusiana_room_12DL_001C28;
#define dkakusiana_room_12DL_007D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_007D60"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_007D60[] = dkakusiana_room_12DL_007D60;
#define dkakusiana_room_12DL_000ED0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000ED0"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_000ED0[] = dkakusiana_room_12DL_000ED0;
#define dkakusiana_room_12DL_007BB8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_007BB8"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_007BB8[] = dkakusiana_room_12DL_007BB8;
#define dkakusiana_room_12DL_0011C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0011C8"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_0011C8[] = dkakusiana_room_12DL_0011C8;
#define dkakusiana_room_12DL_000BA8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000BA8"
static const ALIGN_ASSET(2) char kakusiana_room_12DL_000BA8[] = dkakusiana_room_12DL_000BA8;
#endif // MISC_KAKUSIANA_ROOM_12_H