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

8
soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h
View File

@@ -3,16 +3,16 @@
#include "align_asset_macro.h"
#define dganon_demo_room_0DL_003D58 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0DL_003D58"
#define dganon_demo_room_0DL_003D58 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0DL_003D58"
static const ALIGN_ASSET(2) char ganon_demo_room_0DL_003D58[] = dganon_demo_room_0DL_003D58;
#define dganon_demo_room_0DL_004140 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0DL_004140"
#define dganon_demo_room_0DL_004140 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0DL_004140"
static const ALIGN_ASSET(2) char ganon_demo_room_0DL_004140[] = dganon_demo_room_0DL_004140;
#define dganon_demo_room_0Set_000230DL_003D58 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0Set_000230DL_003D58"
#define dganon_demo_room_0Set_000230DL_003D58 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0Set_000230DL_003D58"
static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_003D58[] = dganon_demo_room_0Set_000230DL_003D58;
#define dganon_demo_room_0Set_000230DL_004140 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0Set_000230DL_004140"
#define dganon_demo_room_0Set_000230DL_004140 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0Set_000230DL_004140"
static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_004140[] = dganon_demo_room_0Set_000230DL_004140;

66
soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h
View File

@@ -3,43 +3,43 @@
#include "align_asset_macro.h"
#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
static const ALIGN_ASSET(2) char ganon_demo_sceneCollisionHeader_001AA0[] = dganon_demo_sceneCollisionHeader_001AA0;
#define dganon_demo_sceneTex_008370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008370"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008370[] = dganon_demo_sceneTex_008370;
#define dganon_demo_sceneTex_007370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_007370"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_007370[] = dganon_demo_sceneTex_007370;
#define dganon_demo_sceneTex_008870 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008870"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008870[] = dganon_demo_sceneTex_008870;
#define dganon_demo_sceneTex_008770 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008770"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008770[] = dganon_demo_sceneTex_008770;
#define dganon_demo_sceneTex_006370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_006370"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006370[] = dganon_demo_sceneTex_006370;
#define dganon_demo_sceneTex_005B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_005B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_005B70[] = dganon_demo_sceneTex_005B70;
#define dganon_demo_sceneTex_004B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_004B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_004B70[] = dganon_demo_sceneTex_004B70;
#define dganon_demo_sceneTex_003B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_003B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_003B70[] = dganon_demo_sceneTex_003B70;
#define dganon_demo_sceneTex_002B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_002B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_002B70[] = dganon_demo_sceneTex_002B70;
#define dganon_demo_sceneTex_001B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_001B70"
#define dganon_demo_sceneTex_001B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_001B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_001B70[] = dganon_demo_sceneTex_001B70;
#define dganon_demo_sceneTex_006B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_006B70"
#define dganon_demo_sceneTex_002B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_002B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_002B70[] = dganon_demo_sceneTex_002B70;
#define dganon_demo_sceneTex_003B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_003B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_003B70[] = dganon_demo_sceneTex_003B70;
#define dganon_demo_sceneTex_004B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_004B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_004B70[] = dganon_demo_sceneTex_004B70;
#define dganon_demo_sceneTex_005B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_005B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_005B70[] = dganon_demo_sceneTex_005B70;
#define dganon_demo_sceneTex_006370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_006370"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006370[] = dganon_demo_sceneTex_006370;
#define dganon_demo_sceneTex_006B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_006B70"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006B70[] = dganon_demo_sceneTex_006B70;
#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
#define dganon_demo_sceneTex_007370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_007370"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_007370[] = dganon_demo_sceneTex_007370;
#define dganon_demo_sceneTex_008370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008370"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008370[] = dganon_demo_sceneTex_008370;
#define dganon_demo_sceneTex_008770 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008770"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008770[] = dganon_demo_sceneTex_008770;
#define dganon_demo_sceneTex_008870 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008870"
static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008870[] = dganon_demo_sceneTex_008870;
#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
static const ALIGN_ASSET(2) char ganon_demo_sceneCollisionHeader_001AA0[] = dganon_demo_sceneCollisionHeader_001AA0;
#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
#endif // DUNGEONS_GANON_DEMO_SCENE_H