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

132
soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h
View File

@@ -3,85 +3,85 @@
#include "align_asset_macro.h"
#define dganon_tou_room_0DL_0084A8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0DL_0084A8"
static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0084A8[] = dganon_tou_room_0DL_0084A8;
#define dganon_tou_room_0Tex_00E750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00E750"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00E750[] = dganon_tou_room_0Tex_00E750;
#define dganon_tou_room_0Tex_00D750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00D750"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00D750[] = dganon_tou_room_0Tex_00D750;
#define dganon_tou_room_0Tex_008550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008550"
#define dganon_tou_room_0Tex_008550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008550"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008550[] = dganon_tou_room_0Tex_008550;
#define dganon_tou_room_0Tex_00FF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00FF50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FF50[] = dganon_tou_room_0Tex_00FF50;
#define dganon_tou_room_0Tex_00FB50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00FB50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FB50[] = dganon_tou_room_0Tex_00FB50;
#define dganon_tou_room_0Tex_00BF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00BF50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BF50[] = dganon_tou_room_0Tex_00BF50;
#define dganon_tou_room_0Tex_00B950 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B950"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B950[] = dganon_tou_room_0Tex_00B950;
#define dganon_tou_room_0Tex_00B550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B550"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B550[] = dganon_tou_room_0Tex_00B550;
#define dganon_tou_room_0Tex_00CF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00CF50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00CF50[] = dganon_tou_room_0Tex_00CF50;
#define dganon_tou_room_0Tex_00BD50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00BD50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BD50[] = dganon_tou_room_0Tex_00BD50;
#define dganon_tou_room_0Tex_00B150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B150[] = dganon_tou_room_0Tex_00B150;
#define dganon_tou_room_0Tex_010550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_010550"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010550[] = dganon_tou_room_0Tex_010550;
#define dganon_tou_room_0Tex_010150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_010150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010150[] = dganon_tou_room_0Tex_010150;
#define dganon_tou_room_0Tex_00F750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00F750"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00F750[] = dganon_tou_room_0Tex_00F750;
#define dganon_tou_room_0Tex_00A150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00A150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00A150[] = dganon_tou_room_0Tex_00A150;
#define dganon_tou_room_0Tex_009150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_009150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_009150[] = dganon_tou_room_0Tex_009150;
#define dganon_tou_room_0Tex_008F50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008F50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008F50[] = dganon_tou_room_0Tex_008F50;
#define dganon_tou_room_0Tex_008D50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008D50"
#define dganon_tou_room_0Tex_008D50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008D50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008D50[] = dganon_tou_room_0Tex_008D50;
#define dganon_tou_room_0DL_0124B8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0DL_0124B8"
static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0124B8[] = dganon_tou_room_0DL_0124B8;
#define dganon_tou_room_0Tex_008F50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008F50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008F50[] = dganon_tou_room_0Tex_008F50;
#define dganon_tou_room_0Tex_0125F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0125F0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0125F0[] = dganon_tou_room_0Tex_0125F0;
#define dganon_tou_room_0Tex_009150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_009150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_009150[] = dganon_tou_room_0Tex_009150;
#define dganon_tou_room_0Tex_0139F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0139F0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0139F0[] = dganon_tou_room_0Tex_0139F0;
#define dganon_tou_room_0Tex_00A150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00A150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00A150[] = dganon_tou_room_0Tex_00A150;
#define dganon_tou_room_0Tex_012DF0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_012DF0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_012DF0[] = dganon_tou_room_0Tex_012DF0;
#define dganon_tou_room_0Tex_00B150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B150[] = dganon_tou_room_0Tex_00B150;
#define dganon_tou_room_0Tex_0135F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0135F0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0135F0[] = dganon_tou_room_0Tex_0135F0;
#define dganon_tou_room_0Tex_00B550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B550"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B550[] = dganon_tou_room_0Tex_00B550;
#define dganon_tou_room_0Tex_0124F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0124F0"
#define dganon_tou_room_0Tex_00B950 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B950"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B950[] = dganon_tou_room_0Tex_00B950;
#define dganon_tou_room_0Tex_00BD50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00BD50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BD50[] = dganon_tou_room_0Tex_00BD50;
#define dganon_tou_room_0Tex_00BF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00BF50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BF50[] = dganon_tou_room_0Tex_00BF50;
#define dganon_tou_room_0Tex_00CF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00CF50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00CF50[] = dganon_tou_room_0Tex_00CF50;
#define dganon_tou_room_0Tex_00D750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00D750"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00D750[] = dganon_tou_room_0Tex_00D750;
#define dganon_tou_room_0Tex_00E750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00E750"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00E750[] = dganon_tou_room_0Tex_00E750;
#define dganon_tou_room_0Tex_00F750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00F750"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00F750[] = dganon_tou_room_0Tex_00F750;
#define dganon_tou_room_0Tex_00FB50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00FB50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FB50[] = dganon_tou_room_0Tex_00FB50;
#define dganon_tou_room_0Tex_00FF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00FF50"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FF50[] = dganon_tou_room_0Tex_00FF50;
#define dganon_tou_room_0Tex_010150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_010150"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010150[] = dganon_tou_room_0Tex_010150;
#define dganon_tou_room_0Tex_010550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_010550"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010550[] = dganon_tou_room_0Tex_010550;
#define dganon_tou_room_0Tex_0124F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0124F0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0124F0[] = dganon_tou_room_0Tex_0124F0;
#define dganon_tou_room_0Set_000160DL_0084A8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0084A8"
#define dganon_tou_room_0Tex_0125F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0125F0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0125F0[] = dganon_tou_room_0Tex_0125F0;
#define dganon_tou_room_0Tex_012DF0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_012DF0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_012DF0[] = dganon_tou_room_0Tex_012DF0;
#define dganon_tou_room_0Tex_0135F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0135F0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0135F0[] = dganon_tou_room_0Tex_0135F0;
#define dganon_tou_room_0Tex_0139F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0139F0"
static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0139F0[] = dganon_tou_room_0Tex_0139F0;
#define dganon_tou_room_0DL_0084A8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0DL_0084A8"
static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0084A8[] = dganon_tou_room_0DL_0084A8;
#define dganon_tou_room_0DL_0124B8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0DL_0124B8"
static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0124B8[] = dganon_tou_room_0DL_0124B8;
#define dganon_tou_room_0Set_000160DL_0084A8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0084A8"
static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0084A8[] = dganon_tou_room_0Set_000160DL_0084A8;
#define dganon_tou_room_0Set_000160DL_0124B8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0124B8"
#define dganon_tou_room_0Set_000160DL_0124B8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0124B8"
static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0124B8[] = dganon_tou_room_0Set_000160DL_0124B8;

22
soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h
View File

@@ -3,19 +3,19 @@
#include "align_asset_macro.h"
#define dgRainbowBridgeCs "__OTR__scenes/nonmq/ganon_tou_scene/gRainbowBridgeCs"
static const ALIGN_ASSET(2) char gRainbowBridgeCs[] = dgRainbowBridgeCs;
#define dgGanonsCastleIntroCs "__OTR__scenes/nonmq/ganon_tou_scene/gGanonsCastleIntroCs"
static const ALIGN_ASSET(2) char gGanonsCastleIntroCs[] = dgGanonsCastleIntroCs;
#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
static const ALIGN_ASSET(2) char ganon_tou_sceneCollisionHeader_002610[] = dganon_tou_sceneCollisionHeader_002610;
#define dganon_tou_sceneTex_003280 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneTex_003280"
#define dganon_tou_sceneTex_003280 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneTex_003280"
static const ALIGN_ASSET(2) char ganon_tou_sceneTex_003280[] = dganon_tou_sceneTex_003280;
#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
#define dgRainbowBridgeCs "__OTR__scenes/shared/ganon_tou_scene/gRainbowBridgeCs"
static const ALIGN_ASSET(2) char gRainbowBridgeCs[] = dgRainbowBridgeCs;
#define dgGanonsCastleIntroCs "__OTR__scenes/shared/ganon_tou_scene/gGanonsCastleIntroCs"
static const ALIGN_ASSET(2) char gGanonsCastleIntroCs[] = dgGanonsCastleIntroCs;
#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
static const ALIGN_ASSET(2) char ganon_tou_sceneCollisionHeader_002610[] = dganon_tou_sceneCollisionHeader_002610;
#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
#endif // DUNGEONS_GANON_TOU_SCENE_H