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

17
soh/assets/scenes/misc/kakusiana/kakusiana_scene.h
View File

@@ -3,16 +3,17 @@
#include "align_asset_macro.h"
#define dkakusiana_sceneCollisionHeader_00B7F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneCollisionHeader_00B7F0"
static const ALIGN_ASSET(2) char kakusiana_sceneCollisionHeader_00B7F0[] = dkakusiana_sceneCollisionHeader_00B7F0;
#define dkakusiana_sceneTex_00C020 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00C020"
static const ALIGN_ASSET(2) char kakusiana_sceneTex_00C020[] = dkakusiana_sceneTex_00C020;
#define dkakusiana_sceneTex_00B820 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00B820"
#define dkakusiana_sceneTex_00B820 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00B820"
static const ALIGN_ASSET(2) char kakusiana_sceneTex_00B820[] = dkakusiana_sceneTex_00B820;
#define dkakusiana_sceneTex_00D020 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00D020"
#define dkakusiana_sceneTex_00C020 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00C020"
static const ALIGN_ASSET(2) char kakusiana_sceneTex_00C020[] = dkakusiana_sceneTex_00C020;
#define dkakusiana_sceneTex_00D020 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00D020"
static const ALIGN_ASSET(2) char kakusiana_sceneTex_00D020[] = dkakusiana_sceneTex_00D020;
#define dkakusiana_sceneCollisionHeader_00B7F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneCollisionHeader_00B7F0"
static const ALIGN_ASSET(2) char kakusiana_sceneCollisionHeader_00B7F0[] = dkakusiana_sceneCollisionHeader_00B7F0;
#endif // MISC_KAKUSIANA_SCENE_H