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

46
soh/assets/scenes/dungeons/ganon/ganon_room_2.h
View File

@@ -3,35 +3,35 @@
#include "align_asset_macro.h"
#define dganon_room_2DL_003DD8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_003DD8"
static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8;
#define dganon_room_2Tex_005DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_005DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0;
#define dganon_room_2Tex_004DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_004DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0;
#define dganon_room_2Tex_0059F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0059F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0;
#define dganon_room_2Tex_0041F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0041F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0;
#define dganon_room_2Tex_0049F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0049F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0;
#define dganon_room_2Tex_003DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_003DF0"
#define dganon_room_2Tex_003DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_003DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_003DF0[] = dganon_room_2Tex_003DF0;
#define dganon_room_2Tex_0051F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0051F0"
#define dganon_room_2Tex_0041F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0041F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0;
#define dganon_room_2Tex_0049F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0049F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0;
#define dganon_room_2Tex_004DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_004DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0;
#define dganon_room_2Tex_0051F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0051F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0051F0[] = dganon_room_2Tex_0051F0;
#define dganon_room_2DL_007040 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_007040"
static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040;
#define dganon_room_2Tex_0059F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0059F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0;
#define dganon_room_2Tex_007050 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_007050"
#define dganon_room_2Tex_005DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_005DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0;
#define dganon_room_2Tex_007050 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_007050"
static const ALIGN_ASSET(2) char ganon_room_2Tex_007050[] = dganon_room_2Tex_007050;
#define dganon_room_2DL_003DD8 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_003DD8"
static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8;
#define dganon_room_2DL_007040 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_007040"
static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040;
#endif // DUNGEONS_GANON_ROOM_2_H