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

56
soh/assets/scenes/indoors/takaraya/takaraya_room_0.h
View File

@@ -3,41 +3,41 @@
#include "align_asset_macro.h"
#define dtakaraya_room_0DL_003B98 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_003B98"
static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98;
#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0083E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0;
#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_005BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0;
#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0073E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0;
#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_006BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0;
#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_004BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0;
#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0043E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0;
#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_003BE0"
#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_003BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_003BE0[] = dtakaraya_room_0Tex_003BE0;
#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_007BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0;
#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0043E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0;
#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0063E0"
#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_004BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0;
#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_005BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0;
#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0063E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0063E0[] = dtakaraya_room_0Tex_0063E0;
#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_0095B0"
static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0;
#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_006BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0;
#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0095C0"
#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0073E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0;
#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_007BE0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0;
#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0083E0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0;
#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0095C0"
static const ALIGN_ASSET(2) char takaraya_room_0Tex_0095C0[] = dtakaraya_room_0Tex_0095C0;
#define dtakaraya_room_0DL_003B98 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_003B98"
static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98;
#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_0095B0"
static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0;
#endif // INDOORS_TAKARAYA_ROOM_0_H