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

32
soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h
View File

@@ -3,26 +3,26 @@
#include "align_asset_macro.h"
#define dgSpiritBossNabooruKnuckleIntroCs "__OTR__scenes/nonmq/jyasinboss_scene/gSpiritBossNabooruKnuckleIntroCs"
static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleIntroCs[] = dgSpiritBossNabooruKnuckleIntroCs;
#define dgSpiritBossNabooruKnuckleDefeatCs "__OTR__scenes/nonmq/jyasinboss_scene/gSpiritBossNabooruKnuckleDefeatCs"
static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleDefeatCs[] = dgSpiritBossNabooruKnuckleDefeatCs;
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
static const ALIGN_ASSET(2) char jyasinboss_sceneCollisionHeader_002B80[] = djyasinboss_sceneCollisionHeader_002B80;
#define djyasinboss_sceneTex_007CF0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneTex_007CF0"
static const ALIGN_ASSET(2) char jyasinboss_sceneTex_007CF0[] = djyasinboss_sceneTex_007CF0;
#define djyasinboss_sceneTex_006CF0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneTex_006CF0"
#define djyasinboss_sceneTex_006CF0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneTex_006CF0"
static const ALIGN_ASSET(2) char jyasinboss_sceneTex_006CF0[] = djyasinboss_sceneTex_006CF0;
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
#define djyasinboss_sceneTex_007CF0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneTex_007CF0"
static const ALIGN_ASSET(2) char jyasinboss_sceneTex_007CF0[] = djyasinboss_sceneTex_007CF0;
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
#define dgSpiritBossNabooruKnuckleIntroCs "__OTR__scenes/shared/jyasinboss_scene/gSpiritBossNabooruKnuckleIntroCs"
static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleIntroCs[] = dgSpiritBossNabooruKnuckleIntroCs;
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
#define dgSpiritBossNabooruKnuckleDefeatCs "__OTR__scenes/shared/jyasinboss_scene/gSpiritBossNabooruKnuckleDefeatCs"
static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleDefeatCs[] = dgSpiritBossNabooruKnuckleDefeatCs;
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
static const ALIGN_ASSET(2) char jyasinboss_sceneCollisionHeader_002B80[] = djyasinboss_sceneCollisionHeader_002B80;
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
#endif // DUNGEONS_JYASINBOSS_SCENE_H