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/dungeons/MIZUsin/MIZUsin_scene.h
View File

@@ -3,6 +3,15 @@
#include "align_asset_macro.h"
#define dMIZUsin_sceneTex_013C30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_013C30"
static const ALIGN_ASSET(2) char MIZUsin_sceneTex_013C30[] = dMIZUsin_sceneTex_013C30;
#define dMIZUsin_sceneTex_014430 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_014430"
static const ALIGN_ASSET(2) char MIZUsin_sceneTex_014430[] = dMIZUsin_sceneTex_014430;
#define dMIZUsin_sceneTex_015030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_015030"
static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030;
#define dgWaterTempleDayEntranceTex "__OTR__scenes/nonmq/MIZUsin_scene/gWaterTempleDayEntranceTex"
static const ALIGN_ASSET(2) char gWaterTempleDayEntranceTex[] = dgWaterTempleDayEntranceTex;
@@ -12,13 +21,5 @@ static const ALIGN_ASSET(2) char gWaterTempleNightEntranceTex[] = dgWaterTempleN
#define dMIZUsin_sceneCollisionHeader_013C04 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneCollisionHeader_013C04"
static const ALIGN_ASSET(2) char MIZUsin_sceneCollisionHeader_013C04[] = dMIZUsin_sceneCollisionHeader_013C04;
#define dMIZUsin_sceneTex_014430 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_014430"
static const ALIGN_ASSET(2) char MIZUsin_sceneTex_014430[] = dMIZUsin_sceneTex_014430;
#define dMIZUsin_sceneTex_013C30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_013C30"
static const ALIGN_ASSET(2) char MIZUsin_sceneTex_013C30[] = dMIZUsin_sceneTex_013C30;
#define dMIZUsin_sceneTex_015030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_015030"
static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030;
#endif // DUNGEONS_MIZUSIN_SCENE_H