Generate assets with MQ present (#2485)

2023-02-16 19:32:01 +01:00
parent 877fc2dcca
commit 6cd7066706
208 changed files with 7785 additions and 7127 deletions
--- a/soh/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/soh/assets/objects/gameplay_keep/gameplay_keep.h
@@ -4822,6 +4822,13 @@ static const __declspec(align(2)) char gEffBubbleDL[] = dgEffBubbleDL;
 static const char gEffBubbleDL[] __attribute__((aligned (2))) = dgEffBubbleDL;
 #endif
            
+#define dgGameplayKeepVtx_01A120 "__OTR__objects/gameplay_keep/gGameplayKeepVtx_01A120"
+#ifdef _WIN32
+static const __declspec(align(2)) char gGameplayKeepVtx_01A120[] = dgGameplayKeepVtx_01A120;
+#else
+static const char gGameplayKeepVtx_01A120[] __attribute__((aligned (2))) = dgGameplayKeepVtx_01A120;
+#endif
+            
 #define dgEffFireFootprint1Tex "__OTR__objects/gameplay_keep/gEffFireFootprint1Tex"
 #ifdef _WIN32
 static const __declspec(align(2)) char gEffFireFootprint1Tex[] = dgEffFireFootprint1Tex;
--- a/soh/assets/objects/object_mag/object_mag.h
+++ b/soh/assets/objects/object_mag/object_mag.h
@@ -27,11 +27,11 @@ static const __declspec(align(2)) char gTitleCopyright19982003Tex[] = dgTitleCop
 static const char gTitleCopyright19982003Tex[] __attribute__((aligned (2))) = dgTitleCopyright19982003Tex;
 #endif
            
-#define dgTitleDiskTex "__OTR__objects/object_mag/gTitleDiskTex"
+#define dgTitleMasterQuestSubtitleTex "__OTR__objects/object_mag/gTitleMasterQuestSubtitleTex"
 #ifdef _WIN32
-static const __declspec(align(2)) char gTitleDiskTex[] = dgTitleDiskTex;
+static const __declspec(align(2)) char gTitleMasterQuestSubtitleTex[] = dgTitleMasterQuestSubtitleTex;
 #else
-static const char gTitleDiskTex[] __attribute__((aligned (2))) = dgTitleDiskTex;
+static const char gTitleMasterQuestSubtitleTex[] __attribute__((aligned (2))) = dgTitleMasterQuestSubtitleTex;
 #endif
            
 #define dgTitleEffectMask00Tex "__OTR__objects/object_mag/gTitleEffectMask00Tex"
@@ -118,6 +118,20 @@ static const __declspec(align(2)) char gTitleOcarinaOfTimeTMTextTex[] = dgTitleO
 static const char gTitleOcarinaOfTimeTMTextTex[] __attribute__((aligned (2))) = dgTitleOcarinaOfTimeTMTextTex;
 #endif
            
+#define dgTitleUraLogoTex "__OTR__objects/object_mag/gTitleUraLogoTex"
+#ifdef _WIN32
+static const __declspec(align(2)) char gTitleUraLogoTex[] = dgTitleUraLogoTex;
+#else
+static const char gTitleUraLogoTex[] __attribute__((aligned (2))) = dgTitleUraLogoTex;
+#endif
+            
+#define dgTitleDiskTex "__OTR__objects/object_mag/gTitleDiskTex"
+#ifdef _WIN32
+static const __declspec(align(2)) char gTitleDiskTex[] = dgTitleDiskTex;
+#else
+static const char gTitleDiskTex[] __attribute__((aligned (2))) = dgTitleDiskTex;
+#endif
+            
 #define dgTitleTitleJPNTex "__OTR__objects/object_mag/gTitleTitleJPNTex"
 #ifdef _WIN32
 static const __declspec(align(2)) char gTitleTitleJPNTex[] = dgTitleTitleJPNTex;
--- a/soh/assets/objects/object_mo/object_mo.h
+++ b/soh/assets/objects/object_mo/object_mo.h
@@ -6,13 +6,6 @@ static const __declspec(align(2)) char gMorphaTitleCardTex[] = dgMorphaTitleCard
 static const char gMorphaTitleCardTex[] __attribute__((aligned (2))) = dgMorphaTitleCardTex;
 #endif
            
-#define dgMorphaWaterTex "__OTR__objects/object_mo/gMorphaWaterTex"
-#ifdef _WIN32
-static const __declspec(align(2)) char gMorphaWaterTex[] = dgMorphaWaterTex;
-#else
-static const char gMorphaWaterTex[] __attribute__((aligned (2))) = dgMorphaWaterTex;
-#endif
-            
 #define dgMorphaCoreMembraneDL "__OTR__objects/object_mo/gMorphaCoreMembraneDL"
 #ifdef _WIN32
 static const __declspec(align(2)) char gMorphaCoreMembraneDL[] = dgMorphaCoreMembraneDL;
@@ -321,6 +314,13 @@ static const __declspec(align(2)) char gMorphaTentaclePart40DL[] = dgMorphaTenta
 static const char gMorphaTentaclePart40DL[] __attribute__((aligned (2))) = dgMorphaTentaclePart40DL;
 #endif
            
+#define dgMorphaWaterTex "__OTR__objects/object_mo/gMorphaWaterTex"
+#ifdef _WIN32
+static const __declspec(align(2)) char gMorphaWaterTex[] = dgMorphaWaterTex;
+#else
+static const char gMorphaWaterTex[] __attribute__((aligned (2))) = dgMorphaWaterTex;
+#endif
+            
 #define dgMorphaBubbleDL "__OTR__objects/object_mo/gMorphaBubbleDL"
 #ifdef _WIN32
 static const __declspec(align(2)) char gMorphaBubbleDL[] = dgMorphaBubbleDL;
--- a/soh/assets/objects/object_owl/object_owl.h
+++ b/soh/assets/objects/object_owl/object_owl.h
@@ -188,6 +188,20 @@ static const __declspec(align(2)) char gOwlPerchingSkel[] = dgOwlPerchingSkel;
 static const char gOwlPerchingSkel[] __attribute__((aligned (2))) = dgOwlPerchingSkel;
 #endif
            
+#define dobject_owl_TLUT_006DA8 "__OTR__objects/object_owl/object_owl_TLUT_006DA8"
+#ifdef _WIN32
+static const __declspec(align(2)) char object_owl_TLUT_006DA8[] = dobject_owl_TLUT_006DA8;
+#else
+static const char object_owl_TLUT_006DA8[] __attribute__((aligned (2))) = dobject_owl_TLUT_006DA8;
+#endif
+            
+#define dobject_owl_TLUT_006FA8 "__OTR__objects/object_owl/object_owl_TLUT_006FA8"
+#ifdef _WIN32
+static const __declspec(align(2)) char object_owl_TLUT_006FA8[] = dobject_owl_TLUT_006FA8;
+#else
+static const char object_owl_TLUT_006FA8[] __attribute__((aligned (2))) = dobject_owl_TLUT_006FA8;
+#endif
+            
 #define dgObjOwlEyeOpenTex "__OTR__objects/object_owl/gObjOwlEyeOpenTex"
 #ifdef _WIN32
 static const __declspec(align(2)) char gObjOwlEyeOpenTex[] = dgObjOwlEyeOpenTex;
@@ -237,13 +251,6 @@ static const __declspec(align(2)) char object_owlTex_0081A8[] = dobject_owlTex_0
 static const char object_owlTex_0081A8[] __attribute__((aligned (2))) = dobject_owlTex_0081A8;
 #endif
            
-#define dobject_owlTLUT_006FA8 "__OTR__objects/object_owl/object_owlTLUT_006FA8"
-#ifdef _WIN32
-static const __declspec(align(2)) char object_owlTLUT_006FA8[] = dobject_owlTLUT_006FA8;
-#else
-static const char object_owlTLUT_006FA8[] __attribute__((aligned (2))) = dobject_owlTLUT_006FA8;
-#endif
-            
 #define dobject_owlTex_0095A8 "__OTR__objects/object_owl/object_owlTex_0095A8"
 #ifdef _WIN32
 static const __declspec(align(2)) char object_owlTex_0095A8[] = dobject_owlTex_0095A8;
@@ -370,11 +377,4 @@ static const __declspec(align(2)) char gOwlPerchingSkelLimbsLimb_010068DL_00F030
 static const char gOwlPerchingSkelLimbsLimb_010068DL_00F030[] __attribute__((aligned (2))) = dgOwlPerchingSkelLimbsLimb_010068DL_00F030;
 #endif
            
-#define dobject_owlTLUT_006DA8 "__OTR__objects/object_owl/object_owlTLUT_006DA8"
-#ifdef _WIN32
-static const __declspec(align(2)) char object_owlTLUT_006DA8[] = dobject_owlTLUT_006DA8;
-#else
-static const char object_owlTLUT_006DA8[] __attribute__((aligned (2))) = dobject_owlTLUT_006DA8;
-#endif
-            

--- a/soh/assets/objects/object_tk/object_tk.h
+++ b/soh/assets/objects/object_tk/object_tk.h
@@ -97,6 +97,13 @@ static const __declspec(align(2)) char gDampeSkel[] = dgDampeSkel;
 static const char gDampeSkel[] __attribute__((aligned (2))) = dgDampeSkel;
 #endif
            
+#define dobject_tkTLUT_003780 "__OTR__objects/object_tk/object_tkTLUT_003780"
+#ifdef _WIN32
+static const __declspec(align(2)) char object_tkTLUT_003780[] = dobject_tkTLUT_003780;
+#else
+static const char object_tkTLUT_003780[] __attribute__((aligned (2))) = dobject_tkTLUT_003780;
+#endif
+            
 #define dobject_tkTex_009CC0 "__OTR__objects/object_tk/object_tkTex_009CC0"
 #ifdef _WIN32
 static const __declspec(align(2)) char object_tkTex_009CC0[] = dobject_tkTex_009CC0;
@@ -258,13 +265,6 @@ static const __declspec(align(2)) char gDampeSkelLimbsLimb_00BDF0DL_008958[] = d
 static const char gDampeSkelLimbsLimb_00BDF0DL_008958[] __attribute__((aligned (2))) = dgDampeSkelLimbsLimb_00BDF0DL_008958;
 #endif
            
-#define dobject_tkTLUT_003780 "__OTR__objects/object_tk/object_tkTLUT_003780"
-#ifdef _WIN32
-static const __declspec(align(2)) char object_tkTLUT_003780[] = dobject_tkTLUT_003780;
-#else
-static const char object_tkTLUT_003780[] __attribute__((aligned (2))) = dobject_tkTLUT_003780;
-#endif
-            
 #define dobject_tkTex_005440 "__OTR__objects/object_tk/object_tkTex_005440"
 #ifdef _WIN32
 static const __declspec(align(2)) char object_tkTex_005440[] = dobject_tkTex_005440;
--- a/soh/assets/objects/object_xc/object_xc.h
+++ b/soh/assets/objects/object_xc/object_xc.h
@@ -55,6 +55,13 @@ static const __declspec(align(2)) char gSheikIdleAnim[] = dgSheikIdleAnim;
 static const char gSheikIdleAnim[] __attribute__((aligned (2))) = dgSheikIdleAnim;
 #endif
            
+#define dobject_xc_TLUT_004A40 "__OTR__objects/object_xc/object_xc_TLUT_004A40"
+#ifdef _WIN32
+static const __declspec(align(2)) char object_xc_TLUT_004A40[] = dobject_xc_TLUT_004A40;
+#else
+static const char object_xc_TLUT_004A40[] __attribute__((aligned (2))) = dobject_xc_TLUT_004A40;
+#endif
+            
 #define dgSheikWalkingAnim "__OTR__objects/object_xc/gSheikWalkingAnim"
 #ifdef _WIN32
 static const __declspec(align(2)) char gSheikWalkingAnim[] = dgSheikWalkingAnim;
@@ -454,13 +461,6 @@ static const __declspec(align(2)) char object_xcTex_0064C0[] = dobject_xcTex_006
 static const char object_xcTex_0064C0[] __attribute__((aligned (2))) = dobject_xcTex_0064C0;
 #endif
            
-#define dobject_xcTLUT_004A40 "__OTR__objects/object_xc/object_xcTLUT_004A40"
-#ifdef _WIN32
-static const __declspec(align(2)) char object_xcTLUT_004A40[] = dobject_xcTLUT_004A40;
-#else
-static const char object_xcTLUT_004A40[] __attribute__((aligned (2))) = dobject_xcTLUT_004A40;
-#endif
-            
 #define dobject_xcTex_006E80 "__OTR__objects/object_xc/object_xcTex_006E80"
 #ifdef _WIN32
 static const __declspec(align(2)) char object_xcTex_006E80[] = dobject_xcTex_006E80;