Simplify Asset Headers (#2474)

2023-03-02 09:37:47 -05:00
parent 21466192e5
commit d3f864cea9
1075 changed files with 60897 additions and 139767 deletions
--- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h
+++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h
@@ -1,37 +1,18 @@
 #pragma once
-#define dddan_boss_room_0DL_002000 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0DL_002000"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000;
-#else
-static const char ddan_boss_room_0DL_002000[] __attribute__((aligned (2))) = dddan_boss_room_0DL_002000;
-#endif
-            
-#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003A28"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28;
-#else
-static const char ddan_boss_room_0Tex_003A28[] __attribute__((aligned (2))) = dddan_boss_room_0Tex_003A28;
-#endif
-            
-#define dddan_boss_room_0Tex_003628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003628"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_0Tex_003628[] = dddan_boss_room_0Tex_003628;
-#else
-static const char ddan_boss_room_0Tex_003628[] __attribute__((aligned (2))) = dddan_boss_room_0Tex_003628;
-#endif
-            
-#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003E28"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_0Tex_003E28[] = dddan_boss_room_0Tex_003E28;
-#else
-static const char ddan_boss_room_0Tex_003E28[] __attribute__((aligned (2))) = dddan_boss_room_0Tex_003E28;
-#endif
-            
-#define dddan_boss_room_0Tex_004628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_004628"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_0Tex_004628[] = dddan_boss_room_0Tex_004628;
-#else
-static const char ddan_boss_room_0Tex_004628[] __attribute__((aligned (2))) = dddan_boss_room_0Tex_004628;
-#endif
-            

+#include "align_asset_macro.h"
+
+#define dddan_boss_room_0DL_002000 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0DL_002000"
+static const ALIGN_ASSET(2) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000;
+
+#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003A28"
+static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28;
+
+#define dddan_boss_room_0Tex_003628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003628"
+static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003628[] = dddan_boss_room_0Tex_003628;
+
+#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003E28"
+static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003E28[] = dddan_boss_room_0Tex_003E28;
+
+#define dddan_boss_room_0Tex_004628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_004628"
+static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_004628[] = dddan_boss_room_0Tex_004628;
--- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h
+++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h
@@ -1,37 +1,18 @@
 #pragma once
-#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/nonmq/ddan_boss_scene/gDodongosCavernBossLavaFloorTex"
-#ifdef _WIN32
-static const __declspec(align(2)) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex;
-#else
-static const char gDodongosCavernBossLavaFloorTex[] __attribute__((aligned (2))) = dgDodongosCavernBossLavaFloorTex;
-#endif
-            
-#define dddan_boss_room_1DL_001A38 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_001A38"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38;
-#else
-static const char ddan_boss_room_1DL_001A38[] __attribute__((aligned (2))) = dddan_boss_room_1DL_001A38;
-#endif
-            
-#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0031D8"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_1Tex_0031D8[] = dddan_boss_room_1Tex_0031D8;
-#else
-static const char ddan_boss_room_1Tex_0031D8[] __attribute__((aligned (2))) = dddan_boss_room_1Tex_0031D8;
-#endif
-            
-#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0039D8"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_1Tex_0039D8[] = dddan_boss_room_1Tex_0039D8;
-#else
-static const char ddan_boss_room_1Tex_0039D8[] __attribute__((aligned (2))) = dddan_boss_room_1Tex_0039D8;
-#endif
-            
-#define dddan_boss_room_1DL_000A50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_000A50"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_room_1DL_000A50[] = dddan_boss_room_1DL_000A50;
-#else
-static const char ddan_boss_room_1DL_000A50[] __attribute__((aligned (2))) = dddan_boss_room_1DL_000A50;
-#endif
-            

+#include "align_asset_macro.h"
+
+#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/nonmq/ddan_boss_scene/gDodongosCavernBossLavaFloorTex"
+static const ALIGN_ASSET(2) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex;
+
+#define dddan_boss_room_1DL_001A38 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_001A38"
+static const ALIGN_ASSET(2) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38;
+
+#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0031D8"
+static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0031D8[] = dddan_boss_room_1Tex_0031D8;
+
+#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0039D8"
+static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0039D8[] = dddan_boss_room_1Tex_0039D8;
+
+#define dddan_boss_room_1DL_000A50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_000A50"
+static const ALIGN_ASSET(2) char ddan_boss_room_1DL_000A50[] = dddan_boss_room_1DL_000A50;
--- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h
+++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h
@@ -1,37 +1,18 @@
 #pragma once
-#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20;
-#else
-static const char ddan_boss_sceneCollisionHeader_000E20[] __attribute__((aligned (2))) = dddan_boss_sceneCollisionHeader_000E20;
-#endif
-            
-#define dddan_boss_sceneTex_001858 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001858"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858;
-#else
-static const char ddan_boss_sceneTex_001858[] __attribute__((aligned (2))) = dddan_boss_sceneTex_001858;
-#endif
-            
-#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTLUT_000E50"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50;
-#else
-static const char ddan_boss_sceneTLUT_000E50[] __attribute__((aligned (2))) = dddan_boss_sceneTLUT_000E50;
-#endif
-            
-#define dddan_boss_sceneTex_002058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_002058"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058;
-#else
-static const char ddan_boss_sceneTex_002058[] __attribute__((aligned (2))) = dddan_boss_sceneTex_002058;
-#endif
-            
-#define dddan_boss_sceneTex_001058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001058"
-#ifdef _WIN32
-static const __declspec(align(2)) char ddan_boss_sceneTex_001058[] = dddan_boss_sceneTex_001058;
-#else
-static const char ddan_boss_sceneTex_001058[] __attribute__((aligned (2))) = dddan_boss_sceneTex_001058;
-#endif
-            

+#include "align_asset_macro.h"
+
+#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20"
+static const ALIGN_ASSET(2) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20;
+
+#define dddan_boss_sceneTex_001858 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001858"
+static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858;
+
+#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTLUT_000E50"
+static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50;
+
+#define dddan_boss_sceneTex_002058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_002058"
+static const ALIGN_ASSET(2) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058;
+
+#define dddan_boss_sceneTex_001058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001058"
+static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001058[] = dddan_boss_sceneTex_001058;