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

126
soh/assets/objects/object_spot09_obj/object_spot09_obj.h
View File

@@ -3,6 +3,69 @@
#include "align_asset_macro.h"
#define dobject_spot09_objTex_008490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008490"
static const ALIGN_ASSET(2) char object_spot09_objTex_008490[] = dobject_spot09_objTex_008490;
#define dobject_spot09_objTex_008C90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008C90"
static const ALIGN_ASSET(2) char object_spot09_objTex_008C90[] = dobject_spot09_objTex_008C90;
#define dobject_spot09_objTex_009490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_009490"
static const ALIGN_ASSET(2) char object_spot09_objTex_009490[] = dobject_spot09_objTex_009490;
#define dobject_spot09_objTex_00A490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00A490"
static const ALIGN_ASSET(2) char object_spot09_objTex_00A490[] = dobject_spot09_objTex_00A490;
#define dobject_spot09_objTex_00AC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00AC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00AC90[] = dobject_spot09_objTex_00AC90;
#define dobject_spot09_objTex_00B490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00B490"
static const ALIGN_ASSET(2) char object_spot09_objTex_00B490[] = dobject_spot09_objTex_00B490;
#define dobject_spot09_objTex_00BC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00BC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00BC90[] = dobject_spot09_objTex_00BC90;
#define dobject_spot09_objTex_00CC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00CC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00CC90[] = dobject_spot09_objTex_00CC90;
#define dobject_spot09_objTex_00DC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00DC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00DC90[] = dobject_spot09_objTex_00DC90;
#define dobject_spot09_objTex_00EC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00EC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00EC90[] = dobject_spot09_objTex_00EC90;
#define dobject_spot09_objTex_00FC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00FC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00FC90[] = dobject_spot09_objTex_00FC90;
#define dobject_spot09_objTex_010090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_010090"
static const ALIGN_ASSET(2) char object_spot09_objTex_010090[] = dobject_spot09_objTex_010090;
#define dobject_spot09_objTex_011090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_011090"
static const ALIGN_ASSET(2) char object_spot09_objTex_011090[] = dobject_spot09_objTex_011090;
#define dobject_spot09_objTex_012090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_012090"
static const ALIGN_ASSET(2) char object_spot09_objTex_012090[] = dobject_spot09_objTex_012090;
#define dobject_spot09_objTex_013090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_013090"
static const ALIGN_ASSET(2) char object_spot09_objTex_013090[] = dobject_spot09_objTex_013090;
#define dobject_spot09_objTex_014090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_014090"
static const ALIGN_ASSET(2) char object_spot09_objTex_014090[] = dobject_spot09_objTex_014090;
#define dobject_spot09_objTex_015090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_015090"
static const ALIGN_ASSET(2) char object_spot09_objTex_015090[] = dobject_spot09_objTex_015090;
#define dobject_spot09_objTex_016090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_016090"
static const ALIGN_ASSET(2) char object_spot09_objTex_016090[] = dobject_spot09_objTex_016090;
#define dobject_spot09_objTex_017090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017090"
static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090;
#define dobject_spot09_objTex_017490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017490"
static const ALIGN_ASSET(2) char object_spot09_objTex_017490[] = dobject_spot09_objTex_017490;
#define dobject_spot09_objTex_017890 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017890"
static const ALIGN_ASSET(2) char object_spot09_objTex_017890[] = dobject_spot09_objTex_017890;
#define dgValleyBridgeSidesDL "__OTR__objects/object_spot09_obj/gValleyBridgeSidesDL"
static const ALIGN_ASSET(2) char gValleyBridgeSidesDL[] = dgValleyBridgeSidesDL;
@@ -33,67 +96,4 @@ static const ALIGN_ASSET(2) char gValleyObjects3Col[] = dgValleyObjects3Col;
#define dgValleyObjects4Col "__OTR__objects/object_spot09_obj/gValleyObjects4Col"
static const ALIGN_ASSET(2) char gValleyObjects4Col[] = dgValleyObjects4Col;
#define dobject_spot09_objTex_013090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_013090"
static const ALIGN_ASSET(2) char object_spot09_objTex_013090[] = dobject_spot09_objTex_013090;
#define dobject_spot09_objTex_014090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_014090"
static const ALIGN_ASSET(2) char object_spot09_objTex_014090[] = dobject_spot09_objTex_014090;
#define dobject_spot09_objTex_00AC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00AC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00AC90[] = dobject_spot09_objTex_00AC90;
#define dobject_spot09_objTex_00BC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00BC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00BC90[] = dobject_spot09_objTex_00BC90;
#define dobject_spot09_objTex_00B490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00B490"
static const ALIGN_ASSET(2) char object_spot09_objTex_00B490[] = dobject_spot09_objTex_00B490;
#define dobject_spot09_objTex_00A490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00A490"
static const ALIGN_ASSET(2) char object_spot09_objTex_00A490[] = dobject_spot09_objTex_00A490;
#define dobject_spot09_objTex_00CC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00CC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00CC90[] = dobject_spot09_objTex_00CC90;
#define dobject_spot09_objTex_00DC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00DC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00DC90[] = dobject_spot09_objTex_00DC90;
#define dobject_spot09_objTex_00EC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00EC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00EC90[] = dobject_spot09_objTex_00EC90;
#define dobject_spot09_objTex_008C90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008C90"
static const ALIGN_ASSET(2) char object_spot09_objTex_008C90[] = dobject_spot09_objTex_008C90;
#define dobject_spot09_objTex_00FC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00FC90"
static const ALIGN_ASSET(2) char object_spot09_objTex_00FC90[] = dobject_spot09_objTex_00FC90;
#define dobject_spot09_objTex_012090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_012090"
static const ALIGN_ASSET(2) char object_spot09_objTex_012090[] = dobject_spot09_objTex_012090;
#define dobject_spot09_objTex_011090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_011090"
static const ALIGN_ASSET(2) char object_spot09_objTex_011090[] = dobject_spot09_objTex_011090;
#define dobject_spot09_objTex_010090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_010090"
static const ALIGN_ASSET(2) char object_spot09_objTex_010090[] = dobject_spot09_objTex_010090;
#define dobject_spot09_objTex_017890 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017890"
static const ALIGN_ASSET(2) char object_spot09_objTex_017890[] = dobject_spot09_objTex_017890;
#define dobject_spot09_objTex_015090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_015090"
static const ALIGN_ASSET(2) char object_spot09_objTex_015090[] = dobject_spot09_objTex_015090;
#define dobject_spot09_objTex_008490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008490"
static const ALIGN_ASSET(2) char object_spot09_objTex_008490[] = dobject_spot09_objTex_008490;
#define dobject_spot09_objTex_016090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_016090"
static const ALIGN_ASSET(2) char object_spot09_objTex_016090[] = dobject_spot09_objTex_016090;
#define dobject_spot09_objTex_009490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_009490"
static const ALIGN_ASSET(2) char object_spot09_objTex_009490[] = dobject_spot09_objTex_009490;
#define dobject_spot09_objTex_017490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017490"
static const ALIGN_ASSET(2) char object_spot09_objTex_017490[] = dobject_spot09_objTex_017490;
#define dobject_spot09_objTex_017090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017090"
static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090;
#endif // OBJECTS_OBJECT_SPOT09_OBJ_H