regenerate asset headers with include guards (#3132)

ZAPDTR/ZAPD/ZFile.cpp

@@ -811,10 +811,10 @@ void ZFile::GenerateSourceFiles()
 void ZFile::GenerateSourceHeaderFiles()
 {
 	OutputFormatter formatter;
-	std::string guard = outName.stem().string();
+	// Use parent folder and output name as guard as some headers have the same output name
+	std::string guard = xmlFilePath.parent_path().stem().string() + "_" + outName.stem().string();
 
 	std::transform(guard.begin(), guard.end(), guard.begin(), ::toupper);
-	formatter.Write("#pragma once\n\n");
 	formatter.Write(
 		StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", guard.c_str(), guard.c_str()));
 	formatter.Write("#include \"align_asset_macro.h\"\n");
@@ -838,7 +838,7 @@ void ZFile::GenerateSourceHeaderFiles()
 
 	formatter.Write(ProcessExterns());
 
-	formatter.Write("#endif\n");
+	formatter.Write(StringHelper::Sprintf("\n#endif // %s_H\n", guard.c_str()));
 
 	fs::path headerFilename = GetSourceOutputFolderPath() / outName.stem().concat(".h");
 
@@ -846,8 +846,6 @@ void ZFile::GenerateSourceHeaderFiles()
 		printf("Writing H file: %s\n", headerFilename.c_str());
 
 	std::string output = formatter.GetOutput();
-	while (output.back() == '\n')
-		output.pop_back();
 
 	if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 		DiskFile::WriteAllText(headerFilename, output);

soh/assets/code/fbdemo_circle/z_fbdemo_circle.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef CODE_Z_FBDEMO_CIRCLE_H
+#define CODE_Z_FBDEMO_CIRCLE_H 1
 
 #include "align_asset_macro.h"
 
@@ -16,3 +17,5 @@ static const ALIGN_ASSET(2) char sTransCircleStarburstTex[] = dsTransCircleStarb
 
 #define dsCircleWipeVtx "__OTR__code/z_fbdemo_circle/sCircleWipeVtx"
 static const ALIGN_ASSET(2) char sCircleWipeVtx[] = dsCircleWipeVtx;
+
+#endif // CODE_Z_FBDEMO_CIRCLE_H

soh/assets/code/fbdemo_triforce/z_fbdemo_triforce.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef CODE_Z_FBDEMO_TRIFORCE_H
+#define CODE_Z_FBDEMO_TRIFORCE_H 1
 
 #include "align_asset_macro.h"
 
@@ -7,3 +8,5 @@ static const ALIGN_ASSET(2) char sTriforceWipeDL[] = dsTriforceWipeDL;
 
 #define dsTriforceWipeVtx "__OTR__code/z_fbdemo_triforce/sTriforceWipeVtx"
 static const ALIGN_ASSET(2) char sTriforceWipeVtx[] = dsTriforceWipeVtx;
+
+#endif // CODE_Z_FBDEMO_TRIFORCE_H

soh/assets/code/fbdemo_wipe1/z_fbdemo_wipe1.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef CODE_Z_FBDEMO_WIPE1_H
+#define CODE_Z_FBDEMO_WIPE1_H 1
 
 #include "align_asset_macro.h"
 
@@ -7,3 +8,5 @@ static const ALIGN_ASSET(2) char sWipe1Vtx[] = dsWipe1Vtx;
 
 #define dsWipe1Tex "__OTR__code/z_fbdemo_wipe1/sWipe1Tex"
 static const ALIGN_ASSET(2) char sWipe1Tex[] = dsWipe1Tex;
+
+#endif // CODE_Z_FBDEMO_WIPE1_H

soh/assets/misc/link_animetion/link_animetion.h

@@ -1,3 +1,7 @@
-#pragma once
+#ifndef MISC_LINK_ANIMETION_H
+#define MISC_LINK_ANIMETION_H 1
 
 #include "align_asset_macro.h"
+
+
+#endif // MISC_LINK_ANIMETION_H

soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_GAMEPLAY_DANGEON_KEEP_H
+#define OBJECTS_GAMEPLAY_DANGEON_KEEP_H 1
 
 #include "align_asset_macro.h"
 
@@ -214,3 +215,5 @@ static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0118A0[] = dgameplay_d
 
 #define dgameplay_dangeon_keepTex_011AA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011AA0"
 static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011AA0[] = dgameplay_dangeon_keepTex_011AA0;
+
+#endif // OBJECTS_GAMEPLAY_DANGEON_KEEP_H

soh/assets/objects/gameplay_field_keep/gameplay_field_keep.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_GAMEPLAY_FIELD_KEEP_H
+#define OBJECTS_GAMEPLAY_FIELD_KEEP_H 1
 
 #include "align_asset_macro.h"
 
@@ -184,3 +185,6 @@ static const ALIGN_ASSET(2) char gFieldUnusedFishSkelLimbsLimb_0088CCDL_006458[]
 
 #define dgFieldUnusedFishSkelLimbsLimb_0088D8DL_0061F8 "__OTR__objects/gameplay_field_keep/gFieldUnusedFishSkelLimbsLimb_0088D8DL_0061F8"
 static const ALIGN_ASSET(2) char gFieldUnusedFishSkelLimbsLimb_0088D8DL_0061F8[] = dgFieldUnusedFishSkelLimbsLimb_0088D8DL_0061F8;
+
+
+#endif // OBJECTS_GAMEPLAY_FIELD_KEEP_H

soh/assets/objects/gameplay_keep/gameplay_keep.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_GAMEPLAY_KEEP_H
+#define OBJECTS_GAMEPLAY_KEEP_H 1
 
 #include "align_asset_macro.h"
 
@@ -2825,15 +2826,6 @@ static const ALIGN_ASSET(2) char gEffSpark3Tex[] = dgEffSpark3Tex;
 #define dgEffSpark4Tex "__OTR__objects/gameplay_keep/gEffSpark4Tex"
 static const ALIGN_ASSET(2) char gEffSpark4Tex[] = dgEffSpark4Tex;
 
-#define dgFishSkelLimbsLimb_018F98DL_018A68 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018F98DL_018A68"
-static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018F98DL_018A68[] = dgFishSkelLimbsLimb_018F98DL_018A68;
-
-#define dgFishSkelLimbsLimb_018FB0DL_018950 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018FB0DL_018950"
-static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018FB0DL_018950[] = dgFishSkelLimbsLimb_018FB0DL_018950;
-
-#define dgFishSkelLimbsLimb_018FBCDL_0188B0 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018FBCDL_0188B0"
-static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018FBCDL_0188B0[] = dgFishSkelLimbsLimb_018FBCDL_0188B0;
-
 #define dgameplay_keepTex_04C540 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C540"
 static const ALIGN_ASSET(2) char gameplay_keepTex_04C540[] = dgameplay_keepTex_04C540;
 
@@ -2845,3 +2837,15 @@ static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_0
 
 #define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40"
 static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40;
+
+#define dgFishSkelLimbsLimb_018F98DL_018A68 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018F98DL_018A68"
+static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018F98DL_018A68[] = dgFishSkelLimbsLimb_018F98DL_018A68;
+
+#define dgFishSkelLimbsLimb_018FB0DL_018950 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018FB0DL_018950"
+static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018FB0DL_018950[] = dgFishSkelLimbsLimb_018FB0DL_018950;
+
+#define dgFishSkelLimbsLimb_018FBCDL_0188B0 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018FBCDL_0188B0"
+static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018FBCDL_0188B0[] = dgFishSkelLimbsLimb_018FBCDL_0188B0;
+
+
+#endif // OBJECTS_GAMEPLAY_KEEP_H

soh/assets/objects/object_Bb/object_Bb.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BB_H
+#define OBJECTS_OBJECT_BB_H 1
 
 #include "align_asset_macro.h"
 
@@ -55,3 +56,6 @@ static const ALIGN_ASSET(2) char object_Bb_Tex_001740[] = dobject_Bb_Tex_001740;
 
 #define dobject_Bb_Skel_001A30 "__OTR__objects/object_Bb/object_Bb_Skel_001A30"
 static const ALIGN_ASSET(2) char object_Bb_Skel_001A30[] = dobject_Bb_Skel_001A30;
+
+
+#endif // OBJECTS_OBJECT_BB_H

soh/assets/objects/object_ahg/object_ahg.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_AHG_H
+#define OBJECTS_OBJECT_AHG_H 1
 
 #include "align_asset_macro.h"
 
@@ -109,3 +110,6 @@ static const ALIGN_ASSET(2) char object_ahg_DL_005508[] = dobject_ahg_DL_005508;
 
 #define dobject_ahg_DL_005728 "__OTR__objects/object_ahg/object_ahg_DL_005728"
 static const ALIGN_ASSET(2) char object_ahg_DL_005728[] = dobject_ahg_DL_005728;
+
+
+#endif // OBJECTS_OBJECT_AHG_H

soh/assets/objects/object_am/object_am.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_AM_H
+#define OBJECTS_OBJECT_AM_H 1
 
 #include "align_asset_macro.h"
 
@@ -67,3 +68,5 @@ static const ALIGN_ASSET(2) char object_amTex_005478[] = dobject_amTex_005478;
 
 #define dobject_amTex_005438 "__OTR__objects/object_am/object_amTex_005438"
 static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438;
+
+#endif // OBJECTS_OBJECT_AM_H

soh/assets/objects/object_ane/object_ane.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_ANE_H
+#define OBJECTS_OBJECT_ANE_H 1
 
 #include "align_asset_macro.h"
 
@@ -88,3 +89,6 @@ static const ALIGN_ASSET(2) char gCuccoLadyEyeHalfTex[] = dgCuccoLadyEyeHalfTex;
 
 #define dgCuccoLadyEyeClosedTex "__OTR__objects/object_ane/gCuccoLadyEyeClosedTex"
 static const ALIGN_ASSET(2) char gCuccoLadyEyeClosedTex[] = dgCuccoLadyEyeClosedTex;
+
+
+#endif // OBJECTS_OBJECT_ANE_H

soh/assets/objects/object_ani/object_ani.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_ANI_H
+#define OBJECTS_OBJECT_ANI_H 1
 
 #include "align_asset_macro.h"
 
@@ -100,3 +101,5 @@ static const ALIGN_ASSET(2) char gRoofManIdleAnim[] = dgRoofManIdleAnim;
 
 #define dobject_aniTex_0011D8 "__OTR__objects/object_ani/object_aniTex_0011D8"
 static const ALIGN_ASSET(2) char object_aniTex_0011D8[] = dobject_aniTex_0011D8;
+
+#endif // OBJECTS_OBJECT_ANI_H

soh/assets/objects/object_anubice/object_anubice.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_ANUBICE_H
+#define OBJECTS_OBJECT_ANUBICE_H 1
 
 #include "align_asset_macro.h"
 
@@ -38,6 +39,12 @@ static const ALIGN_ASSET(2) char gAnubiceAnim_000A48[] = dgAnubiceAnim_000A48;
 #define dgAnubiceAnim_000BAC "__OTR__objects/object_anubice/gAnubiceAnim_000BAC"
 static const ALIGN_ASSET(2) char gAnubiceAnim_000BAC[] = dgAnubiceAnim_000BAC;
 
+#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690"
+static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690;
+
+#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0"
+static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0;
+
 #define dgAnubiceSkelLimbsLimb_0038B8DL_002CE0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_0038B8DL_002CE0"
 static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_0038B8DL_002CE0[] = dgAnubiceSkelLimbsLimb_0038B8DL_002CE0;
 
@@ -62,12 +69,6 @@ static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003930DL_003288[] = dgAnu
 #define dgAnubiceSkelLimbsLimb_003948DL_0031A0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_003948DL_0031A0"
 static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003948DL_0031A0[] = dgAnubiceSkelLimbsLimb_003948DL_0031A0;
 
-#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690"
-static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690;
-
-#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0"
-static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0;
-
 #define dobject_anubiceTex_001090 "__OTR__objects/object_anubice/object_anubiceTex_001090"
 static const ALIGN_ASSET(2) char object_anubiceTex_001090[] = dobject_anubiceTex_001090;
 
@@ -88,3 +89,5 @@ static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex
 
 #define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90"
 static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90;
+
+#endif // OBJECTS_OBJECT_ANUBICE_H

soh/assets/objects/object_aob/object_aob.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_AOB_H
+#define OBJECTS_OBJECT_AOB_H 1
 
 #include "align_asset_macro.h"
 
@@ -85,3 +86,6 @@ static const ALIGN_ASSET(2) char gDogLadyEyeHalfTex[] = dgDogLadyEyeHalfTex;
 
 #define dgDogLadyEyeClosedTex "__OTR__objects/object_aob/gDogLadyEyeClosedTex"
 static const ALIGN_ASSET(2) char gDogLadyEyeClosedTex[] = dgDogLadyEyeClosedTex;
+
+
+#endif // OBJECTS_OBJECT_AOB_H

soh/assets/objects/object_b_heart/object_b_heart.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_B_HEART_H
+#define OBJECTS_OBJECT_B_HEART_H 1
 
 #include "align_asset_macro.h"
 
@@ -13,3 +14,5 @@ static const ALIGN_ASSET(2) char object_b_heart_Tex_0003C0[] = dobject_b_heart_T
 
 #define dobject_b_heart_Tex_0005C0 "__OTR__objects/object_b_heart/object_b_heart_Tex_0005C0"
 static const ALIGN_ASSET(2) char object_b_heart_Tex_0005C0[] = dobject_b_heart_Tex_0005C0;
+
+#endif // OBJECTS_OBJECT_B_HEART_H

soh/assets/objects/object_bba/object_bba.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BBA_H
+#define OBJECTS_OBJECT_BBA_H 1
 
 #include "align_asset_macro.h"
 
@@ -79,3 +80,6 @@ static const ALIGN_ASSET(2) char object_bba_DL_004090[] = dobject_bba_DL_004090;
 
 #define dobject_bba_DL_004160 "__OTR__objects/object_bba/object_bba_DL_004160"
 static const ALIGN_ASSET(2) char object_bba_DL_004160[] = dobject_bba_DL_004160;
+
+
+#endif // OBJECTS_OBJECT_BBA_H

soh/assets/objects/object_bdan_objects/object_bdan_objects.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BDAN_OBJECTS_H
+#define OBJECTS_OBJECT_BDAN_OBJECTS_H 1
 
 #include "align_asset_macro.h"
 
@@ -151,3 +152,5 @@ static const ALIGN_ASSET(2) char gJabuFloorSwitchCol[] = dgJabuFloorSwitchCol;
 
 #define dgJabuBigOctoPlatformCol "__OTR__objects/object_bdan_objects/gJabuBigOctoPlatformCol"
 static const ALIGN_ASSET(2) char gJabuBigOctoPlatformCol[] = dgJabuBigOctoPlatformCol;
+
+#endif // OBJECTS_OBJECT_BDAN_OBJECTS_H

soh/assets/objects/object_bdoor/object_bdoor.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BDOOR_H
+#define OBJECTS_OBJECT_BDOOR_H 1
 
 #include "align_asset_macro.h"
 
@@ -31,3 +32,5 @@ static const ALIGN_ASSET(2) char object_bdoor_Tex_0055C0[] = dobject_bdoor_Tex_0
 
 #define dobject_bdoor_Tex_0065C0 "__OTR__objects/object_bdoor/object_bdoor_Tex_0065C0"
 static const ALIGN_ASSET(2) char object_bdoor_Tex_0065C0[] = dobject_bdoor_Tex_0065C0;
+
+#endif // OBJECTS_OBJECT_BDOOR_H

soh/assets/objects/object_bg/object_bg.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BG_H
+#define OBJECTS_OBJECT_BG_H 1
 
 #include "align_asset_macro.h"
 
@@ -67,3 +68,6 @@ static const ALIGN_ASSET(2) char gChuGirlEyeHalfTex[] = dgChuGirlEyeHalfTex;
 
 #define dgChuGirlEyeClosedTex "__OTR__objects/object_bg/gChuGirlEyeClosedTex"
 static const ALIGN_ASSET(2) char gChuGirlEyeClosedTex[] = dgChuGirlEyeClosedTex;
+
+
+#endif // OBJECTS_OBJECT_BG_H

soh/assets/objects/object_bigokuta/object_bigokuta.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BIGOKUTA_H
+#define OBJECTS_OBJECT_BIGOKUTA_H 1
 
 #include "align_asset_macro.h"
 
@@ -106,3 +107,6 @@ static const ALIGN_ASSET(2) char object_bigokuta_Tex_006890[] = dobject_bigokuta
 
 #define dobject_bigokuta_Skel_006BC0 "__OTR__objects/object_bigokuta/object_bigokuta_Skel_006BC0"
 static const ALIGN_ASSET(2) char object_bigokuta_Skel_006BC0[] = dobject_bigokuta_Skel_006BC0;
+
+
+#endif // OBJECTS_OBJECT_BIGOKUTA_H

soh/assets/objects/object_bird/object_bird.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BIRD_H
+#define OBJECTS_OBJECT_BIRD_H 1
 
 #include "align_asset_macro.h"
 
@@ -43,3 +44,6 @@ static const ALIGN_ASSET(2) char gBirdWingTex[] = dgBirdWingTex;
 
 #define dgBirdSkel "__OTR__objects/object_bird/gBirdSkel"
 static const ALIGN_ASSET(2) char gBirdSkel[] = dgBirdSkel;
+
+
+#endif // OBJECTS_OBJECT_BIRD_H

soh/assets/objects/object_bji/object_bji.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BJI_H
+#define OBJECTS_OBJECT_BJI_H 1
 
 #include "align_asset_macro.h"
 
@@ -94,3 +95,6 @@ static const ALIGN_ASSET(2) char object_bji_Tex_003A08[] = dobject_bji_Tex_003A0
 
 #define dobject_bji_DL_003F68 "__OTR__objects/object_bji/object_bji_DL_003F68"
 static const ALIGN_ASSET(2) char object_bji_DL_003F68[] = dobject_bji_DL_003F68;
+
+
+#endif // OBJECTS_OBJECT_BJI_H

soh/assets/objects/object_bl/object_bl.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BL_H
+#define OBJECTS_OBJECT_BL_H 1
 
 #include "align_asset_macro.h"
 
@@ -52,3 +53,6 @@ static const ALIGN_ASSET(2) char gBiriInnerHoodTex[] = dgBiriInnerHoodTex;
 
 #define dgBiriSkel "__OTR__objects/object_bl/gBiriSkel"
 static const ALIGN_ASSET(2) char gBiriSkel[] = dgBiriSkel;
+
+
+#endif // OBJECTS_OBJECT_BL_H

soh/assets/objects/object_blkobj/object_blkobj.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BLKOBJ_H
+#define OBJECTS_OBJECT_BLKOBJ_H 1
 
 #include "align_asset_macro.h"
 
@@ -79,3 +80,5 @@ static const ALIGN_ASSET(2) char object_blkobjTex_011890[] = dobject_blkobjTex_0
 
 #define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890"
 static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890;
+
+#endif // OBJECTS_OBJECT_BLKOBJ_H

soh/assets/objects/object_bob/object_bob.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BOB_H
+#define OBJECTS_OBJECT_BOB_H 1
 
 #include "align_asset_macro.h"
 
@@ -85,3 +86,6 @@ static const ALIGN_ASSET(2) char object_bob_DL_004DD8[] = dobject_bob_DL_004DD8;
 
 #define dobject_bob_DL_004E28 "__OTR__objects/object_bob/object_bob_DL_004E28"
 static const ALIGN_ASSET(2) char object_bob_DL_004E28[] = dobject_bob_DL_004E28;
+
+
+#endif // OBJECTS_OBJECT_BOB_H

soh/assets/objects/object_boj/object_boj.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BOJ_H
+#define OBJECTS_OBJECT_BOJ_H 1
 
 #include "align_asset_macro.h"
 
@@ -124,3 +125,6 @@ static const ALIGN_ASSET(2) char object_boj_DL_0059B0[] = dobject_boj_DL_0059B0;
 
 #define dobject_boj_DL_005BC8 "__OTR__objects/object_boj/object_boj_DL_005BC8"
 static const ALIGN_ASSET(2) char object_boj_DL_005BC8[] = dobject_boj_DL_005BC8;
+
+
+#endif // OBJECTS_OBJECT_BOJ_H

soh/assets/objects/object_bombf/object_bombf.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BOMBF_H
+#define OBJECTS_OBJECT_BOMBF_H 1
 
 #include "align_asset_macro.h"
 
@@ -22,3 +23,5 @@ static const ALIGN_ASSET(2) char gBombFlowerBombAndSparkDL[] = dgBombFlowerBombA
 
 #define dgBombFlowerBaseLeavesDL "__OTR__objects/object_bombf/gBombFlowerBaseLeavesDL"
 static const ALIGN_ASSET(2) char gBombFlowerBaseLeavesDL[] = dgBombFlowerBaseLeavesDL;
+
+#endif // OBJECTS_OBJECT_BOMBF_H

soh/assets/objects/object_bombiwa/object_bombiwa.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BOMBIWA_H
+#define OBJECTS_OBJECT_BOMBIWA_H 1
 
 #include "align_asset_macro.h"
 
@@ -10,3 +11,5 @@ static const ALIGN_ASSET(2) char object_bombiwa_Tex_000020[] = dobject_bombiwa_T
 
 #define dobject_bombiwa_DL_0009E0 "__OTR__objects/object_bombiwa/object_bombiwa_DL_0009E0"
 static const ALIGN_ASSET(2) char object_bombiwa_DL_0009E0[] = dobject_bombiwa_DL_0009E0;
+
+#endif // OBJECTS_OBJECT_BOMBIWA_H

soh/assets/objects/object_bowl/object_bowl.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BOWL_H
+#define OBJECTS_OBJECT_BOWL_H 1
 
 #include "align_asset_macro.h"
 
@@ -28,3 +29,5 @@ static const ALIGN_ASSET(2) char gBowlingSecondRoundCol[] = dgBowlingSecondRound
 
 #define dgBowlingDefaultCol "__OTR__objects/object_bowl/gBowlingDefaultCol"
 static const ALIGN_ASSET(2) char gBowlingDefaultCol[] = dgBowlingDefaultCol;
+
+#endif // OBJECTS_OBJECT_BOWL_H

soh/assets/objects/object_box/object_box.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BOX_H
+#define OBJECTS_OBJECT_BOX_H 1
 
 #include "align_asset_macro.h"
 
@@ -73,3 +74,5 @@ static const ALIGN_ASSET(2) char gTreasureChestCurveSkelLimbsLimb_005E74Curve2DL
 
 #define dobject_boxTex_004F80 "__OTR__objects/object_box/object_boxTex_004F80"
 static const ALIGN_ASSET(2) char object_boxTex_004F80[] = dobject_boxTex_004F80;
+
+#endif // OBJECTS_OBJECT_BOX_H

soh/assets/objects/object_brob/object_brob.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BROB_H
+#define OBJECTS_OBJECT_BROB_H 1
 
 #include "align_asset_macro.h"
 
@@ -37,3 +38,6 @@ static const ALIGN_ASSET(2) char object_brob_Anim_001958[] = dobject_brob_Anim_0
 
 #define dobject_brob_Col_001A70 "__OTR__objects/object_brob/object_brob_Col_001A70"
 static const ALIGN_ASSET(2) char object_brob_Col_001A70[] = dobject_brob_Col_001A70;
+
+
+#endif // OBJECTS_OBJECT_BROB_H

soh/assets/objects/object_bubble/object_bubble.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BUBBLE_H
+#define OBJECTS_OBJECT_BUBBLE_H 1
 
 #include "align_asset_macro.h"
 
@@ -7,3 +8,5 @@ static const ALIGN_ASSET(2) char gBubbleTex[] = dgBubbleTex;
 
 #define dgBubbleDL "__OTR__objects/object_bubble/gBubbleDL"
 static const ALIGN_ASSET(2) char gBubbleDL[] = dgBubbleDL;
+
+#endif // OBJECTS_OBJECT_BUBBLE_H

soh/assets/objects/object_bv/object_bv.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BV_H
+#define OBJECTS_OBJECT_BV_H 1
 
 #include "align_asset_macro.h"
 
@@ -182,6 +183,87 @@ static const ALIGN_ASSET(2) char gBarinadeDL_0094F8[] = dgBarinadeDL_0094F8;
 #define dgBarinadeDL_0095B0 "__OTR__objects/object_bv/gBarinadeDL_0095B0"
 static const ALIGN_ASSET(2) char gBarinadeDL_0095B0[] = dgBarinadeDL_0095B0;
 
+#define dobject_bvTex_0065A0 "__OTR__objects/object_bv/object_bvTex_0065A0"
+static const ALIGN_ASSET(2) char object_bvTex_0065A0[] = dobject_bvTex_0065A0;
+
+#define dobject_bvTex_005DA0 "__OTR__objects/object_bv/object_bvTex_005DA0"
+static const ALIGN_ASSET(2) char object_bvTex_005DA0[] = dobject_bvTex_005DA0;
+
+#define dobject_bvTex_000A40 "__OTR__objects/object_bv/object_bvTex_000A40"
+static const ALIGN_ASSET(2) char object_bvTex_000A40[] = dobject_bvTex_000A40;
+
+#define dobject_bvTex_013660 "__OTR__objects/object_bv/object_bvTex_013660"
+static const ALIGN_ASSET(2) char object_bvTex_013660[] = dobject_bvTex_013660;
+
+#define dobject_bvTex_0117B8 "__OTR__objects/object_bv/object_bvTex_0117B8"
+static const ALIGN_ASSET(2) char object_bvTex_0117B8[] = dobject_bvTex_0117B8;
+
+#define dobject_bvTex_011BB8 "__OTR__objects/object_bv/object_bvTex_011BB8"
+static const ALIGN_ASSET(2) char object_bvTex_011BB8[] = dobject_bvTex_011BB8;
+
+#define dobject_bvTex_0119B8 "__OTR__objects/object_bv/object_bvTex_0119B8"
+static const ALIGN_ASSET(2) char object_bvTex_0119B8[] = dobject_bvTex_0119B8;
+
+#define dobject_bvTex_012CE0 "__OTR__objects/object_bv/object_bvTex_012CE0"
+static const ALIGN_ASSET(2) char object_bvTex_012CE0[] = dobject_bvTex_012CE0;
+
+#define dobject_bvTex_008F88 "__OTR__objects/object_bv/object_bvTex_008F88"
+static const ALIGN_ASSET(2) char object_bvTex_008F88[] = dobject_bvTex_008F88;
+
+#define dobject_bvTex_019BB8 "__OTR__objects/object_bv/object_bvTex_019BB8"
+static const ALIGN_ASSET(2) char object_bvTex_019BB8[] = dobject_bvTex_019BB8;
+
+#define dobject_bvTLUT_0199B0 "__OTR__objects/object_bv/object_bvTLUT_0199B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_0199B0[] = dobject_bvTLUT_0199B0;
+
+#define dobject_bvTex_01A6B8 "__OTR__objects/object_bv/object_bvTex_01A6B8"
+static const ALIGN_ASSET(2) char object_bvTex_01A6B8[] = dobject_bvTex_01A6B8;
+
+#define dobject_bvTLUT_01A4B0 "__OTR__objects/object_bv/object_bvTLUT_01A4B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01A4B0[] = dobject_bvTLUT_01A4B0;
+
+#define dobject_bvTex_01B1B8 "__OTR__objects/object_bv/object_bvTex_01B1B8"
+static const ALIGN_ASSET(2) char object_bvTex_01B1B8[] = dobject_bvTex_01B1B8;
+
+#define dobject_bvTLUT_01AFB0 "__OTR__objects/object_bv/object_bvTLUT_01AFB0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01AFB0[] = dobject_bvTLUT_01AFB0;
+
+#define dobject_bvTex_01BCB8 "__OTR__objects/object_bv/object_bvTex_01BCB8"
+static const ALIGN_ASSET(2) char object_bvTex_01BCB8[] = dobject_bvTex_01BCB8;
+
+#define dobject_bvTLUT_01BAB0 "__OTR__objects/object_bv/object_bvTLUT_01BAB0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01BAB0[] = dobject_bvTLUT_01BAB0;
+
+#define dobject_bvTex_01C7B8 "__OTR__objects/object_bv/object_bvTex_01C7B8"
+static const ALIGN_ASSET(2) char object_bvTex_01C7B8[] = dobject_bvTex_01C7B8;
+
+#define dobject_bvTLUT_01C5B0 "__OTR__objects/object_bv/object_bvTLUT_01C5B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01C5B0[] = dobject_bvTLUT_01C5B0;
+
+#define dobject_bvTex_01D2B8 "__OTR__objects/object_bv/object_bvTex_01D2B8"
+static const ALIGN_ASSET(2) char object_bvTex_01D2B8[] = dobject_bvTex_01D2B8;
+
+#define dobject_bvTLUT_01D0B0 "__OTR__objects/object_bv/object_bvTLUT_01D0B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01D0B0[] = dobject_bvTLUT_01D0B0;
+
+#define dobject_bvTex_01DDB8 "__OTR__objects/object_bv/object_bvTex_01DDB8"
+static const ALIGN_ASSET(2) char object_bvTex_01DDB8[] = dobject_bvTex_01DDB8;
+
+#define dobject_bvTLUT_01DBB0 "__OTR__objects/object_bv/object_bvTLUT_01DBB0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01DBB0[] = dobject_bvTLUT_01DBB0;
+
+#define dobject_bvTex_01E8B8 "__OTR__objects/object_bv/object_bvTex_01E8B8"
+static const ALIGN_ASSET(2) char object_bvTex_01E8B8[] = dobject_bvTex_01E8B8;
+
+#define dobject_bvTLUT_01E6B0 "__OTR__objects/object_bv/object_bvTLUT_01E6B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01E6B0[] = dobject_bvTLUT_01E6B0;
+
+#define dobject_bvTex_0052A0 "__OTR__objects/object_bv/object_bvTex_0052A0"
+static const ALIGN_ASSET(2) char object_bvTex_0052A0[] = dobject_bvTex_0052A0;
+
+#define dobject_bvTex_0053A0 "__OTR__objects/object_bv/object_bvTex_0053A0"
+static const ALIGN_ASSET(2) char object_bvTex_0053A0[] = dobject_bvTex_0053A0;
+
 #define dgBarinadeBodySkelLimbsLimb_015770DL_007FD8 "__OTR__objects/object_bv/gBarinadeBodySkelLimbsLimb_015770DL_007FD8"
 static const ALIGN_ASSET(2) char gBarinadeBodySkelLimbsLimb_015770DL_007FD8[] = dgBarinadeBodySkelLimbsLimb_015770DL_007FD8;
 
@@ -278,87 +360,6 @@ static const ALIGN_ASSET(2) char gBarinadeCutSupportSkelLimbsLimb_017F88DL_017CB
 #define dgBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90 "__OTR__objects/object_bv/gBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90"
 static const ALIGN_ASSET(2) char gBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90[] = dgBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90;
 
-#define dobject_bvTex_0065A0 "__OTR__objects/object_bv/object_bvTex_0065A0"
-static const ALIGN_ASSET(2) char object_bvTex_0065A0[] = dobject_bvTex_0065A0;
-
-#define dobject_bvTex_005DA0 "__OTR__objects/object_bv/object_bvTex_005DA0"
-static const ALIGN_ASSET(2) char object_bvTex_005DA0[] = dobject_bvTex_005DA0;
-
-#define dobject_bvTex_000A40 "__OTR__objects/object_bv/object_bvTex_000A40"
-static const ALIGN_ASSET(2) char object_bvTex_000A40[] = dobject_bvTex_000A40;
-
-#define dobject_bvTex_013660 "__OTR__objects/object_bv/object_bvTex_013660"
-static const ALIGN_ASSET(2) char object_bvTex_013660[] = dobject_bvTex_013660;
-
-#define dobject_bvTex_0117B8 "__OTR__objects/object_bv/object_bvTex_0117B8"
-static const ALIGN_ASSET(2) char object_bvTex_0117B8[] = dobject_bvTex_0117B8;
-
-#define dobject_bvTex_011BB8 "__OTR__objects/object_bv/object_bvTex_011BB8"
-static const ALIGN_ASSET(2) char object_bvTex_011BB8[] = dobject_bvTex_011BB8;
-
-#define dobject_bvTex_0119B8 "__OTR__objects/object_bv/object_bvTex_0119B8"
-static const ALIGN_ASSET(2) char object_bvTex_0119B8[] = dobject_bvTex_0119B8;
-
-#define dobject_bvTex_012CE0 "__OTR__objects/object_bv/object_bvTex_012CE0"
-static const ALIGN_ASSET(2) char object_bvTex_012CE0[] = dobject_bvTex_012CE0;
-
-#define dobject_bvTex_008F88 "__OTR__objects/object_bv/object_bvTex_008F88"
-static const ALIGN_ASSET(2) char object_bvTex_008F88[] = dobject_bvTex_008F88;
-
-#define dobject_bvTex_019BB8 "__OTR__objects/object_bv/object_bvTex_019BB8"
-static const ALIGN_ASSET(2) char object_bvTex_019BB8[] = dobject_bvTex_019BB8;
-
-#define dobject_bvTLUT_0199B0 "__OTR__objects/object_bv/object_bvTLUT_0199B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_0199B0[] = dobject_bvTLUT_0199B0;
-
-#define dobject_bvTex_01A6B8 "__OTR__objects/object_bv/object_bvTex_01A6B8"
-static const ALIGN_ASSET(2) char object_bvTex_01A6B8[] = dobject_bvTex_01A6B8;
-
-#define dobject_bvTLUT_01A4B0 "__OTR__objects/object_bv/object_bvTLUT_01A4B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01A4B0[] = dobject_bvTLUT_01A4B0;
-
-#define dobject_bvTex_01B1B8 "__OTR__objects/object_bv/object_bvTex_01B1B8"
-static const ALIGN_ASSET(2) char object_bvTex_01B1B8[] = dobject_bvTex_01B1B8;
-
-#define dobject_bvTLUT_01AFB0 "__OTR__objects/object_bv/object_bvTLUT_01AFB0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01AFB0[] = dobject_bvTLUT_01AFB0;
-
-#define dobject_bvTex_01BCB8 "__OTR__objects/object_bv/object_bvTex_01BCB8"
-static const ALIGN_ASSET(2) char object_bvTex_01BCB8[] = dobject_bvTex_01BCB8;
-
-#define dobject_bvTLUT_01BAB0 "__OTR__objects/object_bv/object_bvTLUT_01BAB0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01BAB0[] = dobject_bvTLUT_01BAB0;
-
-#define dobject_bvTex_01C7B8 "__OTR__objects/object_bv/object_bvTex_01C7B8"
-static const ALIGN_ASSET(2) char object_bvTex_01C7B8[] = dobject_bvTex_01C7B8;
-
-#define dobject_bvTLUT_01C5B0 "__OTR__objects/object_bv/object_bvTLUT_01C5B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01C5B0[] = dobject_bvTLUT_01C5B0;
-
-#define dobject_bvTex_01D2B8 "__OTR__objects/object_bv/object_bvTex_01D2B8"
-static const ALIGN_ASSET(2) char object_bvTex_01D2B8[] = dobject_bvTex_01D2B8;
-
-#define dobject_bvTLUT_01D0B0 "__OTR__objects/object_bv/object_bvTLUT_01D0B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01D0B0[] = dobject_bvTLUT_01D0B0;
-
-#define dobject_bvTex_01DDB8 "__OTR__objects/object_bv/object_bvTex_01DDB8"
-static const ALIGN_ASSET(2) char object_bvTex_01DDB8[] = dobject_bvTex_01DDB8;
-
-#define dobject_bvTLUT_01DBB0 "__OTR__objects/object_bv/object_bvTLUT_01DBB0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01DBB0[] = dobject_bvTLUT_01DBB0;
-
-#define dobject_bvTex_01E8B8 "__OTR__objects/object_bv/object_bvTex_01E8B8"
-static const ALIGN_ASSET(2) char object_bvTex_01E8B8[] = dobject_bvTex_01E8B8;
-
-#define dobject_bvTLUT_01E6B0 "__OTR__objects/object_bv/object_bvTLUT_01E6B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01E6B0[] = dobject_bvTLUT_01E6B0;
-
-#define dobject_bvTex_0052A0 "__OTR__objects/object_bv/object_bvTex_0052A0"
-static const ALIGN_ASSET(2) char object_bvTex_0052A0[] = dobject_bvTex_0052A0;
-
-#define dobject_bvTex_0053A0 "__OTR__objects/object_bv/object_bvTex_0053A0"
-static const ALIGN_ASSET(2) char object_bvTex_0053A0[] = dobject_bvTex_0053A0;
-
 #define dobject_bvTex_0051A0 "__OTR__objects/object_bv/object_bvTex_0051A0"
 static const ALIGN_ASSET(2) char object_bvTex_0051A0[] = dobject_bvTex_0051A0;
 
@@ -388,3 +389,5 @@ static const ALIGN_ASSET(2) char object_bvTex_000840[] = dobject_bvTex_000840;
 
 #define dobject_bvTex_000040 "__OTR__objects/object_bv/object_bvTex_000040"
 static const ALIGN_ASSET(2) char object_bvTex_000040[] = dobject_bvTex_000040;
+
+#endif // OBJECTS_OBJECT_BV_H

soh/assets/objects/object_bw/object_bw.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BW_H
+#define OBJECTS_OBJECT_BW_H 1
 
 #include "align_asset_macro.h"
 
@@ -43,3 +44,6 @@ static const ALIGN_ASSET(2) char object_bw_Anim_0021A0[] = dobject_bw_Anim_0021A
 
 #define dobject_bw_Anim_002250 "__OTR__objects/object_bw/object_bw_Anim_002250"
 static const ALIGN_ASSET(2) char object_bw_Anim_002250[] = dobject_bw_Anim_002250;
+
+
+#endif // OBJECTS_OBJECT_BW_H

soh/assets/objects/object_bwall/object_bwall.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BWALL_H
+#define OBJECTS_OBJECT_BWALL_H 1
 
 #include "align_asset_macro.h"
 
@@ -10,3 +11,5 @@ static const ALIGN_ASSET(2) char object_bwall_Col_000118[] = dobject_bwall_Col_0
 
 #define dobject_bwall_Tex_000150 "__OTR__objects/object_bwall/object_bwall_Tex_000150"
 static const ALIGN_ASSET(2) char object_bwall_Tex_000150[] = dobject_bwall_Tex_000150;
+
+#endif // OBJECTS_OBJECT_BWALL_H

soh/assets/objects/object_bxa/object_bxa.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_BXA_H
+#define OBJECTS_OBJECT_BXA_H 1
 
 #include "align_asset_macro.h"
 
@@ -28,3 +29,5 @@ static const ALIGN_ASSET(2) char object_bxa_Tex_0027F0[] = dobject_bxa_Tex_0027F
 
 #define dobject_bxa_Tex_0029F0 "__OTR__objects/object_bxa/object_bxa_Tex_0029F0"
 static const ALIGN_ASSET(2) char object_bxa_Tex_0029F0[] = dobject_bxa_Tex_0029F0;
+
+#endif // OBJECTS_OBJECT_BXA_H

soh/assets/objects/object_cne/object_cne.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_CNE_H
+#define OBJECTS_OBJECT_CNE_H 1
 
 #include "align_asset_macro.h"
 
@@ -82,3 +83,6 @@ static const ALIGN_ASSET(2) char gCneOrangeHairSkinTex[] = dgCneOrangeHairSkinTe
 
 #define dgCneHeadOrangeHairDL "__OTR__objects/object_cne/gCneHeadOrangeHairDL"
 static const ALIGN_ASSET(2) char gCneHeadOrangeHairDL[] = dgCneHeadOrangeHairDL;
+
+
+#endif // OBJECTS_OBJECT_CNE_H

soh/assets/objects/object_cob/object_cob.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_COB_H
+#define OBJECTS_OBJECT_COB_H 1
 
 #include "align_asset_macro.h"
 
@@ -67,3 +68,6 @@ static const ALIGN_ASSET(2) char object_cob_DL_002020[] = dobject_cob_DL_002020;
 
 #define dobject_cob_Skel_0021F8 "__OTR__objects/object_cob/object_cob_Skel_0021F8"
 static const ALIGN_ASSET(2) char object_cob_Skel_0021F8[] = dobject_cob_Skel_0021F8;
+
+
+#endif // OBJECTS_OBJECT_COB_H

soh/assets/objects/object_cow/object_cow.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_COW_H
+#define OBJECTS_OBJECT_COW_H 1
 
 #include "align_asset_macro.h"
 
@@ -73,3 +74,6 @@ static const ALIGN_ASSET(2) char gCowEyelidTex[] = dgCowEyelidTex;
 
 #define dgCowTailTex "__OTR__objects/object_cow/gCowTailTex"
 static const ALIGN_ASSET(2) char gCowTailTex[] = dgCowTailTex;
+
+
+#endif // OBJECTS_OBJECT_COW_H

soh/assets/objects/object_crow/object_crow.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_CROW_H
+#define OBJECTS_OBJECT_CROW_H 1
 
 #include "align_asset_macro.h"
 
@@ -37,3 +38,6 @@ static const ALIGN_ASSET(2) char gGuaySkelLimbsLimb_001088DL_0009A0[] = dgGuaySk
 
 #define dgGuaySkelLimbsLimb_001094DL_000900 "__OTR__objects/object_crow/gGuaySkelLimbsLimb_001094DL_000900"
 static const ALIGN_ASSET(2) char gGuaySkelLimbsLimb_001094DL_000900[] = dgGuaySkelLimbsLimb_001094DL_000900;
+
+
+#endif // OBJECTS_OBJECT_CROW_H

soh/assets/objects/object_cs/object_cs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_CS_H
+#define OBJECTS_OBJECT_CS_H 1
 
 #include "align_asset_macro.h"
 
@@ -109,3 +110,6 @@ static const ALIGN_ASSET(2) char gGraveyardKidFingersTex[] = dgGraveyardKidFinge
 
 #define dgGraveyardKidStickTex "__OTR__objects/object_cs/gGraveyardKidStickTex"
 static const ALIGN_ASSET(2) char gGraveyardKidStickTex[] = dgGraveyardKidStickTex;
+
+
+#endif // OBJECTS_OBJECT_CS_H

soh/assets/objects/object_d_elevator/object_d_elevator.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_D_ELEVATOR_H
+#define OBJECTS_OBJECT_D_ELEVATOR_H 1
 
 #include "align_asset_macro.h"
 
@@ -10,3 +11,5 @@ static const ALIGN_ASSET(2) char object_d_elevator_Col_000360[] = dobject_d_elev
 
 #define dobject_d_elevator_Tex_000390 "__OTR__objects/object_d_elevator/object_d_elevator_Tex_000390"
 static const ALIGN_ASSET(2) char object_d_elevator_Tex_000390[] = dobject_d_elevator_Tex_000390;
+
+#endif // OBJECTS_OBJECT_D_ELEVATOR_H

soh/assets/objects/object_d_hsblock/object_d_hsblock.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_D_HSBLOCK_H
+#define OBJECTS_OBJECT_D_HSBLOCK_H 1
 
 #include "align_asset_macro.h"
 
@@ -19,3 +20,5 @@ static const ALIGN_ASSET(2) char gHookshotTargetTex[] = dgHookshotTargetTex;
 
 #define dgHookshotPostTex "__OTR__objects/object_d_hsblock/gHookshotPostTex"
 static const ALIGN_ASSET(2) char gHookshotPostTex[] = dgHookshotPostTex;
+
+#endif // OBJECTS_OBJECT_D_HSBLOCK_H

soh/assets/objects/object_d_lift/object_d_lift.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_D_LIFT_H
+#define OBJECTS_OBJECT_D_LIFT_H 1
 
 #include "align_asset_macro.h"
 
@@ -13,3 +14,5 @@ static const ALIGN_ASSET(2) char gCollapsingPlatformSideTex[] = dgCollapsingPlat
 
 #define dgCollapsingPlatformTopTex "__OTR__objects/object_d_lift/gCollapsingPlatformTopTex"
 static const ALIGN_ASSET(2) char gCollapsingPlatformTopTex[] = dgCollapsingPlatformTopTex;
+
+#endif // OBJECTS_OBJECT_D_LIFT_H

soh/assets/objects/object_daiku/object_daiku.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DAIKU_H
+#define OBJECTS_OBJECT_DAIKU_H 1
 
 #include "align_asset_macro.h"
 
@@ -121,3 +122,6 @@ static const ALIGN_ASSET(2) char object_daiku_Anim_008164[] = dobject_daiku_Anim
 
 #define dobject_daiku_Anim_00885C "__OTR__objects/object_daiku/object_daiku_Anim_00885C"
 static const ALIGN_ASSET(2) char object_daiku_Anim_00885C[] = dobject_daiku_Anim_00885C;
+
+
+#endif // OBJECTS_OBJECT_DAIKU_H

soh/assets/objects/object_ddan_objects/object_ddan_objects.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DDAN_OBJECTS_H
+#define OBJECTS_OBJECT_DDAN_OBJECTS_H 1
 
 #include "align_asset_macro.h"
 
@@ -64,3 +65,5 @@ static const ALIGN_ASSET(2) char gDodongoRisingPlatformCol[] = dgDodongoRisingPl
 
 #define dgDodongoFallingStairsCol "__OTR__objects/object_ddan_objects/gDodongoFallingStairsCol"
 static const ALIGN_ASSET(2) char gDodongoFallingStairsCol[] = dgDodongoFallingStairsCol;
+
+#endif // OBJECTS_OBJECT_DDAN_OBJECTS_H

soh/assets/objects/object_dekubaba/object_dekubaba.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DEKUBABA_H
+#define OBJECTS_OBJECT_DEKUBABA_H 1
 
 #include "align_asset_macro.h"
 
@@ -49,3 +50,6 @@ static const ALIGN_ASSET(2) char gDekuBabaStickDropDL[] = dgDekuBabaStickDropDL;
 
 #define dgDekuBabaStickDropTex "__OTR__objects/object_dekubaba/gDekuBabaStickDropTex"
 static const ALIGN_ASSET(2) char gDekuBabaStickDropTex[] = dgDekuBabaStickDropTex;
+
+
+#endif // OBJECTS_OBJECT_DEKUBABA_H

soh/assets/objects/object_dekujr/object_dekujr.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DEKUJR_H
+#define OBJECTS_OBJECT_DEKUJR_H 1
 
 #include "align_asset_macro.h"
 
@@ -28,3 +29,5 @@ static const ALIGN_ASSET(2) char object_dekujr_DL_0030D0[] = dobject_dekujr_DL_0
 
 #define dobject_dekujr_DL_0032D8 "__OTR__objects/object_dekujr/object_dekujr_DL_0032D8"
 static const ALIGN_ASSET(2) char object_dekujr_DL_0032D8[] = dobject_dekujr_DL_0032D8;
+
+#endif // OBJECTS_OBJECT_DEKUJR_H

soh/assets/objects/object_dekunuts/object_dekunuts.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DEKUNUTS_H
+#define OBJECTS_OBJECT_DEKUNUTS_H 1
 
 #include "align_asset_macro.h"
 
@@ -85,3 +86,6 @@ static const ALIGN_ASSET(2) char gDekuNutsSkelLimbsLimb_0031F0DL_001DA8[] = dgDe
 
 #define dgDekuNutsSkelLimbsLimb_0031FCDL_001D08 "__OTR__objects/object_dekunuts/gDekuNutsSkelLimbsLimb_0031FCDL_001D08"
 static const ALIGN_ASSET(2) char gDekuNutsSkelLimbsLimb_0031FCDL_001D08[] = dgDekuNutsSkelLimbsLimb_0031FCDL_001D08;
+
+
+#endif // OBJECTS_OBJECT_DEKUNUTS_H

soh/assets/objects/object_demo_6k/object_demo_6k.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DEMO_6K_H
+#define OBJECTS_OBJECT_DEMO_6K_H 1
 
 #include "align_asset_macro.h"
 
@@ -22,3 +23,5 @@ static const ALIGN_ASSET(2) char object_demo_6kVtx_0035E0[] = dobject_demo_6kVtx
 
 #define dobject_demo_6k_DL_0039D0 "__OTR__objects/object_demo_6k/object_demo_6k_DL_0039D0"
 static const ALIGN_ASSET(2) char object_demo_6k_DL_0039D0[] = dobject_demo_6k_DL_0039D0;
+
+#endif // OBJECTS_OBJECT_DEMO_6K_H

soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DEMO_KEKKAI_H
+#define OBJECTS_OBJECT_DEMO_KEKKAI_H 1
 
 #include "align_asset_macro.h"
 
@@ -109,3 +110,5 @@ static const ALIGN_ASSET(2) char object_demo_kekkaiTex_002450[] = dobject_demo_k
 
 #define dobject_demo_kekkaiTex_001000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_001000"
 static const ALIGN_ASSET(2) char object_demo_kekkaiTex_001000[] = dobject_demo_kekkaiTex_001000;
+
+#endif // OBJECTS_OBJECT_DEMO_KEKKAI_H

soh/assets/objects/object_demo_tre_lgt/object_demo_tre_lgt.h

@@ -1,6 +1,9 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DEMO_TRE_LGT_H
+#define OBJECTS_OBJECT_DEMO_TRE_LGT_H 1
 
 #include "align_asset_macro.h"
 
 #define dgWarpDemoTreLgtBlob_000000 "__OTR__objects/object_demo_tre_lgt/gWarpDemoTreLgtBlob_000000"
 static const ALIGN_ASSET(2) char gWarpDemoTreLgtBlob_000000[] = dgWarpDemoTreLgtBlob_000000;
+
+#endif // OBJECTS_OBJECT_DEMO_TRE_LGT_H

soh/assets/objects/object_dh/object_dh.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DH_H
+#define OBJECTS_OBJECT_DH_H 1
 
 #include "align_asset_macro.h"
 
@@ -112,3 +113,6 @@ static const ALIGN_ASSET(2) char object_dh_Tex_0080C0[] = dobject_dh_Tex_0080C0;
 
 #define dobject_dh_Tex_0088C0 "__OTR__objects/object_dh/object_dh_Tex_0088C0"
 static const ALIGN_ASSET(2) char object_dh_Tex_0088C0[] = dobject_dh_Tex_0088C0;
+
+
+#endif // OBJECTS_OBJECT_DH_H

soh/assets/objects/object_dnk/object_dnk.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DNK_H
+#define OBJECTS_OBJECT_DNK_H 1
 
 #include "align_asset_macro.h"
 
@@ -41,6 +42,12 @@ static const ALIGN_ASSET(2) char gDntStageNutDL[] = dgDntStageNutDL;
 #define dgDntStageWaitAnim "__OTR__objects/object_dnk/gDntStageWaitAnim"
 static const ALIGN_ASSET(2) char gDntStageWaitAnim[] = dgDntStageWaitAnim;
 
+#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0"
+static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0;
+
+#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850"
+static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850;
+
 #define dgDntStageSkelLimbsLimb_002A50DL_0011E0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002A50DL_0011E0"
 static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002A50DL_0011E0[] = dgDntStageSkelLimbsLimb_002A50DL_0011E0;
 
@@ -71,12 +78,6 @@ static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002AB0DL_001700[] = dgDn
 #define dgDntStageSkelLimbsLimb_002ABCDL_0017B0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002ABCDL_0017B0"
 static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002ABCDL_0017B0[] = dgDntStageSkelLimbsLimb_002ABCDL_0017B0;
 
-#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0"
-static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0;
-
-#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850"
-static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850;
-
 #define dobject_dnkTex_0023D0 "__OTR__objects/object_dnk/object_dnkTex_0023D0"
 static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0;
 
@@ -85,3 +86,5 @@ static const ALIGN_ASSET(2) char object_dnkTex_002650[] = dobject_dnkTex_002650;
 
 #define dobject_dnkTex_0026D0 "__OTR__objects/object_dnk/object_dnkTex_0026D0"
 static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0;
+
+#endif // OBJECTS_OBJECT_DNK_H

soh/assets/objects/object_dns/object_dns.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DNS_H
+#define OBJECTS_OBJECT_DNS_H 1
 
 #include "align_asset_macro.h"
 
@@ -53,6 +54,12 @@ static const ALIGN_ASSET(2) char gDntJijiUnkAnim[] = dgDntJijiUnkAnim;
 #define dgDntJijiWaitAnim "__OTR__objects/object_dns/gDntJijiWaitAnim"
 static const ALIGN_ASSET(2) char gDntJijiWaitAnim[] = dgDntJijiWaitAnim;
 
+#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0"
+static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0;
+
+#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120"
+static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120;
+
 #define dgDntJijiSkelLimbsLimb_003320DL_001AF0 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_003320DL_001AF0"
 static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003320DL_001AF0[] = dgDntJijiSkelLimbsLimb_003320DL_001AF0;
 
@@ -89,12 +96,6 @@ static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003398DL_001A40[] = dgDnt
 #define dgDntJijiSkelLimbsLimb_0033A4DL_001990 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_0033A4DL_001990"
 static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_0033A4DL_001990[] = dgDntJijiSkelLimbsLimb_0033A4DL_001990;
 
-#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0"
-static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0;
-
-#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120"
-static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120;
-
 #define dobject_dnsTex_002CA0 "__OTR__objects/object_dns/object_dnsTex_002CA0"
 static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0;
 
@@ -103,3 +104,5 @@ static const ALIGN_ASSET(2) char object_dnsTex_002F20[] = dobject_dnsTex_002F20;
 
 #define dobject_dnsTex_002FA0 "__OTR__objects/object_dns/object_dnsTex_002FA0"
 static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0;
+
+#endif // OBJECTS_OBJECT_DNS_H

soh/assets/objects/object_dodojr/object_dodojr.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DODOJR_H
+#define OBJECTS_OBJECT_DODOJR_H 1
 
 #include "align_asset_macro.h"
 
@@ -46,3 +47,6 @@ static const ALIGN_ASSET(2) char object_dodojr_Tex_001C00[] = dobject_dodojr_Tex
 
 #define dobject_dodojr_Skel_0020E0 "__OTR__objects/object_dodojr/object_dodojr_Skel_0020E0"
 static const ALIGN_ASSET(2) char object_dodojr_Skel_0020E0[] = dobject_dodojr_Skel_0020E0;
+
+
+#endif // OBJECTS_OBJECT_DODOJR_H

soh/assets/objects/object_dodongo/object_dodongo.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DODONGO_H
+#define OBJECTS_OBJECT_DODONGO_H 1
 
 #include "align_asset_macro.h"
 
@@ -112,3 +113,6 @@ static const ALIGN_ASSET(2) char gDodongoSkelLimbsLimb_008288DL_007298[] = dgDod
 
 #define dgDodongoSkelLimbsLimb_008294DL_007198 "__OTR__objects/object_dodongo/gDodongoSkelLimbsLimb_008294DL_007198"
 static const ALIGN_ASSET(2) char gDodongoSkelLimbsLimb_008294DL_007198[] = dgDodongoSkelLimbsLimb_008294DL_007198;
+
+
+#endif // OBJECTS_OBJECT_DODONGO_H

soh/assets/objects/object_dog/object_dog.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DOG_H
+#define OBJECTS_OBJECT_DOG_H 1
 
 #include "align_asset_macro.h"
 
@@ -76,3 +77,6 @@ static const ALIGN_ASSET(2) char gDogTailDL[] = dgDogTailDL;
 
 #define dgDogSkel "__OTR__objects/object_dog/gDogSkel"
 static const ALIGN_ASSET(2) char gDogSkel[] = dgDogSkel;
+
+
+#endif // OBJECTS_OBJECT_DOG_H

soh/assets/objects/object_door_gerudo/object_door_gerudo.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DOOR_GERUDO_H
+#define OBJECTS_OBJECT_DOOR_GERUDO_H 1
 
 #include "align_asset_macro.h"
 
@@ -10,3 +11,5 @@ static const ALIGN_ASSET(2) char gGerudoCellDoorDL[] = dgGerudoCellDoorDL;
 
 #define dgGerudoCellDoorCol "__OTR__objects/object_door_gerudo/gGerudoCellDoorCol"
 static const ALIGN_ASSET(2) char gGerudoCellDoorCol[] = dgGerudoCellDoorCol;
+
+#endif // OBJECTS_OBJECT_DOOR_GERUDO_H

soh/assets/objects/object_door_killer/object_door_killer.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DOOR_KILLER_H
+#define OBJECTS_OBJECT_DOOR_KILLER_H 1
 
 #include "align_asset_macro.h"
 
@@ -40,3 +41,6 @@ static const ALIGN_ASSET(2) char object_door_killer_DL_001A58[] = dobject_door_k
 
 #define dobject_door_killer_Skel_001BC8 "__OTR__objects/object_door_killer/object_door_killer_Skel_001BC8"
 static const ALIGN_ASSET(2) char object_door_killer_Skel_001BC8[] = dobject_door_killer_Skel_001BC8;
+
+
+#endif // OBJECTS_OBJECT_DOOR_KILLER_H

soh/assets/objects/object_ds/object_ds.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DS_H
+#define OBJECTS_OBJECT_DS_H 1
 
 #include "align_asset_macro.h"
 
@@ -55,3 +56,6 @@ static const ALIGN_ASSET(2) char gPotionShopLadyCatPattern2Tex[] = dgPotionShopL
 
 #define dgPotionShopLadyAnim "__OTR__objects/object_ds/gPotionShopLadyAnim"
 static const ALIGN_ASSET(2) char gPotionShopLadyAnim[] = dgPotionShopLadyAnim;
+
+
+#endif // OBJECTS_OBJECT_DS_H

soh/assets/objects/object_ds2/object_ds2.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DS2_H
+#define OBJECTS_OBJECT_DS2_H 1
 
 #include "align_asset_macro.h"
 
@@ -67,3 +68,6 @@ static const ALIGN_ASSET(2) char object_ds2_Tex_003FD8[] = dobject_ds2_Tex_003FD
 
 #define dobject_ds2_Skel_004258 "__OTR__objects/object_ds2/object_ds2_Skel_004258"
 static const ALIGN_ASSET(2) char object_ds2_Skel_004258[] = dobject_ds2_Skel_004258;
+
+
+#endif // OBJECTS_OBJECT_DS2_H

soh/assets/objects/object_du/object_du.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DU_H
+#define OBJECTS_OBJECT_DU_H 1
 
 #include "align_asset_macro.h"
 
@@ -181,3 +182,6 @@ static const ALIGN_ASSET(2) char gDaruniaSkelLimbsLimb_011C4CDL_00D1D0[] = dgDar
 
 #define dgDaruniaSkelLimbsLimb_011C58DL_00D810 "__OTR__objects/object_du/gDaruniaSkelLimbsLimb_011C58DL_00D810"
 static const ALIGN_ASSET(2) char gDaruniaSkelLimbsLimb_011C58DL_00D810[] = dgDaruniaSkelLimbsLimb_011C58DL_00D810;
+
+
+#endif // OBJECTS_OBJECT_DU_H

soh/assets/objects/object_dy_obj/object_dy_obj.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_DY_OBJ_H
+#define OBJECTS_OBJECT_DY_OBJ_H 1
 
 #include "align_asset_macro.h"
 
@@ -202,3 +203,6 @@ static const ALIGN_ASSET(2) char gGreatFairySittingAnim[] = dgGreatFairySittingA
 
 #define dgGreatFairySpiralBeamVtx "__OTR__objects/object_dy_obj/gGreatFairySpiralBeamVtx"
 static const ALIGN_ASSET(2) char gGreatFairySpiralBeamVtx[] = dgGreatFairySpiralBeamVtx;
+
+
+#endif // OBJECTS_OBJECT_DY_OBJ_H

soh/assets/objects/object_ec/object_ec.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EC_H
+#define OBJECTS_OBJECT_EC_H 1
 
 #include "align_asset_macro.h"
 
@@ -67,3 +68,5 @@ static const ALIGN_ASSET(2) char gDemoEcTalonAnim[] = dgDemoEcTalonAnim;
 
 #define dgDemoEcDancingZoraAnim "__OTR__objects/object_ec/gDemoEcDancingZoraAnim"
 static const ALIGN_ASSET(2) char gDemoEcDancingZoraAnim[] = dgDemoEcDancingZoraAnim;
+
+#endif // OBJECTS_OBJECT_EC_H

soh/assets/objects/object_efc_crystal_light/object_efc_crystal_light.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_CRYSTAL_LIGHT_H
+#define OBJECTS_OBJECT_EFC_CRYSTAL_LIGHT_H 1
 
 #include "align_asset_macro.h"
 
@@ -7,3 +8,5 @@ static const ALIGN_ASSET(2) char gCrystalLightTex[] = dgCrystalLightTex;
 
 #define dgCrystalLightDL "__OTR__objects/object_efc_crystal_light/gCrystalLightDL"
 static const ALIGN_ASSET(2) char gCrystalLightDL[] = dgCrystalLightDL;
+
+#endif // OBJECTS_OBJECT_EFC_CRYSTAL_LIGHT_H

soh/assets/objects/object_efc_doughnut/object_efc_doughnut.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_DOUGHNUT_H
+#define OBJECTS_OBJECT_EFC_DOUGHNUT_H 1
 
 #include "align_asset_macro.h"
 
@@ -13,3 +14,5 @@ static const ALIGN_ASSET(2) char gDeathMountainCloudCircleFieryDL[] = dgDeathMou
 
 #define dgDeathMountainCloudCircleNormalDL "__OTR__objects/object_efc_doughnut/gDeathMountainCloudCircleNormalDL"
 static const ALIGN_ASSET(2) char gDeathMountainCloudCircleNormalDL[] = dgDeathMountainCloudCircleNormalDL;
+
+#endif // OBJECTS_OBJECT_EFC_DOUGHNUT_H

soh/assets/objects/object_efc_erupc/object_efc_erupc.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_ERUPC_H
+#define OBJECTS_OBJECT_EFC_ERUPC_H 1
 
 #include "align_asset_macro.h"
 
@@ -25,3 +26,5 @@ static const ALIGN_ASSET(2) char object_efc_erupc_DL_0027D8[] = dobject_efc_erup
 
 #define dobject_efc_erupc_Tex_0027F0 "__OTR__objects/object_efc_erupc/object_efc_erupc_Tex_0027F0"
 static const ALIGN_ASSET(2) char object_efc_erupc_Tex_0027F0[] = dobject_efc_erupc_Tex_0027F0;
+
+#endif // OBJECTS_OBJECT_EFC_ERUPC_H

soh/assets/objects/object_efc_fire_ball/object_efc_fire_ball.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_FIRE_BALL_H
+#define OBJECTS_OBJECT_EFC_FIRE_BALL_H 1
 
 #include "align_asset_macro.h"
 
@@ -10,3 +11,5 @@ static const ALIGN_ASSET(2) char gCreationFireBallMaskTex[] = dgCreationFireBall
 
 #define dgCreationFireBallFlameEffectTex "__OTR__objects/object_efc_fire_ball/gCreationFireBallFlameEffectTex"
 static const ALIGN_ASSET(2) char gCreationFireBallFlameEffectTex[] = dgCreationFireBallFlameEffectTex;
+
+#endif // OBJECTS_OBJECT_EFC_FIRE_BALL_H

soh/assets/objects/object_efc_flash/object_efc_flash.h

@@ -1,6 +1,9 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_FLASH_H
+#define OBJECTS_OBJECT_EFC_FLASH_H 1
 
 #include "align_asset_macro.h"
 
 #define dgEfcFlashBlob_000000 "__OTR__objects/object_efc_flash/gEfcFlashBlob_000000"
 static const ALIGN_ASSET(2) char gEfcFlashBlob_000000[] = dgEfcFlashBlob_000000;
+
+#endif // OBJECTS_OBJECT_EFC_FLASH_H

soh/assets/objects/object_efc_lgt_shower/object_efc_lgt_shower.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_LGT_SHOWER_H
+#define OBJECTS_OBJECT_EFC_LGT_SHOWER_H 1
 
 #include "align_asset_macro.h"
 
@@ -7,3 +8,5 @@ static const ALIGN_ASSET(2) char gEnliveningLightTex[] = dgEnliveningLightTex;
 
 #define dgEnliveningLightDL "__OTR__objects/object_efc_lgt_shower/gEnliveningLightDL"
 static const ALIGN_ASSET(2) char gEnliveningLightDL[] = dgEnliveningLightDL;
+
+#endif // OBJECTS_OBJECT_EFC_LGT_SHOWER_H

soh/assets/objects/object_efc_star_field/object_efc_star_field.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_STAR_FIELD_H
+#define OBJECTS_OBJECT_EFC_STAR_FIELD_H 1
 
 #include "align_asset_macro.h"
 
@@ -13,3 +14,5 @@ static const ALIGN_ASSET(2) char object_efc_star_field_DL_000DE0[] = dobject_efc
 
 #define dobject_efc_star_field_Tex_000FD0 "__OTR__objects/object_efc_star_field/object_efc_star_field_Tex_000FD0"
 static const ALIGN_ASSET(2) char object_efc_star_field_Tex_000FD0[] = dobject_efc_star_field_Tex_000FD0;
+
+#endif // OBJECTS_OBJECT_EFC_STAR_FIELD_H

soh/assets/objects/object_efc_tw/object_efc_tw.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EFC_TW_H
+#define OBJECTS_OBJECT_EFC_TW_H 1
 
 #include "align_asset_macro.h"
 
@@ -16,3 +17,6 @@ static const ALIGN_ASSET(2) char gTimeWarpDL[] = dgTimeWarpDL;
 
 #define dgTimeWarpTex "__OTR__objects/object_efc_tw/gTimeWarpTex"
 static const ALIGN_ASSET(2) char gTimeWarpTex[] = dgTimeWarpTex;
+
+
+#endif // OBJECTS_OBJECT_EFC_TW_H

soh/assets/objects/object_ei/object_ei.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_EI_H
+#define OBJECTS_OBJECT_EI_H 1
 
 #include "align_asset_macro.h"
 
@@ -76,3 +77,6 @@ static const ALIGN_ASSET(2) char gStingerHitAnim[] = dgStingerHitAnim;
 
 #define dgStingerIdleAnim "__OTR__objects/object_ei/gStingerIdleAnim"
 static const ALIGN_ASSET(2) char gStingerIdleAnim[] = dgStingerIdleAnim;
+
+
+#endif // OBJECTS_OBJECT_EI_H

soh/assets/objects/object_fa/object_fa.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FA_H
+#define OBJECTS_OBJECT_FA_H 1
 
 #include "align_asset_macro.h"
 
@@ -34,3 +35,5 @@ static const ALIGN_ASSET(2) char gFaEyeClosedTex[] = dgFaEyeClosedTex;
 
 #define dgFaDL "__OTR__objects/object_fa/gFaDL"
 static const ALIGN_ASSET(2) char gFaDL[] = dgFaDL;
+
+#endif // OBJECTS_OBJECT_FA_H

soh/assets/objects/object_fd/object_fd.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FD_H
+#define OBJECTS_OBJECT_FD_H 1
 
 #include "align_asset_macro.h"
 
@@ -149,57 +150,6 @@ static const ALIGN_ASSET(2) char gVolvagiaPlatformDL[] = dgVolvagiaPlatformDL;
 #define dgVolvagiaRockDL "__OTR__objects/object_fd/gVolvagiaRockDL"
 static const ALIGN_ASSET(2) char gVolvagiaRockDL[] = dgVolvagiaRockDL;
 
-#define dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8"
-static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8[] = dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8;
-
-#define dgVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678"
-static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678[] = dgVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678;
-
-#define dgVolvagiaLeftArmSkelLimbsLimb_011498DL_002770 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_011498DL_002770"
-static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_011498DL_002770[] = dgVolvagiaLeftArmSkelLimbsLimb_011498DL_002770;
-
-#define dgVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850"
-static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850[] = dgVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850;
-
-#define dgVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0"
-static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0[] = dgVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0;
-
-#define dgVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990"
-static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990[] = dgVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990;
-
-#define dgVolvagiaRightArmSkelLimbsLimb_011540DL_002C10 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011540DL_002C10"
-static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011540DL_002C10[] = dgVolvagiaRightArmSkelLimbsLimb_011540DL_002C10;
-
-#define dgVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10"
-static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10[] = dgVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10;
-
-#define dgVolvagiaRightArmSkelLimbsLimb_011558DL_002E08 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011558DL_002E08"
-static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011558DL_002E08[] = dgVolvagiaRightArmSkelLimbsLimb_011558DL_002E08;
-
-#define dgVolvagiaRightArmSkelLimbsLimb_011564DL_003028 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011564DL_003028"
-static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011564DL_003028[] = dgVolvagiaRightArmSkelLimbsLimb_011564DL_003028;
-
-#define dgVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8"
-static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8[] = dgVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8;
-
-#define dgVolvagiaRightArmSkelLimbsLimb_01157CDL_003168 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_01157CDL_003168"
-static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_01157CDL_003168[] = dgVolvagiaRightArmSkelLimbsLimb_01157CDL_003168;
-
-#define dgVolvagiaHeadSkelLimbsLimb_01160CDL_002180 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_01160CDL_002180"
-static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_01160CDL_002180[] = dgVolvagiaHeadSkelLimbsLimb_01160CDL_002180;
-
-#define dgVolvagiaHeadSkelLimbsLimb_011618DL_002358 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_011618DL_002358"
-static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011618DL_002358[] = dgVolvagiaHeadSkelLimbsLimb_011618DL_002358;
-
-#define dgVolvagiaHeadSkelLimbsLimb_011624DL_002420 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_011624DL_002420"
-static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011624DL_002420[] = dgVolvagiaHeadSkelLimbsLimb_011624DL_002420;
-
-#define dgVolvagiaHeadSkelLimbsLimb_011630DL_0020A8 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_011630DL_0020A8"
-static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011630DL_0020A8[] = dgVolvagiaHeadSkelLimbsLimb_011630DL_0020A8;
-
-#define dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0"
-static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0[] = dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0;
-
 #define dobject_fdTex_005B60 "__OTR__objects/object_fd/object_fdTex_005B60"
 static const ALIGN_ASSET(2) char object_fdTex_005B60[] = dobject_fdTex_005B60;
 
@@ -266,6 +216,57 @@ static const ALIGN_ASSET(2) char object_fdTex_000458[] = dobject_fdTex_000458;
 #define dobject_fdTex_00A050 "__OTR__objects/object_fd/object_fdTex_00A050"
 static const ALIGN_ASSET(2) char object_fdTex_00A050[] = dobject_fdTex_00A050;
 
+#define dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8"
+static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8[] = dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8;
+
+#define dgVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678"
+static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678[] = dgVolvagiaLeftArmSkelLimbsLimb_01148CDL_002678;
+
+#define dgVolvagiaLeftArmSkelLimbsLimb_011498DL_002770 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_011498DL_002770"
+static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_011498DL_002770[] = dgVolvagiaLeftArmSkelLimbsLimb_011498DL_002770;
+
+#define dgVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850"
+static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850[] = dgVolvagiaLeftArmSkelLimbsLimb_0114A4DL_002850;
+
+#define dgVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0"
+static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0[] = dgVolvagiaLeftArmSkelLimbsLimb_0114B0DL_002AD0;
+
+#define dgVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990"
+static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990[] = dgVolvagiaLeftArmSkelLimbsLimb_0114BCDL_002990;
+
+#define dgVolvagiaRightArmSkelLimbsLimb_011540DL_002C10 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011540DL_002C10"
+static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011540DL_002C10[] = dgVolvagiaRightArmSkelLimbsLimb_011540DL_002C10;
+
+#define dgVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10"
+static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10[] = dgVolvagiaRightArmSkelLimbsLimb_01154CDL_002D10;
+
+#define dgVolvagiaRightArmSkelLimbsLimb_011558DL_002E08 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011558DL_002E08"
+static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011558DL_002E08[] = dgVolvagiaRightArmSkelLimbsLimb_011558DL_002E08;
+
+#define dgVolvagiaRightArmSkelLimbsLimb_011564DL_003028 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011564DL_003028"
+static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011564DL_003028[] = dgVolvagiaRightArmSkelLimbsLimb_011564DL_003028;
+
+#define dgVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8"
+static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8[] = dgVolvagiaRightArmSkelLimbsLimb_011570DL_002EE8;
+
+#define dgVolvagiaRightArmSkelLimbsLimb_01157CDL_003168 "__OTR__objects/object_fd/gVolvagiaRightArmSkelLimbsLimb_01157CDL_003168"
+static const ALIGN_ASSET(2) char gVolvagiaRightArmSkelLimbsLimb_01157CDL_003168[] = dgVolvagiaRightArmSkelLimbsLimb_01157CDL_003168;
+
+#define dgVolvagiaHeadSkelLimbsLimb_01160CDL_002180 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_01160CDL_002180"
+static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_01160CDL_002180[] = dgVolvagiaHeadSkelLimbsLimb_01160CDL_002180;
+
+#define dgVolvagiaHeadSkelLimbsLimb_011618DL_002358 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_011618DL_002358"
+static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011618DL_002358[] = dgVolvagiaHeadSkelLimbsLimb_011618DL_002358;
+
+#define dgVolvagiaHeadSkelLimbsLimb_011624DL_002420 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_011624DL_002420"
+static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011624DL_002420[] = dgVolvagiaHeadSkelLimbsLimb_011624DL_002420;
+
+#define dgVolvagiaHeadSkelLimbsLimb_011630DL_0020A8 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_011630DL_0020A8"
+static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011630DL_0020A8[] = dgVolvagiaHeadSkelLimbsLimb_011630DL_0020A8;
+
+#define dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0"
+static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0[] = dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0;
+
 #define dobject_fdTex_0050A8 "__OTR__objects/object_fd/object_fdTex_0050A8"
 static const ALIGN_ASSET(2) char object_fdTex_0050A8[] = dobject_fdTex_0050A8;
 
@@ -280,3 +281,5 @@ static const ALIGN_ASSET(2) char object_fdTex_0056A8[] = dobject_fdTex_0056A8;
 
 #define dobject_fdTLUT_0032A8 "__OTR__objects/object_fd/object_fdTLUT_0032A8"
 static const ALIGN_ASSET(2) char object_fdTLUT_0032A8[] = dobject_fdTLUT_0032A8;
+
+#endif // OBJECTS_OBJECT_FD_H

soh/assets/objects/object_fd2/object_fd2.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FD2_H
+#define OBJECTS_OBJECT_FD2_H 1
 
 #include "align_asset_macro.h"
 
@@ -62,6 +63,18 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00DD80[] = dgHoleVolvagiaVtx_0
 #define dgHoleVolvagiaVtx_00D000 "__OTR__objects/object_fd2/gHoleVolvagiaVtx_00D000"
 static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00D000[] = dgHoleVolvagiaVtx_00D000;
 
+#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8"
+static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8;
+
+#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0"
+static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0;
+
+#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0"
+static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0;
+
+#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0"
+static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0;
+
 #define dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70"
 static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70[] = dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70;
 
@@ -167,18 +180,6 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119D0DL_001308[] =
 #define dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010"
 static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010[] = dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010;
 
-#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8"
-static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8;
-
-#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0"
-static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0;
-
-#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0"
-static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0;
-
-#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0"
-static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0;
-
 #define dobject_fd2Tex_003308 "__OTR__objects/object_fd2/object_fd2Tex_003308"
 static const ALIGN_ASSET(2) char object_fd2Tex_003308[] = dobject_fd2Tex_003308;
 
@@ -199,3 +200,5 @@ static const ALIGN_ASSET(2) char object_fd2Tex_004908[] = dobject_fd2Tex_004908;
 
 #define dobject_fd2TLUT_002508 "__OTR__objects/object_fd2/object_fd2TLUT_002508"
 static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508;
+
+#endif // OBJECTS_OBJECT_FD2_H

soh/assets/objects/object_fhg/object_fhg.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FHG_H
+#define OBJECTS_OBJECT_FHG_H 1
 
 #include "align_asset_macro.h"
 
@@ -53,6 +54,24 @@ static const ALIGN_ASSET(2) char gPhantomUnkDL_FCA0[] = dgPhantomUnkDL_FCA0;
 #define dgPhantomUnkDL_10CA0 "__OTR__objects/object_fhg/gPhantomUnkDL_10CA0"
 static const ALIGN_ASSET(2) char gPhantomUnkDL_10CA0[] = dgPhantomUnkDL_10CA0;
 
+#define dobject_fhgTex_00E8B0 "__OTR__objects/object_fhg/object_fhgTex_00E8B0"
+static const ALIGN_ASSET(2) char object_fhgTex_00E8B0[] = dobject_fhgTex_00E8B0;
+
+#define dobject_fhgTex_00F0B0 "__OTR__objects/object_fhg/object_fhgTex_00F0B0"
+static const ALIGN_ASSET(2) char object_fhgTex_00F0B0[] = dobject_fhgTex_00F0B0;
+
+#define dobject_fhgTex_00FD98 "__OTR__objects/object_fhg/object_fhgTex_00FD98"
+static const ALIGN_ASSET(2) char object_fhgTex_00FD98[] = dobject_fhgTex_00FD98;
+
+#define dobject_fhgTex_010660 "__OTR__objects/object_fhg/object_fhgTex_010660"
+static const ALIGN_ASSET(2) char object_fhgTex_010660[] = dobject_fhgTex_010660;
+
+#define dobject_fhgTex_011120 "__OTR__objects/object_fhg/object_fhgTex_011120"
+static const ALIGN_ASSET(2) char object_fhgTex_011120[] = dobject_fhgTex_011120;
+
+#define dobject_fhgTex_010D20 "__OTR__objects/object_fhg/object_fhgTex_010D20"
+static const ALIGN_ASSET(2) char object_fhgTex_010D20[] = dobject_fhgTex_010D20;
+
 #define dobject_fhgTex_00D060 "__OTR__objects/object_fhg/object_fhgTex_00D060"
 static const ALIGN_ASSET(2) char object_fhgTex_00D060[] = dobject_fhgTex_00D060;
 
@@ -125,24 +144,6 @@ static const ALIGN_ASSET(2) char gPhantomHorseSkelLimbsLimb_00AFA4DL_003220[] =
 #define dgPhantomHorseSkelLimbsLimb_00AFB4DL_003170 "__OTR__objects/object_fhg/gPhantomHorseSkelLimbsLimb_00AFB4DL_003170"
 static const ALIGN_ASSET(2) char gPhantomHorseSkelLimbsLimb_00AFB4DL_003170[] = dgPhantomHorseSkelLimbsLimb_00AFB4DL_003170;
 
-#define dobject_fhgTex_00E8B0 "__OTR__objects/object_fhg/object_fhgTex_00E8B0"
-static const ALIGN_ASSET(2) char object_fhgTex_00E8B0[] = dobject_fhgTex_00E8B0;
-
-#define dobject_fhgTex_00F0B0 "__OTR__objects/object_fhg/object_fhgTex_00F0B0"
-static const ALIGN_ASSET(2) char object_fhgTex_00F0B0[] = dobject_fhgTex_00F0B0;
-
-#define dobject_fhgTex_00FD98 "__OTR__objects/object_fhg/object_fhgTex_00FD98"
-static const ALIGN_ASSET(2) char object_fhgTex_00FD98[] = dobject_fhgTex_00FD98;
-
-#define dobject_fhgTex_010660 "__OTR__objects/object_fhg/object_fhgTex_010660"
-static const ALIGN_ASSET(2) char object_fhgTex_010660[] = dobject_fhgTex_010660;
-
-#define dobject_fhgTex_011120 "__OTR__objects/object_fhg/object_fhgTex_011120"
-static const ALIGN_ASSET(2) char object_fhgTex_011120[] = dobject_fhgTex_011120;
-
-#define dobject_fhgTex_010D20 "__OTR__objects/object_fhg/object_fhgTex_010D20"
-static const ALIGN_ASSET(2) char object_fhgTex_010D20[] = dobject_fhgTex_010D20;
-
 #define dgPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30 "__OTR__objects/object_fhg/gPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30"
 
 #define dobject_fhgTex_003BA0 "__OTR__objects/object_fhg/object_fhgTex_003BA0"
@@ -165,3 +166,5 @@ static const ALIGN_ASSET(2) char object_fhgTex_0044A0[] = dobject_fhgTex_0044A0;
 
 #define dobject_fhgTex_003B20 "__OTR__objects/object_fhg/object_fhgTex_003B20"
 static const ALIGN_ASSET(2) char object_fhgTex_003B20[] = dobject_fhgTex_003B20;
+
+#endif // OBJECTS_OBJECT_FHG_H

soh/assets/objects/object_fire/object_fire.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FIRE_H
+#define OBJECTS_OBJECT_FIRE_H 1
 
 #include "align_asset_macro.h"
 
@@ -28,3 +29,5 @@ static const ALIGN_ASSET(2) char gFire6Tex[] = dgFire6Tex;
 
 #define dgFire7Tex "__OTR__objects/object_fire/gFire7Tex"
 static const ALIGN_ASSET(2) char gFire7Tex[] = dgFire7Tex;
+
+#endif // OBJECTS_OBJECT_FIRE_H

soh/assets/objects/object_firefly/object_firefly.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FIREFLY_H
+#define OBJECTS_OBJECT_FIREFLY_H 1
 
 #include "align_asset_macro.h"
 
@@ -70,3 +71,6 @@ static const ALIGN_ASSET(2) char gKeeseSkeletonLimbsLimb_00181CDL_0011C8[] = dgK
 
 #define dgKeeseSkeletonLimbsLimb_001840DL_000D30 "__OTR__objects/object_firefly/gKeeseSkeletonLimbsLimb_001840DL_000D30"
 static const ALIGN_ASSET(2) char gKeeseSkeletonLimbsLimb_001840DL_000D30[] = dgKeeseSkeletonLimbsLimb_001840DL_000D30;
+
+
+#endif // OBJECTS_OBJECT_FIREFLY_H

soh/assets/objects/object_fish/object_fish.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FISH_H
+#define OBJECTS_OBJECT_FISH_H 1
 
 #include "align_asset_macro.h"
 
@@ -370,3 +371,6 @@ static const ALIGN_ASSET(2) char gFishingAquariumBottomDL[] = dgFishingAquariumB
 
 #define dgFishingAquariumContainerDL "__OTR__objects/object_fish/gFishingAquariumContainerDL"
 static const ALIGN_ASSET(2) char gFishingAquariumContainerDL[] = dgFishingAquariumContainerDL;
+
+
+#endif // OBJECTS_OBJECT_FISH_H

soh/assets/objects/object_fr/object_fr.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FR_H
+#define OBJECTS_OBJECT_FR_H 1
 
 #include "align_asset_macro.h"
 
@@ -115,3 +116,6 @@ static const ALIGN_ASSET(2) char object_fr_DL_00B0F8[] = dobject_fr_DL_00B0F8;
 
 #define dobject_fr_Skel_00B498 "__OTR__objects/object_fr/object_fr_Skel_00B498"
 static const ALIGN_ASSET(2) char object_fr_Skel_00B498[] = dobject_fr_Skel_00B498;
+
+
+#endif // OBJECTS_OBJECT_FR_H

soh/assets/objects/object_fu/object_fu.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FU_H
+#define OBJECTS_OBJECT_FU_H 1
 
 #include "align_asset_macro.h"
 
@@ -100,3 +101,6 @@ static const ALIGN_ASSET(2) char gWindmillManHairTex[] = dgWindmillManHairTex;
 
 #define dgWindmillManSkel "__OTR__objects/object_fu/gWindmillManSkel"
 static const ALIGN_ASSET(2) char gWindmillManSkel[] = dgWindmillManSkel;
+
+
+#endif // OBJECTS_OBJECT_FU_H

soh/assets/objects/object_fw/object_fw.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FW_H
+#define OBJECTS_OBJECT_FW_H 1
 
 #include "align_asset_macro.h"
 
@@ -151,3 +152,5 @@ static const ALIGN_ASSET(2) char gFlareDancerCoreEndRunCycleAnim[] = dgFlareDanc
 
 #define dobject_fwTex_007A90 "__OTR__objects/object_fw/object_fwTex_007A90"
 static const ALIGN_ASSET(2) char object_fwTex_007A90[] = dobject_fwTex_007A90;
+
+#endif // OBJECTS_OBJECT_FW_H

soh/assets/objects/object_fz/object_fz.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_FZ_H
+#define OBJECTS_OBJECT_FZ_H 1
 
 #include "align_asset_macro.h"
 
@@ -25,3 +26,5 @@ static const ALIGN_ASSET(2) char gFreezardIceRockDL[] = dgFreezardIceRockDL;
 
 #define dgFreezardSteamTex "__OTR__objects/object_fz/gFreezardSteamTex"
 static const ALIGN_ASSET(2) char gFreezardSteamTex[] = dgFreezardSteamTex;
+
+#endif // OBJECTS_OBJECT_FZ_H

soh/assets/objects/object_ganon/object_ganon.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GANON_H
+#define OBJECTS_OBJECT_GANON_H 1
 
 #include "align_asset_macro.h"
 
@@ -184,3 +185,6 @@ static const ALIGN_ASSET(2) char gGanondorfEndingFloatAnim[] = dgGanondorfEnding
 
 #define dgGanondorfSkel "__OTR__objects/object_ganon/gGanondorfSkel"
 static const ALIGN_ASSET(2) char gGanondorfSkel[] = dgGanondorfSkel;
+
+
+#endif // OBJECTS_OBJECT_GANON_H

soh/assets/objects/object_ganon2/object_ganon2.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GANON2_H
+#define OBJECTS_OBJECT_GANON2_H 1
 
 #include "align_asset_macro.h"
 
@@ -325,3 +326,6 @@ static const ALIGN_ASSET(2) char gGanonWalkAnim[] = dgGanonWalkAnim;
 
 #define dgGanonWalkToGuardAnim "__OTR__objects/object_ganon2/gGanonWalkToGuardAnim"
 static const ALIGN_ASSET(2) char gGanonWalkToGuardAnim[] = dgGanonWalkToGuardAnim;
+
+
+#endif // OBJECTS_OBJECT_GANON2_H

soh/assets/objects/object_ganon_anime1/object_ganon_anime1.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GANON_ANIME1_H
+#define OBJECTS_OBJECT_GANON_ANIME1_H 1
 
 #include "align_asset_macro.h"
 
@@ -76,3 +77,5 @@ static const ALIGN_ASSET(2) char gGanondorfVolleyLeftAnim[] = dgGanondorfVolleyL
 
 #define dgGanondorfVolleyRightAnim "__OTR__objects/object_ganon_anime1/gGanondorfVolleyRightAnim"
 static const ALIGN_ASSET(2) char gGanondorfVolleyRightAnim[] = dgGanondorfVolleyRightAnim;
+
+#endif // OBJECTS_OBJECT_GANON_ANIME1_H

soh/assets/objects/object_ganon_anime2/object_ganon_anime2.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GANON_ANIME2_H
+#define OBJECTS_OBJECT_GANON_ANIME2_H 1
 
 #include "align_asset_macro.h"
 
@@ -52,3 +53,5 @@ static const ALIGN_ASSET(2) char gGanondorfYellStartAnim[] = dgGanondorfYellStar
 
 #define dgGanondorfYellLoopAnim "__OTR__objects/object_ganon_anime2/gGanondorfYellLoopAnim"
 static const ALIGN_ASSET(2) char gGanondorfYellLoopAnim[] = dgGanondorfYellLoopAnim;
+
+#endif // OBJECTS_OBJECT_GANON_ANIME2_H

soh/assets/objects/object_ganon_anime3/object_ganon_anime3.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GANON_ANIME3_H
+#define OBJECTS_OBJECT_GANON_ANIME3_H 1
 
 #include "align_asset_macro.h"
 
@@ -28,3 +29,5 @@ static const ALIGN_ASSET(2) char gGanonUncurlAndFlailAnim[] = dgGanonUncurlAndFl
 
 #define dgGanonRoarAnim "__OTR__objects/object_ganon_anime3/gGanonRoarAnim"
 static const ALIGN_ASSET(2) char gGanonRoarAnim[] = dgGanonRoarAnim;
+
+#endif // OBJECTS_OBJECT_GANON_ANIME3_H

soh/assets/objects/object_ganon_objects/object_ganon_objects.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GANON_OBJECTS_H
+#define OBJECTS_OBJECT_GANON_OBJECTS_H 1
 
 #include "align_asset_macro.h"
 
@@ -7,3 +8,5 @@ static const ALIGN_ASSET(2) char object_ganon_objects_DL_0000C0[] = dobject_gano
 
 #define dobject_ganon_objects_Tex_000170 "__OTR__objects/object_ganon_objects/object_ganon_objects_Tex_000170"
 static const ALIGN_ASSET(2) char object_ganon_objects_Tex_000170[] = dobject_ganon_objects_Tex_000170;
+
+#endif // OBJECTS_OBJECT_GANON_OBJECTS_H

soh/assets/objects/object_ge1/object_ge1.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GE1_H
+#define OBJECTS_OBJECT_GE1_H 1
 
 #include "align_asset_macro.h"
 
@@ -124,3 +125,6 @@ static const ALIGN_ASSET(2) char gGerudoWhiteClapAnim[] = dgGerudoWhiteClapAnim;
 
 #define dgGerudoWhiteDismissiveAnim "__OTR__objects/object_ge1/gGerudoWhiteDismissiveAnim"
 static const ALIGN_ASSET(2) char gGerudoWhiteDismissiveAnim[] = dgGerudoWhiteDismissiveAnim;
+
+
+#endif // OBJECTS_OBJECT_GE1_H

soh/assets/objects/object_geff/object_geff.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GEFF_H
+#define OBJECTS_OBJECT_GEFF_H 1
 
 #include "align_asset_macro.h"
 
@@ -10,3 +11,5 @@ static const ALIGN_ASSET(2) char gGanonRubbleOutsideTex[] = dgGanonRubbleOutside
 
 #define dgGanonRubbleDL "__OTR__objects/object_geff/gGanonRubbleDL"
 static const ALIGN_ASSET(2) char gGanonRubbleDL[] = dgGanonRubbleDL;
+
+#endif // OBJECTS_OBJECT_GEFF_H

soh/assets/objects/object_geldb/object_geldb.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GELDB_H
+#define OBJECTS_OBJECT_GELDB_H 1
 
 #include "align_asset_macro.h"
 
@@ -157,3 +158,5 @@ static const ALIGN_ASSET(2) char object_geldbTex_0064E8[] = dobject_geldbTex_006
 
 #define dobject_geldbTex_006568 "__OTR__objects/object_geldb/object_geldbTex_006568"
 static const ALIGN_ASSET(2) char object_geldbTex_006568[] = dobject_geldbTex_006568;
+
+#endif // OBJECTS_OBJECT_GELDB_H

soh/assets/objects/object_gi_arrow/object_gi_arrow.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GI_ARROW_H
+#define OBJECTS_OBJECT_GI_ARROW_H 1
 
 #include "align_asset_macro.h"
 
@@ -10,3 +11,5 @@ static const ALIGN_ASSET(2) char gGiArrowMediumDL[] = dgGiArrowMediumDL;
 
 #define dgGiArrowLargeDL "__OTR__objects/object_gi_arrow/gGiArrowLargeDL"
 static const ALIGN_ASSET(2) char gGiArrowLargeDL[] = dgGiArrowLargeDL;
+
+#endif // OBJECTS_OBJECT_GI_ARROW_H

soh/assets/objects/object_gi_arrowcase/object_gi_arrowcase.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GI_ARROWCASE_H
+#define OBJECTS_OBJECT_GI_ARROWCASE_H 1
 
 #include "align_asset_macro.h"
 
@@ -25,3 +26,5 @@ static const ALIGN_ASSET(2) char gGiQuiverInnerDL[] = dgGiQuiverInnerDL;
 
 #define dgGiQuiverOuterDL "__OTR__objects/object_gi_arrowcase/gGiQuiverOuterDL"
 static const ALIGN_ASSET(2) char gGiQuiverOuterDL[] = dgGiQuiverOuterDL;
+
+#endif // OBJECTS_OBJECT_GI_ARROWCASE_H

soh/assets/objects/object_gi_bean/object_gi_bean.h

@@ -1,6 +1,9 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GI_BEAN_H
+#define OBJECTS_OBJECT_GI_BEAN_H 1
 
 #include "align_asset_macro.h"
 
 #define dgGiBeanDL "__OTR__objects/object_gi_bean/gGiBeanDL"
 static const ALIGN_ASSET(2) char gGiBeanDL[] = dgGiBeanDL;
+
+#endif // OBJECTS_OBJECT_GI_BEAN_H

soh/assets/objects/object_gi_bomb_1/object_gi_bomb_1.h

@@ -1,6 +1,9 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GI_BOMB_1_H
+#define OBJECTS_OBJECT_GI_BOMB_1_H 1
 
 #include "align_asset_macro.h"
 
 #define dgGiBombDL "__OTR__objects/object_gi_bomb_1/gGiBombDL"
 static const ALIGN_ASSET(2) char gGiBombDL[] = dgGiBombDL;
+
+#endif // OBJECTS_OBJECT_GI_BOMB_1_H

soh/assets/objects/object_gi_bomb_2/object_gi_bomb_2.h

@@ -1,6 +1,9 @@
-#pragma once
+#ifndef OBJECTS_OBJECT_GI_BOMB_2_H
+#define OBJECTS_OBJECT_GI_BOMB_2_H 1
 
 #include "align_asset_macro.h"
 
 #define dgGiBombchuDL "__OTR__objects/object_gi_bomb_2/gGiBombchuDL"
 static const ALIGN_ASSET(2) char gGiBombchuDL[] = dgGiBombchuDL;
+
+#endif // OBJECTS_OBJECT_GI_BOMB_2_H