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

55
soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h
View File

@@ -3,40 +3,41 @@
#include "align_asset_macro.h"
#define dgThievesHideoutNightEntranceTex "__OTR__scenes/nonmq/gerudoway_scene/gThievesHideoutNightEntranceTex"
static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex[] = dgThievesHideoutNightEntranceTex;
#define dgThievesHideoutDayEntranceTex "__OTR__scenes/nonmq/gerudoway_scene/gThievesHideoutDayEntranceTex"
static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex[] = dgThievesHideoutDayEntranceTex;
#define dgerudoway_sceneCollisionHeader_0074EC "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneCollisionHeader_0074EC"
static const ALIGN_ASSET(2) char gerudoway_sceneCollisionHeader_0074EC[] = dgerudoway_sceneCollisionHeader_0074EC;
#define dgerudoway_sceneTex_009D20 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_009D20"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_009D20[] = dgerudoway_sceneTex_009D20;
#define dgerudoway_sceneTex_00A920 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00A920"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A920[] = dgerudoway_sceneTex_00A920;
#define dgerudoway_sceneTex_00A520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00A520"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A520[] = dgerudoway_sceneTex_00A520;
#define dgerudoway_sceneTex_009520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_009520"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_009520[] = dgerudoway_sceneTex_009520;
#define dgerudoway_sceneTex_007520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_007520"
#define dgerudoway_sceneTex_007520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_007520"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_007520[] = dgerudoway_sceneTex_007520;
#define dgerudoway_sceneTex_008520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_008520"
#define dgerudoway_sceneTex_008520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_008520"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_008520[] = dgerudoway_sceneTex_008520;
#define dgerudoway_sceneTex_008D20 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_008D20"
#define dgerudoway_sceneTex_008D20 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_008D20"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_008D20[] = dgerudoway_sceneTex_008D20;
#define dgerudoway_sceneTex_00D120 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00D120"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_00D120[] = dgerudoway_sceneTex_00D120;
#define dgerudoway_sceneTex_009520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_009520"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_009520[] = dgerudoway_sceneTex_009520;
#define dgerudoway_sceneTex_00C120 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00C120"
#define dgerudoway_sceneTex_009D20 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_009D20"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_009D20[] = dgerudoway_sceneTex_009D20;
#define dgerudoway_sceneTex_00A520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00A520"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A520[] = dgerudoway_sceneTex_00A520;
#define dgerudoway_sceneTex_00A920 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00A920"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A920[] = dgerudoway_sceneTex_00A920;
#define dgerudoway_sceneTex_00C120 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00C120"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_00C120[] = dgerudoway_sceneTex_00C120;
#define dgerudoway_sceneTex_00D120 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00D120"
static const ALIGN_ASSET(2) char gerudoway_sceneTex_00D120[] = dgerudoway_sceneTex_00D120;
#define dgThievesHideoutNightEntranceTex "__OTR__scenes/shared/gerudoway_scene/gThievesHideoutNightEntranceTex"
static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex[] = dgThievesHideoutNightEntranceTex;
#define dgThievesHideoutDayEntranceTex "__OTR__scenes/shared/gerudoway_scene/gThievesHideoutDayEntranceTex"
static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex[] = dgThievesHideoutDayEntranceTex;
#define dgerudoway_sceneCollisionHeader_0074EC "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneCollisionHeader_0074EC"
static const ALIGN_ASSET(2) char gerudoway_sceneCollisionHeader_0074EC[] = dgerudoway_sceneCollisionHeader_0074EC;
#endif // DUNGEONS_GERUDOWAY_SCENE_H