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

58
soh/assets/scenes/test_levels/syotes/syotes_room_0.h
View File

@@ -3,44 +3,44 @@
#include "align_asset_macro.h"
#define dsyotes_room_0DL_0031C8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0DL_0031C8"
static const ALIGN_ASSET(2) char syotes_room_0DL_0031C8[] = dsyotes_room_0DL_0031C8;
#define dsyotes_room_0Tex_0069E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0069E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0069E8[] = dsyotes_room_0Tex_0069E8;
#define dsyotes_room_0Tex_0079E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0079E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0079E8[] = dsyotes_room_0Tex_0079E8;
#define dsyotes_room_0Tex_0089E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0089E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0089E8[] = dsyotes_room_0Tex_0089E8;
#define dsyotes_room_0Tex_0039E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0039E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0039E8[] = dsyotes_room_0Tex_0039E8;
#define dsyotes_room_0Tex_0031E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0031E8"
#define dsyotes_room_0Tex_0031E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0031E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0031E8[] = dsyotes_room_0Tex_0031E8;
#define dsyotes_room_0Tex_0061E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0061E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0061E8[] = dsyotes_room_0Tex_0061E8;
#define dsyotes_room_0Tex_0039E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0039E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0039E8[] = dsyotes_room_0Tex_0039E8;
#define dsyotes_room_0Tex_0041E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0041E8"
#define dsyotes_room_0Tex_0041E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0041E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0041E8[] = dsyotes_room_0Tex_0041E8;
#define dsyotes_room_0Tex_0099E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0099E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0099E8[] = dsyotes_room_0Tex_0099E8;
#define dsyotes_room_0Tex_00A9E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_00A9E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_00A9E8[] = dsyotes_room_0Tex_00A9E8;
#define dsyotes_room_0Tex_0051E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0051E8"
#define dsyotes_room_0Tex_0051E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0051E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0051E8[] = dsyotes_room_0Tex_0051E8;
#define dsyotes_room_0DL_00BF70 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0DL_00BF70"
static const ALIGN_ASSET(2) char syotes_room_0DL_00BF70[] = dsyotes_room_0DL_00BF70;
#define dsyotes_room_0Tex_0061E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0061E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0061E8[] = dsyotes_room_0Tex_0061E8;
#define dsyotes_room_0Tex_00BF80 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_00BF80"
#define dsyotes_room_0Tex_0069E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0069E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0069E8[] = dsyotes_room_0Tex_0069E8;
#define dsyotes_room_0Tex_0079E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0079E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0079E8[] = dsyotes_room_0Tex_0079E8;
#define dsyotes_room_0Tex_0089E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0089E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0089E8[] = dsyotes_room_0Tex_0089E8;
#define dsyotes_room_0Tex_0099E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0099E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_0099E8[] = dsyotes_room_0Tex_0099E8;
#define dsyotes_room_0Tex_00A9E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_00A9E8"
static const ALIGN_ASSET(2) char syotes_room_0Tex_00A9E8[] = dsyotes_room_0Tex_00A9E8;
#define dsyotes_room_0Tex_00BF80 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_00BF80"
static const ALIGN_ASSET(2) char syotes_room_0Tex_00BF80[] = dsyotes_room_0Tex_00BF80;
#define dsyotes_room_0DL_0031C8 "__OTR__scenes/shared/syotes_scene/syotes_room_0DL_0031C8"
static const ALIGN_ASSET(2) char syotes_room_0DL_0031C8[] = dsyotes_room_0DL_0031C8;
#define dsyotes_room_0DL_00BF70 "__OTR__scenes/shared/syotes_scene/syotes_room_0DL_00BF70"
static const ALIGN_ASSET(2) char syotes_room_0DL_00BF70[] = dsyotes_room_0DL_00BF70;
#endif // TEST_LEVELS_SYOTES_ROOM_0_H