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

118
soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h
View File

@@ -3,77 +3,77 @@
#include "align_asset_macro.h"
#define dhairal_niwa2_room_0DL_008708 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0DL_008708"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_008708[] = dhairal_niwa2_room_0DL_008708;
#define dhairal_niwa2_room_0Tex_00AF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00AF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00AF50[] = dhairal_niwa2_room_0Tex_00AF50;
#define dhairal_niwa2_room_0Tex_008750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008750"
#define dhairal_niwa2_room_0Tex_008750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_008750[] = dhairal_niwa2_room_0Tex_008750;
#define dhairal_niwa2_room_0Tex_00C750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00C750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00C750[] = dhairal_niwa2_room_0Tex_00C750;
#define dhairal_niwa2_room_0Tex_008F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008F50"
#define dhairal_niwa2_room_0Tex_008F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008F50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_008F50[] = dhairal_niwa2_room_0Tex_008F50;
#define dhairal_niwa2_room_0Tex_012750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_012750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_012750[] = dhairal_niwa2_room_0Tex_012750;
#define dhairal_niwa2_room_0Tex_00CF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00CF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00CF50[] = dhairal_niwa2_room_0Tex_00CF50;
#define dhairal_niwa2_room_0Tex_00B750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00B750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00B750[] = dhairal_niwa2_room_0Tex_00B750;
#define dhairal_niwa2_room_0Tex_010F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_010F50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_010F50[] = dhairal_niwa2_room_0Tex_010F50;
#define dhairal_niwa2_room_0Tex_011750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011750[] = dhairal_niwa2_room_0Tex_011750;
#define dhairal_niwa2_room_0Tex_009F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009F50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009F50[] = dhairal_niwa2_room_0Tex_009F50;
#define dhairal_niwa2_room_0Tex_011F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011F50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011F50[] = dhairal_niwa2_room_0Tex_011F50;
#define dhairal_niwa2_room_0Tex_00EF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00EF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00EF50[] = dhairal_niwa2_room_0Tex_00EF50;
#define dhairal_niwa2_room_0Tex_00E750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00E750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00E750[] = dhairal_niwa2_room_0Tex_00E750;
#define dhairal_niwa2_room_0Tex_00FF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00FF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00FF50[] = dhairal_niwa2_room_0Tex_00FF50;
#define dhairal_niwa2_room_0Tex_00F750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00F750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00F750[] = dhairal_niwa2_room_0Tex_00F750;
#define dhairal_niwa2_room_0Tex_00D750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00D750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00D750[] = dhairal_niwa2_room_0Tex_00D750;
#define dhairal_niwa2_room_0Tex_009750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009750"
#define dhairal_niwa2_room_0Tex_009750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009750[] = dhairal_niwa2_room_0Tex_009750;
#define dhairal_niwa2_room_0DL_014BC8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0DL_014BC8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_014BC8[] = dhairal_niwa2_room_0DL_014BC8;
#define dhairal_niwa2_room_0Tex_009F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009F50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009F50[] = dhairal_niwa2_room_0Tex_009F50;
#define dhairal_niwa2_room_0Tex_0173F8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0173F8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0173F8[] = dhairal_niwa2_room_0Tex_0173F8;
#define dhairal_niwa2_room_0Tex_00AF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00AF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00AF50[] = dhairal_niwa2_room_0Tex_00AF50;
#define dhairal_niwa2_room_0Tex_015BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_015BF8"
#define dhairal_niwa2_room_0Tex_00B750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00B750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00B750[] = dhairal_niwa2_room_0Tex_00B750;
#define dhairal_niwa2_room_0Tex_00C750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00C750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00C750[] = dhairal_niwa2_room_0Tex_00C750;
#define dhairal_niwa2_room_0Tex_00CF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00CF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00CF50[] = dhairal_niwa2_room_0Tex_00CF50;
#define dhairal_niwa2_room_0Tex_00D750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00D750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00D750[] = dhairal_niwa2_room_0Tex_00D750;
#define dhairal_niwa2_room_0Tex_00E750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00E750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00E750[] = dhairal_niwa2_room_0Tex_00E750;
#define dhairal_niwa2_room_0Tex_00EF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00EF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00EF50[] = dhairal_niwa2_room_0Tex_00EF50;
#define dhairal_niwa2_room_0Tex_00F750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00F750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00F750[] = dhairal_niwa2_room_0Tex_00F750;
#define dhairal_niwa2_room_0Tex_00FF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00FF50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00FF50[] = dhairal_niwa2_room_0Tex_00FF50;
#define dhairal_niwa2_room_0Tex_010F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_010F50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_010F50[] = dhairal_niwa2_room_0Tex_010F50;
#define dhairal_niwa2_room_0Tex_011750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011750[] = dhairal_niwa2_room_0Tex_011750;
#define dhairal_niwa2_room_0Tex_011F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011F50"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011F50[] = dhairal_niwa2_room_0Tex_011F50;
#define dhairal_niwa2_room_0Tex_012750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_012750"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_012750[] = dhairal_niwa2_room_0Tex_012750;
#define dhairal_niwa2_room_0Tex_014BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_014BF8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8;
#define dhairal_niwa2_room_0Tex_015BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_015BF8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_015BF8[] = dhairal_niwa2_room_0Tex_015BF8;
#define dhairal_niwa2_room_0Tex_016BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_016BF8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_016BF8[] = dhairal_niwa2_room_0Tex_016BF8;
#define dhairal_niwa2_room_0Tex_0163F8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0163F8"
#define dhairal_niwa2_room_0Tex_0163F8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0163F8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0163F8[] = dhairal_niwa2_room_0Tex_0163F8;
#define dhairal_niwa2_room_0Tex_014BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_014BF8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8;
#define dhairal_niwa2_room_0Tex_016BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_016BF8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_016BF8[] = dhairal_niwa2_room_0Tex_016BF8;
#define dhairal_niwa2_room_0Tex_0173F8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0173F8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0173F8[] = dhairal_niwa2_room_0Tex_0173F8;
#define dhairal_niwa2_room_0DL_008708 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0DL_008708"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_008708[] = dhairal_niwa2_room_0DL_008708;
#define dhairal_niwa2_room_0DL_014BC8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0DL_014BC8"
static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_014BC8[] = dhairal_niwa2_room_0DL_014BC8;
#endif // INDOORS_HAIRAL_NIWA2_ROOM_0_H

2
soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h
View File

@@ -3,7 +3,7 @@
#include "align_asset_macro.h"
#define dhairal_niwa2_sceneCollisionHeader_002CD8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_sceneCollisionHeader_002CD8"
#define dhairal_niwa2_sceneCollisionHeader_002CD8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_sceneCollisionHeader_002CD8"
static const ALIGN_ASSET(2) char hairal_niwa2_sceneCollisionHeader_002CD8[] = dhairal_niwa2_sceneCollisionHeader_002CD8;