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

16
soh/assets/scenes/dungeons/ganon/ganon_room_3.h
View File

@@ -3,23 +3,23 @@
#include "align_asset_macro.h"
#define dganon_room_3DL_004F20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3DL_004F20"
static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20;
#define dganon_room_3Tex_004F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_004F30"
#define dganon_room_3Tex_004F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_004F30"
static const ALIGN_ASSET(2) char ganon_room_3Tex_004F30[] = dganon_room_3Tex_004F30;
#define dganon_room_3Tex_005330 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005330"
#define dganon_room_3Tex_005330 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005330"
static const ALIGN_ASSET(2) char ganon_room_3Tex_005330[] = dganon_room_3Tex_005330;
#define dganon_room_3Tex_005730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005730"
#define dganon_room_3Tex_005730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005730"
static const ALIGN_ASSET(2) char ganon_room_3Tex_005730[] = dganon_room_3Tex_005730;
#define dganon_room_3Tex_005F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005F30"
#define dganon_room_3Tex_005F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005F30"
static const ALIGN_ASSET(2) char ganon_room_3Tex_005F30[] = dganon_room_3Tex_005F30;
#define dganon_room_3Tex_006730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_006730"
#define dganon_room_3Tex_006730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_006730"
static const ALIGN_ASSET(2) char ganon_room_3Tex_006730[] = dganon_room_3Tex_006730;
#define dganon_room_3DL_004F20 "__OTR__scenes/shared/ganon_scene/ganon_room_3DL_004F20"
static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20;
#endif // DUNGEONS_GANON_ROOM_3_H