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

36
soh/assets/scenes/dungeons/ganon/ganon_room_0.h
View File

@@ -3,32 +3,32 @@
#include "align_asset_macro.h"
#define dganon_room_0DL_004C50 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0DL_004C50"
static const ALIGN_ASSET(2) char ganon_room_0DL_004C50[] = dganon_room_0DL_004C50;
#define dganon_room_0Tex_004C68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_004C68"
#define dganon_room_0Tex_004C68 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_004C68"
static const ALIGN_ASSET(2) char ganon_room_0Tex_004C68[] = dganon_room_0Tex_004C68;
#define dganon_room_0Tex_005468 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_005468"
#define dganon_room_0Tex_005468 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_005468"
static const ALIGN_ASSET(2) char ganon_room_0Tex_005468[] = dganon_room_0Tex_005468;
#define dganon_room_0Tex_007068 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_007068"
static const ALIGN_ASSET(2) char ganon_room_0Tex_007068[] = dganon_room_0Tex_007068;
#define dganon_room_0Tex_006068 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_006068"
static const ALIGN_ASSET(2) char ganon_room_0Tex_006068[] = dganon_room_0Tex_006068;
#define dganon_room_0Tex_006868 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_006868"
static const ALIGN_ASSET(2) char ganon_room_0Tex_006868[] = dganon_room_0Tex_006868;
#define dganon_room_0Tex_005C68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_005C68"
#define dganon_room_0Tex_005C68 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_005C68"
static const ALIGN_ASSET(2) char ganon_room_0Tex_005C68[] = dganon_room_0Tex_005C68;
#define dganon_room_0DL_0076C0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0DL_0076C0"
static const ALIGN_ASSET(2) char ganon_room_0DL_0076C0[] = dganon_room_0DL_0076C0;
#define dganon_room_0Tex_006068 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_006068"
static const ALIGN_ASSET(2) char ganon_room_0Tex_006068[] = dganon_room_0Tex_006068;
#define dganon_room_0Tex_0076D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_0076D0"
#define dganon_room_0Tex_006868 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_006868"
static const ALIGN_ASSET(2) char ganon_room_0Tex_006868[] = dganon_room_0Tex_006868;
#define dganon_room_0Tex_007068 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_007068"
static const ALIGN_ASSET(2) char ganon_room_0Tex_007068[] = dganon_room_0Tex_007068;
#define dganon_room_0Tex_0076D0 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_0076D0"
static const ALIGN_ASSET(2) char ganon_room_0Tex_0076D0[] = dganon_room_0Tex_0076D0;
#define dganon_room_0DL_004C50 "__OTR__scenes/shared/ganon_scene/ganon_room_0DL_004C50"
static const ALIGN_ASSET(2) char ganon_room_0DL_004C50[] = dganon_room_0DL_004C50;
#define dganon_room_0DL_0076C0 "__OTR__scenes/shared/ganon_scene/ganon_room_0DL_0076C0"
static const ALIGN_ASSET(2) char ganon_room_0DL_0076C0[] = dganon_room_0DL_0076C0;
#endif // DUNGEONS_GANON_ROOM_0_H

28
soh/assets/scenes/dungeons/ganon/ganon_room_1.h
View File

@@ -3,23 +3,23 @@
#include "align_asset_macro.h"
#define dganon_room_1DL_005360 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1DL_005360"
static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360;
#define dganon_room_1Tex_006370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006370"
static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370;
#define dganon_room_1Tex_005F70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005F70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70;
#define dganon_room_1Tex_005B70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005B70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70;
#define dganon_room_1Tex_005370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005370"
#define dganon_room_1Tex_005370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005370"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005370[] = dganon_room_1Tex_005370;
#define dganon_room_1Tex_006770 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006770"
#define dganon_room_1Tex_005B70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005B70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70;
#define dganon_room_1Tex_005F70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005F70"
static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70;
#define dganon_room_1Tex_006370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006370"
static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370;
#define dganon_room_1Tex_006770 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006770"
static const ALIGN_ASSET(2) char ganon_room_1Tex_006770[] = dganon_room_1Tex_006770;
#define dganon_room_1DL_005360 "__OTR__scenes/shared/ganon_scene/ganon_room_1DL_005360"
static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360;
#endif // DUNGEONS_GANON_ROOM_1_H

46
soh/assets/scenes/dungeons/ganon/ganon_room_2.h
View File

@@ -3,35 +3,35 @@
#include "align_asset_macro.h"
#define dganon_room_2DL_003DD8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_003DD8"
static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8;
#define dganon_room_2Tex_005DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_005DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0;
#define dganon_room_2Tex_004DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_004DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0;
#define dganon_room_2Tex_0059F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0059F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0;
#define dganon_room_2Tex_0041F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0041F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0;
#define dganon_room_2Tex_0049F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0049F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0;
#define dganon_room_2Tex_003DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_003DF0"
#define dganon_room_2Tex_003DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_003DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_003DF0[] = dganon_room_2Tex_003DF0;
#define dganon_room_2Tex_0051F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0051F0"
#define dganon_room_2Tex_0041F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0041F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0;
#define dganon_room_2Tex_0049F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0049F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0;
#define dganon_room_2Tex_004DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_004DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0;
#define dganon_room_2Tex_0051F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0051F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0051F0[] = dganon_room_2Tex_0051F0;
#define dganon_room_2DL_007040 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_007040"
static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040;
#define dganon_room_2Tex_0059F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0059F0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0;
#define dganon_room_2Tex_007050 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_007050"
#define dganon_room_2Tex_005DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_005DF0"
static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0;
#define dganon_room_2Tex_007050 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_007050"
static const ALIGN_ASSET(2) char ganon_room_2Tex_007050[] = dganon_room_2Tex_007050;
#define dganon_room_2DL_003DD8 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_003DD8"
static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8;
#define dganon_room_2DL_007040 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_007040"
static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040;
#endif // DUNGEONS_GANON_ROOM_2_H

16
soh/assets/scenes/dungeons/ganon/ganon_room_3.h
View File

@@ -3,23 +3,23 @@
#include "align_asset_macro.h"
#define dganon_room_3DL_004F20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3DL_004F20"
static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20;
#define dganon_room_3Tex_004F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_004F30"
#define dganon_room_3Tex_004F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_004F30"
static const ALIGN_ASSET(2) char ganon_room_3Tex_004F30[] = dganon_room_3Tex_004F30;
#define dganon_room_3Tex_005330 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005330"
#define dganon_room_3Tex_005330 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005330"
static const ALIGN_ASSET(2) char ganon_room_3Tex_005330[] = dganon_room_3Tex_005330;
#define dganon_room_3Tex_005730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005730"
#define dganon_room_3Tex_005730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005730"
static const ALIGN_ASSET(2) char ganon_room_3Tex_005730[] = dganon_room_3Tex_005730;
#define dganon_room_3Tex_005F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005F30"
#define dganon_room_3Tex_005F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005F30"
static const ALIGN_ASSET(2) char ganon_room_3Tex_005F30[] = dganon_room_3Tex_005F30;
#define dganon_room_3Tex_006730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_006730"
#define dganon_room_3Tex_006730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_006730"
static const ALIGN_ASSET(2) char ganon_room_3Tex_006730[] = dganon_room_3Tex_006730;
#define dganon_room_3DL_004F20 "__OTR__scenes/shared/ganon_scene/ganon_room_3DL_004F20"
static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20;
#endif // DUNGEONS_GANON_ROOM_3_H

56
soh/assets/scenes/dungeons/ganon/ganon_room_4.h
View File

@@ -3,44 +3,44 @@
#include "align_asset_macro.h"
#define dganon_room_4DL_004650 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4DL_004650"
static const ALIGN_ASSET(2) char ganon_room_4DL_004650[] = dganon_room_4DL_004650;
#define dganon_room_4Tex_007668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_007668"
static const ALIGN_ASSET(2) char ganon_room_4Tex_007668[] = dganon_room_4Tex_007668;
#define dganon_room_4Tex_004668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_004668"
#define dganon_room_4Tex_004668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_004668"
static const ALIGN_ASSET(2) char ganon_room_4Tex_004668[] = dganon_room_4Tex_004668;
#define dganon_room_4Tex_005A68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_005A68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_005A68[] = dganon_room_4Tex_005A68;
#define dganon_room_4Tex_006268 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006268"
static const ALIGN_ASSET(2) char ganon_room_4Tex_006268[] = dganon_room_4Tex_006268;
#define dganon_room_4Tex_005668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_005668"
static const ALIGN_ASSET(2) char ganon_room_4Tex_005668[] = dganon_room_4Tex_005668;
#define dganon_room_4Tex_004E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_004E68"
#define dganon_room_4Tex_004E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_004E68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_004E68[] = dganon_room_4Tex_004E68;
#define dganon_room_4Tex_006668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006668"
#define dganon_room_4Tex_005668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_005668"
static const ALIGN_ASSET(2) char ganon_room_4Tex_005668[] = dganon_room_4Tex_005668;
#define dganon_room_4Tex_005A68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_005A68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_005A68[] = dganon_room_4Tex_005A68;
#define dganon_room_4Tex_006268 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006268"
static const ALIGN_ASSET(2) char ganon_room_4Tex_006268[] = dganon_room_4Tex_006268;
#define dganon_room_4Tex_006668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006668"
static const ALIGN_ASSET(2) char ganon_room_4Tex_006668[] = dganon_room_4Tex_006668;
#define dganon_room_4Tex_006E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006E68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_006E68[] = dganon_room_4Tex_006E68;
#define dganon_room_4Tex_007E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_007E68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_007E68[] = dganon_room_4Tex_007E68;
#define dganon_room_4Tex_006A68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006A68"
#define dganon_room_4Tex_006A68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006A68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_006A68[] = dganon_room_4Tex_006A68;
#define dganon_room_4DL_0088C0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4DL_0088C0"
static const ALIGN_ASSET(2) char ganon_room_4DL_0088C0[] = dganon_room_4DL_0088C0;
#define dganon_room_4Tex_006E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006E68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_006E68[] = dganon_room_4Tex_006E68;
#define dganon_room_4Tex_0088D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_0088D0"
#define dganon_room_4Tex_007668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_007668"
static const ALIGN_ASSET(2) char ganon_room_4Tex_007668[] = dganon_room_4Tex_007668;
#define dganon_room_4Tex_007E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_007E68"
static const ALIGN_ASSET(2) char ganon_room_4Tex_007E68[] = dganon_room_4Tex_007E68;
#define dganon_room_4Tex_0088D0 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_0088D0"
static const ALIGN_ASSET(2) char ganon_room_4Tex_0088D0[] = dganon_room_4Tex_0088D0;
#define dganon_room_4DL_004650 "__OTR__scenes/shared/ganon_scene/ganon_room_4DL_004650"
static const ALIGN_ASSET(2) char ganon_room_4DL_004650[] = dganon_room_4DL_004650;
#define dganon_room_4DL_0088C0 "__OTR__scenes/shared/ganon_scene/ganon_room_4DL_0088C0"
static const ALIGN_ASSET(2) char ganon_room_4DL_0088C0[] = dganon_room_4DL_0088C0;
#endif // DUNGEONS_GANON_ROOM_4_H

30
soh/assets/scenes/dungeons/ganon/ganon_room_5.h
View File

@@ -3,26 +3,26 @@
#include "align_asset_macro.h"
#define dganon_room_5DL_005AF8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5DL_005AF8"
static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8;
#define dganon_room_5Tex_007F08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007F08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08;
#define dganon_room_5Tex_007B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08;
#define dganon_room_5Tex_005B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_005B08"
#define dganon_room_5Tex_005B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_005B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_005B08[] = dganon_room_5Tex_005B08;
#define dganon_room_5Tex_008308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_008308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308;
#define dganon_room_5Tex_006308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308;
#define dganon_room_5Tex_006B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006B08"
#define dganon_room_5Tex_006B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_006B08[] = dganon_room_5Tex_006B08;
#define dganon_room_5Tex_006308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308;
#define dganon_room_5Tex_007B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007B08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08;
#define dganon_room_5Tex_007F08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007F08"
static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08;
#define dganon_room_5Tex_008308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_008308"
static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308;
#define dganon_room_5DL_005AF8 "__OTR__scenes/shared/ganon_scene/ganon_room_5DL_005AF8"
static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8;
#endif // DUNGEONS_GANON_ROOM_5_H

46
soh/assets/scenes/dungeons/ganon/ganon_room_6.h
View File

@@ -3,35 +3,35 @@
#include "align_asset_macro.h"
#define dganon_room_6DL_006DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6DL_006DF0"
static const ALIGN_ASSET(2) char ganon_room_6DL_006DF0[] = dganon_room_6DL_006DF0;
#define dganon_room_6Tex_007A00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007A00"
static const ALIGN_ASSET(2) char ganon_room_6Tex_007A00[] = dganon_room_6Tex_007A00;
#define dganon_room_6Tex_008200 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008200"
static const ALIGN_ASSET(2) char ganon_room_6Tex_008200[] = dganon_room_6Tex_008200;
#define dganon_room_6Tex_007200 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007200"
static const ALIGN_ASSET(2) char ganon_room_6Tex_007200[] = dganon_room_6Tex_007200;
#define dganon_room_6Tex_008B00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008B00"
static const ALIGN_ASSET(2) char ganon_room_6Tex_008B00[] = dganon_room_6Tex_008B00;
#define dganon_room_6Tex_007600 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007600"
static const ALIGN_ASSET(2) char ganon_room_6Tex_007600[] = dganon_room_6Tex_007600;
#define dganon_room_6Tex_006E00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_006E00"
#define dganon_room_6Tex_006E00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_006E00"
static const ALIGN_ASSET(2) char ganon_room_6Tex_006E00[] = dganon_room_6Tex_006E00;
#define dganon_room_6Tex_008300 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008300"
#define dganon_room_6Tex_007200 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007200"
static const ALIGN_ASSET(2) char ganon_room_6Tex_007200[] = dganon_room_6Tex_007200;
#define dganon_room_6Tex_007600 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007600"
static const ALIGN_ASSET(2) char ganon_room_6Tex_007600[] = dganon_room_6Tex_007600;
#define dganon_room_6Tex_007A00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007A00"
static const ALIGN_ASSET(2) char ganon_room_6Tex_007A00[] = dganon_room_6Tex_007A00;
#define dganon_room_6Tex_008200 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008200"
static const ALIGN_ASSET(2) char ganon_room_6Tex_008200[] = dganon_room_6Tex_008200;
#define dganon_room_6Tex_008300 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008300"
static const ALIGN_ASSET(2) char ganon_room_6Tex_008300[] = dganon_room_6Tex_008300;
#define dganon_room_6DL_009388 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6DL_009388"
static const ALIGN_ASSET(2) char ganon_room_6DL_009388[] = dganon_room_6DL_009388;
#define dganon_room_6Tex_008B00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008B00"
static const ALIGN_ASSET(2) char ganon_room_6Tex_008B00[] = dganon_room_6Tex_008B00;
#define dganon_room_6Tex_009398 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_009398"
#define dganon_room_6Tex_009398 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_009398"
static const ALIGN_ASSET(2) char ganon_room_6Tex_009398[] = dganon_room_6Tex_009398;
#define dganon_room_6DL_006DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_6DL_006DF0"
static const ALIGN_ASSET(2) char ganon_room_6DL_006DF0[] = dganon_room_6DL_006DF0;
#define dganon_room_6DL_009388 "__OTR__scenes/shared/ganon_scene/ganon_room_6DL_009388"
static const ALIGN_ASSET(2) char ganon_room_6DL_009388[] = dganon_room_6DL_009388;
#endif // DUNGEONS_GANON_ROOM_6_H

44
soh/assets/scenes/dungeons/ganon/ganon_room_7.h
View File

@@ -3,32 +3,32 @@
#include "align_asset_macro.h"
#define dganon_room_7DL_0071C8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_0071C8"
static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8;
#define dganon_room_7Tex_0085E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0085E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0;
#define dganon_room_7Tex_0089E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0089E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0;
#define dganon_room_7Tex_007DE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_007DE0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0;
#define dganon_room_7Tex_0075E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0075E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0;
#define dganon_room_7Tex_0091E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0091E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0;
#define dganon_room_7Tex_0071E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0071E0"
#define dganon_room_7Tex_0071E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0071E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0071E0[] = dganon_room_7Tex_0071E0;
#define dganon_room_7DL_009F88 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_009F88"
static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88;
#define dganon_room_7Tex_0075E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0075E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0;
#define dganon_room_7Tex_009F98 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_009F98"
#define dganon_room_7Tex_007DE0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_007DE0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0;
#define dganon_room_7Tex_0085E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0085E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0;
#define dganon_room_7Tex_0089E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0089E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0;
#define dganon_room_7Tex_0091E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0091E0"
static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0;
#define dganon_room_7Tex_009F98 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_009F98"
static const ALIGN_ASSET(2) char ganon_room_7Tex_009F98[] = dganon_room_7Tex_009F98;
#define dganon_room_7DL_0071C8 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_0071C8"
static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8;
#define dganon_room_7DL_009F88 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_009F88"
static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88;
#endif // DUNGEONS_GANON_ROOM_7_H

44
soh/assets/scenes/dungeons/ganon/ganon_room_8.h
View File

@@ -3,35 +3,35 @@
#include "align_asset_macro.h"
#define dganon_room_8DL_004940 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8DL_004940"
static const ALIGN_ASSET(2) char ganon_room_8DL_004940[] = dganon_room_8DL_004940;
#define dganon_room_8Tex_005BE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005BE0"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005BE0[] = dganon_room_8Tex_005BE0;
#define dganon_room_8Tex_0053E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_0053E0"
static const ALIGN_ASSET(2) char ganon_room_8Tex_0053E0[] = dganon_room_8Tex_0053E0;
#define dganon_room_8Tex_005320 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005320"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005320[] = dganon_room_8Tex_005320;
#define dganon_room_8Tex_005220 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005220"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005220[] = dganon_room_8Tex_005220;
#define dganon_room_8Tex_004A20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_004A20"
#define dganon_room_8Tex_004A20 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_004A20"
static const ALIGN_ASSET(2) char ganon_room_8Tex_004A20[] = dganon_room_8Tex_004A20;
#define dganon_room_8TLUT_004950 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8TLUT_004950"
static const ALIGN_ASSET(2) char ganon_room_8TLUT_004950[] = dganon_room_8TLUT_004950;
#define dganon_room_8Tex_005220 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005220"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005220[] = dganon_room_8Tex_005220;
#define dganon_room_8Tex_0063E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_0063E0"
static const ALIGN_ASSET(2) char ganon_room_8Tex_0063E0[] = dganon_room_8Tex_0063E0;
#define dganon_room_8Tex_005320 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005320"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005320[] = dganon_room_8Tex_005320;
#define dganon_room_8Tex_005360 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005360"
#define dganon_room_8Tex_005360 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005360"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005360[] = dganon_room_8Tex_005360;
#define dganon_room_8Tex_005FE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005FE0"
#define dganon_room_8Tex_0053E0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_0053E0"
static const ALIGN_ASSET(2) char ganon_room_8Tex_0053E0[] = dganon_room_8Tex_0053E0;
#define dganon_room_8Tex_005BE0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005BE0"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005BE0[] = dganon_room_8Tex_005BE0;
#define dganon_room_8Tex_005FE0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005FE0"
static const ALIGN_ASSET(2) char ganon_room_8Tex_005FE0[] = dganon_room_8Tex_005FE0;
#define dganon_room_8Tex_0063E0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_0063E0"
static const ALIGN_ASSET(2) char ganon_room_8Tex_0063E0[] = dganon_room_8Tex_0063E0;
#define dganon_room_8TLUT_004950 "__OTR__scenes/shared/ganon_scene/ganon_room_8TLUT_004950"
static const ALIGN_ASSET(2) char ganon_room_8TLUT_004950[] = dganon_room_8TLUT_004950;
#define dganon_room_8DL_004940 "__OTR__scenes/shared/ganon_scene/ganon_room_8DL_004940"
static const ALIGN_ASSET(2) char ganon_room_8DL_004940[] = dganon_room_8DL_004940;
#endif // DUNGEONS_GANON_ROOM_8_H

48
soh/assets/scenes/dungeons/ganon/ganon_room_9.h
View File

@@ -3,41 +3,41 @@
#include "align_asset_macro.h"
#define dganon_room_9DL_001F08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9DL_001F08"
static const ALIGN_ASSET(2) char ganon_room_9DL_001F08[] = dganon_room_9DL_001F08;
#define dganon_room_9Tex_004D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_004D20"
static const ALIGN_ASSET(2) char ganon_room_9Tex_004D20[] = dganon_room_9Tex_004D20;
#define dganon_room_9Tex_003D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003D20"
static const ALIGN_ASSET(2) char ganon_room_9Tex_003D20[] = dganon_room_9Tex_003D20;
#define dganon_room_9Tex_002120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002120"
#define dganon_room_9Tex_002120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002120"
static const ALIGN_ASSET(2) char ganon_room_9Tex_002120[] = dganon_room_9Tex_002120;
#define dganon_room_9Tex_005120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_005120"
static const ALIGN_ASSET(2) char ganon_room_9Tex_005120[] = dganon_room_9Tex_005120;
#define dganon_room_9Tex_002920 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002920"
#define dganon_room_9Tex_002920 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002920"
static const ALIGN_ASSET(2) char ganon_room_9Tex_002920[] = dganon_room_9Tex_002920;
#define dganon_room_9TLUT_001F18 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9TLUT_001F18"
static const ALIGN_ASSET(2) char ganon_room_9TLUT_001F18[] = dganon_room_9TLUT_001F18;
#define dganon_room_9Tex_004520 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_004520"
static const ALIGN_ASSET(2) char ganon_room_9Tex_004520[] = dganon_room_9Tex_004520;
#define dganon_room_9Tex_002D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002D20"
#define dganon_room_9Tex_002D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002D20"
static const ALIGN_ASSET(2) char ganon_room_9Tex_002D20[] = dganon_room_9Tex_002D20;
#define dganon_room_9Tex_003120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003120"
#define dganon_room_9Tex_003120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003120"
static const ALIGN_ASSET(2) char ganon_room_9Tex_003120[] = dganon_room_9Tex_003120;
#define dganon_room_9Tex_003520 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003520"
#define dganon_room_9Tex_003520 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003520"
static const ALIGN_ASSET(2) char ganon_room_9Tex_003520[] = dganon_room_9Tex_003520;
#define dganon_room_9Tex_003920 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003920"
#define dganon_room_9Tex_003920 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003920"
static const ALIGN_ASSET(2) char ganon_room_9Tex_003920[] = dganon_room_9Tex_003920;
#define dganon_room_9Tex_003D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003D20"
static const ALIGN_ASSET(2) char ganon_room_9Tex_003D20[] = dganon_room_9Tex_003D20;
#define dganon_room_9Tex_004520 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_004520"
static const ALIGN_ASSET(2) char ganon_room_9Tex_004520[] = dganon_room_9Tex_004520;
#define dganon_room_9Tex_004D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_004D20"
static const ALIGN_ASSET(2) char ganon_room_9Tex_004D20[] = dganon_room_9Tex_004D20;
#define dganon_room_9Tex_005120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_005120"
static const ALIGN_ASSET(2) char ganon_room_9Tex_005120[] = dganon_room_9Tex_005120;
#define dganon_room_9TLUT_001F18 "__OTR__scenes/shared/ganon_scene/ganon_room_9TLUT_001F18"
static const ALIGN_ASSET(2) char ganon_room_9TLUT_001F18[] = dganon_room_9TLUT_001F18;
#define dganon_room_9DL_001F08 "__OTR__scenes/shared/ganon_scene/ganon_room_9DL_001F08"
static const ALIGN_ASSET(2) char ganon_room_9DL_001F08[] = dganon_room_9DL_001F08;
#endif // DUNGEONS_GANON_ROOM_9_H

39
soh/assets/scenes/dungeons/ganon/ganon_scene.h
View File

@@ -3,34 +3,35 @@
#include "align_asset_macro.h"
#define dganon_sceneCollisionHeader_00E7A0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneCollisionHeader_00E7A0"
static const ALIGN_ASSET(2) char ganon_sceneCollisionHeader_00E7A0[] = dganon_sceneCollisionHeader_00E7A0;
#define dganon_sceneTex_00FBA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00FBA8"
static const ALIGN_ASSET(2) char ganon_sceneTex_00FBA8[] = dganon_sceneTex_00FBA8;
#define dganon_sceneTLUT_00E7D0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00E7D0"
static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E7D0[] = dganon_sceneTLUT_00E7D0;
#define dganon_sceneTex_00EFA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00EFA8"
#define dganon_sceneTex_00EFA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00EFA8"
static const ALIGN_ASSET(2) char ganon_sceneTex_00EFA8[] = dganon_sceneTex_00EFA8;
#define dganon_sceneTLUT_00EDA0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00EDA0"
static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EDA0[] = dganon_sceneTLUT_00EDA0;
#define dganon_sceneTex_00F3A8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00F3A8"
#define dganon_sceneTex_00F3A8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00F3A8"
static const ALIGN_ASSET(2) char ganon_sceneTex_00F3A8[] = dganon_sceneTex_00F3A8;
#define dganon_sceneTex_00F7A8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00F7A8"
#define dganon_sceneTex_00F7A8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00F7A8"
static const ALIGN_ASSET(2) char ganon_sceneTex_00F7A8[] = dganon_sceneTex_00F7A8;
#define dganon_sceneTex_00FFA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00FFA8"
#define dganon_sceneTex_00FBA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00FBA8"
static const ALIGN_ASSET(2) char ganon_sceneTex_00FBA8[] = dganon_sceneTex_00FBA8;
#define dganon_sceneTex_00FFA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00FFA8"
static const ALIGN_ASSET(2) char ganon_sceneTex_00FFA8[] = dganon_sceneTex_00FFA8;
#define dganon_sceneTLUT_00EBE0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00EBE0"
static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EBE0[] = dganon_sceneTLUT_00EBE0;
#define dganon_sceneTLUT_00E7D0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00E7D0"
static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E7D0[] = dganon_sceneTLUT_00E7D0;
#define dganon_sceneTLUT_00E9D8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00E9D8"
#define dganon_sceneTLUT_00E9D8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00E9D8"
static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E9D8[] = dganon_sceneTLUT_00E9D8;
#define dganon_sceneTLUT_00EBE0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00EBE0"
static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EBE0[] = dganon_sceneTLUT_00EBE0;
#define dganon_sceneTLUT_00EDA0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00EDA0"
static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EDA0[] = dganon_sceneTLUT_00EDA0;
#define dganon_sceneCollisionHeader_00E7A0 "__OTR__scenes/shared/ganon_scene/ganon_sceneCollisionHeader_00E7A0"
static const ALIGN_ASSET(2) char ganon_sceneCollisionHeader_00E7A0[] = dganon_sceneCollisionHeader_00E7A0;
#endif // DUNGEONS_GANON_SCENE_H