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

44
soh/assets/scenes/dungeons/ganon/ganon_room_7.h
View File

@@ -3,32 +3,32 @@
#include "align_asset_macro.h"
#define dganon_room_7DL_0071C8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_0071C8"
static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8;
#define dganon_room_7Tex_0085E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0085E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0;
#define dganon_room_7Tex_0089E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0089E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0;
#define dganon_room_7Tex_007DE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_007DE0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0;
#define dganon_room_7Tex_0075E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0075E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0;
#define dganon_room_7Tex_0091E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0091E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0;
#define dganon_room_7Tex_0071E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0071E0"
#define dganon_room_7Tex_0071E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0071E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0071E0[] = dganon_room_7Tex_0071E0;
#define dganon_room_7DL_009F88 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_009F88"
static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88;
#define dganon_room_7Tex_0075E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0075E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0;
#define dganon_room_7Tex_009F98 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_009F98"
#define dganon_room_7Tex_007DE0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_007DE0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0;
#define dganon_room_7Tex_0085E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0085E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0;
#define dganon_room_7Tex_0089E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0089E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0;
#define dganon_room_7Tex_0091E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0091E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0;
#define dganon_room_7Tex_009F98 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_009F98"
static const ALIGN_ASSET(2) char ganon_room_7Tex_009F98[] = dganon_room_7Tex_009F98;
#define dganon_room_7DL_0071C8 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_0071C8"
static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8;
#define dganon_room_7DL_009F88 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_009F88"
static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88;
#endif // DUNGEONS_GANON_ROOM_7_H