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

139
soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h
View File

@@ -3,82 +3,83 @@
#include "align_asset_macro.h"
#define dganon_final_sceneCollisionHeader_002354 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneCollisionHeader_002354"
static const ALIGN_ASSET(2) char ganon_final_sceneCollisionHeader_002354[] = dganon_final_sceneCollisionHeader_002354;
#define dganon_final_sceneTex_00A580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00A580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00A580[] = dganon_final_sceneTex_00A580;
#define dganon_final_sceneTex_00BD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00BD80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00BD80[] = dganon_final_sceneTex_00BD80;
#define dganon_final_sceneTex_00AD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00AD80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00AD80[] = dganon_final_sceneTex_00AD80;
#define dganon_final_sceneTex_00CD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00CD80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CD80[] = dganon_final_sceneTex_00CD80;
#define dganon_final_sceneTex_004D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_004D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_004D80[] = dganon_final_sceneTex_004D80;
#define dganon_final_sceneTex_006D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_006D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_006D80[] = dganon_final_sceneTex_006D80;
#define dganon_final_sceneTex_003D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_003D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_003D80[] = dganon_final_sceneTex_003D80;
#define dganon_final_sceneTex_010580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_010580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_010580[] = dganon_final_sceneTex_010580;
#define dganon_final_sceneTex_00CE80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00CE80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CE80[] = dganon_final_sceneTex_00CE80;
#define dganon_final_sceneTex_00DE80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00DE80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00DE80[] = dganon_final_sceneTex_00DE80;
#define dganon_final_sceneTex_002980 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002980"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_002980[] = dganon_final_sceneTex_002980;
#define dganon_final_sceneTex_002380 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002380"
#define dganon_final_sceneTex_002380 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002380"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_002380[] = dganon_final_sceneTex_002380;
#define dganon_final_sceneTex_002D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_002D80[] = dganon_final_sceneTex_002D80;
#define dganon_final_sceneTex_007580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_007580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_007580[] = dganon_final_sceneTex_007580;
#define dganon_final_sceneTex_00E180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00E180"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E180[] = dganon_final_sceneTex_00E180;
#define dganon_final_sceneTex_00F580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00F580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F580[] = dganon_final_sceneTex_00F580;
#define dganon_final_sceneTex_005D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_005D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_005D80[] = dganon_final_sceneTex_005D80;
#define dganon_final_sceneTex_008580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_008580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_008580[] = dganon_final_sceneTex_008580;
#define dganon_final_sceneTex_009580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_009580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_009580[] = dganon_final_sceneTex_009580;
#define dganon_final_sceneTex_010980 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_010980"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_010980[] = dganon_final_sceneTex_010980;
#define dganon_final_sceneTex_004580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_004580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_004580[] = dganon_final_sceneTex_004580;
#define dganon_final_sceneTex_002780 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002780"
#define dganon_final_sceneTex_002780 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002780"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_002780[] = dganon_final_sceneTex_002780;
#define dganon_final_sceneTex_00F180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00F180"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F180[] = dganon_final_sceneTex_00F180;
#define dganon_final_sceneTex_002980 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002980"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_002980[] = dganon_final_sceneTex_002980;
#define dganon_final_sceneTex_00E080 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00E080"
#define dganon_final_sceneTex_002D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_002D80[] = dganon_final_sceneTex_002D80;
#define dganon_final_sceneTex_003D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_003D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_003D80[] = dganon_final_sceneTex_003D80;
#define dganon_final_sceneTex_004580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_004580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_004580[] = dganon_final_sceneTex_004580;
#define dganon_final_sceneTex_004D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_004D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_004D80[] = dganon_final_sceneTex_004D80;
#define dganon_final_sceneTex_005D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_005D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_005D80[] = dganon_final_sceneTex_005D80;
#define dganon_final_sceneTex_006D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_006D80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_006D80[] = dganon_final_sceneTex_006D80;
#define dganon_final_sceneTex_007580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_007580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_007580[] = dganon_final_sceneTex_007580;
#define dganon_final_sceneTex_008580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_008580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_008580[] = dganon_final_sceneTex_008580;
#define dganon_final_sceneTex_009580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_009580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_009580[] = dganon_final_sceneTex_009580;
#define dganon_final_sceneTex_00A580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00A580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00A580[] = dganon_final_sceneTex_00A580;
#define dganon_final_sceneTex_00AD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00AD80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00AD80[] = dganon_final_sceneTex_00AD80;
#define dganon_final_sceneTex_00BD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00BD80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00BD80[] = dganon_final_sceneTex_00BD80;
#define dganon_final_sceneTex_00CD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00CD80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CD80[] = dganon_final_sceneTex_00CD80;
#define dganon_final_sceneTex_00CE80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00CE80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CE80[] = dganon_final_sceneTex_00CE80;
#define dganon_final_sceneTex_00DE80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00DE80"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00DE80[] = dganon_final_sceneTex_00DE80;
#define dganon_final_sceneTex_00E080 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00E080"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E080[] = dganon_final_sceneTex_00E080;
#define dganon_final_sceneTex_011180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_011180"
#define dganon_final_sceneTex_00E180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00E180"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E180[] = dganon_final_sceneTex_00E180;
#define dganon_final_sceneTex_00F180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00F180"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F180[] = dganon_final_sceneTex_00F180;
#define dganon_final_sceneTex_00F580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00F580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F580[] = dganon_final_sceneTex_00F580;
#define dganon_final_sceneTex_010580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_010580"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_010580[] = dganon_final_sceneTex_010580;
#define dganon_final_sceneTex_010980 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_010980"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_010980[] = dganon_final_sceneTex_010980;
#define dganon_final_sceneTex_011180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_011180"
static const ALIGN_ASSET(2) char ganon_final_sceneTex_011180[] = dganon_final_sceneTex_011180;
#define dganon_final_sceneCollisionHeader_002354 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneCollisionHeader_002354"
static const ALIGN_ASSET(2) char ganon_final_sceneCollisionHeader_002354[] = dganon_final_sceneCollisionHeader_002354;
#endif // DUNGEONS_GANON_FINAL_SCENE_H