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

26
soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h
View File

@@ -3,29 +3,29 @@
#include "align_asset_macro.h"
#define dkakusiana_room_2DL_002650 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_002650"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_002650[] = dkakusiana_room_2DL_002650;
#define dkakusiana_room_2Tex_001448 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2Tex_001448"
static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448;
#define dkakusiana_room_2DL_000F70 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_000F70"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_000F70[] = dkakusiana_room_2DL_000F70;
#define dkakusiana_room_2Tex_001C48 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2Tex_001C48"
#define dkakusiana_room_2Tex_001C48 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2Tex_001C48"
static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001C48[] = dkakusiana_room_2Tex_001C48;
#define dkakusiana_room_2DL_0011B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_0011B0"
#define dkakusiana_room_2DL_002650 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_002650"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_002650[] = dkakusiana_room_2DL_002650;
#define dkakusiana_room_2DL_000F70 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_000F70"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_000F70[] = dkakusiana_room_2DL_000F70;
#define dkakusiana_room_2DL_0011B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_0011B0"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_0011B0[] = dkakusiana_room_2DL_0011B0;
#define dkakusiana_room_2DL_001378 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_001378"
#define dkakusiana_room_2DL_001378 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_001378"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_001378[] = dkakusiana_room_2DL_001378;
#define dkakusiana_room_2DL_002818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_002818"
#define dkakusiana_room_2DL_002818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_002818"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_002818[] = dkakusiana_room_2DL_002818;
#define dkakusiana_room_2DL_000A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_000A20"
#define dkakusiana_room_2DL_000A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_000A20"
static const ALIGN_ASSET(2) char kakusiana_room_2DL_000A20[] = dkakusiana_room_2DL_000A20;
#define dkakusiana_room_2Tex_001448 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2Tex_001448"
static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448;
#endif // MISC_KAKUSIANA_ROOM_2_H