diff --git a/OTRExporter/OTRExporter/Main.cpp b/OTRExporter/OTRExporter/Main.cpp index b5e634ad4..506f8bfd4 100644 --- a/OTRExporter/OTRExporter/Main.cpp +++ b/OTRExporter/OTRExporter/Main.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -70,7 +71,10 @@ static void ExporterProgramEnd() if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) { std::string romPath = Globals::Instance->baseRomPath.string(); - const std::vector& romData = DiskFile::ReadAllBytes(romPath); + std::vector romData = DiskFile::ReadAllBytes(romPath); + + BitConverter::RomToBigEndian(romData.data(), romData.size()); + crc = BitConverter::ToUInt32BE(romData, 0x10); printf("Creating version file...\n"); diff --git a/OTRExporter/assets/accessibility/texts/filechoose_eng.json b/OTRExporter/assets/accessibility/texts/filechoose_eng.json index b61aa5ae0..b43719926 100644 --- a/OTRExporter/assets/accessibility/texts/filechoose_eng.json +++ b/OTRExporter/assets/accessibility/texts/filechoose_eng.json @@ -19,6 +19,9 @@ "audio_surround": "Sound - Surround", "target_switch": "Targeting Mode - Switch", "target_hold": "Targeting Mode - Hold", + "language_english": "Language - English", + "language_german": "Language - German", + "language_french": "Language - French", "quest_sel_vanilla": "Quest - Original", "quest_sel_mq": "Quest - Master Quest", "quest_sel_randomizer": "Quest - Randomizer", diff --git a/OTRExporter/assets/accessibility/texts/filechoose_fra.json b/OTRExporter/assets/accessibility/texts/filechoose_fra.json index 23be1ee3d..f76861f21 100644 --- a/OTRExporter/assets/accessibility/texts/filechoose_fra.json +++ b/OTRExporter/assets/accessibility/texts/filechoose_fra.json @@ -19,6 +19,9 @@ "audio_surround": "Son - Surround", "target_switch": "Visée - Fixe", "target_hold": "Visée - Maintenue", + "language_english": "Langue - Anglaise", + "language_german": "Langue - Allemande", + "language_french": "Langue - Français", "quest_sel_vanilla": "Quête - Originale", "quest_sel_mq": "Quête - Master Quest", "quest_sel_randomizer": "Quête - Randomizer", diff --git a/OTRExporter/assets/accessibility/texts/filechoose_ger.json b/OTRExporter/assets/accessibility/texts/filechoose_ger.json index 6c88f9d44..2ad1322fd 100644 --- a/OTRExporter/assets/accessibility/texts/filechoose_ger.json +++ b/OTRExporter/assets/accessibility/texts/filechoose_ger.json @@ -19,6 +19,9 @@ "audio_surround": "Sound - Surround", "target_switch": "Zielerfassung - Einmal drücken", "target_hold": "Zielerfassung - Trigger halten", + "language_english": "Sprache - Englisch", + "language_german": "Sprache - Deutsch", + "language_french": "Sprache - Französisch", "quest_sel_vanilla": "Quest - Original", "quest_sel_mq": "Quest - Master Quest", "quest_sel_randomizer": "Quest - Randomizer", diff --git a/ZAPDTR/ZAPD/ZFile.cpp b/ZAPDTR/ZAPD/ZFile.cpp index d04f3b7e3..04032e575 100644 --- a/ZAPDTR/ZAPD/ZFile.cpp +++ b/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); diff --git a/ZAPDTR/ZAPD/ZRom.cpp b/ZAPDTR/ZAPD/ZRom.cpp index abce2bf0a..e9b583b26 100644 --- a/ZAPDTR/ZAPD/ZRom.cpp +++ b/ZAPDTR/ZAPD/ZRom.cpp @@ -97,6 +97,8 @@ ZRom::ZRom(std::string romPath) RomVersion version; romData = DiskFile::ReadAllBytes(romPath); + BitConverter::RomToBigEndian(romData.data(), romData.size()); + version.crc = BitConverter::ToInt32BE(romData, 0x10); switch (version.crc) diff --git a/ZAPDTR/ZAPD/ZTexture.cpp b/ZAPDTR/ZAPD/ZTexture.cpp index e0a91f082..5184b834b 100644 --- a/ZAPDTR/ZAPD/ZTexture.cpp +++ b/ZAPDTR/ZAPD/ZTexture.cpp @@ -27,6 +27,13 @@ ZTexture::ZTexture(ZFile* nParent) : ZResource(nParent) RegisterOptionalAttribute("ExternalTlut"); RegisterOptionalAttribute("ExternalTlutOffset"); RegisterOptionalAttribute("SplitTlut"); + + // Dummy property added by https://github.com/HarbourMasters/Shipwright/pull/3161 + // Used to indicate if a resource definition was added through a script + // and to enable easy removal/re-add of the definitions when introducing new rom support + // Can be removed once we feel it is no longer useful + // This is not used in ZAPD itself, the registration is to prevent missing attribute errors + RegisterOptionalAttribute("AddedByScript"); } void ZTexture::ExtractFromBinary(uint32_t nRawDataIndex, int32_t nWidth, int32_t nHeight, diff --git a/libultraship b/libultraship index 0a5781296..ec44917cf 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 0a57812968539176bbeaa76c61532d0d6dec4881 +Subproject commit ec44917cf5536c8c59aaa7865696926e0bec1ba0 diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh index e503680ac..d53a0ff22 100644 --- a/scripts/linux/appimage/soh.sh +++ b/scripts/linux/appimage/soh.sh @@ -26,10 +26,58 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do ln -s "$HERE"/usr/bin/{assets,soh.elf,ZAPD} "$ASSETDIR" export OLDPWD="$PWD" mkdir -p "$ASSETDIR"/tmp - mkdir -p "$ASSETDIR"/Extract + mkdir -p "$ASSETDIR"/Extract ln -s "$romfile" "$ASSETDIR"/tmp/rom.z64 cd "$ASSETDIR" ROMHASH=$(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }') + + # Remap v64 and n64 hashes to their z64 has equivalent + # ZAPD will handle converting the data into z64 format + case "$ROMHASH" in + a9059b56e761c9034fbe02fe4c24985aaa835dac) # v64 + ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099 + ;; + 24708102dc504d3f375a37f4ae4e149c167dc515) # n64 + ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099 + ;; + 580dd0bd1b6d2c51cc20a764eece84dba558964c) # v64 + ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 + ;; + d6342c59007e57c1194661ec6880b2f078403f4e) # n64 + ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 + ;; + 663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64 + ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 + ;; + 24c73d378b0620a380ce5ef9f2b186c6c157a68b) # n64 + ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 + ;; + 973bc6fe56010a8d646166a1182a81b4f13b8cf9) # v64 + ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03 + ;; + d327752c46edc70ff3668b9514083dbbee08927c) # v64 + ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03 + ;; + ecdeb1747560834e079c22243febea7f6f26ba3b) # v64 + ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da + ;; + f19f8662ec7abee29484a272a6fda53e39efe0f1) # n64 + ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da + ;; + ab519ce04a33818ce2c39b3c514a751d807a494a) # v64 + ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6 + ;; + c19a34f7646305e1755249fca2071e178bd7cd00) # n64 + ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6 + ;; + 25e8ae79ea0839ca5c984473f7460d8040c36f9c) # v64 + ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f + ;; + 166c02770d67fcc3954c443eb400a6a3573d3fc0) # n64 + ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f + ;; + esac + case "$ROMHASH" in cee6bc3c2a634b41728f2af8da54d9bf8cc14099) if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then diff --git a/soh/assets/code/fbdemo_circle/z_fbdemo_circle.h b/soh/assets/code/fbdemo_circle/z_fbdemo_circle.h index 022fa8627..5418aa741 100644 --- a/soh/assets/code/fbdemo_circle/z_fbdemo_circle.h +++ b/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" @@ -14,5 +15,7 @@ static const ALIGN_ASSET(2) char sTransCircleRippleTex[] = dsTransCircleRippleTe #define dsTransCircleStarburstTex "__OTR__code/z_fbdemo_circle/sTransCircleStarburstTex" static const ALIGN_ASSET(2) char sTransCircleStarburstTex[] = dsTransCircleStarburstTex; -#define dsCircleWipeVtx "__OTR__code/z_fbdemo_circle/sCircleWipeVtx" -static const ALIGN_ASSET(2) char sCircleWipeVtx[] = dsCircleWipeVtx; \ No newline at end of file +#define dsTransCircleVtx "__OTR__code/z_fbdemo_circle/sTransCircleVtx" +static const ALIGN_ASSET(2) char sTransCircleVtx[] = dsTransCircleVtx; + +#endif // CODE_Z_FBDEMO_CIRCLE_H diff --git a/soh/assets/code/fbdemo_triforce/z_fbdemo_triforce.h b/soh/assets/code/fbdemo_triforce/z_fbdemo_triforce.h index 7aacd9f77..b6bde1966 100644 --- a/soh/assets/code/fbdemo_triforce/z_fbdemo_triforce.h +++ b/soh/assets/code/fbdemo_triforce/z_fbdemo_triforce.h @@ -1,9 +1,12 @@ -#pragma once +#ifndef CODE_Z_FBDEMO_TRIFORCE_H +#define CODE_Z_FBDEMO_TRIFORCE_H 1 #include "align_asset_macro.h" -#define dsTriforceWipeDL "__OTR__code/z_fbdemo_triforce/sTriforceWipeDL" -static const ALIGN_ASSET(2) char sTriforceWipeDL[] = dsTriforceWipeDL; +#define dsTransTriforceDL "__OTR__code/z_fbdemo_triforce/sTransTriforceDL" +static const ALIGN_ASSET(2) char sTransTriforceDL[] = dsTransTriforceDL; -#define dsTriforceWipeVtx "__OTR__code/z_fbdemo_triforce/sTriforceWipeVtx" -static const ALIGN_ASSET(2) char sTriforceWipeVtx[] = dsTriforceWipeVtx; \ No newline at end of file +#define dsTransTriforceVtx "__OTR__code/z_fbdemo_triforce/sTransTriforceVtx" +static const ALIGN_ASSET(2) char sTransTriforceVtx[] = dsTransTriforceVtx; + +#endif // CODE_Z_FBDEMO_TRIFORCE_H diff --git a/soh/assets/code/fbdemo_wipe1/z_fbdemo_wipe1.h b/soh/assets/code/fbdemo_wipe1/z_fbdemo_wipe1.h index 3f627fcec..ce195e562 100644 --- a/soh/assets/code/fbdemo_wipe1/z_fbdemo_wipe1.h +++ b/soh/assets/code/fbdemo_wipe1/z_fbdemo_wipe1.h @@ -1,9 +1,12 @@ -#pragma once +#ifndef CODE_Z_FBDEMO_WIPE1_H +#define CODE_Z_FBDEMO_WIPE1_H 1 #include "align_asset_macro.h" -#define dsWipe1Vtx "__OTR__code/z_fbdemo_wipe1/sWipe1Vtx" -static const ALIGN_ASSET(2) char sWipe1Vtx[] = dsWipe1Vtx; +#define dsTransWipeVtx "__OTR__code/z_fbdemo_wipe1/sTransWipeVtx" +static const ALIGN_ASSET(2) char sTransWipeVtx[] = dsTransWipeVtx; -#define dsWipe1Tex "__OTR__code/z_fbdemo_wipe1/sWipe1Tex" -static const ALIGN_ASSET(2) char sWipe1Tex[] = dsWipe1Tex; \ No newline at end of file +#define dsTransWipeTex "__OTR__code/z_fbdemo_wipe1/sTransWipeTex" +static const ALIGN_ASSET(2) char sTransWipeTex[] = dsTransWipeTex; + +#endif // CODE_Z_FBDEMO_WIPE1_H diff --git a/soh/assets/misc/link_animetion/link_animetion.h b/soh/assets/misc/link_animetion/link_animetion.h index 1209138af..ce14b9c5c 100644 --- a/soh/assets/misc/link_animetion/link_animetion.h +++ b/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" \ No newline at end of file +#include "align_asset_macro.h" + + +#endif // MISC_LINK_ANIMETION_H diff --git a/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h b/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h index 4bd15e438..89e6c9342 100644 --- a/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h +++ b/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" @@ -14,8 +15,8 @@ static const ALIGN_ASSET(2) char gUnusedStoneTex[] = dgUnusedStoneTex; #define dgDoorLockDL "__OTR__objects/gameplay_dangeon_keep/gDoorLockDL" static const ALIGN_ASSET(2) char gDoorLockDL[] = dgDoorLockDL; -#define dgDoorChainsDL "__OTR__objects/gameplay_dangeon_keep/gDoorChainsDL" -static const ALIGN_ASSET(2) char gDoorChainsDL[] = dgDoorChainsDL; +#define dgDoorChainDL "__OTR__objects/gameplay_dangeon_keep/gDoorChainDL" +static const ALIGN_ASSET(2) char gDoorChainDL[] = dgDoorChainDL; #define dgUnusedGoldLockTex "__OTR__objects/gameplay_dangeon_keep/gUnusedGoldLockTex" static const ALIGN_ASSET(2) char gUnusedGoldLockTex[] = dgUnusedGoldLockTex; @@ -213,4 +214,6 @@ static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0108A0[] = dgameplay_d static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0118A0[] = dgameplay_dangeon_keepTex_0118A0; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011AA0[] = dgameplay_dangeon_keepTex_011AA0; + +#endif // OBJECTS_GAMEPLAY_DANGEON_KEEP_H diff --git a/soh/assets/objects/gameplay_field_keep/gameplay_field_keep.h b/soh/assets/objects/gameplay_field_keep/gameplay_field_keep.h index 8a237fa6e..a007132cd 100644 --- a/soh/assets/objects/gameplay_field_keep/gameplay_field_keep.h +++ b/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" @@ -183,4 +184,7 @@ static const ALIGN_ASSET(2) char gButterflySkelLimbsLimb_0036C8DL_002630[] = dgB static const ALIGN_ASSET(2) char gFieldUnusedFishSkelLimbsLimb_0088CCDL_006458[] = dgFieldUnusedFishSkelLimbsLimb_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; \ No newline at end of file +static const ALIGN_ASSET(2) char gFieldUnusedFishSkelLimbsLimb_0088D8DL_0061F8[] = dgFieldUnusedFishSkelLimbsLimb_0088D8DL_0061F8; + + +#endif // OBJECTS_GAMEPLAY_FIELD_KEEP_H diff --git a/soh/assets/objects/gameplay_keep/gameplay_keep.h b/soh/assets/objects/gameplay_keep/gameplay_keep.h index eebb19ab1..473b2b8d6 100644 --- a/soh/assets/objects/gameplay_keep/gameplay_keep.h +++ b/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" @@ -2720,17 +2721,17 @@ static const ALIGN_ASSET(2) char gDoorMetalBarsDL[] = dgDoorMetalBarsDL; #define dgGenericDungeonDoorTex "__OTR__objects/gameplay_keep/gGenericDungeonDoorTex" static const ALIGN_ASSET(2) char gGenericDungeonDoorTex[] = dgGenericDungeonDoorTex; -#define dgSunTex "__OTR__objects/gameplay_keep/gSunTex" -static const ALIGN_ASSET(2) char gSunTex[] = dgSunTex; +#define dgSun1Tex "__OTR__objects/gameplay_keep/gSun1Tex" +static const ALIGN_ASSET(2) char gSun1Tex[] = dgSun1Tex; -#define dgSunEveningTex "__OTR__objects/gameplay_keep/gSunEveningTex" -static const ALIGN_ASSET(2) char gSunEveningTex[] = dgSunEveningTex; +#define dgSunEvening1Tex "__OTR__objects/gameplay_keep/gSunEvening1Tex" +static const ALIGN_ASSET(2) char gSunEvening1Tex[] = dgSunEvening1Tex; -#define dgKokiriDustMoteTextureLoadDL "__OTR__objects/gameplay_keep/gKokiriDustMoteTextureLoadDL" -static const ALIGN_ASSET(2) char gKokiriDustMoteTextureLoadDL[] = dgKokiriDustMoteTextureLoadDL; +#define dgKokiriDustMoteMaterialDL "__OTR__objects/gameplay_keep/gKokiriDustMoteMaterialDL" +static const ALIGN_ASSET(2) char gKokiriDustMoteMaterialDL[] = dgKokiriDustMoteMaterialDL; -#define dgKokiriDustMoteDL "__OTR__objects/gameplay_keep/gKokiriDustMoteDL" -static const ALIGN_ASSET(2) char gKokiriDustMoteDL[] = dgKokiriDustMoteDL; +#define dgKokiriDustMoteModelDL "__OTR__objects/gameplay_keep/gKokiriDustMoteModelDL" +static const ALIGN_ASSET(2) char gKokiriDustMoteModelDL[] = dgKokiriDustMoteModelDL; #define dgSunDL "__OTR__objects/gameplay_keep/gSunDL" static const ALIGN_ASSET(2) char gSunDL[] = dgSunDL; @@ -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; @@ -2844,4 +2836,16 @@ static const ALIGN_ASSET(2) char gameplay_keepTex_04CD40[] = dgameplay_keepTex_0 static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_04C740; #define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40" -static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40; \ No newline at end of file +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 diff --git a/soh/assets/objects/object_Bb/object_Bb.h b/soh/assets/objects/object_Bb/object_Bb.h index 878739d85..9afa4abbd 100644 --- a/soh/assets/objects/object_Bb/object_Bb.h +++ b/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" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char object_Bb_Tex_001640[] = dobject_Bb_Tex_001640; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_Bb_Skel_001A30[] = dobject_Bb_Skel_001A30; + + +#endif // OBJECTS_OBJECT_BB_H diff --git a/soh/assets/objects/object_ahg/object_ahg.h b/soh/assets/objects/object_ahg/object_ahg.h index 11243d46c..ea6b1443d 100644 --- a/soh/assets/objects/object_ahg/object_ahg.h +++ b/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" @@ -108,4 +109,7 @@ static const ALIGN_ASSET(2) char object_ahg_Tex_004C88[] = dobject_ahg_Tex_004C8 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ahg_DL_005728[] = dobject_ahg_DL_005728; + + +#endif // OBJECTS_OBJECT_AHG_H diff --git a/soh/assets/objects/object_am/object_am.h b/soh/assets/objects/object_am/object_am.h index 371326a6f..0f91c99b4 100644 --- a/soh/assets/objects/object_am/object_am.h +++ b/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" @@ -66,4 +67,6 @@ static const ALIGN_ASSET(2) char object_amTex_002E38[] = dobject_amTex_002E38; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438; + +#endif // OBJECTS_OBJECT_AM_H diff --git a/soh/assets/objects/object_ane/object_ane.h b/soh/assets/objects/object_ane/object_ane.h index 1fe35b290..dadb76389 100644 --- a/soh/assets/objects/object_ane/object_ane.h +++ b/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" @@ -87,4 +88,7 @@ static const ALIGN_ASSET(2) char gCuccoLadyEyeOpenTex[] = dgCuccoLadyEyeOpenTex; static const ALIGN_ASSET(2) char gCuccoLadyEyeHalfTex[] = dgCuccoLadyEyeHalfTex; #define dgCuccoLadyEyeClosedTex "__OTR__objects/object_ane/gCuccoLadyEyeClosedTex" -static const ALIGN_ASSET(2) char gCuccoLadyEyeClosedTex[] = dgCuccoLadyEyeClosedTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCuccoLadyEyeClosedTex[] = dgCuccoLadyEyeClosedTex; + + +#endif // OBJECTS_OBJECT_ANE_H diff --git a/soh/assets/objects/object_ani/object_ani.h b/soh/assets/objects/object_ani/object_ani.h index b61feda0f..a2b80171f 100644 --- a/soh/assets/objects/object_ani/object_ani.h +++ b/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" @@ -99,4 +100,6 @@ static const ALIGN_ASSET(2) char gRoofManGettingUpAfterKnockbackAnim[] = dgRoofM 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_aniTex_0011D8[] = dobject_aniTex_0011D8; + +#endif // OBJECTS_OBJECT_ANI_H diff --git a/soh/assets/objects/object_anubice/object_anubice.h b/soh/assets/objects/object_anubice/object_anubice.h index 2b4c47e1c..3d0e76d01 100644 --- a/soh/assets/objects/object_anubice/object_anubice.h +++ b/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; @@ -87,4 +88,6 @@ static const ALIGN_ASSET(2) char object_anubiceTex_001590[] = dobject_anubiceTex static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex_001610; #define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90" -static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90; \ No newline at end of file +static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90; + +#endif // OBJECTS_OBJECT_ANUBICE_H diff --git a/soh/assets/objects/object_aob/object_aob.h b/soh/assets/objects/object_aob/object_aob.h index f74720dc4..6a3f5aaf0 100644 --- a/soh/assets/objects/object_aob/object_aob.h +++ b/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" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char gDogLadyEyeOpenTex[] = dgDogLadyEyeOpenTex; static const ALIGN_ASSET(2) char gDogLadyEyeHalfTex[] = dgDogLadyEyeHalfTex; #define dgDogLadyEyeClosedTex "__OTR__objects/object_aob/gDogLadyEyeClosedTex" -static const ALIGN_ASSET(2) char gDogLadyEyeClosedTex[] = dgDogLadyEyeClosedTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDogLadyEyeClosedTex[] = dgDogLadyEyeClosedTex; + + +#endif // OBJECTS_OBJECT_AOB_H diff --git a/soh/assets/objects/object_b_heart/object_b_heart.h b/soh/assets/objects/object_b_heart/object_b_heart.h index 5c1f6f2a7..f4f97772a 100644 --- a/soh/assets/objects/object_b_heart/object_b_heart.h +++ b/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" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char object_b_heart_DL_000348[] = dobject_b_heart_DL static const ALIGN_ASSET(2) char object_b_heart_Tex_0003C0[] = dobject_b_heart_Tex_0003C0; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_b_heart_Tex_0005C0[] = dobject_b_heart_Tex_0005C0; + +#endif // OBJECTS_OBJECT_B_HEART_H diff --git a/soh/assets/objects/object_bba/object_bba.h b/soh/assets/objects/object_bba/object_bba.h index b8c09e602..12d9d5075 100644 --- a/soh/assets/objects/object_bba/object_bba.h +++ b/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" @@ -78,4 +79,7 @@ static const ALIGN_ASSET(2) char object_bba_DL_003FC0[] = dobject_bba_DL_003FC0; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bba_DL_004160[] = dobject_bba_DL_004160; + + +#endif // OBJECTS_OBJECT_BBA_H diff --git a/soh/assets/objects/object_bdan_objects/object_bdan_objects.h b/soh/assets/objects/object_bdan_objects/object_bdan_objects.h index cfb236742..c714aff45 100644 --- a/soh/assets/objects/object_bdan_objects/object_bdan_objects.h +++ b/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" @@ -150,4 +151,6 @@ static const ALIGN_ASSET(2) char gJabuLoweringPlatformCol[] = dgJabuLoweringPlat static const ALIGN_ASSET(2) char gJabuFloorSwitchCol[] = dgJabuFloorSwitchCol; #define dgJabuBigOctoPlatformCol "__OTR__objects/object_bdan_objects/gJabuBigOctoPlatformCol" -static const ALIGN_ASSET(2) char gJabuBigOctoPlatformCol[] = dgJabuBigOctoPlatformCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gJabuBigOctoPlatformCol[] = dgJabuBigOctoPlatformCol; + +#endif // OBJECTS_OBJECT_BDAN_OBJECTS_H diff --git a/soh/assets/objects/object_bdoor/object_bdoor.h b/soh/assets/objects/object_bdoor/object_bdoor.h index 09629f38f..5b0442482 100644 --- a/soh/assets/objects/object_bdoor/object_bdoor.h +++ b/soh/assets/objects/object_bdoor/object_bdoor.h @@ -1,33 +1,36 @@ -#pragma once +#ifndef OBJECTS_OBJECT_BDOOR_H +#define OBJECTS_OBJECT_BDOOR_H 1 #include "align_asset_macro.h" -#define dobject_bdoor_Tex_000000 "__OTR__objects/object_bdoor/object_bdoor_Tex_000000" -static const ALIGN_ASSET(2) char object_bdoor_Tex_000000[] = dobject_bdoor_Tex_000000; +#define dgBossDoorGanonsCastleTex "__OTR__objects/object_bdoor/gBossDoorGanonsCastleTex" +static const ALIGN_ASSET(2) char gBossDoorGanonsCastleTex[] = dgBossDoorGanonsCastleTex; -#define dobject_bdoor_DL_0010C0 "__OTR__objects/object_bdoor/object_bdoor_DL_0010C0" -static const ALIGN_ASSET(2) char object_bdoor_DL_0010C0[] = dobject_bdoor_DL_0010C0; +#define dgBossDoorDL "__OTR__objects/object_bdoor/gBossDoorDL" +static const ALIGN_ASSET(2) char gBossDoorDL[] = dgBossDoorDL; -#define dobject_bdoor_DL_001400 "__OTR__objects/object_bdoor/object_bdoor_DL_001400" -static const ALIGN_ASSET(2) char object_bdoor_DL_001400[] = dobject_bdoor_DL_001400; +#define dgBossDoorLockDL "__OTR__objects/object_bdoor/gBossDoorLockDL" +static const ALIGN_ASSET(2) char gBossDoorLockDL[] = dgBossDoorLockDL; -#define dobject_bdoor_DL_001530 "__OTR__objects/object_bdoor/object_bdoor_DL_001530" -static const ALIGN_ASSET(2) char object_bdoor_DL_001530[] = dobject_bdoor_DL_001530; +#define dgBossDoorChainDL "__OTR__objects/object_bdoor/gBossDoorChainDL" +static const ALIGN_ASSET(2) char gBossDoorChainDL[] = dgBossDoorChainDL; -#define dobject_bdoor_Tex_0015C0 "__OTR__objects/object_bdoor/object_bdoor_Tex_0015C0" -static const ALIGN_ASSET(2) char object_bdoor_Tex_0015C0[] = dobject_bdoor_Tex_0015C0; +#define dgBossDoorSpiritTex "__OTR__objects/object_bdoor/gBossDoorSpiritTex" +static const ALIGN_ASSET(2) char gBossDoorSpiritTex[] = dgBossDoorSpiritTex; -#define dobject_bdoor_Tex_0025C0 "__OTR__objects/object_bdoor/object_bdoor_Tex_0025C0" -static const ALIGN_ASSET(2) char object_bdoor_Tex_0025C0[] = dobject_bdoor_Tex_0025C0; +#define dgBossDoorForestTex "__OTR__objects/object_bdoor/gBossDoorForestTex" +static const ALIGN_ASSET(2) char gBossDoorForestTex[] = dgBossDoorForestTex; -#define dobject_bdoor_Tex_0035C0 "__OTR__objects/object_bdoor/object_bdoor_Tex_0035C0" -static const ALIGN_ASSET(2) char object_bdoor_Tex_0035C0[] = dobject_bdoor_Tex_0035C0; +#define dgBossDoorFireTex "__OTR__objects/object_bdoor/gBossDoorFireTex" +static const ALIGN_ASSET(2) char gBossDoorFireTex[] = dgBossDoorFireTex; -#define dobject_bdoor_Tex_0045C0 "__OTR__objects/object_bdoor/object_bdoor_Tex_0045C0" -static const ALIGN_ASSET(2) char object_bdoor_Tex_0045C0[] = dobject_bdoor_Tex_0045C0; +#define dgBossDoorShadowTex "__OTR__objects/object_bdoor/gBossDoorShadowTex" +static const ALIGN_ASSET(2) char gBossDoorShadowTex[] = dgBossDoorShadowTex; -#define dobject_bdoor_Tex_0055C0 "__OTR__objects/object_bdoor/object_bdoor_Tex_0055C0" -static const ALIGN_ASSET(2) char object_bdoor_Tex_0055C0[] = dobject_bdoor_Tex_0055C0; +#define dgBossDoorWaterTex "__OTR__objects/object_bdoor/gBossDoorWaterTex" +static const ALIGN_ASSET(2) char gBossDoorWaterTex[] = dgBossDoorWaterTex; -#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; \ No newline at end of file +#define dgBossDoorDefaultTex "__OTR__objects/object_bdoor/gBossDoorDefaultTex" +static const ALIGN_ASSET(2) char gBossDoorDefaultTex[] = dgBossDoorDefaultTex; + +#endif // OBJECTS_OBJECT_BDOOR_H diff --git a/soh/assets/objects/object_bg/object_bg.h b/soh/assets/objects/object_bg/object_bg.h index 330d4b90e..2896af001 100644 --- a/soh/assets/objects/object_bg/object_bg.h +++ b/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" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char gChuGirlEyeOpenTex[] = dgChuGirlEyeOpenTex; static const ALIGN_ASSET(2) char gChuGirlEyeHalfTex[] = dgChuGirlEyeHalfTex; #define dgChuGirlEyeClosedTex "__OTR__objects/object_bg/gChuGirlEyeClosedTex" -static const ALIGN_ASSET(2) char gChuGirlEyeClosedTex[] = dgChuGirlEyeClosedTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gChuGirlEyeClosedTex[] = dgChuGirlEyeClosedTex; + + +#endif // OBJECTS_OBJECT_BG_H diff --git a/soh/assets/objects/object_bigokuta/object_bigokuta.h b/soh/assets/objects/object_bigokuta/object_bigokuta.h index 85b0187e1..5ef37cc7d 100644 --- a/soh/assets/objects/object_bigokuta/object_bigokuta.h +++ b/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" @@ -105,4 +106,7 @@ static const ALIGN_ASSET(2) char object_bigokuta_Tex_006790[] = dobject_bigokuta static const ALIGN_ASSET(2) char object_bigokuta_Tex_006890[] = dobject_bigokuta_Tex_006890; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bigokuta_Skel_006BC0[] = dobject_bigokuta_Skel_006BC0; + + +#endif // OBJECTS_OBJECT_BIGOKUTA_H diff --git a/soh/assets/objects/object_bird/object_bird.h b/soh/assets/objects/object_bird/object_bird.h index 6066d3cb5..389407fbe 100644 --- a/soh/assets/objects/object_bird/object_bird.h +++ b/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" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char gBirdTailTex[] = dgBirdTailTex; static const ALIGN_ASSET(2) char gBirdWingTex[] = dgBirdWingTex; #define dgBirdSkel "__OTR__objects/object_bird/gBirdSkel" -static const ALIGN_ASSET(2) char gBirdSkel[] = dgBirdSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gBirdSkel[] = dgBirdSkel; + + +#endif // OBJECTS_OBJECT_BIRD_H diff --git a/soh/assets/objects/object_bji/object_bji.h b/soh/assets/objects/object_bji/object_bji.h index b9a2d82ce..0452703ed 100644 --- a/soh/assets/objects/object_bji/object_bji.h +++ b/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" @@ -93,4 +94,7 @@ static const ALIGN_ASSET(2) char object_bji_Tex_003988[] = dobject_bji_Tex_00398 static const ALIGN_ASSET(2) char object_bji_Tex_003A08[] = dobject_bji_Tex_003A08; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bji_DL_003F68[] = dobject_bji_DL_003F68; + + +#endif // OBJECTS_OBJECT_BJI_H diff --git a/soh/assets/objects/object_bl/object_bl.h b/soh/assets/objects/object_bl/object_bl.h index c376adb0e..957bf5383 100644 --- a/soh/assets/objects/object_bl/object_bl.h +++ b/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" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char gBiriTentacles7Tex[] = dgBiriTentacles7Tex; static const ALIGN_ASSET(2) char gBiriInnerHoodTex[] = dgBiriInnerHoodTex; #define dgBiriSkel "__OTR__objects/object_bl/gBiriSkel" -static const ALIGN_ASSET(2) char gBiriSkel[] = dgBiriSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gBiriSkel[] = dgBiriSkel; + + +#endif // OBJECTS_OBJECT_BL_H diff --git a/soh/assets/objects/object_blkobj/object_blkobj.h b/soh/assets/objects/object_blkobj/object_blkobj.h index 1f8150b02..3e1524b3a 100644 --- a/soh/assets/objects/object_blkobj/object_blkobj.h +++ b/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" @@ -78,4 +79,6 @@ static const ALIGN_ASSET(2) char object_blkobjTex_011090[] = dobject_blkobjTex_0 static const ALIGN_ASSET(2) char object_blkobjTex_011890[] = dobject_blkobjTex_011890; #define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890" -static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890; \ No newline at end of file +static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890; + +#endif // OBJECTS_OBJECT_BLKOBJ_H diff --git a/soh/assets/objects/object_bob/object_bob.h b/soh/assets/objects/object_bob/object_bob.h index e1a485bf4..da3538f50 100644 --- a/soh/assets/objects/object_bob/object_bob.h +++ b/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" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char object_bob_DL_004D08[] = dobject_bob_DL_004D08; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bob_DL_004E28[] = dobject_bob_DL_004E28; + + +#endif // OBJECTS_OBJECT_BOB_H diff --git a/soh/assets/objects/object_boj/object_boj.h b/soh/assets/objects/object_boj/object_boj.h index 41944eb44..599ec8ad9 100644 --- a/soh/assets/objects/object_boj/object_boj.h +++ b/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" @@ -123,4 +124,7 @@ static const ALIGN_ASSET(2) char object_boj_DL_005738[] = dobject_boj_DL_005738; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_boj_DL_005BC8[] = dobject_boj_DL_005BC8; + + +#endif // OBJECTS_OBJECT_BOJ_H diff --git a/soh/assets/objects/object_bombf/object_bombf.h b/soh/assets/objects/object_bombf/object_bombf.h index 9709f4f71..0e40576b2 100644 --- a/soh/assets/objects/object_bombf/object_bombf.h +++ b/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" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gBombFlowerLeavesDL[] = dgBombFlowerLeavesDL; static const ALIGN_ASSET(2) char gBombFlowerBombAndSparkDL[] = dgBombFlowerBombAndSparkDL; #define dgBombFlowerBaseLeavesDL "__OTR__objects/object_bombf/gBombFlowerBaseLeavesDL" -static const ALIGN_ASSET(2) char gBombFlowerBaseLeavesDL[] = dgBombFlowerBaseLeavesDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gBombFlowerBaseLeavesDL[] = dgBombFlowerBaseLeavesDL; + +#endif // OBJECTS_OBJECT_BOMBF_H diff --git a/soh/assets/objects/object_bombiwa/object_bombiwa.h b/soh/assets/objects/object_bombiwa/object_bombiwa.h index f646f0e7f..fe7d713c5 100644 --- a/soh/assets/objects/object_bombiwa/object_bombiwa.h +++ b/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" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char object_bombiwa_TLUT_000000[] = dobject_bombiwa_ static const ALIGN_ASSET(2) char object_bombiwa_Tex_000020[] = dobject_bombiwa_Tex_000020; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bombiwa_DL_0009E0[] = dobject_bombiwa_DL_0009E0; + +#endif // OBJECTS_OBJECT_BOMBIWA_H diff --git a/soh/assets/objects/object_bowl/object_bowl.h b/soh/assets/objects/object_bowl/object_bowl.h index b6d85f959..062e9f5ec 100644 --- a/soh/assets/objects/object_bowl/object_bowl.h +++ b/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" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gBowlingFirstAndFinalRoundCol[] = dgBowlingFirs static const ALIGN_ASSET(2) char gBowlingSecondRoundCol[] = dgBowlingSecondRoundCol; #define dgBowlingDefaultCol "__OTR__objects/object_bowl/gBowlingDefaultCol" -static const ALIGN_ASSET(2) char gBowlingDefaultCol[] = dgBowlingDefaultCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gBowlingDefaultCol[] = dgBowlingDefaultCol; + +#endif // OBJECTS_OBJECT_BOWL_H diff --git a/soh/assets/objects/object_box/object_box.h b/soh/assets/objects/object_box/object_box.h index cf6f77973..118b0cc50 100644 --- a/soh/assets/objects/object_box/object_box.h +++ b/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" @@ -72,4 +73,6 @@ static const ALIGN_ASSET(2) char gTreasureChestCurveSkelLimbsLimb_005E50Curve2DL static const ALIGN_ASSET(2) char gTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8[] = dgTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8; #define dobject_boxTex_004F80 "__OTR__objects/object_box/object_boxTex_004F80" -static const ALIGN_ASSET(2) char object_boxTex_004F80[] = dobject_boxTex_004F80; \ No newline at end of file +static const ALIGN_ASSET(2) char object_boxTex_004F80[] = dobject_boxTex_004F80; + +#endif // OBJECTS_OBJECT_BOX_H diff --git a/soh/assets/objects/object_brob/object_brob.h b/soh/assets/objects/object_brob/object_brob.h index 05294de32..034607861 100644 --- a/soh/assets/objects/object_brob/object_brob.h +++ b/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" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char object_brob_Anim_001750[] = dobject_brob_Anim_0 static const ALIGN_ASSET(2) char object_brob_Anim_001958[] = dobject_brob_Anim_001958; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_brob_Col_001A70[] = dobject_brob_Col_001A70; + + +#endif // OBJECTS_OBJECT_BROB_H diff --git a/soh/assets/objects/object_bubble/object_bubble.h b/soh/assets/objects/object_bubble/object_bubble.h index 872a4ccc8..ea9faefbc 100644 --- a/soh/assets/objects/object_bubble/object_bubble.h +++ b/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" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gBubbleTex[] = dgBubbleTex; #define dgBubbleDL "__OTR__objects/object_bubble/gBubbleDL" -static const ALIGN_ASSET(2) char gBubbleDL[] = dgBubbleDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gBubbleDL[] = dgBubbleDL; + +#endif // OBJECTS_OBJECT_BUBBLE_H diff --git a/soh/assets/objects/object_bv/object_bv.h b/soh/assets/objects/object_bv/object_bv.h index 92b02f164..fc65e6bf5 100644 --- a/soh/assets/objects/object_bv/object_bv.h +++ b/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; @@ -387,4 +388,6 @@ static const ALIGN_ASSET(2) char object_bvTex_018770[] = dobject_bvTex_018770; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bvTex_000040[] = dobject_bvTex_000040; + +#endif // OBJECTS_OBJECT_BV_H diff --git a/soh/assets/objects/object_bw/object_bw.h b/soh/assets/objects/object_bw/object_bw.h index 5843a075b..9d98367bf 100644 --- a/soh/assets/objects/object_bw/object_bw.h +++ b/soh/assets/objects/object_bw/object_bw.h @@ -1,45 +1,49 @@ -#pragma once +#ifndef OBJECTS_OBJECT_BW_H +#define OBJECTS_OBJECT_BW_H 1 #include "align_asset_macro.h" -#define dobject_bw_Anim_000228 "__OTR__objects/object_bw/object_bw_Anim_000228" -static const ALIGN_ASSET(2) char object_bw_Anim_000228[] = dobject_bw_Anim_000228; +#define dgTorchSlugEyestalkWaveAnim "__OTR__objects/object_bw/gTorchSlugEyestalkWaveAnim" +static const ALIGN_ASSET(2) char gTorchSlugEyestalkWaveAnim[] = dgTorchSlugEyestalkWaveAnim; -#define dobject_bw_DL_0002C0 "__OTR__objects/object_bw/object_bw_DL_0002C0" -static const ALIGN_ASSET(2) char object_bw_DL_0002C0[] = dobject_bw_DL_0002C0; +#define dgTorchSlugLeftLowerEyestalkDL "__OTR__objects/object_bw/gTorchSlugLeftLowerEyestalkDL" +static const ALIGN_ASSET(2) char gTorchSlugLeftLowerEyestalkDL[] = dgTorchSlugLeftLowerEyestalkDL; -#define dobject_bw_DL_0003E8 "__OTR__objects/object_bw/object_bw_DL_0003E8" -static const ALIGN_ASSET(2) char object_bw_DL_0003E8[] = dobject_bw_DL_0003E8; +#define dgTorchSlugLeftUpperEyestalkDL "__OTR__objects/object_bw/gTorchSlugLeftUpperEyestalkDL" +static const ALIGN_ASSET(2) char gTorchSlugLeftUpperEyestalkDL[] = dgTorchSlugLeftUpperEyestalkDL; -#define dobject_bw_DL_000558 "__OTR__objects/object_bw/object_bw_DL_000558" -static const ALIGN_ASSET(2) char object_bw_DL_000558[] = dobject_bw_DL_000558; +#define dgTorchSlugRightLowerEyestalkDL "__OTR__objects/object_bw/gTorchSlugRightLowerEyestalkDL" +static const ALIGN_ASSET(2) char gTorchSlugRightLowerEyestalkDL[] = dgTorchSlugRightLowerEyestalkDL; -#define dobject_bw_DL_000680 "__OTR__objects/object_bw/object_bw_DL_000680" -static const ALIGN_ASSET(2) char object_bw_DL_000680[] = dobject_bw_DL_000680; +#define dgTorchSlugRightUpperEyestalkDL "__OTR__objects/object_bw/gTorchSlugRightUpperEyestalkDL" +static const ALIGN_ASSET(2) char gTorchSlugRightUpperEyestalkDL[] = dgTorchSlugRightUpperEyestalkDL; -#define dobject_bw_DL_001050 "__OTR__objects/object_bw/object_bw_DL_001050" -static const ALIGN_ASSET(2) char object_bw_DL_001050[] = dobject_bw_DL_001050; +#define dgTorchSlugBodyDL "__OTR__objects/object_bw/gTorchSlugBodyDL" +static const ALIGN_ASSET(2) char gTorchSlugBodyDL[] = dgTorchSlugBodyDL; -#define dobject_bw_Tex_001240 "__OTR__objects/object_bw/object_bw_Tex_001240" -static const ALIGN_ASSET(2) char object_bw_Tex_001240[] = dobject_bw_Tex_001240; +#define dgTorchSlugEyestalkTex "__OTR__objects/object_bw/gTorchSlugEyestalkTex" +static const ALIGN_ASSET(2) char gTorchSlugEyestalkTex[] = dgTorchSlugEyestalkTex; -#define dobject_bw_Tex_001440 "__OTR__objects/object_bw/object_bw_Tex_001440" -static const ALIGN_ASSET(2) char object_bw_Tex_001440[] = dobject_bw_Tex_001440; +#define dgTorchSlugEyeTex "__OTR__objects/object_bw/gTorchSlugEyeTex" +static const ALIGN_ASSET(2) char gTorchSlugEyeTex[] = dgTorchSlugEyeTex; -#define dobject_bw_TLUT_001640 "__OTR__objects/object_bw/object_bw_TLUT_001640" -static const ALIGN_ASSET(2) char object_bw_TLUT_001640[] = dobject_bw_TLUT_001640; +#define dgTorchSlugBodyTLUT "__OTR__objects/object_bw/gTorchSlugBodyTLUT" +static const ALIGN_ASSET(2) char gTorchSlugBodyTLUT[] = dgTorchSlugBodyTLUT; -#define dobject_bw_Tex_001840 "__OTR__objects/object_bw/object_bw_Tex_001840" -static const ALIGN_ASSET(2) char object_bw_Tex_001840[] = dobject_bw_Tex_001840; +#define dgTorchSlugBody1Tex "__OTR__objects/object_bw/gTorchSlugBody1Tex" +static const ALIGN_ASSET(2) char gTorchSlugBody1Tex[] = dgTorchSlugBody1Tex; -#define dobject_bw_Tex_001C40 "__OTR__objects/object_bw/object_bw_Tex_001C40" -static const ALIGN_ASSET(2) char object_bw_Tex_001C40[] = dobject_bw_Tex_001C40; +#define dgTorchSlugBody2Tex "__OTR__objects/object_bw/gTorchSlugBody2Tex" +static const ALIGN_ASSET(2) char gTorchSlugBody2Tex[] = dgTorchSlugBody2Tex; -#define dobject_bw_Skel_0020F0 "__OTR__objects/object_bw/object_bw_Skel_0020F0" -static const ALIGN_ASSET(2) char object_bw_Skel_0020F0[] = dobject_bw_Skel_0020F0; +#define dgTorchSlugSkel "__OTR__objects/object_bw/gTorchSlugSkel" +static const ALIGN_ASSET(2) char gTorchSlugSkel[] = dgTorchSlugSkel; -#define dobject_bw_Anim_0021A0 "__OTR__objects/object_bw/object_bw_Anim_0021A0" -static const ALIGN_ASSET(2) char object_bw_Anim_0021A0[] = dobject_bw_Anim_0021A0; +#define dgTorchSlugEyestalkRaiseAnim "__OTR__objects/object_bw/gTorchSlugEyestalkRaiseAnim" +static const ALIGN_ASSET(2) char gTorchSlugEyestalkRaiseAnim[] = dgTorchSlugEyestalkRaiseAnim; -#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; \ No newline at end of file +#define dgTorchSlugEyestalkFlailAnim "__OTR__objects/object_bw/gTorchSlugEyestalkFlailAnim" +static const ALIGN_ASSET(2) char gTorchSlugEyestalkFlailAnim[] = dgTorchSlugEyestalkFlailAnim; + + +#endif // OBJECTS_OBJECT_BW_H diff --git a/soh/assets/objects/object_bwall/object_bwall.h b/soh/assets/objects/object_bwall/object_bwall.h index 9715cee73..de886c4bc 100644 --- a/soh/assets/objects/object_bwall/object_bwall.h +++ b/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" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char object_bwall_DL_000040[] = dobject_bwall_DL_000 static const ALIGN_ASSET(2) char object_bwall_Col_000118[] = dobject_bwall_Col_000118; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bwall_Tex_000150[] = dobject_bwall_Tex_000150; + +#endif // OBJECTS_OBJECT_BWALL_H diff --git a/soh/assets/objects/object_bxa/object_bxa.h b/soh/assets/objects/object_bxa/object_bxa.h index 915e433d7..e528682c9 100644 --- a/soh/assets/objects/object_bxa/object_bxa.h +++ b/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" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char object_bxa_Tex_0026F0[] = dobject_bxa_Tex_0026F static const ALIGN_ASSET(2) char object_bxa_Tex_0027F0[] = dobject_bxa_Tex_0027F0; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_bxa_Tex_0029F0[] = dobject_bxa_Tex_0029F0; + +#endif // OBJECTS_OBJECT_BXA_H diff --git a/soh/assets/objects/object_cne/object_cne.h b/soh/assets/objects/object_cne/object_cne.h index 839a85fca..434c9e0e1 100644 --- a/soh/assets/objects/object_cne/object_cne.h +++ b/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" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char gCneOrangeHairFaceTex[] = dgCneOrangeHairFaceTe static const ALIGN_ASSET(2) char gCneOrangeHairSkinTex[] = dgCneOrangeHairSkinTex; #define dgCneHeadOrangeHairDL "__OTR__objects/object_cne/gCneHeadOrangeHairDL" -static const ALIGN_ASSET(2) char gCneHeadOrangeHairDL[] = dgCneHeadOrangeHairDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gCneHeadOrangeHairDL[] = dgCneHeadOrangeHairDL; + + +#endif // OBJECTS_OBJECT_CNE_H diff --git a/soh/assets/objects/object_cob/object_cob.h b/soh/assets/objects/object_cob/object_cob.h index 45fc6e85a..10a5f5682 100644 --- a/soh/assets/objects/object_cob/object_cob.h +++ b/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" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char object_cob_DL_001FD0[] = dobject_cob_DL_001FD0; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_cob_Skel_0021F8[] = dobject_cob_Skel_0021F8; + + +#endif // OBJECTS_OBJECT_COB_H diff --git a/soh/assets/objects/object_cow/object_cow.h b/soh/assets/objects/object_cow/object_cow.h index 8f0bb49f5..eb6883c7d 100644 --- a/soh/assets/objects/object_cow/object_cow.h +++ b/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" @@ -72,4 +73,7 @@ static const ALIGN_ASSET(2) char gCowEarTex[] = dgCowEarTex; static const ALIGN_ASSET(2) char gCowEyelidTex[] = dgCowEyelidTex; #define dgCowTailTex "__OTR__objects/object_cow/gCowTailTex" -static const ALIGN_ASSET(2) char gCowTailTex[] = dgCowTailTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCowTailTex[] = dgCowTailTex; + + +#endif // OBJECTS_OBJECT_COW_H diff --git a/soh/assets/objects/object_crow/object_crow.h b/soh/assets/objects/object_crow/object_crow.h index 9e20a9a76..ad1a9539e 100644 --- a/soh/assets/objects/object_crow/object_crow.h +++ b/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" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char gGuaySkelLimbsLimb_00107CDL_000770[] = dgGuaySk static const ALIGN_ASSET(2) char gGuaySkelLimbsLimb_001088DL_0009A0[] = dgGuaySkelLimbsLimb_001088DL_0009A0; #define dgGuaySkelLimbsLimb_001094DL_000900 "__OTR__objects/object_crow/gGuaySkelLimbsLimb_001094DL_000900" -static const ALIGN_ASSET(2) char gGuaySkelLimbsLimb_001094DL_000900[] = dgGuaySkelLimbsLimb_001094DL_000900; \ No newline at end of file +static const ALIGN_ASSET(2) char gGuaySkelLimbsLimb_001094DL_000900[] = dgGuaySkelLimbsLimb_001094DL_000900; + + +#endif // OBJECTS_OBJECT_CROW_H diff --git a/soh/assets/objects/object_cs/object_cs.h b/soh/assets/objects/object_cs/object_cs.h index cd293b8d7..dfb6ddf91 100644 --- a/soh/assets/objects/object_cs/object_cs.h +++ b/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" @@ -108,4 +109,7 @@ static const ALIGN_ASSET(2) char gGraveyardKidShirt2Tex[] = dgGraveyardKidShirt2 static const ALIGN_ASSET(2) char gGraveyardKidFingersTex[] = dgGraveyardKidFingersTex; #define dgGraveyardKidStickTex "__OTR__objects/object_cs/gGraveyardKidStickTex" -static const ALIGN_ASSET(2) char gGraveyardKidStickTex[] = dgGraveyardKidStickTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGraveyardKidStickTex[] = dgGraveyardKidStickTex; + + +#endif // OBJECTS_OBJECT_CS_H diff --git a/soh/assets/objects/object_d_elevator/object_d_elevator.h b/soh/assets/objects/object_d_elevator/object_d_elevator.h index 63f51e197..80c45e3a9 100644 --- a/soh/assets/objects/object_d_elevator/object_d_elevator.h +++ b/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" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char object_d_elevator_DL_000180[] = dobject_d_eleva static const ALIGN_ASSET(2) char object_d_elevator_Col_000360[] = dobject_d_elevator_Col_000360; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_d_elevator_Tex_000390[] = dobject_d_elevator_Tex_000390; + +#endif // OBJECTS_OBJECT_D_ELEVATOR_H diff --git a/soh/assets/objects/object_d_hsblock/object_d_hsblock.h b/soh/assets/objects/object_d_hsblock/object_d_hsblock.h index f2aad8cdc..847f27276 100644 --- a/soh/assets/objects/object_d_hsblock/object_d_hsblock.h +++ b/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" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gHookshotTargetDL[] = dgHookshotTargetDL; static const ALIGN_ASSET(2) char gHookshotTargetTex[] = dgHookshotTargetTex; #define dgHookshotPostTex "__OTR__objects/object_d_hsblock/gHookshotPostTex" -static const ALIGN_ASSET(2) char gHookshotPostTex[] = dgHookshotPostTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHookshotPostTex[] = dgHookshotPostTex; + +#endif // OBJECTS_OBJECT_D_HSBLOCK_H diff --git a/soh/assets/objects/object_d_lift/object_d_lift.h b/soh/assets/objects/object_d_lift/object_d_lift.h index 63e017c60..0ffc1d947 100644 --- a/soh/assets/objects/object_d_lift/object_d_lift.h +++ b/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" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gCollapsingPlatformCol[] = dgCollapsingPlatform static const ALIGN_ASSET(2) char gCollapsingPlatformSideTex[] = dgCollapsingPlatformSideTex; #define dgCollapsingPlatformTopTex "__OTR__objects/object_d_lift/gCollapsingPlatformTopTex" -static const ALIGN_ASSET(2) char gCollapsingPlatformTopTex[] = dgCollapsingPlatformTopTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCollapsingPlatformTopTex[] = dgCollapsingPlatformTopTex; + +#endif // OBJECTS_OBJECT_D_LIFT_H diff --git a/soh/assets/objects/object_daiku/object_daiku.h b/soh/assets/objects/object_daiku/object_daiku.h index c9b733959..61f50edca 100644 --- a/soh/assets/objects/object_daiku/object_daiku.h +++ b/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" @@ -120,4 +121,7 @@ static const ALIGN_ASSET(2) char object_daiku_Anim_007DE0[] = dobject_daiku_Anim static const ALIGN_ASSET(2) char object_daiku_Anim_008164[] = dobject_daiku_Anim_008164; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_daiku_Anim_00885C[] = dobject_daiku_Anim_00885C; + + +#endif // OBJECTS_OBJECT_DAIKU_H diff --git a/soh/assets/objects/object_ddan_objects/object_ddan_objects.h b/soh/assets/objects/object_ddan_objects/object_ddan_objects.h index bb50ff09c..9d1c71530 100644 --- a/soh/assets/objects/object_ddan_objects/object_ddan_objects.h +++ b/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" @@ -63,4 +64,6 @@ static const ALIGN_ASSET(2) char gDodongoLowerJawCol[] = dgDodongoLowerJawCol; static const ALIGN_ASSET(2) char gDodongoRisingPlatformCol[] = dgDodongoRisingPlatformCol; #define dgDodongoFallingStairsCol "__OTR__objects/object_ddan_objects/gDodongoFallingStairsCol" -static const ALIGN_ASSET(2) char gDodongoFallingStairsCol[] = dgDodongoFallingStairsCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gDodongoFallingStairsCol[] = dgDodongoFallingStairsCol; + +#endif // OBJECTS_OBJECT_DDAN_OBJECTS_H diff --git a/soh/assets/objects/object_dekubaba/object_dekubaba.h b/soh/assets/objects/object_dekubaba/object_dekubaba.h index 3cfdfe168..3bc1c514c 100644 --- a/soh/assets/objects/object_dekubaba/object_dekubaba.h +++ b/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" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char gDekuBabaSkel[] = dgDekuBabaSkel; static const ALIGN_ASSET(2) char gDekuBabaStickDropDL[] = dgDekuBabaStickDropDL; #define dgDekuBabaStickDropTex "__OTR__objects/object_dekubaba/gDekuBabaStickDropTex" -static const ALIGN_ASSET(2) char gDekuBabaStickDropTex[] = dgDekuBabaStickDropTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDekuBabaStickDropTex[] = dgDekuBabaStickDropTex; + + +#endif // OBJECTS_OBJECT_DEKUBABA_H diff --git a/soh/assets/objects/object_dekujr/object_dekujr.h b/soh/assets/objects/object_dekujr/object_dekujr.h index 3a4af5c80..257895fb1 100644 --- a/soh/assets/objects/object_dekujr/object_dekujr.h +++ b/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" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char object_dekujr_Tex_002640[] = dobject_dekujr_Tex static const ALIGN_ASSET(2) char object_dekujr_DL_0030D0[] = dobject_dekujr_DL_0030D0; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_dekujr_DL_0032D8[] = dobject_dekujr_DL_0032D8; + +#endif // OBJECTS_OBJECT_DEKUJR_H diff --git a/soh/assets/objects/object_dekunuts/object_dekunuts.h b/soh/assets/objects/object_dekunuts/object_dekunuts.h index a9c3d44bc..ec008b7de 100644 --- a/soh/assets/objects/object_dekunuts/object_dekunuts.h +++ b/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" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char gDekuNutsSkelLimbsLimb_0031C0DL_001AA8[] = dgDe static const ALIGN_ASSET(2) char gDekuNutsSkelLimbsLimb_0031F0DL_001DA8[] = dgDekuNutsSkelLimbsLimb_0031F0DL_001DA8; #define dgDekuNutsSkelLimbsLimb_0031FCDL_001D08 "__OTR__objects/object_dekunuts/gDekuNutsSkelLimbsLimb_0031FCDL_001D08" -static const ALIGN_ASSET(2) char gDekuNutsSkelLimbsLimb_0031FCDL_001D08[] = dgDekuNutsSkelLimbsLimb_0031FCDL_001D08; \ No newline at end of file +static const ALIGN_ASSET(2) char gDekuNutsSkelLimbsLimb_0031FCDL_001D08[] = dgDekuNutsSkelLimbsLimb_0031FCDL_001D08; + + +#endif // OBJECTS_OBJECT_DEKUNUTS_H diff --git a/soh/assets/objects/object_demo_6k/object_demo_6k.h b/soh/assets/objects/object_demo_6k/object_demo_6k.h index 304dddecf..fdc1dbabc 100644 --- a/soh/assets/objects/object_demo_6k/object_demo_6k.h +++ b/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" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char object_demo_6k_Tex_0025E0[] = dobject_demo_6k_T static const ALIGN_ASSET(2) char object_demo_6kVtx_0035E0[] = dobject_demo_6kVtx_0035E0; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_demo_6k_DL_0039D0[] = dobject_demo_6k_DL_0039D0; + +#endif // OBJECTS_OBJECT_DEMO_6K_H diff --git a/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h b/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h index c66084a79..5cc98d75f 100644 --- a/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h +++ b/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" @@ -108,4 +109,6 @@ static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006940[] = dobject_demo_k static const ALIGN_ASSET(2) char object_demo_kekkaiTex_002450[] = dobject_demo_kekkaiTex_002450; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_001000[] = dobject_demo_kekkaiTex_001000; + +#endif // OBJECTS_OBJECT_DEMO_KEKKAI_H diff --git a/soh/assets/objects/object_demo_tre_lgt/object_demo_tre_lgt.h b/soh/assets/objects/object_demo_tre_lgt/object_demo_tre_lgt.h index 4d030e29a..b0b2a082d 100644 --- a/soh/assets/objects/object_demo_tre_lgt/object_demo_tre_lgt.h +++ b/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; \ No newline at end of file +static const ALIGN_ASSET(2) char gWarpDemoTreLgtBlob_000000[] = dgWarpDemoTreLgtBlob_000000; + +#endif // OBJECTS_OBJECT_DEMO_TRE_LGT_H diff --git a/soh/assets/objects/object_dh/object_dh.h b/soh/assets/objects/object_dh/object_dh.h index 2e40ac36f..b80ee7963 100644 --- a/soh/assets/objects/object_dh/object_dh.h +++ b/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" @@ -111,4 +112,7 @@ static const ALIGN_ASSET(2) char object_dh_DL_007FC0[] = dobject_dh_DL_007FC0; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_dh_Tex_0088C0[] = dobject_dh_Tex_0088C0; + + +#endif // OBJECTS_OBJECT_DH_H diff --git a/soh/assets/objects/object_dnk/object_dnk.h b/soh/assets/objects/object_dnk/object_dnk.h index dafc1c761..6fcec0b50 100644 --- a/soh/assets/objects/object_dnk/object_dnk.h +++ b/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; @@ -84,4 +85,6 @@ static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0; + +#endif // OBJECTS_OBJECT_DNK_H diff --git a/soh/assets/objects/object_dns/object_dns.h b/soh/assets/objects/object_dns/object_dns.h index 7ecb42b18..630a7e9d0 100644 --- a/soh/assets/objects/object_dns/object_dns.h +++ b/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; @@ -102,4 +103,6 @@ static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0; + +#endif // OBJECTS_OBJECT_DNS_H diff --git a/soh/assets/objects/object_dodojr/object_dodojr.h b/soh/assets/objects/object_dodojr/object_dodojr.h index e9f6ffffb..fea4045a6 100644 --- a/soh/assets/objects/object_dodojr/object_dodojr.h +++ b/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" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char object_dodojr_Tex_001A00[] = dobject_dodojr_Tex static const ALIGN_ASSET(2) char object_dodojr_Tex_001C00[] = dobject_dodojr_Tex_001C00; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_dodojr_Skel_0020E0[] = dobject_dodojr_Skel_0020E0; + + +#endif // OBJECTS_OBJECT_DODOJR_H diff --git a/soh/assets/objects/object_dodongo/object_dodongo.h b/soh/assets/objects/object_dodongo/object_dodongo.h index df9de624c..30dd84ab1 100644 --- a/soh/assets/objects/object_dodongo/object_dodongo.h +++ b/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" @@ -111,4 +112,7 @@ static const ALIGN_ASSET(2) char gDodongoSkelLimbsLimb_00827CDL_0073A8[] = dgDod static const ALIGN_ASSET(2) char gDodongoSkelLimbsLimb_008288DL_007298[] = dgDodongoSkelLimbsLimb_008288DL_007298; #define dgDodongoSkelLimbsLimb_008294DL_007198 "__OTR__objects/object_dodongo/gDodongoSkelLimbsLimb_008294DL_007198" -static const ALIGN_ASSET(2) char gDodongoSkelLimbsLimb_008294DL_007198[] = dgDodongoSkelLimbsLimb_008294DL_007198; \ No newline at end of file +static const ALIGN_ASSET(2) char gDodongoSkelLimbsLimb_008294DL_007198[] = dgDodongoSkelLimbsLimb_008294DL_007198; + + +#endif // OBJECTS_OBJECT_DODONGO_H diff --git a/soh/assets/objects/object_dog/object_dog.h b/soh/assets/objects/object_dog/object_dog.h index 21455d738..4cd8a19dd 100644 --- a/soh/assets/objects/object_dog/object_dog.h +++ b/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" @@ -75,4 +76,7 @@ static const ALIGN_ASSET(2) char gDogBackLeftLegDL[] = dgDogBackLeftLegDL; static const ALIGN_ASSET(2) char gDogTailDL[] = dgDogTailDL; #define dgDogSkel "__OTR__objects/object_dog/gDogSkel" -static const ALIGN_ASSET(2) char gDogSkel[] = dgDogSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gDogSkel[] = dgDogSkel; + + +#endif // OBJECTS_OBJECT_DOG_H diff --git a/soh/assets/objects/object_door_gerudo/object_door_gerudo.h b/soh/assets/objects/object_door_gerudo/object_door_gerudo.h index d50ef58b2..c6870dc27 100644 --- a/soh/assets/objects/object_door_gerudo/object_door_gerudo.h +++ b/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" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGerudoCellDoorTex[] = dgGerudoCellDoorTex; static const ALIGN_ASSET(2) char gGerudoCellDoorDL[] = dgGerudoCellDoorDL; #define dgGerudoCellDoorCol "__OTR__objects/object_door_gerudo/gGerudoCellDoorCol" -static const ALIGN_ASSET(2) char gGerudoCellDoorCol[] = dgGerudoCellDoorCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gGerudoCellDoorCol[] = dgGerudoCellDoorCol; + +#endif // OBJECTS_OBJECT_DOOR_GERUDO_H diff --git a/soh/assets/objects/object_door_killer/object_door_killer.h b/soh/assets/objects/object_door_killer/object_door_killer.h index 0c93360a7..0e7e01d6d 100644 --- a/soh/assets/objects/object_door_killer/object_door_killer.h +++ b/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" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char object_door_killer_DL_0017B8[] = dobject_door_k static const ALIGN_ASSET(2) char object_door_killer_DL_001A58[] = dobject_door_killer_DL_001A58; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_door_killer_Skel_001BC8[] = dobject_door_killer_Skel_001BC8; + + +#endif // OBJECTS_OBJECT_DOOR_KILLER_H diff --git a/soh/assets/objects/object_ds/object_ds.h b/soh/assets/objects/object_ds/object_ds.h index 2da5d9660..c5445a72a 100644 --- a/soh/assets/objects/object_ds/object_ds.h +++ b/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" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char gPotionShopLadyCatPattern1Tex[] = dgPotionShopL static const ALIGN_ASSET(2) char gPotionShopLadyCatPattern2Tex[] = dgPotionShopLadyCatPattern2Tex; #define dgPotionShopLadyAnim "__OTR__objects/object_ds/gPotionShopLadyAnim" -static const ALIGN_ASSET(2) char gPotionShopLadyAnim[] = dgPotionShopLadyAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gPotionShopLadyAnim[] = dgPotionShopLadyAnim; + + +#endif // OBJECTS_OBJECT_DS_H diff --git a/soh/assets/objects/object_ds2/object_ds2.h b/soh/assets/objects/object_ds2/object_ds2.h index 9d386b89b..be8e6ecb5 100644 --- a/soh/assets/objects/object_ds2/object_ds2.h +++ b/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" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char object_ds2_Tex_003ED8[] = dobject_ds2_Tex_003ED static const ALIGN_ASSET(2) char object_ds2_Tex_003FD8[] = dobject_ds2_Tex_003FD8; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ds2_Skel_004258[] = dobject_ds2_Skel_004258; + + +#endif // OBJECTS_OBJECT_DS2_H diff --git a/soh/assets/objects/object_du/object_du.h b/soh/assets/objects/object_du/object_du.h index 6993d2f78..6be5ca732 100644 --- a/soh/assets/objects/object_du/object_du.h +++ b/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" @@ -180,4 +181,7 @@ static const ALIGN_ASSET(2) char gDaruniaSkelLimbsLimb_011C40DL_010930[] = dgDar static const ALIGN_ASSET(2) char gDaruniaSkelLimbsLimb_011C4CDL_00D1D0[] = dgDaruniaSkelLimbsLimb_011C4CDL_00D1D0; #define dgDaruniaSkelLimbsLimb_011C58DL_00D810 "__OTR__objects/object_du/gDaruniaSkelLimbsLimb_011C58DL_00D810" -static const ALIGN_ASSET(2) char gDaruniaSkelLimbsLimb_011C58DL_00D810[] = dgDaruniaSkelLimbsLimb_011C58DL_00D810; \ No newline at end of file +static const ALIGN_ASSET(2) char gDaruniaSkelLimbsLimb_011C58DL_00D810[] = dgDaruniaSkelLimbsLimb_011C58DL_00D810; + + +#endif // OBJECTS_OBJECT_DU_H diff --git a/soh/assets/objects/object_dy_obj/object_dy_obj.h b/soh/assets/objects/object_dy_obj/object_dy_obj.h index b7f655bef..9f6642a39 100644 --- a/soh/assets/objects/object_dy_obj/object_dy_obj.h +++ b/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" @@ -201,4 +202,7 @@ static const ALIGN_ASSET(2) char gGreatFairySittingTransitionAnim[] = dgGreatFai static const ALIGN_ASSET(2) char gGreatFairySittingAnim[] = dgGreatFairySittingAnim; #define dgGreatFairySpiralBeamVtx "__OTR__objects/object_dy_obj/gGreatFairySpiralBeamVtx" -static const ALIGN_ASSET(2) char gGreatFairySpiralBeamVtx[] = dgGreatFairySpiralBeamVtx; \ No newline at end of file +static const ALIGN_ASSET(2) char gGreatFairySpiralBeamVtx[] = dgGreatFairySpiralBeamVtx; + + +#endif // OBJECTS_OBJECT_DY_OBJ_H diff --git a/soh/assets/objects/object_ec/object_ec.h b/soh/assets/objects/object_ec/object_ec.h index 5580a6fe7..e9b53416a 100644 --- a/soh/assets/objects/object_ec/object_ec.h +++ b/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" @@ -66,4 +67,6 @@ static const ALIGN_ASSET(2) char gDemoEcPotionShopOwnerAnim[] = dgDemoEcPotionSh static const ALIGN_ASSET(2) char gDemoEcTalonAnim[] = dgDemoEcTalonAnim; #define dgDemoEcDancingZoraAnim "__OTR__objects/object_ec/gDemoEcDancingZoraAnim" -static const ALIGN_ASSET(2) char gDemoEcDancingZoraAnim[] = dgDemoEcDancingZoraAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gDemoEcDancingZoraAnim[] = dgDemoEcDancingZoraAnim; + +#endif // OBJECTS_OBJECT_EC_H diff --git a/soh/assets/objects/object_efc_crystal_light/object_efc_crystal_light.h b/soh/assets/objects/object_efc_crystal_light/object_efc_crystal_light.h index 33c626bab..e76e081b1 100644 --- a/soh/assets/objects/object_efc_crystal_light/object_efc_crystal_light.h +++ b/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" @@ -6,4 +7,6 @@ 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; \ No newline at end of file +static const ALIGN_ASSET(2) char gCrystalLightDL[] = dgCrystalLightDL; + +#endif // OBJECTS_OBJECT_EFC_CRYSTAL_LIGHT_H diff --git a/soh/assets/objects/object_efc_doughnut/object_efc_doughnut.h b/soh/assets/objects/object_efc_doughnut/object_efc_doughnut.h index e0c1e2bf8..6e3000742 100644 --- a/soh/assets/objects/object_efc_doughnut/object_efc_doughnut.h +++ b/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" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gDeathMountainCloudNormalTex[] = dgDeathMountai static const ALIGN_ASSET(2) char gDeathMountainCloudCircleFieryDL[] = dgDeathMountainCloudCircleFieryDL; #define dgDeathMountainCloudCircleNormalDL "__OTR__objects/object_efc_doughnut/gDeathMountainCloudCircleNormalDL" -static const ALIGN_ASSET(2) char gDeathMountainCloudCircleNormalDL[] = dgDeathMountainCloudCircleNormalDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gDeathMountainCloudCircleNormalDL[] = dgDeathMountainCloudCircleNormalDL; + +#endif // OBJECTS_OBJECT_EFC_DOUGHNUT_H diff --git a/soh/assets/objects/object_efc_erupc/object_efc_erupc.h b/soh/assets/objects/object_efc_erupc/object_efc_erupc.h index 9eff5a724..05e8d2dbf 100644 --- a/soh/assets/objects/object_efc_erupc/object_efc_erupc.h +++ b/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" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char object_efc_erupc_DL_002760[] = dobject_efc_erup static const ALIGN_ASSET(2) char object_efc_erupc_DL_0027D8[] = dobject_efc_erupc_DL_0027D8; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_efc_erupc_Tex_0027F0[] = dobject_efc_erupc_Tex_0027F0; + +#endif // OBJECTS_OBJECT_EFC_ERUPC_H diff --git a/soh/assets/objects/object_efc_fire_ball/object_efc_fire_ball.h b/soh/assets/objects/object_efc_fire_ball/object_efc_fire_ball.h index e3481e57b..fbf87be0f 100644 --- a/soh/assets/objects/object_efc_fire_ball/object_efc_fire_ball.h +++ b/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" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gCreationFireBallDL[] = dgCreationFireBallDL; static const ALIGN_ASSET(2) char gCreationFireBallMaskTex[] = dgCreationFireBallMaskTex; #define dgCreationFireBallFlameEffectTex "__OTR__objects/object_efc_fire_ball/gCreationFireBallFlameEffectTex" -static const ALIGN_ASSET(2) char gCreationFireBallFlameEffectTex[] = dgCreationFireBallFlameEffectTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCreationFireBallFlameEffectTex[] = dgCreationFireBallFlameEffectTex; + +#endif // OBJECTS_OBJECT_EFC_FIRE_BALL_H diff --git a/soh/assets/objects/object_efc_flash/object_efc_flash.h b/soh/assets/objects/object_efc_flash/object_efc_flash.h index 5a26ec4a6..ed34781cf 100644 --- a/soh/assets/objects/object_efc_flash/object_efc_flash.h +++ b/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; \ No newline at end of file +static const ALIGN_ASSET(2) char gEfcFlashBlob_000000[] = dgEfcFlashBlob_000000; + +#endif // OBJECTS_OBJECT_EFC_FLASH_H diff --git a/soh/assets/objects/object_efc_lgt_shower/object_efc_lgt_shower.h b/soh/assets/objects/object_efc_lgt_shower/object_efc_lgt_shower.h index 846c5c052..588407b21 100644 --- a/soh/assets/objects/object_efc_lgt_shower/object_efc_lgt_shower.h +++ b/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" @@ -6,4 +7,6 @@ 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; \ No newline at end of file +static const ALIGN_ASSET(2) char gEnliveningLightDL[] = dgEnliveningLightDL; + +#endif // OBJECTS_OBJECT_EFC_LGT_SHOWER_H diff --git a/soh/assets/objects/object_efc_star_field/object_efc_star_field.h b/soh/assets/objects/object_efc_star_field/object_efc_star_field.h index 0e79b5bb1..46c953ec3 100644 --- a/soh/assets/objects/object_efc_star_field/object_efc_star_field.h +++ b/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" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char object_efc_star_field_Tex_000108[] = dobject_ef static const ALIGN_ASSET(2) char object_efc_star_field_DL_000DE0[] = dobject_efc_star_field_DL_000DE0; #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; \ No newline at end of file +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 diff --git a/soh/assets/objects/object_efc_tw/object_efc_tw.h b/soh/assets/objects/object_efc_tw/object_efc_tw.h index 37da95044..2bc8daefd 100644 --- a/soh/assets/objects/object_efc_tw/object_efc_tw.h +++ b/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" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char gTimeWarpVtx[] = dgTimeWarpVtx; static const ALIGN_ASSET(2) char gTimeWarpDL[] = dgTimeWarpDL; #define dgTimeWarpTex "__OTR__objects/object_efc_tw/gTimeWarpTex" -static const ALIGN_ASSET(2) char gTimeWarpTex[] = dgTimeWarpTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gTimeWarpTex[] = dgTimeWarpTex; + + +#endif // OBJECTS_OBJECT_EFC_TW_H diff --git a/soh/assets/objects/object_ei/object_ei.h b/soh/assets/objects/object_ei/object_ei.h index 2a32c349b..2274070a1 100644 --- a/soh/assets/objects/object_ei/object_ei.h +++ b/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" @@ -75,4 +76,7 @@ static const ALIGN_ASSET(2) char gStingerBackflipAnim[] = dgStingerBackflipAnim; static const ALIGN_ASSET(2) char gStingerHitAnim[] = dgStingerHitAnim; #define dgStingerIdleAnim "__OTR__objects/object_ei/gStingerIdleAnim" -static const ALIGN_ASSET(2) char gStingerIdleAnim[] = dgStingerIdleAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gStingerIdleAnim[] = dgStingerIdleAnim; + + +#endif // OBJECTS_OBJECT_EI_H diff --git a/soh/assets/objects/object_fa/object_fa.h b/soh/assets/objects/object_fa/object_fa.h index 0240d324b..b7892476d 100644 --- a/soh/assets/objects/object_fa/object_fa.h +++ b/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" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char gFaEyeHalfTex[] = dgFaEyeHalfTex; static const ALIGN_ASSET(2) char gFaEyeClosedTex[] = dgFaEyeClosedTex; #define dgFaDL "__OTR__objects/object_fa/gFaDL" -static const ALIGN_ASSET(2) char gFaDL[] = dgFaDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gFaDL[] = dgFaDL; + +#endif // OBJECTS_OBJECT_FA_H diff --git a/soh/assets/objects/object_fd/object_fd.h b/soh/assets/objects/object_fd/object_fd.h index 1466ed4b6..fb2beed84 100644 --- a/soh/assets/objects/object_fd/object_fd.h +++ b/soh/assets/objects/object_fd/object_fd.h @@ -1,9 +1,10 @@ -#pragma once +#ifndef OBJECTS_OBJECT_FD_H +#define OBJECTS_OBJECT_FD_H 1 #include "align_asset_macro.h" -#define dgVolvagiaBossTitleCardTex "__OTR__objects/object_fd/gVolvagiaBossTitleCardTex" -static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardTex[] = dgVolvagiaBossTitleCardTex; +#define dgVolvagiaTitleCardTex "__OTR__objects/object_fd/gVolvagiaTitleCardTex" +static const ALIGN_ASSET(2) char gVolvagiaTitleCardTex[] = dgVolvagiaTitleCardTex; #define dgVolvagiaLeftArmSkel "__OTR__objects/object_fd/gVolvagiaLeftArmSkel" static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkel[] = dgVolvagiaLeftArmSkel; @@ -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; @@ -279,4 +280,6 @@ static const ALIGN_ASSET(2) char object_fdTex_0052A8[] = dobject_fdTex_0052A8; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_fdTLUT_0032A8[] = dobject_fdTLUT_0032A8; + +#endif // OBJECTS_OBJECT_FD_H diff --git a/soh/assets/objects/object_fd2/object_fd2.h b/soh/assets/objects/object_fd2/object_fd2.h index 07699a063..736f5f1f1 100644 --- a/soh/assets/objects/object_fd2/object_fd2.h +++ b/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; @@ -198,4 +199,6 @@ static const ALIGN_ASSET(2) char object_fd2Tex_004508[] = dobject_fd2Tex_004508; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508; + +#endif // OBJECTS_OBJECT_FD2_H diff --git a/soh/assets/objects/object_fhg/object_fhg.h b/soh/assets/objects/object_fhg/object_fhg.h index eb99b5a3d..fb398e416 100644 --- a/soh/assets/objects/object_fhg/object_fhg.h +++ b/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" @@ -164,4 +165,6 @@ static const ALIGN_ASSET(2) char object_fhgTex_003920[] = dobject_fhgTex_003920; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_fhgTex_003B20[] = dobject_fhgTex_003B20; + +#endif // OBJECTS_OBJECT_FHG_H diff --git a/soh/assets/objects/object_fire/object_fire.h b/soh/assets/objects/object_fire/object_fire.h index 679715c2f..09b826344 100644 --- a/soh/assets/objects/object_fire/object_fire.h +++ b/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" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gFire5Tex[] = dgFire5Tex; static const ALIGN_ASSET(2) char gFire6Tex[] = dgFire6Tex; #define dgFire7Tex "__OTR__objects/object_fire/gFire7Tex" -static const ALIGN_ASSET(2) char gFire7Tex[] = dgFire7Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gFire7Tex[] = dgFire7Tex; + +#endif // OBJECTS_OBJECT_FIRE_H diff --git a/soh/assets/objects/object_firefly/object_firefly.h b/soh/assets/objects/object_firefly/object_firefly.h index 8cbc7b5df..6fd706219 100644 --- a/soh/assets/objects/object_firefly/object_firefly.h +++ b/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" @@ -69,4 +70,7 @@ static const ALIGN_ASSET(2) char gKeeseSkeletonLimbsLimb_001810DL_001290[] = dgK static const ALIGN_ASSET(2) char gKeeseSkeletonLimbsLimb_00181CDL_0011C8[] = dgKeeseSkeletonLimbsLimb_00181CDL_0011C8; #define dgKeeseSkeletonLimbsLimb_001840DL_000D30 "__OTR__objects/object_firefly/gKeeseSkeletonLimbsLimb_001840DL_000D30" -static const ALIGN_ASSET(2) char gKeeseSkeletonLimbsLimb_001840DL_000D30[] = dgKeeseSkeletonLimbsLimb_001840DL_000D30; \ No newline at end of file +static const ALIGN_ASSET(2) char gKeeseSkeletonLimbsLimb_001840DL_000D30[] = dgKeeseSkeletonLimbsLimb_001840DL_000D30; + + +#endif // OBJECTS_OBJECT_FIREFLY_H diff --git a/soh/assets/objects/object_fish/object_fish.h b/soh/assets/objects/object_fish/object_fish.h index c7a91a972..ed023d972 100644 --- a/soh/assets/objects/object_fish/object_fish.h +++ b/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" @@ -369,4 +370,7 @@ static const ALIGN_ASSET(2) char gFishingAquariumGlassTex[] = dgFishingAquariumG static const ALIGN_ASSET(2) char gFishingAquariumBottomDL[] = dgFishingAquariumBottomDL; #define dgFishingAquariumContainerDL "__OTR__objects/object_fish/gFishingAquariumContainerDL" -static const ALIGN_ASSET(2) char gFishingAquariumContainerDL[] = dgFishingAquariumContainerDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gFishingAquariumContainerDL[] = dgFishingAquariumContainerDL; + + +#endif // OBJECTS_OBJECT_FISH_H diff --git a/soh/assets/objects/object_fr/object_fr.h b/soh/assets/objects/object_fr/object_fr.h index ad53708cf..378fdb489 100644 --- a/soh/assets/objects/object_fr/object_fr.h +++ b/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" @@ -114,4 +115,7 @@ static const ALIGN_ASSET(2) char object_fr_DL_00AED8[] = dobject_fr_DL_00AED8; 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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_fr_Skel_00B498[] = dobject_fr_Skel_00B498; + + +#endif // OBJECTS_OBJECT_FR_H diff --git a/soh/assets/objects/object_fu/object_fu.h b/soh/assets/objects/object_fu/object_fu.h index f177eb414..e6e684203 100644 --- a/soh/assets/objects/object_fu/object_fu.h +++ b/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" @@ -99,4 +100,7 @@ static const ALIGN_ASSET(2) char gWindmillManMouthAngryTex[] = dgWindmillManMout static const ALIGN_ASSET(2) char gWindmillManHairTex[] = dgWindmillManHairTex; #define dgWindmillManSkel "__OTR__objects/object_fu/gWindmillManSkel" -static const ALIGN_ASSET(2) char gWindmillManSkel[] = dgWindmillManSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gWindmillManSkel[] = dgWindmillManSkel; + + +#endif // OBJECTS_OBJECT_FU_H diff --git a/soh/assets/objects/object_fw/object_fw.h b/soh/assets/objects/object_fw/object_fw.h index a4667aea3..5cf2925d2 100644 --- a/soh/assets/objects/object_fw/object_fw.h +++ b/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" @@ -150,4 +151,6 @@ static const ALIGN_ASSET(2) char gFlareDancerCoreRunCycleAnim[] = dgFlareDancerC static const ALIGN_ASSET(2) char gFlareDancerCoreEndRunCycleAnim[] = dgFlareDancerCoreEndRunCycleAnim; #define dobject_fwTex_007A90 "__OTR__objects/object_fw/object_fwTex_007A90" -static const ALIGN_ASSET(2) char object_fwTex_007A90[] = dobject_fwTex_007A90; \ No newline at end of file +static const ALIGN_ASSET(2) char object_fwTex_007A90[] = dobject_fwTex_007A90; + +#endif // OBJECTS_OBJECT_FW_H diff --git a/soh/assets/objects/object_fz/object_fz.h b/soh/assets/objects/object_fz/object_fz.h index e676473b9..e214a65bd 100644 --- a/soh/assets/objects/object_fz/object_fz.h +++ b/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" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gFreezardIceTriangleDL[] = dgFreezardIceTriangl static const ALIGN_ASSET(2) char gFreezardIceRockDL[] = dgFreezardIceRockDL; #define dgFreezardSteamTex "__OTR__objects/object_fz/gFreezardSteamTex" -static const ALIGN_ASSET(2) char gFreezardSteamTex[] = dgFreezardSteamTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gFreezardSteamTex[] = dgFreezardSteamTex; + +#endif // OBJECTS_OBJECT_FZ_H diff --git a/soh/assets/objects/object_ganon/object_ganon.h b/soh/assets/objects/object_ganon/object_ganon.h index 0f88ced7c..727257723 100644 --- a/soh/assets/objects/object_ganon/object_ganon.h +++ b/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" @@ -183,4 +184,7 @@ static const ALIGN_ASSET(2) char gGanondorfTitleCardTex[] = dgGanondorfTitleCard static const ALIGN_ASSET(2) char gGanondorfEndingFloatAnim[] = dgGanondorfEndingFloatAnim; #define dgGanondorfSkel "__OTR__objects/object_ganon/gGanondorfSkel" -static const ALIGN_ASSET(2) char gGanondorfSkel[] = dgGanondorfSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanondorfSkel[] = dgGanondorfSkel; + + +#endif // OBJECTS_OBJECT_GANON_H diff --git a/soh/assets/objects/object_ganon2/object_ganon2.h b/soh/assets/objects/object_ganon2/object_ganon2.h index 2e81aa125..ff59583fd 100644 --- a/soh/assets/objects/object_ganon2/object_ganon2.h +++ b/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" @@ -324,4 +325,7 @@ static const ALIGN_ASSET(2) char gGanonDownedLoopAnim[] = dgGanonDownedLoopAnim; static const ALIGN_ASSET(2) char gGanonWalkAnim[] = dgGanonWalkAnim; #define dgGanonWalkToGuardAnim "__OTR__objects/object_ganon2/gGanonWalkToGuardAnim" -static const ALIGN_ASSET(2) char gGanonWalkToGuardAnim[] = dgGanonWalkToGuardAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanonWalkToGuardAnim[] = dgGanonWalkToGuardAnim; + + +#endif // OBJECTS_OBJECT_GANON2_H diff --git a/soh/assets/objects/object_ganon_anime1/object_ganon_anime1.h b/soh/assets/objects/object_ganon_anime1/object_ganon_anime1.h index 049dba81f..9dd922e87 100644 --- a/soh/assets/objects/object_ganon_anime1/object_ganon_anime1.h +++ b/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" @@ -75,4 +76,6 @@ static const ALIGN_ASSET(2) char gGanondorfChargeLightBallAnim[] = dgGanondorfCh static const ALIGN_ASSET(2) char gGanondorfVolleyLeftAnim[] = dgGanondorfVolleyLeftAnim; #define dgGanondorfVolleyRightAnim "__OTR__objects/object_ganon_anime1/gGanondorfVolleyRightAnim" -static const ALIGN_ASSET(2) char gGanondorfVolleyRightAnim[] = dgGanondorfVolleyRightAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanondorfVolleyRightAnim[] = dgGanondorfVolleyRightAnim; + +#endif // OBJECTS_OBJECT_GANON_ANIME1_H diff --git a/soh/assets/objects/object_ganon_anime2/object_ganon_anime2.h b/soh/assets/objects/object_ganon_anime2/object_ganon_anime2.h index 8e8b8dd0e..b1ad53104 100644 --- a/soh/assets/objects/object_ganon_anime2/object_ganon_anime2.h +++ b/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" @@ -51,4 +52,6 @@ static const ALIGN_ASSET(2) char gGanondorfDefeatedLoopAnim[] = dgGanondorfDefea static const ALIGN_ASSET(2) char gGanondorfYellStartAnim[] = dgGanondorfYellStartAnim; #define dgGanondorfYellLoopAnim "__OTR__objects/object_ganon_anime2/gGanondorfYellLoopAnim" -static const ALIGN_ASSET(2) char gGanondorfYellLoopAnim[] = dgGanondorfYellLoopAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanondorfYellLoopAnim[] = dgGanondorfYellLoopAnim; + +#endif // OBJECTS_OBJECT_GANON_ANIME2_H diff --git a/soh/assets/objects/object_ganon_anime3/object_ganon_anime3.h b/soh/assets/objects/object_ganon_anime3/object_ganon_anime3.h index a2fbbe594..bdcadaf8c 100644 --- a/soh/assets/objects/object_ganon_anime3/object_ganon_anime3.h +++ b/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" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gGanondorfShowTriforceLoopAnim[] = dgGanondorfS static const ALIGN_ASSET(2) char gGanonUncurlAndFlailAnim[] = dgGanonUncurlAndFlailAnim; #define dgGanonRoarAnim "__OTR__objects/object_ganon_anime3/gGanonRoarAnim" -static const ALIGN_ASSET(2) char gGanonRoarAnim[] = dgGanonRoarAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanonRoarAnim[] = dgGanonRoarAnim; + +#endif // OBJECTS_OBJECT_GANON_ANIME3_H diff --git a/soh/assets/objects/object_ganon_objects/object_ganon_objects.h b/soh/assets/objects/object_ganon_objects/object_ganon_objects.h index 2e770972a..e804484ae 100644 --- a/soh/assets/objects/object_ganon_objects/object_ganon_objects.h +++ b/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" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_ganon_objects_DL_0000C0[] = dobject_ganon_objects_DL_0000C0; #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; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ganon_objects_Tex_000170[] = dobject_ganon_objects_Tex_000170; + +#endif // OBJECTS_OBJECT_GANON_OBJECTS_H diff --git a/soh/assets/objects/object_ge1/object_ge1.h b/soh/assets/objects/object_ge1/object_ge1.h index 9f317029f..2de39c4e7 100644 --- a/soh/assets/objects/object_ge1/object_ge1.h +++ b/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" @@ -123,4 +124,7 @@ static const ALIGN_ASSET(2) char gGerudoWhiteIdleAnim[] = dgGerudoWhiteIdleAnim; static const ALIGN_ASSET(2) char gGerudoWhiteClapAnim[] = dgGerudoWhiteClapAnim; #define dgGerudoWhiteDismissiveAnim "__OTR__objects/object_ge1/gGerudoWhiteDismissiveAnim" -static const ALIGN_ASSET(2) char gGerudoWhiteDismissiveAnim[] = dgGerudoWhiteDismissiveAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGerudoWhiteDismissiveAnim[] = dgGerudoWhiteDismissiveAnim; + + +#endif // OBJECTS_OBJECT_GE1_H diff --git a/soh/assets/objects/object_geff/object_geff.h b/soh/assets/objects/object_geff/object_geff.h index a01aaaf2e..2c7ec331b 100644 --- a/soh/assets/objects/object_geff/object_geff.h +++ b/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" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGanonRubbleInsideTex[] = dgGanonRubbleInsideTe static const ALIGN_ASSET(2) char gGanonRubbleOutsideTex[] = dgGanonRubbleOutsideTex; #define dgGanonRubbleDL "__OTR__objects/object_geff/gGanonRubbleDL" -static const ALIGN_ASSET(2) char gGanonRubbleDL[] = dgGanonRubbleDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanonRubbleDL[] = dgGanonRubbleDL; + +#endif // OBJECTS_OBJECT_GEFF_H diff --git a/soh/assets/objects/object_geldb/object_geldb.h b/soh/assets/objects/object_geldb/object_geldb.h index 1da62e3fb..169277a70 100644 --- a/soh/assets/objects/object_geldb/object_geldb.h +++ b/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" @@ -156,4 +157,6 @@ static const ALIGN_ASSET(2) char object_geldbTex_002B80[] = dobject_geldbTex_002 static const ALIGN_ASSET(2) char object_geldbTex_0064E8[] = dobject_geldbTex_0064E8; #define dobject_geldbTex_006568 "__OTR__objects/object_geldb/object_geldbTex_006568" -static const ALIGN_ASSET(2) char object_geldbTex_006568[] = dobject_geldbTex_006568; \ No newline at end of file +static const ALIGN_ASSET(2) char object_geldbTex_006568[] = dobject_geldbTex_006568; + +#endif // OBJECTS_OBJECT_GELDB_H diff --git a/soh/assets/objects/object_gi_arrow/object_gi_arrow.h b/soh/assets/objects/object_gi_arrow/object_gi_arrow.h index 3fe058384..afa509b6a 100644 --- a/soh/assets/objects/object_gi_arrow/object_gi_arrow.h +++ b/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" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiArrowSmallDL[] = dgGiArrowSmallDL; static const ALIGN_ASSET(2) char gGiArrowMediumDL[] = dgGiArrowMediumDL; #define dgGiArrowLargeDL "__OTR__objects/object_gi_arrow/gGiArrowLargeDL" -static const ALIGN_ASSET(2) char gGiArrowLargeDL[] = dgGiArrowLargeDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiArrowLargeDL[] = dgGiArrowLargeDL; + +#endif // OBJECTS_OBJECT_GI_ARROW_H diff --git a/soh/assets/objects/object_gi_arrowcase/object_gi_arrowcase.h b/soh/assets/objects/object_gi_arrowcase/object_gi_arrowcase.h index 3ff54e231..de7c05132 100644 --- a/soh/assets/objects/object_gi_arrowcase/object_gi_arrowcase.h +++ b/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" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gGiQuiver50OuterColorDL[] = dgGiQuiver50OuterCo static const ALIGN_ASSET(2) char gGiQuiverInnerDL[] = dgGiQuiverInnerDL; #define dgGiQuiverOuterDL "__OTR__objects/object_gi_arrowcase/gGiQuiverOuterDL" -static const ALIGN_ASSET(2) char gGiQuiverOuterDL[] = dgGiQuiverOuterDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiQuiverOuterDL[] = dgGiQuiverOuterDL; + +#endif // OBJECTS_OBJECT_GI_ARROWCASE_H diff --git a/soh/assets/objects/object_gi_bean/object_gi_bean.h b/soh/assets/objects/object_gi_bean/object_gi_bean.h index 92754077e..19984cf9f 100644 --- a/soh/assets/objects/object_gi_bean/object_gi_bean.h +++ b/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; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBeanDL[] = dgGiBeanDL; + +#endif // OBJECTS_OBJECT_GI_BEAN_H diff --git a/soh/assets/objects/object_gi_bomb_1/object_gi_bomb_1.h b/soh/assets/objects/object_gi_bomb_1/object_gi_bomb_1.h index 623ad1942..82791d2ed 100644 --- a/soh/assets/objects/object_gi_bomb_1/object_gi_bomb_1.h +++ b/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; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBombDL[] = dgGiBombDL; + +#endif // OBJECTS_OBJECT_GI_BOMB_1_H diff --git a/soh/assets/objects/object_gi_bomb_2/object_gi_bomb_2.h b/soh/assets/objects/object_gi_bomb_2/object_gi_bomb_2.h index 86de8f01a..95d9a9bef 100644 --- a/soh/assets/objects/object_gi_bomb_2/object_gi_bomb_2.h +++ b/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; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBombchuDL[] = dgGiBombchuDL; + +#endif // OBJECTS_OBJECT_GI_BOMB_2_H diff --git a/soh/assets/objects/object_gi_bombpouch/object_gi_bombpouch.h b/soh/assets/objects/object_gi_bombpouch/object_gi_bombpouch.h index dc7c86439..925fd09ae 100644 --- a/soh/assets/objects/object_gi_bombpouch/object_gi_bombpouch.h +++ b/soh/assets/objects/object_gi_bombpouch/object_gi_bombpouch.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BOMBPOUCH_H +#define OBJECTS_OBJECT_GI_BOMBPOUCH_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gGiBombBag40RingColorDL[] = dgGiBombBag40RingCo static const ALIGN_ASSET(2) char gGiBombBagDL[] = dgGiBombBagDL; #define dgGiBombBagRingDL "__OTR__objects/object_gi_bombpouch/gGiBombBagRingDL" -static const ALIGN_ASSET(2) char gGiBombBagRingDL[] = dgGiBombBagRingDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBombBagRingDL[] = dgGiBombBagRingDL; + +#endif // OBJECTS_OBJECT_GI_BOMBPOUCH_H diff --git a/soh/assets/objects/object_gi_boomerang/object_gi_boomerang.h b/soh/assets/objects/object_gi_boomerang/object_gi_boomerang.h index 6bec42515..e7a566a7e 100644 --- a/soh/assets/objects/object_gi_boomerang/object_gi_boomerang.h +++ b/soh/assets/objects/object_gi_boomerang/object_gi_boomerang.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BOOMERANG_H +#define OBJECTS_OBJECT_GI_BOOMERANG_H 1 #include "align_asset_macro.h" #define dgGiBoomerangDL "__OTR__objects/object_gi_boomerang/gGiBoomerangDL" -static const ALIGN_ASSET(2) char gGiBoomerangDL[] = dgGiBoomerangDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBoomerangDL[] = dgGiBoomerangDL; + +#endif // OBJECTS_OBJECT_GI_BOOMERANG_H diff --git a/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h b/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h index 7dbbcfd02..c7cb14d3b 100644 --- a/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h +++ b/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BOOTS_2_H +#define OBJECTS_OBJECT_GI_BOOTS_2_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiIronBootsDL[] = dgGiIronBootsDL; static const ALIGN_ASSET(2) char gGiIronBootsRivetsDL[] = dgGiIronBootsRivetsDL; #define dobject_gi_boots_2Tex_000000 "__OTR__objects/object_gi_boots_2/object_gi_boots_2Tex_000000" -static const ALIGN_ASSET(2) char object_gi_boots_2Tex_000000[] = dobject_gi_boots_2Tex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_boots_2Tex_000000[] = dobject_gi_boots_2Tex_000000; + +#endif // OBJECTS_OBJECT_GI_BOOTS_2_H diff --git a/soh/assets/objects/object_gi_bosskey/object_gi_bosskey.h b/soh/assets/objects/object_gi_bosskey/object_gi_bosskey.h index 85f565241..73b0d91b2 100644 --- a/soh/assets/objects/object_gi_bosskey/object_gi_bosskey.h +++ b/soh/assets/objects/object_gi_bosskey/object_gi_bosskey.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BOSSKEY_H +#define OBJECTS_OBJECT_GI_BOSSKEY_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiBossKeyDL[] = dgGiBossKeyDL; #define dgGiBossKeyGemDL "__OTR__objects/object_gi_bosskey/gGiBossKeyGemDL" -static const ALIGN_ASSET(2) char gGiBossKeyGemDL[] = dgGiBossKeyGemDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBossKeyGemDL[] = dgGiBossKeyGemDL; + +#endif // OBJECTS_OBJECT_GI_BOSSKEY_H diff --git a/soh/assets/objects/object_gi_bottle/object_gi_bottle.h b/soh/assets/objects/object_gi_bottle/object_gi_bottle.h index ba8a778ca..5aaa7f1c1 100644 --- a/soh/assets/objects/object_gi_bottle/object_gi_bottle.h +++ b/soh/assets/objects/object_gi_bottle/object_gi_bottle.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BOTTLE_H +#define OBJECTS_OBJECT_GI_BOTTLE_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiBottleStopperDL[] = dgGiBottleStopperDL; #define dgGiBottleDL "__OTR__objects/object_gi_bottle/gGiBottleDL" -static const ALIGN_ASSET(2) char gGiBottleDL[] = dgGiBottleDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBottleDL[] = dgGiBottleDL; + +#endif // OBJECTS_OBJECT_GI_BOTTLE_H diff --git a/soh/assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.h b/soh/assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.h index ca2a5f8c0..c6ca44fbe 100644 --- a/soh/assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.h +++ b/soh/assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BOTTLE_LETTER_H +#define OBJECTS_OBJECT_GI_BOTTLE_LETTER_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiLetterBottleContentsDL[] = dgGiLetterBottleContentsDL; #define dgGiLetterBottleDL "__OTR__objects/object_gi_bottle_letter/gGiLetterBottleDL" -static const ALIGN_ASSET(2) char gGiLetterBottleDL[] = dgGiLetterBottleDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiLetterBottleDL[] = dgGiLetterBottleDL; + +#endif // OBJECTS_OBJECT_GI_BOTTLE_LETTER_H diff --git a/soh/assets/objects/object_gi_bow/object_gi_bow.h b/soh/assets/objects/object_gi_bow/object_gi_bow.h index 7ad8e7b1c..c14d55dcf 100644 --- a/soh/assets/objects/object_gi_bow/object_gi_bow.h +++ b/soh/assets/objects/object_gi_bow/object_gi_bow.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BOW_H +#define OBJECTS_OBJECT_GI_BOW_H 1 #include "align_asset_macro.h" #define dgGiBowDL "__OTR__objects/object_gi_bow/gGiBowDL" -static const ALIGN_ASSET(2) char gGiBowDL[] = dgGiBowDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBowDL[] = dgGiBowDL; + +#endif // OBJECTS_OBJECT_GI_BOW_H diff --git a/soh/assets/objects/object_gi_bracelet/object_gi_bracelet.h b/soh/assets/objects/object_gi_bracelet/object_gi_bracelet.h index 32f6f286c..e2af41c21 100644 --- a/soh/assets/objects/object_gi_bracelet/object_gi_bracelet.h +++ b/soh/assets/objects/object_gi_bracelet/object_gi_bracelet.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BRACELET_H +#define OBJECTS_OBJECT_GI_BRACELET_H 1 #include "align_asset_macro.h" #define dgGiGoronBraceletDL "__OTR__objects/object_gi_bracelet/gGiGoronBraceletDL" -static const ALIGN_ASSET(2) char gGiGoronBraceletDL[] = dgGiGoronBraceletDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiGoronBraceletDL[] = dgGiGoronBraceletDL; + +#endif // OBJECTS_OBJECT_GI_BRACELET_H diff --git a/soh/assets/objects/object_gi_brokensword/object_gi_brokensword.h b/soh/assets/objects/object_gi_brokensword/object_gi_brokensword.h index 0030219ed..a48cc1d58 100644 --- a/soh/assets/objects/object_gi_brokensword/object_gi_brokensword.h +++ b/soh/assets/objects/object_gi_brokensword/object_gi_brokensword.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BROKENSWORD_H +#define OBJECTS_OBJECT_GI_BROKENSWORD_H 1 #include "align_asset_macro.h" #define dgGiBrokenGoronSwordDL "__OTR__objects/object_gi_brokensword/gGiBrokenGoronSwordDL" -static const ALIGN_ASSET(2) char gGiBrokenGoronSwordDL[] = dgGiBrokenGoronSwordDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBrokenGoronSwordDL[] = dgGiBrokenGoronSwordDL; + +#endif // OBJECTS_OBJECT_GI_BROKENSWORD_H diff --git a/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h b/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h index 1365a02f0..f8936cfa7 100644 --- a/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h +++ b/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_BUTTERFLY_H +#define OBJECTS_OBJECT_GI_BUTTERFLY_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiButterflyContainerDL[] = dgGiButterflyContai static const ALIGN_ASSET(2) char gGiButterflyGlassDL[] = dgGiButterflyGlassDL; #define dobject_gi_butterflyTex_000000 "__OTR__objects/object_gi_butterfly/object_gi_butterflyTex_000000" -static const ALIGN_ASSET(2) char object_gi_butterflyTex_000000[] = dobject_gi_butterflyTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_butterflyTex_000000[] = dobject_gi_butterflyTex_000000; + +#endif // OBJECTS_OBJECT_GI_BUTTERFLY_H diff --git a/soh/assets/objects/object_gi_clothes/object_gi_clothes.h b/soh/assets/objects/object_gi_clothes/object_gi_clothes.h index 563e499b5..f9546b31f 100644 --- a/soh/assets/objects/object_gi_clothes/object_gi_clothes.h +++ b/soh/assets/objects/object_gi_clothes/object_gi_clothes.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_CLOTHES_H +#define OBJECTS_OBJECT_GI_CLOTHES_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gGiTunicCollarDL[] = dgGiTunicCollarDL; static const ALIGN_ASSET(2) char gGiTunicDL[] = dgGiTunicDL; #define dobject_gi_clothesTex_000000 "__OTR__objects/object_gi_clothes/object_gi_clothesTex_000000" -static const ALIGN_ASSET(2) char object_gi_clothesTex_000000[] = dobject_gi_clothesTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_clothesTex_000000[] = dobject_gi_clothesTex_000000; + +#endif // OBJECTS_OBJECT_GI_CLOTHES_H diff --git a/soh/assets/objects/object_gi_coin/object_gi_coin.h b/soh/assets/objects/object_gi_coin/object_gi_coin.h index 7e87f6bb2..63f978f5e 100644 --- a/soh/assets/objects/object_gi_coin/object_gi_coin.h +++ b/soh/assets/objects/object_gi_coin/object_gi_coin.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_COIN_H +#define OBJECTS_OBJECT_GI_COIN_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gGiBlueCoinColorDL[] = dgGiBlueCoinColorDL; static const ALIGN_ASSET(2) char gGiCoinDL[] = dgGiCoinDL; #define dgGiNDL "__OTR__objects/object_gi_coin/gGiNDL" -static const ALIGN_ASSET(2) char gGiNDL[] = dgGiNDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiNDL[] = dgGiNDL; + +#endif // OBJECTS_OBJECT_GI_COIN_H diff --git a/soh/assets/objects/object_gi_compass/object_gi_compass.h b/soh/assets/objects/object_gi_compass/object_gi_compass.h index 269aa960a..1aa8dea0a 100644 --- a/soh/assets/objects/object_gi_compass/object_gi_compass.h +++ b/soh/assets/objects/object_gi_compass/object_gi_compass.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_COMPASS_H +#define OBJECTS_OBJECT_GI_COMPASS_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiCompassDL[] = dgGiCompassDL; #define dgGiCompassGlassDL "__OTR__objects/object_gi_compass/gGiCompassGlassDL" -static const ALIGN_ASSET(2) char gGiCompassGlassDL[] = dgGiCompassGlassDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiCompassGlassDL[] = dgGiCompassGlassDL; + +#endif // OBJECTS_OBJECT_GI_COMPASS_H diff --git a/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h b/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h index 391710e95..c80b269e0 100644 --- a/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h +++ b/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_DEKUPOUCH_H +#define OBJECTS_OBJECT_GI_DEKUPOUCH_H 1 #include "align_asset_macro.h" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gGiBulletBagWritingDL[] = dgGiBulletBagWritingD static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000000[] = dobject_gi_dekupouchTex_000000; #define dobject_gi_dekupouchTex_000100 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000100" -static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000100[] = dobject_gi_dekupouchTex_000100; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000100[] = dobject_gi_dekupouchTex_000100; + +#endif // OBJECTS_OBJECT_GI_DEKUPOUCH_H diff --git a/soh/assets/objects/object_gi_egg/object_gi_egg.h b/soh/assets/objects/object_gi_egg/object_gi_egg.h index 569d3f9e3..f20b91c4d 100644 --- a/soh/assets/objects/object_gi_egg/object_gi_egg.h +++ b/soh/assets/objects/object_gi_egg/object_gi_egg.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_EGG_H +#define OBJECTS_OBJECT_GI_EGG_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiEggMaterialDL[] = dgGiEggMaterialDL; #define dgGiEggDL "__OTR__objects/object_gi_egg/gGiEggDL" -static const ALIGN_ASSET(2) char gGiEggDL[] = dgGiEggDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiEggDL[] = dgGiEggDL; + +#endif // OBJECTS_OBJECT_GI_EGG_H diff --git a/soh/assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.h b/soh/assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.h index 9a5ba02cf..b379f5c22 100644 --- a/soh/assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.h +++ b/soh/assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_EYE_LOTION_H +#define OBJECTS_OBJECT_GI_EYE_LOTION_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiEyeDropsCapDL[] = dgGiEyeDropsCapDL; #define dgGiEyeDropsBottleDL "__OTR__objects/object_gi_eye_lotion/gGiEyeDropsBottleDL" -static const ALIGN_ASSET(2) char gGiEyeDropsBottleDL[] = dgGiEyeDropsBottleDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiEyeDropsBottleDL[] = dgGiEyeDropsBottleDL; + +#endif // OBJECTS_OBJECT_GI_EYE_LOTION_H diff --git a/soh/assets/objects/object_gi_fire/object_gi_fire.h b/soh/assets/objects/object_gi_fire/object_gi_fire.h index 40fdf793d..f66f7a766 100644 --- a/soh/assets/objects/object_gi_fire/object_gi_fire.h +++ b/soh/assets/objects/object_gi_fire/object_gi_fire.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_FIRE_H +#define OBJECTS_OBJECT_GI_FIRE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gGiBlueFireFlameDL[] = dgGiBlueFireFlameDL; static const ALIGN_ASSET(2) char object_gi_fireTex_000000[] = dobject_gi_fireTex_000000; #define dobject_gi_fireTex_000200 "__OTR__objects/object_gi_fire/object_gi_fireTex_000200" -static const ALIGN_ASSET(2) char object_gi_fireTex_000200[] = dobject_gi_fireTex_000200; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_fireTex_000200[] = dobject_gi_fireTex_000200; + +#endif // OBJECTS_OBJECT_GI_FIRE_H diff --git a/soh/assets/objects/object_gi_fish/object_gi_fish.h b/soh/assets/objects/object_gi_fish/object_gi_fish.h index 3dd2cb3df..dfabcbb66 100644 --- a/soh/assets/objects/object_gi_fish/object_gi_fish.h +++ b/soh/assets/objects/object_gi_fish/object_gi_fish.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_FISH_H +#define OBJECTS_OBJECT_GI_FISH_H 1 #include "align_asset_macro.h" #define dgGiFishDL "__OTR__objects/object_gi_fish/gGiFishDL" -static const ALIGN_ASSET(2) char gGiFishDL[] = dgGiFishDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiFishDL[] = dgGiFishDL; + +#endif // OBJECTS_OBJECT_GI_FISH_H diff --git a/soh/assets/objects/object_gi_frog/object_gi_frog.h b/soh/assets/objects/object_gi_frog/object_gi_frog.h index 752d4aeb7..ba33d67b5 100644 --- a/soh/assets/objects/object_gi_frog/object_gi_frog.h +++ b/soh/assets/objects/object_gi_frog/object_gi_frog.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_FROG_H +#define OBJECTS_OBJECT_GI_FROG_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiFrogDL[] = dgGiFrogDL; static const ALIGN_ASSET(2) char gGiFrogEyesDL[] = dgGiFrogEyesDL; #define dobject_gi_frogTex_000000 "__OTR__objects/object_gi_frog/object_gi_frogTex_000000" -static const ALIGN_ASSET(2) char object_gi_frogTex_000000[] = dobject_gi_frogTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_frogTex_000000[] = dobject_gi_frogTex_000000; + +#endif // OBJECTS_OBJECT_GI_FROG_H diff --git a/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h b/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h index 258556943..fd05e9ff0 100644 --- a/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h +++ b/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GERUDO_H +#define OBJECTS_OBJECT_GI_GERUDO_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiGerudoCardDL[] = dgGiGerudoCardDL; #define dobject_gi_gerudoTex_000000 "__OTR__objects/object_gi_gerudo/object_gi_gerudoTex_000000" -static const ALIGN_ASSET(2) char object_gi_gerudoTex_000000[] = dobject_gi_gerudoTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_gerudoTex_000000[] = dobject_gi_gerudoTex_000000; + +#endif // OBJECTS_OBJECT_GI_GERUDO_H diff --git a/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h b/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h index 363ad2577..2eb6032b6 100644 --- a/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h +++ b/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GERUDOMASK_H +#define OBJECTS_OBJECT_GI_GERUDOMASK_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000248[] = dobject_gi_g static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000348[] = dobject_gi_gerudomaskTex_000348; #define dobject_gi_gerudomaskTex_000448 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTex_000448" -static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000448[] = dobject_gi_gerudomaskTex_000448; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000448[] = dobject_gi_gerudomaskTex_000448; + +#endif // OBJECTS_OBJECT_GI_GERUDOMASK_H diff --git a/soh/assets/objects/object_gi_ghost/object_gi_ghost.h b/soh/assets/objects/object_gi_ghost/object_gi_ghost.h index 9b084c871..e1cf7f924 100644 --- a/soh/assets/objects/object_gi_ghost/object_gi_ghost.h +++ b/soh/assets/objects/object_gi_ghost/object_gi_ghost.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GHOST_H +#define OBJECTS_OBJECT_GI_GHOST_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gGiGhostContainerContentsDL[] = dgGiGhostContai static const ALIGN_ASSET(2) char object_gi_ghostTex_000000[] = dobject_gi_ghostTex_000000; #define dobject_gi_ghostTex_000200 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000200" -static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200; + +#endif // OBJECTS_OBJECT_GI_GHOST_H diff --git a/soh/assets/objects/object_gi_glasses/object_gi_glasses.h b/soh/assets/objects/object_gi_glasses/object_gi_glasses.h index 6a01159b6..c8e761033 100644 --- a/soh/assets/objects/object_gi_glasses/object_gi_glasses.h +++ b/soh/assets/objects/object_gi_glasses/object_gi_glasses.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GLASSES_H +#define OBJECTS_OBJECT_GI_GLASSES_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiLensDL[] = dgGiLensDL; #define dgGiLensGlassDL "__OTR__objects/object_gi_glasses/gGiLensGlassDL" -static const ALIGN_ASSET(2) char gGiLensGlassDL[] = dgGiLensGlassDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiLensGlassDL[] = dgGiLensGlassDL; + +#endif // OBJECTS_OBJECT_GI_GLASSES_H diff --git a/soh/assets/objects/object_gi_gloves/object_gi_gloves.h b/soh/assets/objects/object_gi_gloves/object_gi_gloves.h index b481b91e2..f56225493 100644 --- a/soh/assets/objects/object_gi_gloves/object_gi_gloves.h +++ b/soh/assets/objects/object_gi_gloves/object_gi_gloves.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GLOVES_H +#define OBJECTS_OBJECT_GI_GLOVES_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gGiGauntletsDL[] = dgGiGauntletsDL; static const ALIGN_ASSET(2) char gGiGauntletsPlateDL[] = dgGiGauntletsPlateDL; #define dobject_gi_glovesTex_000000 "__OTR__objects/object_gi_gloves/object_gi_glovesTex_000000" -static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000; + +#endif // OBJECTS_OBJECT_GI_GLOVES_H diff --git a/soh/assets/objects/object_gi_goddess/object_gi_goddess.h b/soh/assets/objects/object_gi_goddess/object_gi_goddess.h index 126d7f214..651e83d8f 100644 --- a/soh/assets/objects/object_gi_goddess/object_gi_goddess.h +++ b/soh/assets/objects/object_gi_goddess/object_gi_goddess.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GODDESS_H +#define OBJECTS_OBJECT_GI_GODDESS_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gGiFaroresWindColorDL[] = dgGiFaroresWindColorD static const ALIGN_ASSET(2) char gGiNayrusLoveColorDL[] = dgGiNayrusLoveColorDL; #define dgGiMagicSpellOrbDL "__OTR__objects/object_gi_goddess/gGiMagicSpellOrbDL" -static const ALIGN_ASSET(2) char gGiMagicSpellOrbDL[] = dgGiMagicSpellOrbDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiMagicSpellOrbDL[] = dgGiMagicSpellOrbDL; + +#endif // OBJECTS_OBJECT_GI_GODDESS_H diff --git a/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h b/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h index b03715904..3e6dc1bcf 100644 --- a/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h +++ b/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GOLONMASK_H +#define OBJECTS_OBJECT_GI_GOLONMASK_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000248[] = dobject_gi_go static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000348[] = dobject_gi_golonmaskTex_000348; #define dobject_gi_golonmaskTex_000748 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTex_000748" -static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000748[] = dobject_gi_golonmaskTex_000748; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000748[] = dobject_gi_golonmaskTex_000748; + +#endif // OBJECTS_OBJECT_GI_GOLONMASK_H diff --git a/soh/assets/objects/object_gi_grass/object_gi_grass.h b/soh/assets/objects/object_gi_grass/object_gi_grass.h index c9b666002..c33b89368 100644 --- a/soh/assets/objects/object_gi_grass/object_gi_grass.h +++ b/soh/assets/objects/object_gi_grass/object_gi_grass.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_GRASS_H +#define OBJECTS_OBJECT_GI_GRASS_H 1 #include "align_asset_macro.h" #define dgGiGrassDL "__OTR__objects/object_gi_grass/gGiGrassDL" -static const ALIGN_ASSET(2) char gGiGrassDL[] = dgGiGrassDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiGrassDL[] = dgGiGrassDL; + +#endif // OBJECTS_OBJECT_GI_GRASS_H diff --git a/soh/assets/objects/object_gi_hammer/object_gi_hammer.h b/soh/assets/objects/object_gi_hammer/object_gi_hammer.h index 07f4090f0..bb6508549 100644 --- a/soh/assets/objects/object_gi_hammer/object_gi_hammer.h +++ b/soh/assets/objects/object_gi_hammer/object_gi_hammer.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_HAMMER_H +#define OBJECTS_OBJECT_GI_HAMMER_H 1 #include "align_asset_macro.h" #define dgGiHammerDL "__OTR__objects/object_gi_hammer/gGiHammerDL" -static const ALIGN_ASSET(2) char gGiHammerDL[] = dgGiHammerDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiHammerDL[] = dgGiHammerDL; + +#endif // OBJECTS_OBJECT_GI_HAMMER_H diff --git a/soh/assets/objects/object_gi_heart/object_gi_heart.h b/soh/assets/objects/object_gi_heart/object_gi_heart.h index dbbc31894..6ead6f6ae 100644 --- a/soh/assets/objects/object_gi_heart/object_gi_heart.h +++ b/soh/assets/objects/object_gi_heart/object_gi_heart.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_HEART_H +#define OBJECTS_OBJECT_GI_HEART_H 1 #include "align_asset_macro.h" #define dgGiRecoveryHeartDL "__OTR__objects/object_gi_heart/gGiRecoveryHeartDL" -static const ALIGN_ASSET(2) char gGiRecoveryHeartDL[] = dgGiRecoveryHeartDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiRecoveryHeartDL[] = dgGiRecoveryHeartDL; + +#endif // OBJECTS_OBJECT_GI_HEART_H diff --git a/soh/assets/objects/object_gi_hearts/object_gi_hearts.h b/soh/assets/objects/object_gi_hearts/object_gi_hearts.h index e0afa9977..eb9a015c1 100644 --- a/soh/assets/objects/object_gi_hearts/object_gi_hearts.h +++ b/soh/assets/objects/object_gi_hearts/object_gi_hearts.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_HEARTS_H +#define OBJECTS_OBJECT_GI_HEARTS_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiHeartBorderDL[] = dgGiHeartBorderDL; static const ALIGN_ASSET(2) char gGiHeartContainerDL[] = dgGiHeartContainerDL; #define dgGiHeartPieceDL "__OTR__objects/object_gi_hearts/gGiHeartPieceDL" -static const ALIGN_ASSET(2) char gGiHeartPieceDL[] = dgGiHeartPieceDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiHeartPieceDL[] = dgGiHeartPieceDL; + +#endif // OBJECTS_OBJECT_GI_HEARTS_H diff --git a/soh/assets/objects/object_gi_hookshot/object_gi_hookshot.h b/soh/assets/objects/object_gi_hookshot/object_gi_hookshot.h index 5f791fbf2..3de2bf9ea 100644 --- a/soh/assets/objects/object_gi_hookshot/object_gi_hookshot.h +++ b/soh/assets/objects/object_gi_hookshot/object_gi_hookshot.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_HOOKSHOT_H +#define OBJECTS_OBJECT_GI_HOOKSHOT_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiHookshotDL[] = dgGiHookshotDL; #define dgGiLongshotDL "__OTR__objects/object_gi_hookshot/gGiLongshotDL" -static const ALIGN_ASSET(2) char gGiLongshotDL[] = dgGiLongshotDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiLongshotDL[] = dgGiLongshotDL; + +#endif // OBJECTS_OBJECT_GI_HOOKSHOT_H diff --git a/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h b/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h index 5f3b25fbb..9c1558700 100644 --- a/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h +++ b/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_HOVERBOOTS_H +#define OBJECTS_OBJECT_GI_HOVERBOOTS_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiHoverBootsDL[] = dgGiHoverBootsDL; static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000300[] = dobject_gi_hoverbootsTex_000300; #define dobject_gi_hoverbootsTex_000000 "__OTR__objects/object_gi_hoverboots/object_gi_hoverbootsTex_000000" -static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000000[] = dobject_gi_hoverbootsTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000000[] = dobject_gi_hoverbootsTex_000000; + +#endif // OBJECTS_OBJECT_GI_HOVERBOOTS_H diff --git a/soh/assets/objects/object_gi_insect/object_gi_insect.h b/soh/assets/objects/object_gi_insect/object_gi_insect.h index 6392a366a..01deece93 100644 --- a/soh/assets/objects/object_gi_insect/object_gi_insect.h +++ b/soh/assets/objects/object_gi_insect/object_gi_insect.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_INSECT_H +#define OBJECTS_OBJECT_GI_INSECT_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiBugsContainerDL[] = dgGiBugsContainerDL; #define dgGiBugsGlassDL "__OTR__objects/object_gi_insect/gGiBugsGlassDL" -static const ALIGN_ASSET(2) char gGiBugsGlassDL[] = dgGiBugsGlassDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBugsGlassDL[] = dgGiBugsGlassDL; + +#endif // OBJECTS_OBJECT_GI_INSECT_H diff --git a/soh/assets/objects/object_gi_jewel/object_gi_jewel.h b/soh/assets/objects/object_gi_jewel/object_gi_jewel.h index 100dac543..0edf5030e 100644 --- a/soh/assets/objects/object_gi_jewel/object_gi_jewel.h +++ b/soh/assets/objects/object_gi_jewel/object_gi_jewel.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_JEWEL_H +#define OBJECTS_OBJECT_GI_JEWEL_H 1 #include "align_asset_macro.h" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gGiZoraSapphireScintillationTex[] = dgGiZoraSap static const ALIGN_ASSET(2) char gGiZoraSapphireSettingDL[] = dgGiZoraSapphireSettingDL; #define dgGiZoraSapphireGemDL "__OTR__objects/object_gi_jewel/gGiZoraSapphireGemDL" -static const ALIGN_ASSET(2) char gGiZoraSapphireGemDL[] = dgGiZoraSapphireGemDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiZoraSapphireGemDL[] = dgGiZoraSapphireGemDL; + +#endif // OBJECTS_OBJECT_GI_JEWEL_H diff --git a/soh/assets/objects/object_gi_key/object_gi_key.h b/soh/assets/objects/object_gi_key/object_gi_key.h index a8b82ffa8..bc7348811 100644 --- a/soh/assets/objects/object_gi_key/object_gi_key.h +++ b/soh/assets/objects/object_gi_key/object_gi_key.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_KEY_H +#define OBJECTS_OBJECT_GI_KEY_H 1 #include "align_asset_macro.h" #define dgGiSmallKeyDL "__OTR__objects/object_gi_key/gGiSmallKeyDL" -static const ALIGN_ASSET(2) char gGiSmallKeyDL[] = dgGiSmallKeyDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSmallKeyDL[] = dgGiSmallKeyDL; + +#endif // OBJECTS_OBJECT_GI_KEY_H diff --git a/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h b/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h index 92e75b104..3a7e897ea 100644 --- a/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h +++ b/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_KI_TAN_MASK_H +#define OBJECTS_OBJECT_GI_KI_TAN_MASK_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiKeatonMaskDL[] = dgGiKeatonMaskDL; static const ALIGN_ASSET(2) char gGiKeatonMaskEyesDL[] = dgGiKeatonMaskEyesDL; #define dobject_gi_ki_tan_maskTex_000000 "__OTR__objects/object_gi_ki_tan_mask/object_gi_ki_tan_maskTex_000000" -static const ALIGN_ASSET(2) char object_gi_ki_tan_maskTex_000000[] = dobject_gi_ki_tan_maskTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_ki_tan_maskTex_000000[] = dobject_gi_ki_tan_maskTex_000000; + +#endif // OBJECTS_OBJECT_GI_KI_TAN_MASK_H diff --git a/soh/assets/objects/object_gi_letter/object_gi_letter.h b/soh/assets/objects/object_gi_letter/object_gi_letter.h index af3de1bdd..cc813ce0c 100644 --- a/soh/assets/objects/object_gi_letter/object_gi_letter.h +++ b/soh/assets/objects/object_gi_letter/object_gi_letter.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_LETTER_H +#define OBJECTS_OBJECT_GI_LETTER_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gGiLetterWritingDL[] = dgGiLetterWritingDL; static const ALIGN_ASSET(2) char object_gi_letterTex_000000[] = dobject_gi_letterTex_000000; #define dobject_gi_letterTex_000600 "__OTR__objects/object_gi_letter/object_gi_letterTex_000600" -static const ALIGN_ASSET(2) char object_gi_letterTex_000600[] = dobject_gi_letterTex_000600; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_letterTex_000600[] = dobject_gi_letterTex_000600; + +#endif // OBJECTS_OBJECT_GI_LETTER_H diff --git a/soh/assets/objects/object_gi_liquid/object_gi_liquid.h b/soh/assets/objects/object_gi_liquid/object_gi_liquid.h index d2747b406..533a96f84 100644 --- a/soh/assets/objects/object_gi_liquid/object_gi_liquid.h +++ b/soh/assets/objects/object_gi_liquid/object_gi_liquid.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_LIQUID_H +#define OBJECTS_OBJECT_GI_LIQUID_H 1 #include "align_asset_macro.h" @@ -45,4 +46,6 @@ static const ALIGN_ASSET(2) char object_gi_liquidTex_000000[] = dobject_gi_liqui static const ALIGN_ASSET(2) char object_gi_liquidTex_000200[] = dobject_gi_liquidTex_000200; #define dobject_gi_liquidTex_000400 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000400" -static const ALIGN_ASSET(2) char object_gi_liquidTex_000400[] = dobject_gi_liquidTex_000400; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_liquidTex_000400[] = dobject_gi_liquidTex_000400; + +#endif // OBJECTS_OBJECT_GI_LIQUID_H diff --git a/soh/assets/objects/object_gi_longsword/object_gi_longsword.h b/soh/assets/objects/object_gi_longsword/object_gi_longsword.h index 754dad9d7..51d4ca69b 100644 --- a/soh/assets/objects/object_gi_longsword/object_gi_longsword.h +++ b/soh/assets/objects/object_gi_longsword/object_gi_longsword.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_LONGSWORD_H +#define OBJECTS_OBJECT_GI_LONGSWORD_H 1 #include "align_asset_macro.h" #define dgGiBiggoronSwordDL "__OTR__objects/object_gi_longsword/gGiBiggoronSwordDL" -static const ALIGN_ASSET(2) char gGiBiggoronSwordDL[] = dgGiBiggoronSwordDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiBiggoronSwordDL[] = dgGiBiggoronSwordDL; + +#endif // OBJECTS_OBJECT_GI_LONGSWORD_H diff --git a/soh/assets/objects/object_gi_m_arrow/object_gi_m_arrow.h b/soh/assets/objects/object_gi_m_arrow/object_gi_m_arrow.h index 6ee91f5e7..8b7fadf9a 100644 --- a/soh/assets/objects/object_gi_m_arrow/object_gi_m_arrow.h +++ b/soh/assets/objects/object_gi_m_arrow/object_gi_m_arrow.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_M_ARROW_H +#define OBJECTS_OBJECT_GI_M_ARROW_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gGiIceArrowColorDL[] = dgGiIceArrowColorDL; static const ALIGN_ASSET(2) char gGiLightArrowColorDL[] = dgGiLightArrowColorDL; #define dgGiArrowMagicDL "__OTR__objects/object_gi_m_arrow/gGiArrowMagicDL" -static const ALIGN_ASSET(2) char gGiArrowMagicDL[] = dgGiArrowMagicDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiArrowMagicDL[] = dgGiArrowMagicDL; + +#endif // OBJECTS_OBJECT_GI_M_ARROW_H diff --git a/soh/assets/objects/object_gi_magicpot/object_gi_magicpot.h b/soh/assets/objects/object_gi_magicpot/object_gi_magicpot.h index 8323ff862..eee44bfb7 100644 --- a/soh/assets/objects/object_gi_magicpot/object_gi_magicpot.h +++ b/soh/assets/objects/object_gi_magicpot/object_gi_magicpot.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_MAGICPOT_H +#define OBJECTS_OBJECT_GI_MAGICPOT_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiMagicJarSmallDL[] = dgGiMagicJarSmallDL; #define dgGiMagicJarLargeDL "__OTR__objects/object_gi_magicpot/gGiMagicJarLargeDL" -static const ALIGN_ASSET(2) char gGiMagicJarLargeDL[] = dgGiMagicJarLargeDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiMagicJarLargeDL[] = dgGiMagicJarLargeDL; + +#endif // OBJECTS_OBJECT_GI_MAGICPOT_H diff --git a/soh/assets/objects/object_gi_map/object_gi_map.h b/soh/assets/objects/object_gi_map/object_gi_map.h index 2408fe1c8..c4ecee7e9 100644 --- a/soh/assets/objects/object_gi_map/object_gi_map.h +++ b/soh/assets/objects/object_gi_map/object_gi_map.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_MAP_H +#define OBJECTS_OBJECT_GI_MAP_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiDungeonMapDL[] = dgGiDungeonMapDL; static const ALIGN_ASSET(2) char gGiStoneOfAgonyDL[] = dgGiStoneOfAgonyDL; #define dobject_gi_mapTex_000D60 "__OTR__objects/object_gi_map/object_gi_mapTex_000D60" -static const ALIGN_ASSET(2) char object_gi_mapTex_000D60[] = dobject_gi_mapTex_000D60; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_mapTex_000D60[] = dobject_gi_mapTex_000D60; + +#endif // OBJECTS_OBJECT_GI_MAP_H diff --git a/soh/assets/objects/object_gi_medal/object_gi_medal.h b/soh/assets/objects/object_gi_medal/object_gi_medal.h index 5115b280e..3aa7c8005 100644 --- a/soh/assets/objects/object_gi_medal/object_gi_medal.h +++ b/soh/assets/objects/object_gi_medal/object_gi_medal.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_MEDAL_H +#define OBJECTS_OBJECT_GI_MEDAL_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gGiSpiritMedallionFaceDL[] = dgGiSpiritMedallio static const ALIGN_ASSET(2) char gGiShadowMedallionFaceDL[] = dgGiShadowMedallionFaceDL; #define dgGiLightMedallionFaceDL "__OTR__objects/object_gi_medal/gGiLightMedallionFaceDL" -static const ALIGN_ASSET(2) char gGiLightMedallionFaceDL[] = dgGiLightMedallionFaceDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiLightMedallionFaceDL[] = dgGiLightMedallionFaceDL; + +#endif // OBJECTS_OBJECT_GI_MEDAL_H diff --git a/soh/assets/objects/object_gi_melody/object_gi_melody.h b/soh/assets/objects/object_gi_melody/object_gi_melody.h index 80aa67346..0c1c34dcb 100644 --- a/soh/assets/objects/object_gi_melody/object_gi_melody.h +++ b/soh/assets/objects/object_gi_melody/object_gi_melody.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_MELODY_H +#define OBJECTS_OBJECT_GI_MELODY_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gGiNocturneColorDL[] = dgGiNocturneColorDL; static const ALIGN_ASSET(2) char gGiPreludeColorDL[] = dgGiPreludeColorDL; #define dgGiSongNoteDL "__OTR__objects/object_gi_melody/gGiSongNoteDL" -static const ALIGN_ASSET(2) char gGiSongNoteDL[] = dgGiSongNoteDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSongNoteDL[] = dgGiSongNoteDL; + +#endif // OBJECTS_OBJECT_GI_MELODY_H diff --git a/soh/assets/objects/object_gi_milk/object_gi_milk.h b/soh/assets/objects/object_gi_milk/object_gi_milk.h index eee577fab..3b6bb4d21 100644 --- a/soh/assets/objects/object_gi_milk/object_gi_milk.h +++ b/soh/assets/objects/object_gi_milk/object_gi_milk.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_MILK_H +#define OBJECTS_OBJECT_GI_MILK_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiMilkBottleContentsDL[] = dgGiMilkBottleConte static const ALIGN_ASSET(2) char gGiMilkBottleDL[] = dgGiMilkBottleDL; #define dobject_gi_milkTex_000000 "__OTR__objects/object_gi_milk/object_gi_milkTex_000000" -static const ALIGN_ASSET(2) char object_gi_milkTex_000000[] = dobject_gi_milkTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_milkTex_000000[] = dobject_gi_milkTex_000000; + +#endif // OBJECTS_OBJECT_GI_MILK_H diff --git a/soh/assets/objects/object_gi_mushroom/object_gi_mushroom.h b/soh/assets/objects/object_gi_mushroom/object_gi_mushroom.h index 623f515ae..31b7a7a5e 100644 --- a/soh/assets/objects/object_gi_mushroom/object_gi_mushroom.h +++ b/soh/assets/objects/object_gi_mushroom/object_gi_mushroom.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_MUSHROOM_H +#define OBJECTS_OBJECT_GI_MUSHROOM_H 1 #include "align_asset_macro.h" #define dgGiOddMushroomDL "__OTR__objects/object_gi_mushroom/gGiOddMushroomDL" -static const ALIGN_ASSET(2) char gGiOddMushroomDL[] = dgGiOddMushroomDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiOddMushroomDL[] = dgGiOddMushroomDL; + +#endif // OBJECTS_OBJECT_GI_MUSHROOM_H diff --git a/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h b/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h index e60b5ba18..1a8a63a0e 100644 --- a/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h +++ b/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_NIWATORI_H +#define OBJECTS_OBJECT_GI_NIWATORI_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gGiChickenEyesDL[] = dgGiChickenEyesDL; static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000000[] = dobject_gi_niwatoriTex_000000; #define dobject_gi_niwatoriTex_000800 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000800" -static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800; + +#endif // OBJECTS_OBJECT_GI_NIWATORI_H diff --git a/soh/assets/objects/object_gi_nuts/object_gi_nuts.h b/soh/assets/objects/object_gi_nuts/object_gi_nuts.h index cdc86614e..e758b46fb 100644 --- a/soh/assets/objects/object_gi_nuts/object_gi_nuts.h +++ b/soh/assets/objects/object_gi_nuts/object_gi_nuts.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_NUTS_H +#define OBJECTS_OBJECT_GI_NUTS_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiNutDL[] = dgGiNutDL; #define dobject_gi_nutsTex_000000 "__OTR__objects/object_gi_nuts/object_gi_nutsTex_000000" -static const ALIGN_ASSET(2) char object_gi_nutsTex_000000[] = dobject_gi_nutsTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_nutsTex_000000[] = dobject_gi_nutsTex_000000; + +#endif // OBJECTS_OBJECT_GI_NUTS_H diff --git a/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h b/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h index 3998223d9..77efb0331 100644 --- a/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h +++ b/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_OCARINA_H +#define OBJECTS_OBJECT_GI_OCARINA_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiOcarinaTimeDL[] = dgGiOcarinaTimeDL; static const ALIGN_ASSET(2) char gGiOcarinaTimeHolesDL[] = dgGiOcarinaTimeHolesDL; #define dobject_gi_ocarinaTex_000000 "__OTR__objects/object_gi_ocarina/object_gi_ocarinaTex_000000" -static const ALIGN_ASSET(2) char object_gi_ocarinaTex_000000[] = dobject_gi_ocarinaTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_ocarinaTex_000000[] = dobject_gi_ocarinaTex_000000; + +#endif // OBJECTS_OBJECT_GI_OCARINA_H diff --git a/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h b/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h index 86d3d7e04..747a5ad6a 100644 --- a/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h +++ b/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_OCARINA_0_H +#define OBJECTS_OBJECT_GI_OCARINA_0_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiOcarinaFairyDL[] = dgGiOcarinaFairyDL; static const ALIGN_ASSET(2) char gGiOcarinaFairyHolesDL[] = dgGiOcarinaFairyHolesDL; #define dobject_gi_ocarina_0Tex_000000 "__OTR__objects/object_gi_ocarina_0/object_gi_ocarina_0Tex_000000" -static const ALIGN_ASSET(2) char object_gi_ocarina_0Tex_000000[] = dobject_gi_ocarina_0Tex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_ocarina_0Tex_000000[] = dobject_gi_ocarina_0Tex_000000; + +#endif // OBJECTS_OBJECT_GI_OCARINA_0_H diff --git a/soh/assets/objects/object_gi_pachinko/object_gi_pachinko.h b/soh/assets/objects/object_gi_pachinko/object_gi_pachinko.h index 95dc3869a..5bda1feb6 100644 --- a/soh/assets/objects/object_gi_pachinko/object_gi_pachinko.h +++ b/soh/assets/objects/object_gi_pachinko/object_gi_pachinko.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_PACHINKO_H +#define OBJECTS_OBJECT_GI_PACHINKO_H 1 #include "align_asset_macro.h" #define dgGiSlingshotDL "__OTR__objects/object_gi_pachinko/gGiSlingshotDL" -static const ALIGN_ASSET(2) char gGiSlingshotDL[] = dgGiSlingshotDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSlingshotDL[] = dgGiSlingshotDL; + +#endif // OBJECTS_OBJECT_GI_PACHINKO_H diff --git a/soh/assets/objects/object_gi_powder/object_gi_powder.h b/soh/assets/objects/object_gi_powder/object_gi_powder.h index bb996665e..96d656656 100644 --- a/soh/assets/objects/object_gi_powder/object_gi_powder.h +++ b/soh/assets/objects/object_gi_powder/object_gi_powder.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_POWDER_H +#define OBJECTS_OBJECT_GI_POWDER_H 1 #include "align_asset_macro.h" #define dgGiOddPotionDL "__OTR__objects/object_gi_powder/gGiOddPotionDL" -static const ALIGN_ASSET(2) char gGiOddPotionDL[] = dgGiOddPotionDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiOddPotionDL[] = dgGiOddPotionDL; + +#endif // OBJECTS_OBJECT_GI_POWDER_H diff --git a/soh/assets/objects/object_gi_prescription/object_gi_prescription.h b/soh/assets/objects/object_gi_prescription/object_gi_prescription.h index 247e2ffd1..249b89bf0 100644 --- a/soh/assets/objects/object_gi_prescription/object_gi_prescription.h +++ b/soh/assets/objects/object_gi_prescription/object_gi_prescription.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_PRESCRIPTION_H +#define OBJECTS_OBJECT_GI_PRESCRIPTION_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiPrescriptionDL[] = dgGiPrescriptionDL; static const ALIGN_ASSET(2) char gGiPrescriptionWritingDL[] = dgGiPrescriptionWritingDL; #define dobject_gi_prescriptionTex_000000 "__OTR__objects/object_gi_prescription/object_gi_prescriptionTex_000000" -static const ALIGN_ASSET(2) char object_gi_prescriptionTex_000000[] = dobject_gi_prescriptionTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_prescriptionTex_000000[] = dobject_gi_prescriptionTex_000000; + +#endif // OBJECTS_OBJECT_GI_PRESCRIPTION_H diff --git a/soh/assets/objects/object_gi_purse/object_gi_purse.h b/soh/assets/objects/object_gi_purse/object_gi_purse.h index ed1a96883..6949c7455 100644 --- a/soh/assets/objects/object_gi_purse/object_gi_purse.h +++ b/soh/assets/objects/object_gi_purse/object_gi_purse.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_PURSE_H +#define OBJECTS_OBJECT_GI_PURSE_H 1 #include "align_asset_macro.h" @@ -39,4 +40,6 @@ static const ALIGN_ASSET(2) char gGiWalletStringDL[] = dgGiWalletStringDL; static const ALIGN_ASSET(2) char gGiWalletRupeeInnerDL[] = dgGiWalletRupeeInnerDL; #define dobject_gi_purseTex_000000 "__OTR__objects/object_gi_purse/object_gi_purseTex_000000" -static const ALIGN_ASSET(2) char object_gi_purseTex_000000[] = dobject_gi_purseTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_purseTex_000000[] = dobject_gi_purseTex_000000; + +#endif // OBJECTS_OBJECT_GI_PURSE_H diff --git a/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h b/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h index ff148c7b7..575ba6706 100644 --- a/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h +++ b/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_RABIT_MASK_H +#define OBJECTS_OBJECT_GI_RABIT_MASK_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGiBunnyHoodDL[] = dgGiBunnyHoodDL; static const ALIGN_ASSET(2) char gGiBunnyHoodEyesDL[] = dgGiBunnyHoodEyesDL; #define dobject_gi_rabit_maskTex_000000 "__OTR__objects/object_gi_rabit_mask/object_gi_rabit_maskTex_000000" -static const ALIGN_ASSET(2) char object_gi_rabit_maskTex_000000[] = dobject_gi_rabit_maskTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_rabit_maskTex_000000[] = dobject_gi_rabit_maskTex_000000; + +#endif // OBJECTS_OBJECT_GI_RABIT_MASK_H diff --git a/soh/assets/objects/object_gi_redead_mask/object_gi_redead_mask.h b/soh/assets/objects/object_gi_redead_mask/object_gi_redead_mask.h index b88498432..0e61c3cfc 100644 --- a/soh/assets/objects/object_gi_redead_mask/object_gi_redead_mask.h +++ b/soh/assets/objects/object_gi_redead_mask/object_gi_redead_mask.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_REDEAD_MASK_H +#define OBJECTS_OBJECT_GI_REDEAD_MASK_H 1 #include "align_asset_macro.h" #define dgGiSpookyMaskDL "__OTR__objects/object_gi_redead_mask/gGiSpookyMaskDL" -static const ALIGN_ASSET(2) char gGiSpookyMaskDL[] = dgGiSpookyMaskDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSpookyMaskDL[] = dgGiSpookyMaskDL; + +#endif // OBJECTS_OBJECT_GI_REDEAD_MASK_H diff --git a/soh/assets/objects/object_gi_rupy/object_gi_rupy.h b/soh/assets/objects/object_gi_rupy/object_gi_rupy.h index a826db180..3c4503ab7 100644 --- a/soh/assets/objects/object_gi_rupy/object_gi_rupy.h +++ b/soh/assets/objects/object_gi_rupy/object_gi_rupy.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_RUPY_H +#define OBJECTS_OBJECT_GI_RUPY_H 1 #include "align_asset_macro.h" @@ -36,4 +37,6 @@ static const ALIGN_ASSET(2) char gGiGoldRupeeOuterColorDL[] = dgGiGoldRupeeOuter static const ALIGN_ASSET(2) char gGiRupeeInnerDL[] = dgGiRupeeInnerDL; #define dgGiRupeeOuterDL "__OTR__objects/object_gi_rupy/gGiRupeeOuterDL" -static const ALIGN_ASSET(2) char gGiRupeeOuterDL[] = dgGiRupeeOuterDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiRupeeOuterDL[] = dgGiRupeeOuterDL; + +#endif // OBJECTS_OBJECT_GI_RUPY_H diff --git a/soh/assets/objects/object_gi_saw/object_gi_saw.h b/soh/assets/objects/object_gi_saw/object_gi_saw.h index b012fecb3..cda5a82f1 100644 --- a/soh/assets/objects/object_gi_saw/object_gi_saw.h +++ b/soh/assets/objects/object_gi_saw/object_gi_saw.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SAW_H +#define OBJECTS_OBJECT_GI_SAW_H 1 #include "align_asset_macro.h" #define dgGiSawDL "__OTR__objects/object_gi_saw/gGiSawDL" -static const ALIGN_ASSET(2) char gGiSawDL[] = dgGiSawDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSawDL[] = dgGiSawDL; + +#endif // OBJECTS_OBJECT_GI_SAW_H diff --git a/soh/assets/objects/object_gi_scale/object_gi_scale.h b/soh/assets/objects/object_gi_scale/object_gi_scale.h index 325a7acdf..993079a4c 100644 --- a/soh/assets/objects/object_gi_scale/object_gi_scale.h +++ b/soh/assets/objects/object_gi_scale/object_gi_scale.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SCALE_H +#define OBJECTS_OBJECT_GI_SCALE_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gGiGoldenScaleColorDL[] = dgGiGoldenScaleColorD static const ALIGN_ASSET(2) char gGiScaleWaterDL[] = dgGiScaleWaterDL; #define dgGiScaleDL "__OTR__objects/object_gi_scale/gGiScaleDL" -static const ALIGN_ASSET(2) char gGiScaleDL[] = dgGiScaleDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiScaleDL[] = dgGiScaleDL; + +#endif // OBJECTS_OBJECT_GI_SCALE_H diff --git a/soh/assets/objects/object_gi_seed/object_gi_seed.h b/soh/assets/objects/object_gi_seed/object_gi_seed.h index 20420dc65..6ab218fbc 100644 --- a/soh/assets/objects/object_gi_seed/object_gi_seed.h +++ b/soh/assets/objects/object_gi_seed/object_gi_seed.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SEED_H +#define OBJECTS_OBJECT_GI_SEED_H 1 #include "align_asset_macro.h" #define dgGiSeedDL "__OTR__objects/object_gi_seed/gGiSeedDL" -static const ALIGN_ASSET(2) char gGiSeedDL[] = dgGiSeedDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSeedDL[] = dgGiSeedDL; + +#endif // OBJECTS_OBJECT_GI_SEED_H diff --git a/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h b/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h index c6cd49154..6c7e2c907 100644 --- a/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h +++ b/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SHIELD_1_H +#define OBJECTS_OBJECT_GI_SHIELD_1_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiDekuShieldDL[] = dgGiDekuShieldDL; #define dobject_gi_shield_1Tex_000000 "__OTR__objects/object_gi_shield_1/object_gi_shield_1Tex_000000" -static const ALIGN_ASSET(2) char object_gi_shield_1Tex_000000[] = dobject_gi_shield_1Tex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_shield_1Tex_000000[] = dobject_gi_shield_1Tex_000000; + +#endif // OBJECTS_OBJECT_GI_SHIELD_1_H diff --git a/soh/assets/objects/object_gi_shield_2/object_gi_shield_2.h b/soh/assets/objects/object_gi_shield_2/object_gi_shield_2.h index 26a66a6ce..f772ea7f4 100644 --- a/soh/assets/objects/object_gi_shield_2/object_gi_shield_2.h +++ b/soh/assets/objects/object_gi_shield_2/object_gi_shield_2.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SHIELD_2_H +#define OBJECTS_OBJECT_GI_SHIELD_2_H 1 #include "align_asset_macro.h" #define dgGiHylianShieldDL "__OTR__objects/object_gi_shield_2/gGiHylianShieldDL" -static const ALIGN_ASSET(2) char gGiHylianShieldDL[] = dgGiHylianShieldDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiHylianShieldDL[] = dgGiHylianShieldDL; + +#endif // OBJECTS_OBJECT_GI_SHIELD_2_H diff --git a/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h b/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h index dc7cdc4c0..81f8013c8 100644 --- a/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h +++ b/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SHIELD_3_H +#define OBJECTS_OBJECT_GI_SHIELD_3_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gGiMirrorShieldSymbolDL[] = dgGiMirrorShieldSym static const ALIGN_ASSET(2) char object_gi_shield_3Tex_000000[] = dobject_gi_shield_3Tex_000000; #define dobject_gi_shield_3Tex_000400 "__OTR__objects/object_gi_shield_3/object_gi_shield_3Tex_000400" -static const ALIGN_ASSET(2) char object_gi_shield_3Tex_000400[] = dobject_gi_shield_3Tex_000400; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_shield_3Tex_000400[] = dobject_gi_shield_3Tex_000400; + +#endif // OBJECTS_OBJECT_GI_SHIELD_3_H diff --git a/soh/assets/objects/object_gi_skj_mask/object_gi_skj_mask.h b/soh/assets/objects/object_gi_skj_mask/object_gi_skj_mask.h index b5909732b..7770c8282 100644 --- a/soh/assets/objects/object_gi_skj_mask/object_gi_skj_mask.h +++ b/soh/assets/objects/object_gi_skj_mask/object_gi_skj_mask.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SKJ_MASK_H +#define OBJECTS_OBJECT_GI_SKJ_MASK_H 1 #include "align_asset_macro.h" #define dgGiSkullMaskDL "__OTR__objects/object_gi_skj_mask/gGiSkullMaskDL" -static const ALIGN_ASSET(2) char gGiSkullMaskDL[] = dgGiSkullMaskDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSkullMaskDL[] = dgGiSkullMaskDL; + +#endif // OBJECTS_OBJECT_GI_SKJ_MASK_H diff --git a/soh/assets/objects/object_gi_soldout/object_gi_soldout.h b/soh/assets/objects/object_gi_soldout/object_gi_soldout.h index b5742a283..5aa035518 100644 --- a/soh/assets/objects/object_gi_soldout/object_gi_soldout.h +++ b/soh/assets/objects/object_gi_soldout/object_gi_soldout.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SOLDOUT_H +#define OBJECTS_OBJECT_GI_SOLDOUT_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiSoldOutDL[] = dgGiSoldOutDL; #define dobject_gi_soldoutTex_000000 "__OTR__objects/object_gi_soldout/object_gi_soldoutTex_000000" -static const ALIGN_ASSET(2) char object_gi_soldoutTex_000000[] = dobject_gi_soldoutTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_soldoutTex_000000[] = dobject_gi_soldoutTex_000000; + +#endif // OBJECTS_OBJECT_GI_SOLDOUT_H diff --git a/soh/assets/objects/object_gi_soul/object_gi_soul.h b/soh/assets/objects/object_gi_soul/object_gi_soul.h index bf902f40d..da5fcb74c 100644 --- a/soh/assets/objects/object_gi_soul/object_gi_soul.h +++ b/soh/assets/objects/object_gi_soul/object_gi_soul.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SOUL_H +#define OBJECTS_OBJECT_GI_SOUL_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gGiFairyContainerGlassDL[] = dgGiFairyContainer static const ALIGN_ASSET(2) char gGiFairyContainerContentsDL[] = dgGiFairyContainerContentsDL; #define dobject_gi_soulTex_000000 "__OTR__objects/object_gi_soul/object_gi_soulTex_000000" -static const ALIGN_ASSET(2) char object_gi_soulTex_000000[] = dobject_gi_soulTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_soulTex_000000[] = dobject_gi_soulTex_000000; + +#endif // OBJECTS_OBJECT_GI_SOUL_H diff --git a/soh/assets/objects/object_gi_stick/object_gi_stick.h b/soh/assets/objects/object_gi_stick/object_gi_stick.h index a8a3662d4..37ce29880 100644 --- a/soh/assets/objects/object_gi_stick/object_gi_stick.h +++ b/soh/assets/objects/object_gi_stick/object_gi_stick.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_STICK_H +#define OBJECTS_OBJECT_GI_STICK_H 1 #include "align_asset_macro.h" #define dgGiStickDL "__OTR__objects/object_gi_stick/gGiStickDL" -static const ALIGN_ASSET(2) char gGiStickDL[] = dgGiStickDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiStickDL[] = dgGiStickDL; + +#endif // OBJECTS_OBJECT_GI_STICK_H diff --git a/soh/assets/objects/object_gi_sutaru/object_gi_sutaru.h b/soh/assets/objects/object_gi_sutaru/object_gi_sutaru.h index 9cf23e05e..14ef40014 100644 --- a/soh/assets/objects/object_gi_sutaru/object_gi_sutaru.h +++ b/soh/assets/objects/object_gi_sutaru/object_gi_sutaru.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SUTARU_H +#define OBJECTS_OBJECT_GI_SUTARU_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGiSkulltulaTokenDL[] = dgGiSkulltulaTokenDL; #define dgGiSkulltulaTokenFlameDL "__OTR__objects/object_gi_sutaru/gGiSkulltulaTokenFlameDL" -static const ALIGN_ASSET(2) char gGiSkulltulaTokenFlameDL[] = dgGiSkulltulaTokenFlameDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiSkulltulaTokenFlameDL[] = dgGiSkulltulaTokenFlameDL; + +#endif // OBJECTS_OBJECT_GI_SUTARU_H diff --git a/soh/assets/objects/object_gi_sword_1/object_gi_sword_1.h b/soh/assets/objects/object_gi_sword_1/object_gi_sword_1.h index 4e8406499..d24de7c01 100644 --- a/soh/assets/objects/object_gi_sword_1/object_gi_sword_1.h +++ b/soh/assets/objects/object_gi_sword_1/object_gi_sword_1.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_SWORD_1_H +#define OBJECTS_OBJECT_GI_SWORD_1_H 1 #include "align_asset_macro.h" #define dgGiKokiriSwordDL "__OTR__objects/object_gi_sword_1/gGiKokiriSwordDL" -static const ALIGN_ASSET(2) char gGiKokiriSwordDL[] = dgGiKokiriSwordDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGiKokiriSwordDL[] = dgGiKokiriSwordDL; + +#endif // OBJECTS_OBJECT_GI_SWORD_1_H diff --git a/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h b/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h index cde1a35fe..ad02d89ce 100644 --- a/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h +++ b/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_TICKETSTONE_H +#define OBJECTS_OBJECT_GI_TICKETSTONE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gGiClaimCheckWritingDL[] = dgGiClaimCheckWritin static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000240[] = dobject_gi_ticketstoneTex_000240; #define dobject_gi_ticketstoneTex_000000 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000000" -static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000000[] = dobject_gi_ticketstoneTex_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000000[] = dobject_gi_ticketstoneTex_000000; + +#endif // OBJECTS_OBJECT_GI_TICKETSTONE_H diff --git a/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h b/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h index 647455535..bae7c2954 100644 --- a/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h +++ b/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_TRUTH_MASK_H +#define OBJECTS_OBJECT_GI_TRUTH_MASK_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gGiMaskOfTruthAccentsDL[] = dgGiMaskOfTruthAcce static const ALIGN_ASSET(2) char object_gi_truth_maskTex_000000[] = dobject_gi_truth_maskTex_000000; #define dobject_gi_truth_maskTex_000400 "__OTR__objects/object_gi_truth_mask/object_gi_truth_maskTex_000400" -static const ALIGN_ASSET(2) char object_gi_truth_maskTex_000400[] = dobject_gi_truth_maskTex_000400; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_truth_maskTex_000400[] = dobject_gi_truth_maskTex_000400; + +#endif // OBJECTS_OBJECT_GI_TRUTH_MASK_H diff --git a/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h b/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h index 80c44e1d9..fa17359cb 100644 --- a/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h +++ b/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GI_ZORAMASK_H +#define OBJECTS_OBJECT_GI_ZORAMASK_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000248[] = dobject_gi_zor static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000648[] = dobject_gi_zoramaskTex_000648; #define dobject_gi_zoramaskTex_000A48 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTex_000A48" -static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000A48[] = dobject_gi_zoramaskTex_000A48; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000A48[] = dobject_gi_zoramaskTex_000A48; + +#endif // OBJECTS_OBJECT_GI_ZORAMASK_H diff --git a/soh/assets/objects/object_gj/object_gj.h b/soh/assets/objects/object_gj/object_gj.h index 528753de7..a05b7a084 100644 --- a/soh/assets/objects/object_gj/object_gj.h +++ b/soh/assets/objects/object_gj/object_gj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GJ_H +#define OBJECTS_OBJECT_GJ_H 1 #include "align_asset_macro.h" @@ -87,4 +88,6 @@ static const ALIGN_ASSET(2) char object_gjTex_007320[] = dobject_gjTex_007320; static const ALIGN_ASSET(2) char object_gjTex_007720[] = dobject_gjTex_007720; #define dobject_gjTex_006F20 "__OTR__objects/object_gj/object_gjTex_006F20" -static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20; + +#endif // OBJECTS_OBJECT_GJ_H diff --git a/soh/assets/objects/object_gjyo_objects/object_gjyo_objects.h b/soh/assets/objects/object_gjyo_objects/object_gjyo_objects.h index ba7530ba2..630aa7ad1 100644 --- a/soh/assets/objects/object_gjyo_objects/object_gjyo_objects.h +++ b/soh/assets/objects/object_gjyo_objects/object_gjyo_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GJYO_OBJECTS_H +#define OBJECTS_OBJECT_GJYO_OBJECTS_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gRainbowBridgeTex[] = dgRainbowBridgeTex; static const ALIGN_ASSET(2) char gRainbowBridgeDL[] = dgRainbowBridgeDL; #define dgRainbowBridgeCol "__OTR__objects/object_gjyo_objects/gRainbowBridgeCol" -static const ALIGN_ASSET(2) char gRainbowBridgeCol[] = dgRainbowBridgeCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gRainbowBridgeCol[] = dgRainbowBridgeCol; + +#endif // OBJECTS_OBJECT_GJYO_OBJECTS_H diff --git a/soh/assets/objects/object_gla/object_gla.h b/soh/assets/objects/object_gla/object_gla.h index af330c64c..b59d088fb 100644 --- a/soh/assets/objects/object_gla/object_gla.h +++ b/soh/assets/objects/object_gla/object_gla.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GLA_H +#define OBJECTS_OBJECT_GLA_H 1 #include "align_asset_macro.h" @@ -138,4 +139,7 @@ static const ALIGN_ASSET(2) char gGerudoPurpleChargingAnim[] = dgGerudoPurpleCha static const ALIGN_ASSET(2) char gGerudoPurpleLookingAboutAnim[] = dgGerudoPurpleLookingAboutAnim; #define dgGerudoPurpleWalkingAnim "__OTR__objects/object_gla/gGerudoPurpleWalkingAnim" -static const ALIGN_ASSET(2) char gGerudoPurpleWalkingAnim[] = dgGerudoPurpleWalkingAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGerudoPurpleWalkingAnim[] = dgGerudoPurpleWalkingAnim; + + +#endif // OBJECTS_OBJECT_GLA_H diff --git a/soh/assets/objects/object_gm/object_gm.h b/soh/assets/objects/object_gm/object_gm.h index 6e8f1e4b5..def50a63c 100644 --- a/soh/assets/objects/object_gm/object_gm.h +++ b/soh/assets/objects/object_gm/object_gm.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GM_H +#define OBJECTS_OBJECT_GM_H 1 #include "align_asset_macro.h" #define dobject_gm_Anim_0002B8 "__OTR__objects/object_gm/object_gm_Anim_0002B8" -static const ALIGN_ASSET(2) char object_gm_Anim_0002B8[] = dobject_gm_Anim_0002B8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gm_Anim_0002B8[] = dobject_gm_Anim_0002B8; + +#endif // OBJECTS_OBJECT_GM_H diff --git a/soh/assets/objects/object_gnd/object_gnd.h b/soh/assets/objects/object_gnd/object_gnd.h index 989dda49b..ffad270fb 100644 --- a/soh/assets/objects/object_gnd/object_gnd.h +++ b/soh/assets/objects/object_gnd/object_gnd.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GND_H +#define OBJECTS_OBJECT_GND_H 1 #include "align_asset_macro.h" @@ -176,6 +177,9 @@ static const ALIGN_ASSET(2) char gPhantomGanonBarsDL[] = dgPhantomGanonBarsDL; #define dgPhantomGanonBarsCol "__OTR__objects/object_gnd/gPhantomGanonBarsCol" static const ALIGN_ASSET(2) char gPhantomGanonBarsCol[] = dgPhantomGanonBarsCol; +#define dobject_gndTex_012B50 "__OTR__objects/object_gnd/object_gndTex_012B50" +static const ALIGN_ASSET(2) char object_gndTex_012B50[] = dobject_gndTex_012B50; + #define dgPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0 "__OTR__objects/object_gnd/gPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0" static const ALIGN_ASSET(2) char gPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0[] = dgPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0; @@ -224,5 +228,5 @@ static const ALIGN_ASSET(2) char gPhantomGanonSkelLimbsLimb_00C694DL_009D68[] = #define dgPhantomGanonSkelLimbsLimb_00C6A0DL_009CA8 "__OTR__objects/object_gnd/gPhantomGanonSkelLimbsLimb_00C6A0DL_009CA8" static const ALIGN_ASSET(2) char gPhantomGanonSkelLimbsLimb_00C6A0DL_009CA8[] = dgPhantomGanonSkelLimbsLimb_00C6A0DL_009CA8; -#define dobject_gndTex_012B50 "__OTR__objects/object_gnd/object_gndTex_012B50" -static const ALIGN_ASSET(2) char object_gndTex_012B50[] = dobject_gndTex_012B50; \ No newline at end of file + +#endif // OBJECTS_OBJECT_GND_H diff --git a/soh/assets/objects/object_gnd_magic/object_gnd_magic.h b/soh/assets/objects/object_gnd_magic/object_gnd_magic.h index a75234e37..c3dc64d1e 100644 --- a/soh/assets/objects/object_gnd_magic/object_gnd_magic.h +++ b/soh/assets/objects/object_gnd_magic/object_gnd_magic.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GND_MAGIC_H +#define OBJECTS_OBJECT_GND_MAGIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char object_gnd_magic_Tex_000000[] = dobject_gnd_mag static const ALIGN_ASSET(2) char object_gnd_magic_Tex_000800[] = dobject_gnd_magic_Tex_000800; #define dobject_gnd_magic_DL_001190 "__OTR__objects/object_gnd_magic/object_gnd_magic_DL_001190" -static const ALIGN_ASSET(2) char object_gnd_magic_DL_001190[] = dobject_gnd_magic_DL_001190; \ No newline at end of file +static const ALIGN_ASSET(2) char object_gnd_magic_DL_001190[] = dobject_gnd_magic_DL_001190; + +#endif // OBJECTS_OBJECT_GND_MAGIC_H diff --git a/soh/assets/objects/object_gndd/object_gndd.h b/soh/assets/objects/object_gndd/object_gndd.h index c00fb856b..c733a8425 100644 --- a/soh/assets/objects/object_gndd/object_gndd.h +++ b/soh/assets/objects/object_gndd/object_gndd.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GNDD_H +#define OBJECTS_OBJECT_GNDD_H 1 #include "align_asset_macro.h" @@ -207,4 +208,7 @@ static const ALIGN_ASSET(2) char gYoungGanondorfFingerUndersideTex[] = dgYoungGa static const ALIGN_ASSET(2) char gYoungGanondorfFingernailTex[] = dgYoungGanondorfFingernailTex; #define dgYoungGanondorfSkel "__OTR__objects/object_gndd/gYoungGanondorfSkel" -static const ALIGN_ASSET(2) char gYoungGanondorfSkel[] = dgYoungGanondorfSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gYoungGanondorfSkel[] = dgYoungGanondorfSkel; + + +#endif // OBJECTS_OBJECT_GNDD_H diff --git a/soh/assets/objects/object_god_lgt/object_god_lgt.h b/soh/assets/objects/object_god_lgt/object_god_lgt.h index 91c7b3dcd..0f6536bd0 100644 --- a/soh/assets/objects/object_god_lgt/object_god_lgt.h +++ b/soh/assets/objects/object_god_lgt/object_god_lgt.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GOD_LGT_H +#define OBJECTS_OBJECT_GOD_LGT_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gGoldenGoddessAuraHeadTex[] = dgGoldenGoddessAu static const ALIGN_ASSET(2) char gGoldenGoddessAuraMaskTex[] = dgGoldenGoddessAuraMaskTex; #define dgGoldenGoddessBodyDL "__OTR__objects/object_god_lgt/gGoldenGoddessBodyDL" -static const ALIGN_ASSET(2) char gGoldenGoddessBodyDL[] = dgGoldenGoddessBodyDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoldenGoddessBodyDL[] = dgGoldenGoddessBodyDL; + +#endif // OBJECTS_OBJECT_GOD_LGT_H diff --git a/soh/assets/objects/object_gol/object_gol.h b/soh/assets/objects/object_gol/object_gol.h index 770ac548c..53c4908c9 100644 --- a/soh/assets/objects/object_gol/object_gol.h +++ b/soh/assets/objects/object_gol/object_gol.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GOL_H +#define OBJECTS_OBJECT_GOL_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char gObjectGolEyeWhiteTex[] = dgObjectGolEyeWhiteTe static const ALIGN_ASSET(2) char gObjectGolEyeIrisTex[] = dgObjectGolEyeIrisTex; #define dgObjectGolEggTex "__OTR__objects/object_gol/gObjectGolEggTex" -static const ALIGN_ASSET(2) char gObjectGolEggTex[] = dgObjectGolEggTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gObjectGolEggTex[] = dgObjectGolEggTex; + + +#endif // OBJECTS_OBJECT_GOL_H diff --git a/soh/assets/objects/object_goma/object_goma.h b/soh/assets/objects/object_goma/object_goma.h index 64468ff0e..f41f1d84a 100644 --- a/soh/assets/objects/object_goma/object_goma.h +++ b/soh/assets/objects/object_goma/object_goma.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GOMA_H +#define OBJECTS_OBJECT_GOMA_H 1 #include "align_asset_macro.h" @@ -195,4 +196,7 @@ static const ALIGN_ASSET(2) char gGohmaDoorDL[] = dgGohmaDoorDL; static const ALIGN_ASSET(2) char gGohmaDoorCol[] = dgGohmaDoorCol; #define dgGohmaDoorTex "__OTR__objects/object_goma/gGohmaDoorTex" -static const ALIGN_ASSET(2) char gGohmaDoorTex[] = dgGohmaDoorTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGohmaDoorTex[] = dgGohmaDoorTex; + + +#endif // OBJECTS_OBJECT_GOMA_H diff --git a/soh/assets/objects/object_goroiwa/object_goroiwa.h b/soh/assets/objects/object_goroiwa/object_goroiwa.h index 66d1b6407..6ecba0a4b 100644 --- a/soh/assets/objects/object_goroiwa/object_goroiwa.h +++ b/soh/assets/objects/object_goroiwa/object_goroiwa.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GOROIWA_H +#define OBJECTS_OBJECT_GOROIWA_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gRollingRockTex[] = dgRollingRockTex; #define dgRollingRockDL "__OTR__objects/object_goroiwa/gRollingRockDL" -static const ALIGN_ASSET(2) char gRollingRockDL[] = dgRollingRockDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gRollingRockDL[] = dgRollingRockDL; + +#endif // OBJECTS_OBJECT_GOROIWA_H diff --git a/soh/assets/objects/object_gr/object_gr.h b/soh/assets/objects/object_gr/object_gr.h index e71e2bfbd..d2f09cef2 100644 --- a/soh/assets/objects/object_gr/object_gr.h +++ b/soh/assets/objects/object_gr/object_gr.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GR_H +#define OBJECTS_OBJECT_GR_H 1 #include "align_asset_macro.h" @@ -114,4 +115,6 @@ static const ALIGN_ASSET(2) char object_grTex_005EF8[] = dobject_grTex_005EF8; static const ALIGN_ASSET(2) char object_grTex_0097F8[] = dobject_grTex_0097F8; #define dobject_grTex_009808 "__OTR__objects/object_gr/object_grTex_009808" -static const ALIGN_ASSET(2) char object_grTex_009808[] = dobject_grTex_009808; \ No newline at end of file +static const ALIGN_ASSET(2) char object_grTex_009808[] = dobject_grTex_009808; + +#endif // OBJECTS_OBJECT_GR_H diff --git a/soh/assets/objects/object_gs/object_gs.h b/soh/assets/objects/object_gs/object_gs.h index 17b6ee117..faa284c37 100644 --- a/soh/assets/objects/object_gs/object_gs.h +++ b/soh/assets/objects/object_gs/object_gs.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GS_H +#define OBJECTS_OBJECT_GS_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gGossipStoneMaterialDL[] = dgGossipStoneMateria static const ALIGN_ASSET(2) char gGossipStoneDL[] = dgGossipStoneDL; #define dgGossipStoneSquishedDL "__OTR__objects/object_gs/gGossipStoneSquishedDL" -static const ALIGN_ASSET(2) char gGossipStoneSquishedDL[] = dgGossipStoneSquishedDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gGossipStoneSquishedDL[] = dgGossipStoneSquishedDL; + +#endif // OBJECTS_OBJECT_GS_H diff --git a/soh/assets/objects/object_gt/object_gt.h b/soh/assets/objects/object_gt/object_gt.h index 72c9895f5..6573daa6c 100644 --- a/soh/assets/objects/object_gt/object_gt.h +++ b/soh/assets/objects/object_gt/object_gt.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_GT_H +#define OBJECTS_OBJECT_GT_H 1 #include "align_asset_macro.h" @@ -84,4 +85,6 @@ static const ALIGN_ASSET(2) char gTowerCollapseCsAlternativeWalkwayDL[] = dgTowe static const ALIGN_ASSET(2) char gTowerCollapseCsCollapsedStructureInnerCol[] = dgTowerCollapseCsCollapsedStructureInnerCol; #define dgTowerCollapseCsCollapsedStructureOuterCol "__OTR__objects/object_gt/gTowerCollapseCsCollapsedStructureOuterCol" -static const ALIGN_ASSET(2) char gTowerCollapseCsCollapsedStructureOuterCol[] = dgTowerCollapseCsCollapsedStructureOuterCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gTowerCollapseCsCollapsedStructureOuterCol[] = dgTowerCollapseCsCollapsedStructureOuterCol; + +#endif // OBJECTS_OBJECT_GT_H diff --git a/soh/assets/objects/object_haka/object_haka.h b/soh/assets/objects/object_haka/object_haka.h index a63ed90c9..55a9738cf 100644 --- a/soh/assets/objects/object_haka/object_haka.h +++ b/soh/assets/objects/object_haka/object_haka.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HAKA_H +#define OBJECTS_OBJECT_HAKA_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gGravestoneStoneDL[] = dgGravestoneStoneDL; static const ALIGN_ASSET(2) char gGravestoneEarthDL[] = dgGravestoneEarthDL; #define dgGravestoneCol "__OTR__objects/object_haka/gGravestoneCol" -static const ALIGN_ASSET(2) char gGravestoneCol[] = dgGravestoneCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gGravestoneCol[] = dgGravestoneCol; + +#endif // OBJECTS_OBJECT_HAKA_H diff --git a/soh/assets/objects/object_haka_door/object_haka_door.h b/soh/assets/objects/object_haka_door/object_haka_door.h index 93e489e2d..ba4cbf4b2 100644 --- a/soh/assets/objects/object_haka_door/object_haka_door.h +++ b/soh/assets/objects/object_haka_door/object_haka_door.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HAKA_DOOR_H +#define OBJECTS_OBJECT_HAKA_DOOR_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char object_haka_door_DL_002620[] = dobject_haka_doo static const ALIGN_ASSET(2) char object_haka_door_Tex_002700[] = dobject_haka_door_Tex_002700; #define dobject_haka_door_DL_003890 "__OTR__objects/object_haka_door/object_haka_door_DL_003890" -static const ALIGN_ASSET(2) char object_haka_door_DL_003890[] = dobject_haka_door_DL_003890; \ No newline at end of file +static const ALIGN_ASSET(2) char object_haka_door_DL_003890[] = dobject_haka_door_DL_003890; + +#endif // OBJECTS_OBJECT_HAKA_DOOR_H diff --git a/soh/assets/objects/object_haka_objects/object_haka_objects.h b/soh/assets/objects/object_haka_objects/object_haka_objects.h index 6a591d8ad..4055eec28 100644 --- a/soh/assets/objects/object_haka_objects/object_haka_objects.h +++ b/soh/assets/objects/object_haka_objects/object_haka_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HAKA_OBJECTS_H +#define OBJECTS_OBJECT_HAKA_OBJECTS_H 1 #include "align_asset_macro.h" @@ -243,4 +244,6 @@ static const ALIGN_ASSET(2) char object_haka_objects_Tex_01C470[] = dobject_haka static const ALIGN_ASSET(2) char object_haka_objects_Tex_01C670[] = dobject_haka_objects_Tex_01C670; #define dobject_haka_objects_Tex_01CEB0 "__OTR__objects/object_haka_objects/object_haka_objects_Tex_01CEB0" -static const ALIGN_ASSET(2) char object_haka_objects_Tex_01CEB0[] = dobject_haka_objects_Tex_01CEB0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_haka_objects_Tex_01CEB0[] = dobject_haka_objects_Tex_01CEB0; + +#endif // OBJECTS_OBJECT_HAKA_OBJECTS_H diff --git a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h index 608a804ce..caeaaf280 100644 --- a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h +++ b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HAKACH_OBJECTS_H +#define OBJECTS_OBJECT_HAKACH_OBJECTS_H 1 #include "align_asset_macro.h" @@ -69,4 +70,6 @@ static const ALIGN_ASSET(2) char gBotwTex_0058F0[] = dgBotwTex_0058F0; static const ALIGN_ASSET(2) char gBotwTex_0060F0[] = dgBotwTex_0060F0; #define dobject_hakach_objectsTex_0062F0 "__OTR__objects/object_hakach_objects/object_hakach_objectsTex_0062F0" -static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0; + +#endif // OBJECTS_OBJECT_HAKACH_OBJECTS_H diff --git a/soh/assets/objects/object_hata/object_hata.h b/soh/assets/objects/object_hata/object_hata.h index 36942480f..2af5b7bd4 100644 --- a/soh/assets/objects/object_hata/object_hata.h +++ b/soh/assets/objects/object_hata/object_hata.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HATA_H +#define OBJECTS_OBJECT_HATA_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char gFlagpolePoleTex[] = dgFlagpolePoleTex; static const ALIGN_ASSET(2) char gFlagpoleTopTex[] = dgFlagpoleTopTex; #define dgFlagpoleFlagTex "__OTR__objects/object_hata/gFlagpoleFlagTex" -static const ALIGN_ASSET(2) char gFlagpoleFlagTex[] = dgFlagpoleFlagTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gFlagpoleFlagTex[] = dgFlagpoleFlagTex; + + +#endif // OBJECTS_OBJECT_HATA_H diff --git a/soh/assets/objects/object_heavy_object/object_heavy_object.h b/soh/assets/objects/object_heavy_object/object_heavy_object.h index 879b1d418..96b75786d 100644 --- a/soh/assets/objects/object_heavy_object/object_heavy_object.h +++ b/soh/assets/objects/object_heavy_object/object_heavy_object.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HEAVY_OBJECT_H +#define OBJECTS_OBJECT_HEAVY_OBJECT_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gHeavyBlockBigPieceDL[] = dgHeavyBlockBigPieceD static const ALIGN_ASSET(2) char gHeavyBlockSmallPieceDL[] = dgHeavyBlockSmallPieceDL; #define dgHeavyBlockCol "__OTR__objects/object_heavy_object/gHeavyBlockCol" -static const ALIGN_ASSET(2) char gHeavyBlockCol[] = dgHeavyBlockCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gHeavyBlockCol[] = dgHeavyBlockCol; + +#endif // OBJECTS_OBJECT_HEAVY_OBJECT_H diff --git a/soh/assets/objects/object_hidan_objects/object_hidan_objects.h b/soh/assets/objects/object_hidan_objects/object_hidan_objects.h index 4c62edb8a..50bc08df1 100644 --- a/soh/assets/objects/object_hidan_objects/object_hidan_objects.h +++ b/soh/assets/objects/object_hidan_objects/object_hidan_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HIDAN_OBJECTS_H +#define OBJECTS_OBJECT_HIDAN_OBJECTS_H 1 #include "align_asset_macro.h" @@ -261,4 +262,6 @@ static const ALIGN_ASSET(2) char object_hidan_objectsTex_006E40[] = dobject_hida static const ALIGN_ASSET(2) char object_hidan_objectsTex_00FB20[] = dobject_hidan_objectsTex_00FB20; #define dobject_hidan_objectsTex_010D90 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_010D90" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_010D90[] = dobject_hidan_objectsTex_010D90; \ No newline at end of file +static const ALIGN_ASSET(2) char object_hidan_objectsTex_010D90[] = dobject_hidan_objectsTex_010D90; + +#endif // OBJECTS_OBJECT_HIDAN_OBJECTS_H diff --git a/soh/assets/objects/object_hintnuts/object_hintnuts.h b/soh/assets/objects/object_hintnuts/object_hintnuts.h index 1eb5ac6d0..59ea49111 100644 --- a/soh/assets/objects/object_hintnuts/object_hintnuts.h +++ b/soh/assets/objects/object_hintnuts/object_hintnuts.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HINTNUTS_H +#define OBJECTS_OBJECT_HINTNUTS_H 1 #include "align_asset_macro.h" @@ -38,6 +39,12 @@ static const ALIGN_ASSET(2) char gHintNutsFlowerDL[] = dgHintNutsFlowerDL; #define dgHintNutsNutDL "__OTR__objects/object_hintnuts/gHintNutsNutDL" static const ALIGN_ASSET(2) char gHintNutsNutDL[] = dgHintNutsNutDL; +#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8" +static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8; + +#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128" +static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128; + #define dgHintNutsSkelLimbsLimb_002328DL_000C68 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002328DL_000C68" static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002328DL_000C68[] = dgHintNutsSkelLimbsLimb_002328DL_000C68; @@ -65,12 +72,6 @@ static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_00237CDL_000E28[] = dgHi #define dgHintNutsSkelLimbsLimb_002388DL_000EC8 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002388DL_000EC8" static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002388DL_000EC8[] = dgHintNutsSkelLimbsLimb_002388DL_000EC8; -#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8" -static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8; - -#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128" -static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128; - #define dobject_hintnutsTex_001DA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001DA8" static const ALIGN_ASSET(2) char object_hintnutsTex_001DA8[] = dobject_hintnutsTex_001DA8; @@ -81,4 +82,6 @@ static const ALIGN_ASSET(2) char object_hintnutsTex_001FA8[] = dobject_hintnutsT static const ALIGN_ASSET(2) char object_hintnutsTex_002028[] = dobject_hintnutsTex_002028; #define dobject_hintnutsTex_0020A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0020A8" -static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8; + +#endif // OBJECTS_OBJECT_HINTNUTS_H diff --git a/soh/assets/objects/object_hni/object_hni.h b/soh/assets/objects/object_hni/object_hni.h index 7f4c9d06f..ce5296327 100644 --- a/soh/assets/objects/object_hni/object_hni.h +++ b/soh/assets/objects/object_hni/object_hni.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HNI_H +#define OBJECTS_OBJECT_HNI_H 1 #include "align_asset_macro.h" @@ -83,18 +84,6 @@ static const ALIGN_ASSET(2) char gHorseIngoGerudoSaddleFlapTex[] = dgHorseIngoGe #define dgHorseIngoEyeTex "__OTR__objects/object_hni/gHorseIngoEyeTex" static const ALIGN_ASSET(2) char gHorseIngoEyeTex[] = dgHorseIngoEyeTex; -#define dgHorseIngoSkelLimbsLimb_0047C8DL_002110 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_0047C8DL_002110" -static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_0047C8DL_002110[] = dgHorseIngoSkelLimbsLimb_0047C8DL_002110; - -#define dgHorseIngoSkelLimbsLimb_004848DL_001C90 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_004848DL_001C90" -static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_004848DL_001C90[] = dgHorseIngoSkelLimbsLimb_004848DL_001C90; - -#define dgHorseIngoSkelLimbsLimb_0048D8DL_001F90 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_0048D8DL_001F90" -static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_0048D8DL_001F90[] = dgHorseIngoSkelLimbsLimb_0048D8DL_001F90; - -#define dgHorseIngoSkelLimbsLimb_004958DL_001E10 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_004958DL_001E10" -static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_004958DL_001E10[] = dgHorseIngoSkelLimbsLimb_004958DL_001E10; - #define dgHorseIngoHeadLimbDL_002290 "__OTR__objects/object_hni/gHorseIngoHeadLimbDL_002290" static const ALIGN_ASSET(2) char gHorseIngoHeadLimbDL_002290[] = dgHorseIngoHeadLimbDL_002290; @@ -114,4 +103,19 @@ static const ALIGN_ASSET(2) char gHorseIngoHoof2LimbDL_001E88[] = dgHorseIngoHoo static const ALIGN_ASSET(2) char gHorseIngoHoof3LimbDL_002008[] = dgHorseIngoHoof3LimbDL_002008; #define dgHorseIngoHoof4LimbDL_002188 "__OTR__objects/object_hni/gHorseIngoHoof4LimbDL_002188" -static const ALIGN_ASSET(2) char gHorseIngoHoof4LimbDL_002188[] = dgHorseIngoHoof4LimbDL_002188; \ No newline at end of file +static const ALIGN_ASSET(2) char gHorseIngoHoof4LimbDL_002188[] = dgHorseIngoHoof4LimbDL_002188; + +#define dgHorseIngoSkelLimbsLimb_0047C8DL_002110 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_0047C8DL_002110" +static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_0047C8DL_002110[] = dgHorseIngoSkelLimbsLimb_0047C8DL_002110; + +#define dgHorseIngoSkelLimbsLimb_004848DL_001C90 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_004848DL_001C90" +static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_004848DL_001C90[] = dgHorseIngoSkelLimbsLimb_004848DL_001C90; + +#define dgHorseIngoSkelLimbsLimb_0048D8DL_001F90 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_0048D8DL_001F90" +static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_0048D8DL_001F90[] = dgHorseIngoSkelLimbsLimb_0048D8DL_001F90; + +#define dgHorseIngoSkelLimbsLimb_004958DL_001E10 "__OTR__objects/object_hni/gHorseIngoSkelLimbsLimb_004958DL_001E10" +static const ALIGN_ASSET(2) char gHorseIngoSkelLimbsLimb_004958DL_001E10[] = dgHorseIngoSkelLimbsLimb_004958DL_001E10; + + +#endif // OBJECTS_OBJECT_HNI_H diff --git a/soh/assets/objects/object_horse/object_horse.h b/soh/assets/objects/object_horse/object_horse.h index 610166dd7..7a589e7ee 100644 --- a/soh/assets/objects/object_horse/object_horse.h +++ b/soh/assets/objects/object_horse/object_horse.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HORSE_H +#define OBJECTS_OBJECT_HORSE_H 1 #include "align_asset_macro.h" @@ -141,4 +142,7 @@ static const ALIGN_ASSET(2) char gEponaHoof2LimbDL_000DA0[] = dgEponaHoof2LimbDL static const ALIGN_ASSET(2) char gEponaHoof3LimbDL_001170[] = dgEponaHoof3LimbDL_001170; #define dgEponaHoof4LimbDL_001540 "__OTR__objects/object_horse/gEponaHoof4LimbDL_001540" -static const ALIGN_ASSET(2) char gEponaHoof4LimbDL_001540[] = dgEponaHoof4LimbDL_001540; \ No newline at end of file +static const ALIGN_ASSET(2) char gEponaHoof4LimbDL_001540[] = dgEponaHoof4LimbDL_001540; + + +#endif // OBJECTS_OBJECT_HORSE_H diff --git a/soh/assets/objects/object_horse_ganon/object_horse_ganon.h b/soh/assets/objects/object_horse_ganon/object_horse_ganon.h index 41f8db0ea..99ba41bd1 100644 --- a/soh/assets/objects/object_horse_ganon/object_horse_ganon.h +++ b/soh/assets/objects/object_horse_ganon/object_horse_ganon.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HORSE_GANON_H +#define OBJECTS_OBJECT_HORSE_GANON_H 1 #include "align_asset_macro.h" @@ -116,4 +117,6 @@ static const ALIGN_ASSET(2) char object_horse_ganonTex_00A810[] = dobject_horse_ static const ALIGN_ASSET(2) char object_horse_ganonTex_00B690[] = dobject_horse_ganonTex_00B690; #define dobject_horse_ganonTex_00B610 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B610" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00B610[] = dobject_horse_ganonTex_00B610; \ No newline at end of file +static const ALIGN_ASSET(2) char object_horse_ganonTex_00B610[] = dobject_horse_ganonTex_00B610; + +#endif // OBJECTS_OBJECT_HORSE_GANON_H diff --git a/soh/assets/objects/object_horse_link_child/object_horse_link_child.h b/soh/assets/objects/object_horse_link_child/object_horse_link_child.h index b9bd05bab..c52e043e0 100644 --- a/soh/assets/objects/object_horse_link_child/object_horse_link_child.h +++ b/soh/assets/objects/object_horse_link_child/object_horse_link_child.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HORSE_LINK_CHILD_H +#define OBJECTS_OBJECT_HORSE_LINK_CHILD_H 1 #include "align_asset_macro.h" @@ -89,4 +90,6 @@ static const ALIGN_ASSET(2) char object_horse_link_childTex_002588[] = dobject_h static const ALIGN_ASSET(2) char object_horse_link_childTex_002368[] = dobject_horse_link_childTex_002368; #define dobject_horse_link_childTex_001F28 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F28" -static const ALIGN_ASSET(2) char object_horse_link_childTex_001F28[] = dobject_horse_link_childTex_001F28; \ No newline at end of file +static const ALIGN_ASSET(2) char object_horse_link_childTex_001F28[] = dobject_horse_link_childTex_001F28; + +#endif // OBJECTS_OBJECT_HORSE_LINK_CHILD_H diff --git a/soh/assets/objects/object_horse_normal/object_horse_normal.h b/soh/assets/objects/object_horse_normal/object_horse_normal.h index 3e6337f01..5fbb019ba 100644 --- a/soh/assets/objects/object_horse_normal/object_horse_normal.h +++ b/soh/assets/objects/object_horse_normal/object_horse_normal.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HORSE_NORMAL_H +#define OBJECTS_OBJECT_HORSE_NORMAL_H 1 #include "align_asset_macro.h" @@ -89,4 +90,6 @@ static const ALIGN_ASSET(2) char object_horse_normalTex_005918[] = dobject_horse static const ALIGN_ASSET(2) char object_horse_normalTex_005C98[] = dobject_horse_normalTex_005C98; #define dobject_horse_normalTex_005B18 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B18" -static const ALIGN_ASSET(2) char object_horse_normalTex_005B18[] = dobject_horse_normalTex_005B18; \ No newline at end of file +static const ALIGN_ASSET(2) char object_horse_normalTex_005B18[] = dobject_horse_normalTex_005B18; + +#endif // OBJECTS_OBJECT_HORSE_NORMAL_H diff --git a/soh/assets/objects/object_horse_zelda/object_horse_zelda.h b/soh/assets/objects/object_horse_zelda/object_horse_zelda.h index d386a4d98..59647d4b0 100644 --- a/soh/assets/objects/object_horse_zelda/object_horse_zelda.h +++ b/soh/assets/objects/object_horse_zelda/object_horse_zelda.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HORSE_ZELDA_H +#define OBJECTS_OBJECT_HORSE_ZELDA_H 1 #include "align_asset_macro.h" @@ -86,4 +87,6 @@ static const ALIGN_ASSET(2) char object_horse_zeldaTex_000988[] = dobject_horse_ static const ALIGN_ASSET(2) char object_horse_zeldaTex_000888[] = dobject_horse_zeldaTex_000888; #define dobject_horse_zeldaTex_000408 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000408" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_000408[] = dobject_horse_zeldaTex_000408; \ No newline at end of file +static const ALIGN_ASSET(2) char object_horse_zeldaTex_000408[] = dobject_horse_zeldaTex_000408; + +#endif // OBJECTS_OBJECT_HORSE_ZELDA_H diff --git a/soh/assets/objects/object_hs/object_hs.h b/soh/assets/objects/object_hs/object_hs.h index f4a7b4f15..25d7ab988 100644 --- a/soh/assets/objects/object_hs/object_hs.h +++ b/soh/assets/objects/object_hs/object_hs.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HS_H +#define OBJECTS_OBJECT_HS_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char object_hs_Tex_005EF0[] = dobject_hs_Tex_005EF0; static const ALIGN_ASSET(2) char object_hs_Tex_005F70[] = dobject_hs_Tex_005F70; #define dobject_hs_Skel_006260 "__OTR__objects/object_hs/object_hs_Skel_006260" -static const ALIGN_ASSET(2) char object_hs_Skel_006260[] = dobject_hs_Skel_006260; \ No newline at end of file +static const ALIGN_ASSET(2) char object_hs_Skel_006260[] = dobject_hs_Skel_006260; + + +#endif // OBJECTS_OBJECT_HS_H diff --git a/soh/assets/objects/object_human/object_human.h b/soh/assets/objects/object_human/object_human.h index 986fccbd2..2bdda7e9f 100644 --- a/soh/assets/objects/object_human/object_human.h +++ b/soh/assets/objects/object_human/object_human.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_HUMAN_H +#define OBJECTS_OBJECT_HUMAN_H 1 #include "align_asset_macro.h" @@ -309,4 +310,6 @@ static const ALIGN_ASSET(2) char gHumanWalkingAnim[] = dgHumanWalkingAnim; static const ALIGN_ASSET(2) char gHumanWalkingEndAnim[] = dgHumanWalkingEndAnim; #define dgHumanWalkingStartAnim "__OTR__objects/object_human/gHumanWalkingStartAnim" -static const ALIGN_ASSET(2) char gHumanWalkingStartAnim[] = dgHumanWalkingStartAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gHumanWalkingStartAnim[] = dgHumanWalkingStartAnim; + +#endif // OBJECTS_OBJECT_HUMAN_H diff --git a/soh/assets/objects/object_ice_objects/object_ice_objects.h b/soh/assets/objects/object_ice_objects/object_ice_objects.h index f85143491..c0d23fa91 100644 --- a/soh/assets/objects/object_ice_objects/object_ice_objects.h +++ b/soh/assets/objects/object_ice_objects/object_ice_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ICE_OBJECTS_H +#define OBJECTS_OBJECT_ICE_OBJECTS_H 1 #include "align_asset_macro.h" @@ -8,14 +9,14 @@ static const ALIGN_ASSET(2) char object_ice_objects_DL_000190[] = dobject_ice_ob #define dobject_ice_objects_Col_0003F0 "__OTR__objects/object_ice_objects/object_ice_objects_Col_0003F0" static const ALIGN_ASSET(2) char object_ice_objects_Col_0003F0[] = dobject_ice_objects_Col_0003F0; -#define dobject_ice_objects_DL_0006F0 "__OTR__objects/object_ice_objects/object_ice_objects_DL_0006F0" -static const ALIGN_ASSET(2) char object_ice_objects_DL_0006F0[] = dobject_ice_objects_DL_0006F0; +#define dgRedIceBlockDL "__OTR__objects/object_ice_objects/gRedIceBlockDL" +static const ALIGN_ASSET(2) char gRedIceBlockDL[] = dgRedIceBlockDL; -#define dobject_ice_objects_DL_0012A0 "__OTR__objects/object_ice_objects/object_ice_objects_DL_0012A0" -static const ALIGN_ASSET(2) char object_ice_objects_DL_0012A0[] = dobject_ice_objects_DL_0012A0; +#define dgRedIcePlatformDL "__OTR__objects/object_ice_objects/gRedIcePlatformDL" +static const ALIGN_ASSET(2) char gRedIcePlatformDL[] = dgRedIcePlatformDL; -#define dobject_ice_objects_Col_001C1C "__OTR__objects/object_ice_objects/object_ice_objects_Col_001C1C" -static const ALIGN_ASSET(2) char object_ice_objects_Col_001C1C[] = dobject_ice_objects_Col_001C1C; +#define dgRedIcePlatformCol "__OTR__objects/object_ice_objects/gRedIcePlatformCol" +static const ALIGN_ASSET(2) char gRedIcePlatformCol[] = dgRedIcePlatformCol; #define dobject_ice_objects_DL_001D10 "__OTR__objects/object_ice_objects/object_ice_objects_DL_001D10" static const ALIGN_ASSET(2) char object_ice_objects_DL_001D10[] = dobject_ice_objects_DL_001D10; @@ -29,8 +30,8 @@ static const ALIGN_ASSET(2) char object_ice_objects_DL_0023D0[] = dobject_ice_ob #define dobject_ice_objects_Col_002594 "__OTR__objects/object_ice_objects/object_ice_objects_Col_002594" static const ALIGN_ASSET(2) char object_ice_objects_Col_002594[] = dobject_ice_objects_Col_002594; -#define dobject_ice_objects_DL_002640 "__OTR__objects/object_ice_objects/object_ice_objects_DL_002640" -static const ALIGN_ASSET(2) char object_ice_objects_DL_002640[] = dobject_ice_objects_DL_002640; +#define dgRedIceWallDL "__OTR__objects/object_ice_objects/gRedIceWallDL" +static const ALIGN_ASSET(2) char gRedIceWallDL[] = dgRedIceWallDL; #define dobject_ice_objects_DL_002740 "__OTR__objects/object_ice_objects/object_ice_objects_DL_002740" static const ALIGN_ASSET(2) char object_ice_objects_DL_002740[] = dobject_ice_objects_DL_002740; @@ -38,14 +39,14 @@ static const ALIGN_ASSET(2) char object_ice_objects_DL_002740[] = dobject_ice_ob #define dobject_ice_objects_Col_002854 "__OTR__objects/object_ice_objects/object_ice_objects_Col_002854" static const ALIGN_ASSET(2) char object_ice_objects_Col_002854[] = dobject_ice_objects_Col_002854; -#define dobject_ice_objects_Col_002920 "__OTR__objects/object_ice_objects/object_ice_objects_Col_002920" -static const ALIGN_ASSET(2) char object_ice_objects_Col_002920[] = dobject_ice_objects_Col_002920; +#define dgRedIceWallCol "__OTR__objects/object_ice_objects/gRedIceWallCol" +static const ALIGN_ASSET(2) char gRedIceWallCol[] = dgRedIceWallCol; #define dobject_ice_objects_Tex_002950 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_002950" static const ALIGN_ASSET(2) char object_ice_objects_Tex_002950[] = dobject_ice_objects_Tex_002950; -#define dobject_ice_objects_Tex_003150 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_003150" -static const ALIGN_ASSET(2) char object_ice_objects_Tex_003150[] = dobject_ice_objects_Tex_003150; +#define dgRedIceWallTex "__OTR__objects/object_ice_objects/gRedIceWallTex" +static const ALIGN_ASSET(2) char gRedIceWallTex[] = dgRedIceWallTex; #define dobject_ice_objects_Tex_004150 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_004150" static const ALIGN_ASSET(2) char object_ice_objects_Tex_004150[] = dobject_ice_objects_Tex_004150; @@ -53,11 +54,11 @@ static const ALIGN_ASSET(2) char object_ice_objects_Tex_004150[] = dobject_ice_o #define dobject_ice_objects_Tex_004950 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_004950" static const ALIGN_ASSET(2) char object_ice_objects_Tex_004950[] = dobject_ice_objects_Tex_004950; -#define dobject_ice_objects_Tex_005150 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_005150" -static const ALIGN_ASSET(2) char object_ice_objects_Tex_005150[] = dobject_ice_objects_Tex_005150; +#define dgRedIceBlockTex "__OTR__objects/object_ice_objects/gRedIceBlockTex" +static const ALIGN_ASSET(2) char gRedIceBlockTex[] = dgRedIceBlockTex; -#define dobject_ice_objects_Tex_005550 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_005550" -static const ALIGN_ASSET(2) char object_ice_objects_Tex_005550[] = dobject_ice_objects_Tex_005550; +#define dgRedIcePlatformTex "__OTR__objects/object_ice_objects/gRedIcePlatformTex" +static const ALIGN_ASSET(2) char gRedIcePlatformTex[] = dgRedIcePlatformTex; #define dobject_ice_objects_Tex_005D50 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_005D50" static const ALIGN_ASSET(2) char object_ice_objects_Tex_005D50[] = dobject_ice_objects_Tex_005D50; @@ -66,4 +67,6 @@ static const ALIGN_ASSET(2) char object_ice_objects_Tex_005D50[] = dobject_ice_o static const ALIGN_ASSET(2) char object_ice_objects_Tex_006D50[] = dobject_ice_objects_Tex_006D50; #define dobject_ice_objects_Tex_007D50 "__OTR__objects/object_ice_objects/object_ice_objects_Tex_007D50" -static const ALIGN_ASSET(2) char object_ice_objects_Tex_007D50[] = dobject_ice_objects_Tex_007D50; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ice_objects_Tex_007D50[] = dobject_ice_objects_Tex_007D50; + +#endif // OBJECTS_OBJECT_ICE_OBJECTS_H diff --git a/soh/assets/objects/object_ik/object_ik.h b/soh/assets/objects/object_ik/object_ik.h index 37c46d207..4e6da046b 100644 --- a/soh/assets/objects/object_ik/object_ik.h +++ b/soh/assets/objects/object_ik/object_ik.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_IK_H +#define OBJECTS_OBJECT_IK_H 1 #include "align_asset_macro.h" @@ -23,11 +24,11 @@ static const ALIGN_ASSET(2) char object_ik_Skel_01EB40[] = dobject_ik_Skel_01EB4 #define dobject_ik_Skel_01EE60 "__OTR__objects/object_ik/object_ik_Skel_01EE60" static const ALIGN_ASSET(2) char object_ik_Skel_01EE60[] = dobject_ik_Skel_01EE60; -#define dobject_ik_Skel_01E178 "__OTR__objects/object_ik/object_ik_Skel_01E178" -static const ALIGN_ASSET(2) char object_ik_Skel_01E178[] = dobject_ik_Skel_01E178; +#define dgIronKnuckleSkel "__OTR__objects/object_ik/gIronKnuckleSkel" +static const ALIGN_ASSET(2) char gIronKnuckleSkel[] = dgIronKnuckleSkel; -#define dobject_ik_Skel_0205C0 "__OTR__objects/object_ik/object_ik_Skel_0205C0" -static const ALIGN_ASSET(2) char object_ik_Skel_0205C0[] = dobject_ik_Skel_0205C0; +#define dgIronKnuckleDefeatSkel "__OTR__objects/object_ik/gIronKnuckleDefeatSkel" +static const ALIGN_ASSET(2) char gIronKnuckleDefeatSkel[] = dgIronKnuckleDefeatSkel; #define dobject_ik_Anim_00035C "__OTR__objects/object_ik/object_ik_Anim_00035C" static const ALIGN_ASSET(2) char object_ik_Anim_00035C[] = dobject_ik_Anim_00035C; @@ -44,47 +45,47 @@ static const ALIGN_ASSET(2) char object_ik_Anim_000C6C[] = dobject_ik_Anim_000C6 #define dobject_ik_Anim_000F0C "__OTR__objects/object_ik/object_ik_Anim_000F0C" static const ALIGN_ASSET(2) char object_ik_Anim_000F0C[] = dobject_ik_Anim_000F0C; -#define dobject_ik_Anim_001C28 "__OTR__objects/object_ik/object_ik_Anim_001C28" -static const ALIGN_ASSET(2) char object_ik_Anim_001C28[] = dobject_ik_Anim_001C28; +#define dgIronKnuckleVerticalAttackAnim "__OTR__objects/object_ik/gIronKnuckleVerticalAttackAnim" +static const ALIGN_ASSET(2) char gIronKnuckleVerticalAttackAnim[] = dgIronKnuckleVerticalAttackAnim; -#define dobject_ik_Anim_002538 "__OTR__objects/object_ik/object_ik_Anim_002538" -static const ALIGN_ASSET(2) char object_ik_Anim_002538[] = dobject_ik_Anim_002538; +#define dgIronKnuckleRecoverFromVerticalAttackAnim "__OTR__objects/object_ik/gIronKnuckleRecoverFromVerticalAttackAnim" +static const ALIGN_ASSET(2) char gIronKnuckleRecoverFromVerticalAttackAnim[] = dgIronKnuckleRecoverFromVerticalAttackAnim; -#define dobject_ik_Anim_0029FC "__OTR__objects/object_ik/object_ik_Anim_0029FC" -static const ALIGN_ASSET(2) char object_ik_Anim_0029FC[] = dobject_ik_Anim_0029FC; +#define dgIronKnuckleAxeStuckAnim "__OTR__objects/object_ik/gIronKnuckleAxeStuckAnim" +static const ALIGN_ASSET(2) char gIronKnuckleAxeStuckAnim[] = dgIronKnuckleAxeStuckAnim; -#define dobject_ik_Anim_0033C4 "__OTR__objects/object_ik/object_ik_Anim_0033C4" -static const ALIGN_ASSET(2) char object_ik_Anim_0033C4[] = dobject_ik_Anim_0033C4; +#define dgIronKnuckleHorizontalAttackAnim "__OTR__objects/object_ik/gIronKnuckleHorizontalAttackAnim" +static const ALIGN_ASSET(2) char gIronKnuckleHorizontalAttackAnim[] = dgIronKnuckleHorizontalAttackAnim; -#define dobject_ik_Anim_003DBC "__OTR__objects/object_ik/object_ik_Anim_003DBC" -static const ALIGN_ASSET(2) char object_ik_Anim_003DBC[] = dobject_ik_Anim_003DBC; +#define dgIronKnuckleRecoverFromHorizontalAttackAnim "__OTR__objects/object_ik/gIronKnuckleRecoverFromHorizontalAttackAnim" +static const ALIGN_ASSET(2) char gIronKnuckleRecoverFromHorizontalAttackAnim[] = dgIronKnuckleRecoverFromHorizontalAttackAnim; -#define dobject_ik_Anim_0045BC "__OTR__objects/object_ik/object_ik_Anim_0045BC" -static const ALIGN_ASSET(2) char object_ik_Anim_0045BC[] = dobject_ik_Anim_0045BC; +#define dgIronKnuckleBackHitAnim "__OTR__objects/object_ik/gIronKnuckleBackHitAnim" +static const ALIGN_ASSET(2) char gIronKnuckleBackHitAnim[] = dgIronKnuckleBackHitAnim; -#define dobject_ik_Anim_00485C "__OTR__objects/object_ik/object_ik_Anim_00485C" -static const ALIGN_ASSET(2) char object_ik_Anim_00485C[] = dobject_ik_Anim_00485C; +#define dgIronKnuckleBlockAnim "__OTR__objects/object_ik/gIronKnuckleBlockAnim" +static const ALIGN_ASSET(2) char gIronKnuckleBlockAnim[] = dgIronKnuckleBlockAnim; -#define dobject_ik_Anim_005944 "__OTR__objects/object_ik/object_ik_Anim_005944" -static const ALIGN_ASSET(2) char object_ik_Anim_005944[] = dobject_ik_Anim_005944; +#define dgIronKnuckleDeathAnim "__OTR__objects/object_ik/gIronKnuckleDeathAnim" +static const ALIGN_ASSET(2) char gIronKnuckleDeathAnim[] = dgIronKnuckleDeathAnim; -#define dobject_ik_Anim_006194 "__OTR__objects/object_ik/object_ik_Anim_006194" -static const ALIGN_ASSET(2) char object_ik_Anim_006194[] = dobject_ik_Anim_006194; +#define dgIronKnuckleFrontHitAnim "__OTR__objects/object_ik/gIronKnuckleFrontHitAnim" +static const ALIGN_ASSET(2) char gIronKnuckleFrontHitAnim[] = dgIronKnuckleFrontHitAnim; -#define dobject_ik_Anim_006734 "__OTR__objects/object_ik/object_ik_Anim_006734" -static const ALIGN_ASSET(2) char object_ik_Anim_006734[] = dobject_ik_Anim_006734; +#define dgIronKnuckleRunAnim "__OTR__objects/object_ik/gIronKnuckleRunAnim" +static const ALIGN_ASSET(2) char gIronKnuckleRunAnim[] = dgIronKnuckleRunAnim; -#define dobject_ik_Anim_00C114 "__OTR__objects/object_ik/object_ik_Anim_00C114" -static const ALIGN_ASSET(2) char object_ik_Anim_00C114[] = dobject_ik_Anim_00C114; +#define dgIronKnuckleNabooruSummonAxeAnim "__OTR__objects/object_ik/gIronKnuckleNabooruSummonAxeAnim" +static const ALIGN_ASSET(2) char gIronKnuckleNabooruSummonAxeAnim[] = dgIronKnuckleNabooruSummonAxeAnim; -#define dobject_ik_Anim_00CD70 "__OTR__objects/object_ik/object_ik_Anim_00CD70" -static const ALIGN_ASSET(2) char object_ik_Anim_00CD70[] = dobject_ik_Anim_00CD70; +#define dgIronKnuckleStandUpAnim "__OTR__objects/object_ik/gIronKnuckleStandUpAnim" +static const ALIGN_ASSET(2) char gIronKnuckleStandUpAnim[] = dgIronKnuckleStandUpAnim; #define dobject_ik_Anim_00DD50 "__OTR__objects/object_ik/object_ik_Anim_00DD50" static const ALIGN_ASSET(2) char object_ik_Anim_00DD50[] = dobject_ik_Anim_00DD50; -#define dobject_ik_Anim_00ED24 "__OTR__objects/object_ik/object_ik_Anim_00ED24" -static const ALIGN_ASSET(2) char object_ik_Anim_00ED24[] = dobject_ik_Anim_00ED24; +#define dgIronKnuckleWalkAnim "__OTR__objects/object_ik/gIronKnuckleWalkAnim" +static const ALIGN_ASSET(2) char gIronKnuckleWalkAnim[] = dgIronKnuckleWalkAnim; #define dobject_ik_Anim_01EB14 "__OTR__objects/object_ik/object_ik_Anim_01EB14" static const ALIGN_ASSET(2) char object_ik_Anim_01EB14[] = dobject_ik_Anim_01EB14; @@ -92,47 +93,47 @@ static const ALIGN_ASSET(2) char object_ik_Anim_01EB14[] = dobject_ik_Anim_01EB1 #define dobject_ik_Anim_01EE34 "__OTR__objects/object_ik/object_ik_Anim_01EE34" static const ALIGN_ASSET(2) char object_ik_Anim_01EE34[] = dobject_ik_Anim_01EE34; -#define dobject_ik_Anim_0203D8 "__OTR__objects/object_ik/object_ik_Anim_0203D8" -static const ALIGN_ASSET(2) char object_ik_Anim_0203D8[] = dobject_ik_Anim_0203D8; +#define dgIronKnuckleNabooruDeathAnim "__OTR__objects/object_ik/gIronKnuckleNabooruDeathAnim" +static const ALIGN_ASSET(2) char gIronKnuckleNabooruDeathAnim[] = dgIronKnuckleNabooruDeathAnim; #define dobject_ik_Tlut_00F630 "__OTR__objects/object_ik/object_ik_Tlut_00F630" static const ALIGN_ASSET(2) char object_ik_Tlut_00F630[] = dobject_ik_Tlut_00F630; -#define dobject_ik_Tex_00F7A0 "__OTR__objects/object_ik/object_ik_Tex_00F7A0" -static const ALIGN_ASSET(2) char object_ik_Tex_00F7A0[] = dobject_ik_Tex_00F7A0; +#define dgIronKnuckleMetalTex "__OTR__objects/object_ik/gIronKnuckleMetalTex" +static const ALIGN_ASSET(2) char gIronKnuckleMetalTex[] = dgIronKnuckleMetalTex; #define dgIronKnuckleMetalOverflowTex "__OTR__objects/object_ik/gIronKnuckleMetalOverflowTex" static const ALIGN_ASSET(2) char gIronKnuckleMetalOverflowTex[] = dgIronKnuckleMetalOverflowTex; -#define dobject_ik_Tex_00FBA0 "__OTR__objects/object_ik/object_ik_Tex_00FBA0" -static const ALIGN_ASSET(2) char object_ik_Tex_00FBA0[] = dobject_ik_Tex_00FBA0; +#define dgIronKnuckleBigRivetTex "__OTR__objects/object_ik/gIronKnuckleBigRivetTex" +static const ALIGN_ASSET(2) char gIronKnuckleBigRivetTex[] = dgIronKnuckleBigRivetTex; -#define dobject_ik_Tex_00FFA0 "__OTR__objects/object_ik/object_ik_Tex_00FFA0" -static const ALIGN_ASSET(2) char object_ik_Tex_00FFA0[] = dobject_ik_Tex_00FFA0; +#define dgIronKnuckleBlockPatternTex "__OTR__objects/object_ik/gIronKnuckleBlockPatternTex" +static const ALIGN_ASSET(2) char gIronKnuckleBlockPatternTex[] = dgIronKnuckleBlockPatternTex; -#define dobject_ik_Tex_0101A0 "__OTR__objects/object_ik/object_ik_Tex_0101A0" -static const ALIGN_ASSET(2) char object_ik_Tex_0101A0[] = dobject_ik_Tex_0101A0; +#define dgIronKnuckleChainMailTex "__OTR__objects/object_ik/gIronKnuckleChainMailTex" +static const ALIGN_ASSET(2) char gIronKnuckleChainMailTex[] = dgIronKnuckleChainMailTex; #define dobject_ik_Tex_0103A0 "__OTR__objects/object_ik/object_ik_Tex_0103A0" static const ALIGN_ASSET(2) char object_ik_Tex_0103A0[] = dobject_ik_Tex_0103A0; -#define dobject_ik_Tex_010BA0 "__OTR__objects/object_ik/object_ik_Tex_010BA0" -static const ALIGN_ASSET(2) char object_ik_Tex_010BA0[] = dobject_ik_Tex_010BA0; +#define dgIronKnuckleGerudoEyeTex "__OTR__objects/object_ik/gIronKnuckleGerudoEyeTex" +static const ALIGN_ASSET(2) char gIronKnuckleGerudoEyeTex[] = dgIronKnuckleGerudoEyeTex; -#define dobject_ik_Tex_0113A0 "__OTR__objects/object_ik/object_ik_Tex_0113A0" -static const ALIGN_ASSET(2) char object_ik_Tex_0113A0[] = dobject_ik_Tex_0113A0; +#define dgIronKnuckleNabooruLipTex "__OTR__objects/object_ik/gIronKnuckleNabooruLipTex" +static const ALIGN_ASSET(2) char gIronKnuckleNabooruLipTex[] = dgIronKnuckleNabooruLipTex; -#define dobject_ik_Tex_011420 "__OTR__objects/object_ik/object_ik_Tex_011420" -static const ALIGN_ASSET(2) char object_ik_Tex_011420[] = dobject_ik_Tex_011420; +#define dgIronKnuckleJewelTex "__OTR__objects/object_ik/gIronKnuckleJewelTex" +static const ALIGN_ASSET(2) char gIronKnuckleJewelTex[] = dgIronKnuckleJewelTex; -#define dobject_ik_Tex_011520 "__OTR__objects/object_ik/object_ik_Tex_011520" -static const ALIGN_ASSET(2) char object_ik_Tex_011520[] = dobject_ik_Tex_011520; +#define dgIronKnuckleNabooruForeheadJewelTex "__OTR__objects/object_ik/gIronKnuckleNabooruForeheadJewelTex" +static const ALIGN_ASSET(2) char gIronKnuckleNabooruForeheadJewelTex[] = dgIronKnuckleNabooruForeheadJewelTex; #define dobject_ik_Tex_011620 "__OTR__objects/object_ik/object_ik_Tex_011620" static const ALIGN_ASSET(2) char object_ik_Tex_011620[] = dobject_ik_Tex_011620; -#define dobject_ik_Tex_011660 "__OTR__objects/object_ik/object_ik_Tex_011660" -static const ALIGN_ASSET(2) char object_ik_Tex_011660[] = dobject_ik_Tex_011660; +#define dgIronKnuckleNabooruHair1Tex "__OTR__objects/object_ik/gIronKnuckleNabooruHair1Tex" +static const ALIGN_ASSET(2) char gIronKnuckleNabooruHair1Tex[] = dgIronKnuckleNabooruHair1Tex; #define dobject_ik_Tex_011760 "__OTR__objects/object_ik/object_ik_Tex_011760" static const ALIGN_ASSET(2) char object_ik_Tex_011760[] = dobject_ik_Tex_011760; @@ -152,14 +153,14 @@ static const ALIGN_ASSET(2) char object_ik_DL_0151F0[] = dobject_ik_DL_0151F0; #define dobject_ik_DL_015380 "__OTR__objects/object_ik/object_ik_DL_015380" static const ALIGN_ASSET(2) char object_ik_DL_015380[] = dobject_ik_DL_015380; -#define dobject_ik_DL_0154E0 "__OTR__objects/object_ik/object_ik_DL_0154E0" -static const ALIGN_ASSET(2) char object_ik_DL_0154E0[] = dobject_ik_DL_0154E0; +#define dgIronKnuckleNabooruHelmetDL "__OTR__objects/object_ik/gIronKnuckleNabooruHelmetDL" +static const ALIGN_ASSET(2) char gIronKnuckleNabooruHelmetDL[] = dgIronKnuckleNabooruHelmetDL; -#define dobject_ik_DL_015840 "__OTR__objects/object_ik/object_ik_DL_015840" -static const ALIGN_ASSET(2) char object_ik_DL_015840[] = dobject_ik_DL_015840; +#define dgIronKnuckleAxeDL "__OTR__objects/object_ik/gIronKnuckleAxeDL" +static const ALIGN_ASSET(2) char gIronKnuckleAxeDL[] = dgIronKnuckleAxeDL; -#define dobject_ik_DL_015B00 "__OTR__objects/object_ik/object_ik_DL_015B00" -static const ALIGN_ASSET(2) char object_ik_DL_015B00[] = dobject_ik_DL_015B00; +#define dgIronKnuckleShockedNabooruHeadDL "__OTR__objects/object_ik/gIronKnuckleShockedNabooruHeadDL" +static const ALIGN_ASSET(2) char gIronKnuckleShockedNabooruHeadDL[] = dgIronKnuckleShockedNabooruHeadDL; #define dobject_ik_DL_016118 "__OTR__objects/object_ik/object_ik_DL_016118" static const ALIGN_ASSET(2) char object_ik_DL_016118[] = dobject_ik_DL_016118; @@ -179,14 +180,14 @@ static const ALIGN_ASSET(2) char object_ik_DL_016568[] = dobject_ik_DL_016568; #define dobject_ik_DL_016658 "__OTR__objects/object_ik/object_ik_DL_016658" static const ALIGN_ASSET(2) char object_ik_DL_016658[] = dobject_ik_DL_016658; -#define dobject_ik_DL_016748 "__OTR__objects/object_ik/object_ik_DL_016748" -static const ALIGN_ASSET(2) char object_ik_DL_016748[] = dobject_ik_DL_016748; +#define dgIronKnuckleSplitHelmetLeftDL "__OTR__objects/object_ik/gIronKnuckleSplitHelmetLeftDL" +static const ALIGN_ASSET(2) char gIronKnuckleSplitHelmetLeftDL[] = dgIronKnuckleSplitHelmetLeftDL; -#define dobject_ik_DL_0169E8 "__OTR__objects/object_ik/object_ik_DL_0169E8" -static const ALIGN_ASSET(2) char object_ik_DL_0169E8[] = dobject_ik_DL_0169E8; +#define dgIronKnuckleSplitHelmetRightDL "__OTR__objects/object_ik/gIronKnuckleSplitHelmetRightDL" +static const ALIGN_ASSET(2) char gIronKnuckleSplitHelmetRightDL[] = dgIronKnuckleSplitHelmetRightDL; -#define dobject_ik_DL_016BE0 "__OTR__objects/object_ik/object_ik_DL_016BE0" -static const ALIGN_ASSET(2) char object_ik_DL_016BE0[] = dobject_ik_DL_016BE0; +#define dgIronKnuckleArmorRivetAndSymbolDL "__OTR__objects/object_ik/gIronKnuckleArmorRivetAndSymbolDL" +static const ALIGN_ASSET(2) char gIronKnuckleArmorRivetAndSymbolDL[] = dgIronKnuckleArmorRivetAndSymbolDL; #define dobject_ik_DL_016CD8 "__OTR__objects/object_ik/object_ik_DL_016CD8" static const ALIGN_ASSET(2) char object_ik_DL_016CD8[] = dobject_ik_DL_016CD8; @@ -215,8 +216,8 @@ static const ALIGN_ASSET(2) char object_ik_Tex_017378[] = dobject_ik_Tex_017378; #define dobject_ik_Tex_017478 "__OTR__objects/object_ik/object_ik_Tex_017478" static const ALIGN_ASSET(2) char object_ik_Tex_017478[] = dobject_ik_Tex_017478; -#define dobject_ik_Tex_0174B8 "__OTR__objects/object_ik/object_ik_Tex_0174B8" -static const ALIGN_ASSET(2) char object_ik_Tex_0174B8[] = dobject_ik_Tex_0174B8; +#define dgIronKnuckleHair2Tex "__OTR__objects/object_ik/gIronKnuckleHair2Tex" +static const ALIGN_ASSET(2) char gIronKnuckleHair2Tex[] = dgIronKnuckleHair2Tex; #define dobject_ik_Tex_0175B8 "__OTR__objects/object_ik/object_ik_Tex_0175B8" static const ALIGN_ASSET(2) char object_ik_Tex_0175B8[] = dobject_ik_Tex_0175B8; @@ -227,17 +228,17 @@ static const ALIGN_ASSET(2) char object_ik_Tex_017638[] = dobject_ik_Tex_017638; #define dobject_ik_Tex_0176B8 "__OTR__objects/object_ik/object_ik_Tex_0176B8" static const ALIGN_ASSET(2) char object_ik_Tex_0176B8[] = dobject_ik_Tex_0176B8; -#define dobject_ik_DL_018E78 "__OTR__objects/object_ik/object_ik_DL_018E78" -static const ALIGN_ASSET(2) char object_ik_DL_018E78[] = dobject_ik_DL_018E78; +#define dgIronKnuckleHelmetDL "__OTR__objects/object_ik/gIronKnuckleHelmetDL" +static const ALIGN_ASSET(2) char gIronKnuckleHelmetDL[] = dgIronKnuckleHelmetDL; -#define dobject_ik_DL_019100 "__OTR__objects/object_ik/object_ik_DL_019100" -static const ALIGN_ASSET(2) char object_ik_DL_019100[] = dobject_ik_DL_019100; +#define dgIronKnuckleGerudoHeadDL "__OTR__objects/object_ik/gIronKnuckleGerudoHeadDL" +static const ALIGN_ASSET(2) char gIronKnuckleGerudoHeadDL[] = dgIronKnuckleGerudoHeadDL; -#define dobject_ik_DL_019E08 "__OTR__objects/object_ik/object_ik_DL_019E08" -static const ALIGN_ASSET(2) char object_ik_DL_019E08[] = dobject_ik_DL_019E08; +#define dgIronKnuckleHelmetMarkingDL "__OTR__objects/object_ik/gIronKnuckleHelmetMarkingDL" +static const ALIGN_ASSET(2) char gIronKnuckleHelmetMarkingDL[] = dgIronKnuckleHelmetMarkingDL; -#define dobject_ik_DL_01BA78 "__OTR__objects/object_ik/object_ik_DL_01BA78" -static const ALIGN_ASSET(2) char object_ik_DL_01BA78[] = dobject_ik_DL_01BA78; +#define dgIronKnuckleTorsoDL "__OTR__objects/object_ik/gIronKnuckleTorsoDL" +static const ALIGN_ASSET(2) char gIronKnuckleTorsoDL[] = dgIronKnuckleTorsoDL; #define dobject_ik_DL_01BE98 "__OTR__objects/object_ik/object_ik_DL_01BE98" static const ALIGN_ASSET(2) char object_ik_DL_01BE98[] = dobject_ik_DL_01BE98; @@ -281,8 +282,11 @@ static const ALIGN_ASSET(2) char object_ik_Tlut_01D9A8[] = dobject_ik_Tlut_01D9A #define dobject_ik_Tex_01DBA8 "__OTR__objects/object_ik/object_ik_Tex_01DBA8" static const ALIGN_ASSET(2) char object_ik_Tex_01DBA8[] = dobject_ik_Tex_01DBA8; -#define dobject_ik_Tex_01DDA8 "__OTR__objects/object_ik/object_ik_Tex_01DDA8" -static const ALIGN_ASSET(2) char object_ik_Tex_01DDA8[] = dobject_ik_Tex_01DDA8; +#define dgIronKnuckleHair3Tex "__OTR__objects/object_ik/gIronKnuckleHair3Tex" +static const ALIGN_ASSET(2) char gIronKnuckleHair3Tex[] = dgIronKnuckleHair3Tex; -#define dobject_ik_Tex_01DEA8 "__OTR__objects/object_ik/object_ik_Tex_01DEA8" -static const ALIGN_ASSET(2) char object_ik_Tex_01DEA8[] = dobject_ik_Tex_01DEA8; \ No newline at end of file +#define dgIronKnuckleNabooruChestJewelTex "__OTR__objects/object_ik/gIronKnuckleNabooruChestJewelTex" +static const ALIGN_ASSET(2) char gIronKnuckleNabooruChestJewelTex[] = dgIronKnuckleNabooruChestJewelTex; + + +#endif // OBJECTS_OBJECT_IK_H diff --git a/soh/assets/objects/object_im/object_im.h b/soh/assets/objects/object_im/object_im.h index 4ec1bc29d..be60fb1f3 100644 --- a/soh/assets/objects/object_im/object_im.h +++ b/soh/assets/objects/object_im/object_im.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_IM_H +#define OBJECTS_OBJECT_IM_H 1 #include "align_asset_macro.h" @@ -171,4 +172,7 @@ static const ALIGN_ASSET(2) char gImpaWhistlingAnim[] = dgImpaWhistlingAnim; static const ALIGN_ASSET(2) char gImpaPrepareSealGanonAnim[] = dgImpaPrepareSealGanonAnim; #define dgImpaSealGanonAnim "__OTR__objects/object_im/gImpaSealGanonAnim" -static const ALIGN_ASSET(2) char gImpaSealGanonAnim[] = dgImpaSealGanonAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gImpaSealGanonAnim[] = dgImpaSealGanonAnim; + + +#endif // OBJECTS_OBJECT_IM_H diff --git a/soh/assets/objects/object_in/object_in.h b/soh/assets/objects/object_in/object_in.h index 884423198..46ea6ab42 100644 --- a/soh/assets/objects/object_in/object_in.h +++ b/soh/assets/objects/object_in/object_in.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_IN_H +#define OBJECTS_OBJECT_IN_H 1 #include "align_asset_macro.h" @@ -324,4 +325,7 @@ static const ALIGN_ASSET(2) char object_in_Anim_018C38[] = dobject_in_Anim_018C3 static const ALIGN_ASSET(2) char gIngoBlob_0020D0[] = dgIngoBlob_0020D0; #define dgIngoBlob_003150 "__OTR__objects/object_in/gIngoBlob_003150" -static const ALIGN_ASSET(2) char gIngoBlob_003150[] = dgIngoBlob_003150; \ No newline at end of file +static const ALIGN_ASSET(2) char gIngoBlob_003150[] = dgIngoBlob_003150; + + +#endif // OBJECTS_OBJECT_IN_H diff --git a/soh/assets/objects/object_ingate/object_ingate.h b/soh/assets/objects/object_ingate/object_ingate.h index e460c9a34..dae91ab09 100644 --- a/soh/assets/objects/object_ingate/object_ingate.h +++ b/soh/assets/objects/object_ingate/object_ingate.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_INGATE_H +#define OBJECTS_OBJECT_INGATE_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gIngoGateTex[] = dgIngoGateTex; static const ALIGN_ASSET(2) char gIngoGateDL[] = dgIngoGateDL; #define dgIngoGateCol "__OTR__objects/object_ingate/gIngoGateCol" -static const ALIGN_ASSET(2) char gIngoGateCol[] = dgIngoGateCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gIngoGateCol[] = dgIngoGateCol; + +#endif // OBJECTS_OBJECT_INGATE_H diff --git a/soh/assets/objects/object_jj/object_jj.h b/soh/assets/objects/object_jj/object_jj.h index ecbda13dd..3bbf8e1aa 100644 --- a/soh/assets/objects/object_jj/object_jj.h +++ b/soh/assets/objects/object_jj/object_jj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_JJ_H +#define OBJECTS_OBJECT_JJ_H 1 #include "align_asset_macro.h" @@ -105,4 +106,7 @@ static const ALIGN_ASSET(2) char gJabuJabuHeadCol[] = dgJabuJabuHeadCol; static const ALIGN_ASSET(2) char gJabuJabuBodyCol[] = dgJabuJabuBodyCol; #define dgJabuJabuUnusedCol "__OTR__objects/object_jj/gJabuJabuUnusedCol" -static const ALIGN_ASSET(2) char gJabuJabuUnusedCol[] = dgJabuJabuUnusedCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gJabuJabuUnusedCol[] = dgJabuJabuUnusedCol; + + +#endif // OBJECTS_OBJECT_JJ_H diff --git a/soh/assets/objects/object_js/object_js.h b/soh/assets/objects/object_js/object_js.h index fdf602113..bcbc9ac36 100644 --- a/soh/assets/objects/object_js/object_js.h +++ b/soh/assets/objects/object_js/object_js.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_JS_H +#define OBJECTS_OBJECT_JS_H 1 #include "align_asset_macro.h" @@ -78,4 +79,7 @@ static const ALIGN_ASSET(2) char gCarpetMerchantSlappingKneeAnim[] = dgCarpetMer static const ALIGN_ASSET(2) char gCarpetMerchantIdleAnim[] = dgCarpetMerchantIdleAnim; #define dgCarpetMerchantCol "__OTR__objects/object_js/gCarpetMerchantCol" -static const ALIGN_ASSET(2) char gCarpetMerchantCol[] = dgCarpetMerchantCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gCarpetMerchantCol[] = dgCarpetMerchantCol; + + +#endif // OBJECTS_OBJECT_JS_H diff --git a/soh/assets/objects/object_jya_door/object_jya_door.h b/soh/assets/objects/object_jya_door/object_jya_door.h index c3b367e00..45f165776 100644 --- a/soh/assets/objects/object_jya_door/object_jya_door.h +++ b/soh/assets/objects/object_jya_door/object_jya_door.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_JYA_DOOR_H +#define OBJECTS_OBJECT_JYA_DOOR_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gJyaDoorMetalBarsDL[] = dgJyaDoorMetalBarsDL; static const ALIGN_ASSET(2) char gSpiritDoorTex[] = dgSpiritDoorTex; #define dgSpiritDoorMetalBarsTex "__OTR__objects/object_jya_door/gSpiritDoorMetalBarsTex" -static const ALIGN_ASSET(2) char gSpiritDoorMetalBarsTex[] = dgSpiritDoorMetalBarsTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSpiritDoorMetalBarsTex[] = dgSpiritDoorMetalBarsTex; + +#endif // OBJECTS_OBJECT_JYA_DOOR_H diff --git a/soh/assets/objects/object_jya_iron/object_jya_iron.h b/soh/assets/objects/object_jya_iron/object_jya_iron.h index 85c142d7e..e75d5bc03 100644 --- a/soh/assets/objects/object_jya_iron/object_jya_iron.h +++ b/soh/assets/objects/object_jya_iron/object_jya_iron.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_JYA_IRON_H +#define OBJECTS_OBJECT_JYA_IRON_H 1 #include "align_asset_macro.h" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gThroneCol[] = dgThroneCol; static const ALIGN_ASSET(2) char gPillarSideTex[] = dgPillarSideTex; #define dgPillarTopTex "__OTR__objects/object_jya_iron/gPillarTopTex" -static const ALIGN_ASSET(2) char gPillarTopTex[] = dgPillarTopTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gPillarTopTex[] = dgPillarTopTex; + +#endif // OBJECTS_OBJECT_JYA_IRON_H diff --git a/soh/assets/objects/object_jya_obj/object_jya_obj.h b/soh/assets/objects/object_jya_obj/object_jya_obj.h index 37caa8f36..e34686999 100644 --- a/soh/assets/objects/object_jya_obj/object_jya_obj.h +++ b/soh/assets/objects/object_jya_obj/object_jya_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_JYA_OBJ_H +#define OBJECTS_OBJECT_JYA_OBJ_H 1 #include "align_asset_macro.h" @@ -249,4 +250,6 @@ static const ALIGN_ASSET(2) char object_jya_objTex_016140[] = dobject_jya_objTex static const ALIGN_ASSET(2) char object_jya_objTex_011A80[] = dobject_jya_objTex_011A80; #define dobject_jya_objTLUT_011A60 "__OTR__objects/object_jya_obj/object_jya_objTLUT_011A60" -static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60; \ No newline at end of file +static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60; + +#endif // OBJECTS_OBJECT_JYA_OBJ_H diff --git a/soh/assets/objects/object_ka/object_ka.h b/soh/assets/objects/object_ka/object_ka.h index 1a1d85f98..bd5bc3b2b 100644 --- a/soh/assets/objects/object_ka/object_ka.h +++ b/soh/assets/objects/object_ka/object_ka.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KA_H +#define OBJECTS_OBJECT_KA_H 1 #include "align_asset_macro.h" @@ -99,4 +100,7 @@ static const ALIGN_ASSET(2) char object_ka_Tex_005C00[] = dobject_ka_Tex_005C00; static const ALIGN_ASSET(2) char object_ka_Skel_0065B0[] = dobject_ka_Skel_0065B0; #define dobject_ka_Anim_0067AC "__OTR__objects/object_ka/object_ka_Anim_0067AC" -static const ALIGN_ASSET(2) char object_ka_Anim_0067AC[] = dobject_ka_Anim_0067AC; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ka_Anim_0067AC[] = dobject_ka_Anim_0067AC; + + +#endif // OBJECTS_OBJECT_KA_H diff --git a/soh/assets/objects/object_kanban/object_kanban.h b/soh/assets/objects/object_kanban/object_kanban.h index 490ab5b08..e157b588d 100644 --- a/soh/assets/objects/object_kanban/object_kanban.h +++ b/soh/assets/objects/object_kanban/object_kanban.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KANBAN_H +#define OBJECTS_OBJECT_KANBAN_H 1 #include "align_asset_macro.h" @@ -42,4 +43,6 @@ static const ALIGN_ASSET(2) char object_kanban_DL_001540[] = dobject_kanban_DL_0 static const ALIGN_ASSET(2) char object_kanban_DL_001630[] = dobject_kanban_DL_001630; #define dobject_kanban_Tex_0016B0 "__OTR__objects/object_kanban/object_kanban_Tex_0016B0" -static const ALIGN_ASSET(2) char object_kanban_Tex_0016B0[] = dobject_kanban_Tex_0016B0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_kanban_Tex_0016B0[] = dobject_kanban_Tex_0016B0; + +#endif // OBJECTS_OBJECT_KANBAN_H diff --git a/soh/assets/objects/object_kibako2/object_kibako2.h b/soh/assets/objects/object_kibako2/object_kibako2.h index a9574a423..fa6ec48f9 100644 --- a/soh/assets/objects/object_kibako2/object_kibako2.h +++ b/soh/assets/objects/object_kibako2/object_kibako2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KIBAKO2_H +#define OBJECTS_OBJECT_KIBAKO2_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gLargeCrateFragment1Tex[] = dgLargeCrateFragmen static const ALIGN_ASSET(2) char gLargeCrateFragment2Tex[] = dgLargeCrateFragment2Tex; #define dgLargeCrateCol "__OTR__objects/object_kibako2/gLargeCrateCol" -static const ALIGN_ASSET(2) char gLargeCrateCol[] = dgLargeCrateCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gLargeCrateCol[] = dgLargeCrateCol; + +#endif // OBJECTS_OBJECT_KIBAKO2_H diff --git a/soh/assets/objects/object_kingdodongo/object_kingdodongo.h b/soh/assets/objects/object_kingdodongo/object_kingdodongo.h index fb9ecb135..6e4176f3a 100644 --- a/soh/assets/objects/object_kingdodongo/object_kingdodongo.h +++ b/soh/assets/objects/object_kingdodongo/object_kingdodongo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KINGDODONGO_H +#define OBJECTS_OBJECT_KINGDODONGO_H 1 #include "align_asset_macro.h" @@ -234,4 +235,7 @@ static const ALIGN_ASSET(2) char object_kingdodongo_Tex_0300E0[] = dobject_kingd static const ALIGN_ASSET(2) char object_kingdodongo_Tex_0304E0[] = dobject_kingdodongo_Tex_0304E0; #define dobject_kingdodongo_Tex_0308E0 "__OTR__objects/object_kingdodongo/object_kingdodongo_Tex_0308E0" -static const ALIGN_ASSET(2) char object_kingdodongo_Tex_0308E0[] = dobject_kingdodongo_Tex_0308E0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_kingdodongo_Tex_0308E0[] = dobject_kingdodongo_Tex_0308E0; + + +#endif // OBJECTS_OBJECT_KINGDODONGO_H diff --git a/soh/assets/objects/object_km1/object_km1.h b/soh/assets/objects/object_km1/object_km1.h index c27f260a7..7e5b870e0 100644 --- a/soh/assets/objects/object_km1/object_km1.h +++ b/soh/assets/objects/object_km1/object_km1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KM1_H +#define OBJECTS_OBJECT_KM1_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char gKm1SkelLimb_000084DL_004138[] = dgKm1SkelLimb_ static const ALIGN_ASSET(2) char gKm1SkelLimb_000090DL_004370[] = dgKm1SkelLimb_000090DL_004370; #define dgKm1SkelLimb_00009CDL_0044A8 "__OTR__objects/object_km1/gKm1SkelLimb_00009CDL_0044A8" -static const ALIGN_ASSET(2) char gKm1SkelLimb_00009CDL_0044A8[] = dgKm1SkelLimb_00009CDL_0044A8; \ No newline at end of file +static const ALIGN_ASSET(2) char gKm1SkelLimb_00009CDL_0044A8[] = dgKm1SkelLimb_00009CDL_0044A8; + + +#endif // OBJECTS_OBJECT_KM1_H diff --git a/soh/assets/objects/object_kusa/object_kusa.h b/soh/assets/objects/object_kusa/object_kusa.h index 7996f1da0..9c671d170 100644 --- a/soh/assets/objects/object_kusa/object_kusa.h +++ b/soh/assets/objects/object_kusa/object_kusa.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KUSA_H +#define OBJECTS_OBJECT_KUSA_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_kusa_DL_000140[] = dobject_kusa_DL_000140; #define dobject_kusa_DL_0002E0 "__OTR__objects/object_kusa/object_kusa_DL_0002E0" -static const ALIGN_ASSET(2) char object_kusa_DL_0002E0[] = dobject_kusa_DL_0002E0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_kusa_DL_0002E0[] = dobject_kusa_DL_0002E0; + +#endif // OBJECTS_OBJECT_KUSA_H diff --git a/soh/assets/objects/object_kw1/object_kw1.h b/soh/assets/objects/object_kw1/object_kw1.h index a4f1bdb59..b2f1a51b0 100644 --- a/soh/assets/objects/object_kw1/object_kw1.h +++ b/soh/assets/objects/object_kw1/object_kw1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KW1_H +#define OBJECTS_OBJECT_KW1_H 1 #include "align_asset_macro.h" @@ -99,4 +100,7 @@ static const ALIGN_ASSET(2) char object_kw1_DL_006478[] = dobject_kw1_DL_006478; static const ALIGN_ASSET(2) char object_kw1_DL_006620[] = dobject_kw1_DL_006620; #define dobject_kw1_DL_0067C0 "__OTR__objects/object_kw1/object_kw1_DL_0067C0" -static const ALIGN_ASSET(2) char object_kw1_DL_0067C0[] = dobject_kw1_DL_0067C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_kw1_DL_0067C0[] = dobject_kw1_DL_0067C0; + + +#endif // OBJECTS_OBJECT_KW1_H diff --git a/soh/assets/objects/object_kz/object_kz.h b/soh/assets/objects/object_kz/object_kz.h index 4fc6c3096..d30f9a257 100644 --- a/soh/assets/objects/object_kz/object_kz.h +++ b/soh/assets/objects/object_kz/object_kz.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_KZ_H +#define OBJECTS_OBJECT_KZ_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char gKzLeftLegDL[] = dgKzLeftLegDL; static const ALIGN_ASSET(2) char gKzLeftFootDL[] = dgKzLeftFootDL; #define dgKzSkel "__OTR__objects/object_kz/gKzSkel" -static const ALIGN_ASSET(2) char gKzSkel[] = dgKzSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gKzSkel[] = dgKzSkel; + + +#endif // OBJECTS_OBJECT_KZ_H diff --git a/soh/assets/objects/object_light_ring/object_light_ring.h b/soh/assets/objects/object_light_ring/object_light_ring.h index b0fd766cb..337b2c89b 100644 --- a/soh/assets/objects/object_light_ring/object_light_ring.h +++ b/soh/assets/objects/object_light_ring/object_light_ring.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_LIGHT_RING_H +#define OBJECTS_OBJECT_LIGHT_RING_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGoldenGoddessLightRingDL[] = dgGoldenGoddessLightRingDL; #define dgGoldenGoddessLightRingTex "__OTR__objects/object_light_ring/gGoldenGoddessLightRingTex" -static const ALIGN_ASSET(2) char gGoldenGoddessLightRingTex[] = dgGoldenGoddessLightRingTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoldenGoddessLightRingTex[] = dgGoldenGoddessLightRingTex; + +#endif // OBJECTS_OBJECT_LIGHT_RING_H diff --git a/soh/assets/objects/object_lightbox/object_lightbox.h b/soh/assets/objects/object_lightbox/object_lightbox.h index c173d8d9a..b45053136 100644 --- a/soh/assets/objects/object_lightbox/object_lightbox.h +++ b/soh/assets/objects/object_lightbox/object_lightbox.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_LIGHTBOX_H +#define OBJECTS_OBJECT_LIGHTBOX_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_lightbox_Tex_000E10[] = dobject_lightbox static const ALIGN_ASSET(2) char object_lightbox_Tex_001610[] = dobject_lightbox_Tex_001610; #define dobject_lightbox_Col_001F10 "__OTR__objects/object_lightbox/object_lightbox_Col_001F10" -static const ALIGN_ASSET(2) char object_lightbox_Col_001F10[] = dobject_lightbox_Col_001F10; \ No newline at end of file +static const ALIGN_ASSET(2) char object_lightbox_Col_001F10[] = dobject_lightbox_Col_001F10; + +#endif // OBJECTS_OBJECT_LIGHTBOX_H diff --git a/soh/assets/objects/object_lightswitch/object_lightswitch.h b/soh/assets/objects/object_lightswitch/object_lightswitch.h index 2393f96d5..fd2e5fcbb 100644 --- a/soh/assets/objects/object_lightswitch/object_lightswitch.h +++ b/soh/assets/objects/object_lightswitch/object_lightswitch.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_LIGHTSWITCH_H +#define OBJECTS_OBJECT_LIGHTSWITCH_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char object_lightswitch_Tex_000C20[] = dobject_light static const ALIGN_ASSET(2) char object_lightswitch_Tex_001420[] = dobject_lightswitch_Tex_001420; #define dobject_lightswitch_Tex_001C20 "__OTR__objects/object_lightswitch/object_lightswitch_Tex_001C20" -static const ALIGN_ASSET(2) char object_lightswitch_Tex_001C20[] = dobject_lightswitch_Tex_001C20; \ No newline at end of file +static const ALIGN_ASSET(2) char object_lightswitch_Tex_001C20[] = dobject_lightswitch_Tex_001C20; + +#endif // OBJECTS_OBJECT_LIGHTSWITCH_H diff --git a/soh/assets/objects/object_link_boy/object_link_boy.h b/soh/assets/objects/object_link_boy/object_link_boy.h index ff7b63291..084225d14 100644 --- a/soh/assets/objects/object_link_boy/object_link_boy.h +++ b/soh/assets/objects/object_link_boy/object_link_boy.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_LINK_BOY_H +#define OBJECTS_OBJECT_LINK_BOY_H 1 #include "align_asset_macro.h" @@ -507,4 +508,6 @@ static const ALIGN_ASSET(2) char object_link_boyTLUT_00CF50[] = dobject_link_boy static const ALIGN_ASSET(2) char object_link_boyTLUT_00CB40[] = dobject_link_boyTLUT_00CB40; #define dobject_link_boyTLUT_00D078 "__OTR__objects/object_link_boy/object_link_boyTLUT_00D078" -static const ALIGN_ASSET(2) char object_link_boyTLUT_00D078[] = dobject_link_boyTLUT_00D078; \ No newline at end of file +static const ALIGN_ASSET(2) char object_link_boyTLUT_00D078[] = dobject_link_boyTLUT_00D078; + +#endif // OBJECTS_OBJECT_LINK_BOY_H diff --git a/soh/assets/objects/object_link_child/object_link_child.h b/soh/assets/objects/object_link_child/object_link_child.h index b73523fc5..8f49d115c 100644 --- a/soh/assets/objects/object_link_child/object_link_child.h +++ b/soh/assets/objects/object_link_child/object_link_child.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_LINK_CHILD_H +#define OBJECTS_OBJECT_LINK_CHILD_H 1 #include "align_asset_macro.h" @@ -456,4 +457,7 @@ static const ALIGN_ASSET(2) char gLinkChildVtx_01EB38[] = dgLinkChildVtx_01EB38; static const ALIGN_ASSET(2) char gLinkChildVtx_01F2B8[] = dgLinkChildVtx_01F2B8; #define dgLinkChildVtx_01FA28 "__OTR__objects/object_link_child/gLinkChildVtx_01FA28" -static const ALIGN_ASSET(2) char gLinkChildVtx_01FA28[] = dgLinkChildVtx_01FA28; \ No newline at end of file +static const ALIGN_ASSET(2) char gLinkChildVtx_01FA28[] = dgLinkChildVtx_01FA28; + + +#endif // OBJECTS_OBJECT_LINK_CHILD_H diff --git a/soh/assets/objects/object_ma1/object_ma1.h b/soh/assets/objects/object_ma1/object_ma1.h index 209ec0c98..baab12026 100644 --- a/soh/assets/objects/object_ma1/object_ma1.h +++ b/soh/assets/objects/object_ma1/object_ma1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MA1_H +#define OBJECTS_OBJECT_MA1_H 1 #include "align_asset_macro.h" @@ -117,4 +118,7 @@ static const ALIGN_ASSET(2) char gMalonChildLeftThighDL[] = dgMalonChildLeftThig static const ALIGN_ASSET(2) char gMalonChildLeftShinDL[] = dgMalonChildLeftShinDL; #define dgMalonChildLeftFootDL "__OTR__objects/object_ma1/gMalonChildLeftFootDL" -static const ALIGN_ASSET(2) char gMalonChildLeftFootDL[] = dgMalonChildLeftFootDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gMalonChildLeftFootDL[] = dgMalonChildLeftFootDL; + + +#endif // OBJECTS_OBJECT_MA1_H diff --git a/soh/assets/objects/object_ma2/object_ma2.h b/soh/assets/objects/object_ma2/object_ma2.h index 589413798..4da1f8d77 100644 --- a/soh/assets/objects/object_ma2/object_ma2.h +++ b/soh/assets/objects/object_ma2/object_ma2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MA2_H +#define OBJECTS_OBJECT_MA2_H 1 #include "align_asset_macro.h" @@ -141,4 +142,7 @@ static const ALIGN_ASSET(2) char gMalonAdultSingToIdleAnim[] = dgMalonAdultSingT static const ALIGN_ASSET(2) char gMalonAdultStandStillAnim[] = dgMalonAdultStandStillAnim; #define dgMalonAdultSingAnim "__OTR__objects/object_ma2/gMalonAdultSingAnim" -static const ALIGN_ASSET(2) char gMalonAdultSingAnim[] = dgMalonAdultSingAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gMalonAdultSingAnim[] = dgMalonAdultSingAnim; + + +#endif // OBJECTS_OBJECT_MA2_H diff --git a/soh/assets/objects/object_mag/object_mag.h b/soh/assets/objects/object_mag/object_mag.h index 8d397a0c5..07ccd88db 100644 --- a/soh/assets/objects/object_mag/object_mag.h +++ b/soh/assets/objects/object_mag/object_mag.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MAG_H +#define OBJECTS_OBJECT_MAG_H 1 #include "align_asset_macro.h" @@ -60,4 +61,6 @@ static const ALIGN_ASSET(2) char gTitleUraLogoTex[] = dgTitleUraLogoTex; static const ALIGN_ASSET(2) char gTitleDiskTex[] = dgTitleDiskTex; #define dgTitleTitleJPNTex "__OTR__objects/object_mag/gTitleTitleJPNTex" -static const ALIGN_ASSET(2) char gTitleTitleJPNTex[] = dgTitleTitleJPNTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gTitleTitleJPNTex[] = dgTitleTitleJPNTex; + +#endif // OBJECTS_OBJECT_MAG_H diff --git a/soh/assets/objects/object_mamenoki/object_mamenoki.h b/soh/assets/objects/object_mamenoki/object_mamenoki.h index 75c1cab5f..0909a714d 100644 --- a/soh/assets/objects/object_mamenoki/object_mamenoki.h +++ b/soh/assets/objects/object_mamenoki/object_mamenoki.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MAMENOKI_H +#define OBJECTS_OBJECT_MAMENOKI_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char gMagicBeanPlatformRootsTex[] = dgMagicBeanPlatf static const ALIGN_ASSET(2) char gMagicBeanStemTex[] = dgMagicBeanStemTex; #define dgMagicBeanPlatformCol "__OTR__objects/object_mamenoki/gMagicBeanPlatformCol" -static const ALIGN_ASSET(2) char gMagicBeanPlatformCol[] = dgMagicBeanPlatformCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gMagicBeanPlatformCol[] = dgMagicBeanPlatformCol; + +#endif // OBJECTS_OBJECT_MAMENOKI_H diff --git a/soh/assets/objects/object_mastergolon/object_mastergolon.h b/soh/assets/objects/object_mastergolon/object_mastergolon.h index f27c44e0d..3d49db758 100644 --- a/soh/assets/objects/object_mastergolon/object_mastergolon.h +++ b/soh/assets/objects/object_mastergolon/object_mastergolon.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MASTERGOLON_H +#define OBJECTS_OBJECT_MASTERGOLON_H 1 #include "align_asset_macro.h" #define dgGoronShopkeeperAnim "__OTR__objects/object_mastergolon/gGoronShopkeeperAnim" -static const ALIGN_ASSET(2) char gGoronShopkeeperAnim[] = dgGoronShopkeeperAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoronShopkeeperAnim[] = dgGoronShopkeeperAnim; + +#endif // OBJECTS_OBJECT_MASTERGOLON_H diff --git a/soh/assets/objects/object_masterkokiri/object_masterkokiri.h b/soh/assets/objects/object_masterkokiri/object_masterkokiri.h index 482f8e04d..8a44d6927 100644 --- a/soh/assets/objects/object_masterkokiri/object_masterkokiri.h +++ b/soh/assets/objects/object_masterkokiri/object_masterkokiri.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MASTERKOKIRI_H +#define OBJECTS_OBJECT_MASTERKOKIRI_H 1 #include "align_asset_macro.h" #define dobject_masterkokiri_Anim_0004A8 "__OTR__objects/object_masterkokiri/object_masterkokiri_Anim_0004A8" -static const ALIGN_ASSET(2) char object_masterkokiri_Anim_0004A8[] = dobject_masterkokiri_Anim_0004A8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_masterkokiri_Anim_0004A8[] = dobject_masterkokiri_Anim_0004A8; + +#endif // OBJECTS_OBJECT_MASTERKOKIRI_H diff --git a/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h b/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h index 60a94e0a3..eb93d9bc6 100644 --- a/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h +++ b/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MASTERKOKIRIHEAD_H +#define OBJECTS_OBJECT_MASTERKOKIRIHEAD_H 1 #include "align_asset_macro.h" @@ -36,4 +37,6 @@ static const ALIGN_ASSET(2) char gKokiriShopkeeperMouthAndNoseTex[] = dgKokiriSh static const ALIGN_ASSET(2) char object_masterkokiriheadTex_0009F0[] = dobject_masterkokiriheadTex_0009F0; #define dobject_masterkokiriheadTex_000A30 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_000A30" -static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30; \ No newline at end of file +static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30; + +#endif // OBJECTS_OBJECT_MASTERKOKIRIHEAD_H diff --git a/soh/assets/objects/object_masterzoora/object_masterzoora.h b/soh/assets/objects/object_masterzoora/object_masterzoora.h index 960f616ed..53bb1626b 100644 --- a/soh/assets/objects/object_masterzoora/object_masterzoora.h +++ b/soh/assets/objects/object_masterzoora/object_masterzoora.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MASTERZOORA_H +#define OBJECTS_OBJECT_MASTERZOORA_H 1 #include "align_asset_macro.h" #define dgZoraShopkeeperAnim "__OTR__objects/object_masterzoora/gZoraShopkeeperAnim" -static const ALIGN_ASSET(2) char gZoraShopkeeperAnim[] = dgZoraShopkeeperAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gZoraShopkeeperAnim[] = dgZoraShopkeeperAnim; + +#endif // OBJECTS_OBJECT_MASTERZOORA_H diff --git a/soh/assets/objects/object_mb/object_mb.h b/soh/assets/objects/object_mb/object_mb.h index 7aed44cba..3079270a0 100644 --- a/soh/assets/objects/object_mb/object_mb.h +++ b/soh/assets/objects/object_mb/object_mb.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MB_H +#define OBJECTS_OBJECT_MB_H 1 #include "align_asset_macro.h" @@ -167,9 +168,6 @@ static const ALIGN_ASSET(2) char gEnMbDL_013A30[] = dgEnMbDL_013A30; #define dgEnMbDL_013DF0 "__OTR__objects/object_mb/gEnMbDL_013DF0" static const ALIGN_ASSET(2) char gEnMbDL_013DF0[] = dgEnMbDL_013DF0; -#define dgEnMbSpearSkelLimbsLimb_008DE8DL_007908 "__OTR__objects/object_mb/gEnMbSpearSkelLimbsLimb_008DE8DL_007908" -static const ALIGN_ASSET(2) char gEnMbSpearSkelLimbsLimb_008DE8DL_007908[] = dgEnMbSpearSkelLimbsLimb_008DE8DL_007908; - #define dobject_mbTex_008328 "__OTR__objects/object_mb/object_mbTex_008328" static const ALIGN_ASSET(2) char object_mbTex_008328[] = dobject_mbTex_008328; @@ -210,4 +208,10 @@ static const ALIGN_ASSET(2) char object_mbTex_00EF00[] = dobject_mbTex_00EF00; static const ALIGN_ASSET(2) char object_mbTex_00F000[] = dobject_mbTex_00F000; #define dobject_mbTex_00F200 "__OTR__objects/object_mb/object_mbTex_00F200" -static const ALIGN_ASSET(2) char object_mbTex_00F200[] = dobject_mbTex_00F200; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mbTex_00F200[] = dobject_mbTex_00F200; + +#define dgEnMbSpearSkelLimbsLimb_008DE8DL_007908 "__OTR__objects/object_mb/gEnMbSpearSkelLimbsLimb_008DE8DL_007908" +static const ALIGN_ASSET(2) char gEnMbSpearSkelLimbsLimb_008DE8DL_007908[] = dgEnMbSpearSkelLimbsLimb_008DE8DL_007908; + + +#endif // OBJECTS_OBJECT_MB_H diff --git a/soh/assets/objects/object_md/object_md.h b/soh/assets/objects/object_md/object_md.h index e7769fe83..1c82cde81 100644 --- a/soh/assets/objects/object_md/object_md.h +++ b/soh/assets/objects/object_md/object_md.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MD_H +#define OBJECTS_OBJECT_MD_H 1 #include "align_asset_macro.h" @@ -162,4 +163,7 @@ static const ALIGN_ASSET(2) char gMidoPutHandDownAnim[] = dgMidoPutHandDownAnim; static const ALIGN_ASSET(2) char gMidoHaltAnim[] = dgMidoHaltAnim; #define dgMidoWalkingAnim "__OTR__objects/object_md/gMidoWalkingAnim" -static const ALIGN_ASSET(2) char gMidoWalkingAnim[] = dgMidoWalkingAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gMidoWalkingAnim[] = dgMidoWalkingAnim; + + +#endif // OBJECTS_OBJECT_MD_H diff --git a/soh/assets/objects/object_medal/object_medal.h b/soh/assets/objects/object_medal/object_medal.h index d051b1aad..e3334b259 100644 --- a/soh/assets/objects/object_medal/object_medal.h +++ b/soh/assets/objects/object_medal/object_medal.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MEDAL_H +#define OBJECTS_OBJECT_MEDAL_H 1 #include "align_asset_macro.h" @@ -39,4 +40,6 @@ static const ALIGN_ASSET(2) char object_medal_Tex_003940[] = dobject_medal_Tex_0 static const ALIGN_ASSET(2) char object_medal_Tex_004140[] = dobject_medal_Tex_004140; #define dobject_medal_Tex_004940 "__OTR__objects/object_medal/object_medal_Tex_004940" -static const ALIGN_ASSET(2) char object_medal_Tex_004940[] = dobject_medal_Tex_004940; \ No newline at end of file +static const ALIGN_ASSET(2) char object_medal_Tex_004940[] = dobject_medal_Tex_004940; + +#endif // OBJECTS_OBJECT_MEDAL_H diff --git a/soh/assets/objects/object_menkuri_objects/object_menkuri_objects.h b/soh/assets/objects/object_menkuri_objects/object_menkuri_objects.h index d883aa380..3aea6c548 100644 --- a/soh/assets/objects/object_menkuri_objects/object_menkuri_objects.h +++ b/soh/assets/objects/object_menkuri_objects/object_menkuri_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MENKURI_OBJECTS_H +#define OBJECTS_OBJECT_MENKURI_OBJECTS_H 1 #include "align_asset_macro.h" @@ -42,4 +43,6 @@ static const ALIGN_ASSET(2) char gGTGEyeStatueEyeDL[] = dgGTGEyeStatueEyeDL; static const ALIGN_ASSET(2) char gGTGRotatingRingPlatformDL[] = dgGTGRotatingRingPlatformDL; #define dgGTGRotatingRingPlatformCol "__OTR__objects/object_menkuri_objects/gGTGRotatingRingPlatformCol" -static const ALIGN_ASSET(2) char gGTGRotatingRingPlatformCol[] = dgGTGRotatingRingPlatformCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gGTGRotatingRingPlatformCol[] = dgGTGRotatingRingPlatformCol; + +#endif // OBJECTS_OBJECT_MENKURI_OBJECTS_H diff --git a/soh/assets/objects/object_mir_ray/object_mir_ray.h b/soh/assets/objects/object_mir_ray/object_mir_ray.h index a697e3cb3..e8acf291e 100644 --- a/soh/assets/objects/object_mir_ray/object_mir_ray.h +++ b/soh/assets/objects/object_mir_ray/object_mir_ray.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MIR_RAY_H +#define OBJECTS_OBJECT_MIR_RAY_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gShieldBeamImageCircleTex[] = dgShieldBeamImage static const ALIGN_ASSET(2) char gShieldBeamImageGerudoSymbolNewTex[] = dgShieldBeamImageGerudoSymbolNewTex; #define dgShieldBeamGlowRayTex "__OTR__objects/object_mir_ray/gShieldBeamGlowRayTex" -static const ALIGN_ASSET(2) char gShieldBeamGlowRayTex[] = dgShieldBeamGlowRayTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gShieldBeamGlowRayTex[] = dgShieldBeamGlowRayTex; + +#endif // OBJECTS_OBJECT_MIR_RAY_H diff --git a/soh/assets/objects/object_mizu_objects/object_mizu_objects.h b/soh/assets/objects/object_mizu_objects/object_mizu_objects.h index aa5b5b7de..c135c8db2 100644 --- a/soh/assets/objects/object_mizu_objects/object_mizu_objects.h +++ b/soh/assets/objects/object_mizu_objects/object_mizu_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MIZU_OBJECTS_H +#define OBJECTS_OBJECT_MIZU_OBJECTS_H 1 #include "align_asset_macro.h" @@ -132,4 +133,6 @@ static const ALIGN_ASSET(2) char object_mizu_objectsTex_004C00[] = dobject_mizu_ static const ALIGN_ASSET(2) char object_mizu_objectsTex_005E70[] = dobject_mizu_objectsTex_005E70; #define dobject_mizu_objectsTex_00A720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00A720" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_00A720[] = dobject_mizu_objectsTex_00A720; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mizu_objectsTex_00A720[] = dobject_mizu_objectsTex_00A720; + +#endif // OBJECTS_OBJECT_MIZU_OBJECTS_H diff --git a/soh/assets/objects/object_mjin/object_mjin.h b/soh/assets/objects/object_mjin/object_mjin.h index ce95b1b64..3b1f3d347 100644 --- a/soh/assets/objects/object_mjin/object_mjin.h +++ b/soh/assets/objects/object_mjin/object_mjin.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_H +#define OBJECTS_OBJECT_MJIN_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gWarpPadCol[] = dgWarpPadCol; static const ALIGN_ASSET(2) char gWarpPadSideTex[] = dgWarpPadSideTex; #define dgWarpPadTopTex "__OTR__objects/object_mjin/gWarpPadTopTex" -static const ALIGN_ASSET(2) char gWarpPadTopTex[] = dgWarpPadTopTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gWarpPadTopTex[] = dgWarpPadTopTex; + +#endif // OBJECTS_OBJECT_MJIN_H diff --git a/soh/assets/objects/object_mjin_dark/object_mjin_dark.h b/soh/assets/objects/object_mjin_dark/object_mjin_dark.h index f591919ac..4859350f2 100644 --- a/soh/assets/objects/object_mjin_dark/object_mjin_dark.h +++ b/soh/assets/objects/object_mjin_dark/object_mjin_dark.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_DARK_H +#define OBJECTS_OBJECT_MJIN_DARK_H 1 #include "align_asset_macro.h" #define dgShadowMedallionPlatformTex "__OTR__objects/object_mjin_dark/gShadowMedallionPlatformTex" -static const ALIGN_ASSET(2) char gShadowMedallionPlatformTex[] = dgShadowMedallionPlatformTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gShadowMedallionPlatformTex[] = dgShadowMedallionPlatformTex; + +#endif // OBJECTS_OBJECT_MJIN_DARK_H diff --git a/soh/assets/objects/object_mjin_flame/object_mjin_flame.h b/soh/assets/objects/object_mjin_flame/object_mjin_flame.h index 7c423bc6b..2a9f0c043 100644 --- a/soh/assets/objects/object_mjin_flame/object_mjin_flame.h +++ b/soh/assets/objects/object_mjin_flame/object_mjin_flame.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_FLAME_H +#define OBJECTS_OBJECT_MJIN_FLAME_H 1 #include "align_asset_macro.h" #define dgFireMedallionPlatformTex "__OTR__objects/object_mjin_flame/gFireMedallionPlatformTex" -static const ALIGN_ASSET(2) char gFireMedallionPlatformTex[] = dgFireMedallionPlatformTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gFireMedallionPlatformTex[] = dgFireMedallionPlatformTex; + +#endif // OBJECTS_OBJECT_MJIN_FLAME_H diff --git a/soh/assets/objects/object_mjin_flash/object_mjin_flash.h b/soh/assets/objects/object_mjin_flash/object_mjin_flash.h index 0ec2e155e..6f34cbe9a 100644 --- a/soh/assets/objects/object_mjin_flash/object_mjin_flash.h +++ b/soh/assets/objects/object_mjin_flash/object_mjin_flash.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_FLASH_H +#define OBJECTS_OBJECT_MJIN_FLASH_H 1 #include "align_asset_macro.h" #define dgLightMedallionPlatformTex "__OTR__objects/object_mjin_flash/gLightMedallionPlatformTex" -static const ALIGN_ASSET(2) char gLightMedallionPlatformTex[] = dgLightMedallionPlatformTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLightMedallionPlatformTex[] = dgLightMedallionPlatformTex; + +#endif // OBJECTS_OBJECT_MJIN_FLASH_H diff --git a/soh/assets/objects/object_mjin_ice/object_mjin_ice.h b/soh/assets/objects/object_mjin_ice/object_mjin_ice.h index 5cb0a2a6c..f8955337d 100644 --- a/soh/assets/objects/object_mjin_ice/object_mjin_ice.h +++ b/soh/assets/objects/object_mjin_ice/object_mjin_ice.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_ICE_H +#define OBJECTS_OBJECT_MJIN_ICE_H 1 #include "align_asset_macro.h" #define dgWaterMedallionPlatformTex "__OTR__objects/object_mjin_ice/gWaterMedallionPlatformTex" -static const ALIGN_ASSET(2) char gWaterMedallionPlatformTex[] = dgWaterMedallionPlatformTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gWaterMedallionPlatformTex[] = dgWaterMedallionPlatformTex; + +#endif // OBJECTS_OBJECT_MJIN_ICE_H diff --git a/soh/assets/objects/object_mjin_oka/object_mjin_oka.h b/soh/assets/objects/object_mjin_oka/object_mjin_oka.h index f76bd1d42..2cd6ba1d1 100644 --- a/soh/assets/objects/object_mjin_oka/object_mjin_oka.h +++ b/soh/assets/objects/object_mjin_oka/object_mjin_oka.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_OKA_H +#define OBJECTS_OBJECT_MJIN_OKA_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gOcarinaWarpPadCol[] = dgOcarinaWarpPadCol; static const ALIGN_ASSET(2) char gOcarinaWarpPadSideTex[] = dgOcarinaWarpPadSideTex; #define dgOcarinaWarpPadOcarinaTex "__OTR__objects/object_mjin_oka/gOcarinaWarpPadOcarinaTex" -static const ALIGN_ASSET(2) char gOcarinaWarpPadOcarinaTex[] = dgOcarinaWarpPadOcarinaTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gOcarinaWarpPadOcarinaTex[] = dgOcarinaWarpPadOcarinaTex; + +#endif // OBJECTS_OBJECT_MJIN_OKA_H diff --git a/soh/assets/objects/object_mjin_soul/object_mjin_soul.h b/soh/assets/objects/object_mjin_soul/object_mjin_soul.h index 13dff55d4..e6c60fbe1 100644 --- a/soh/assets/objects/object_mjin_soul/object_mjin_soul.h +++ b/soh/assets/objects/object_mjin_soul/object_mjin_soul.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_SOUL_H +#define OBJECTS_OBJECT_MJIN_SOUL_H 1 #include "align_asset_macro.h" #define dgSpiritMedallionPlatformTex "__OTR__objects/object_mjin_soul/gSpiritMedallionPlatformTex" -static const ALIGN_ASSET(2) char gSpiritMedallionPlatformTex[] = dgSpiritMedallionPlatformTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSpiritMedallionPlatformTex[] = dgSpiritMedallionPlatformTex; + +#endif // OBJECTS_OBJECT_MJIN_SOUL_H diff --git a/soh/assets/objects/object_mjin_wind/object_mjin_wind.h b/soh/assets/objects/object_mjin_wind/object_mjin_wind.h index d964ebc78..97149dfc9 100644 --- a/soh/assets/objects/object_mjin_wind/object_mjin_wind.h +++ b/soh/assets/objects/object_mjin_wind/object_mjin_wind.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MJIN_WIND_H +#define OBJECTS_OBJECT_MJIN_WIND_H 1 #include "align_asset_macro.h" #define dgForestMedallionPlatformTex "__OTR__objects/object_mjin_wind/gForestMedallionPlatformTex" -static const ALIGN_ASSET(2) char gForestMedallionPlatformTex[] = dgForestMedallionPlatformTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gForestMedallionPlatformTex[] = dgForestMedallionPlatformTex; + +#endif // OBJECTS_OBJECT_MJIN_WIND_H diff --git a/soh/assets/objects/object_mk/object_mk.h b/soh/assets/objects/object_mk/object_mk.h index 069b5b18d..da5ad2f98 100644 --- a/soh/assets/objects/object_mk/object_mk.h +++ b/soh/assets/objects/object_mk/object_mk.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MK_H +#define OBJECTS_OBJECT_MK_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char object_mk_Tex_005BF0[] = dobject_mk_Tex_005BF0; static const ALIGN_ASSET(2) char object_mk_Tex_005C30[] = dobject_mk_Tex_005C30; #define dobject_mk_Skel_005DF0 "__OTR__objects/object_mk/object_mk_Skel_005DF0" -static const ALIGN_ASSET(2) char object_mk_Skel_005DF0[] = dobject_mk_Skel_005DF0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mk_Skel_005DF0[] = dobject_mk_Skel_005DF0; + + +#endif // OBJECTS_OBJECT_MK_H diff --git a/soh/assets/objects/object_mm/object_mm.h b/soh/assets/objects/object_mm/object_mm.h index 1507b02c4..00170fa3b 100644 --- a/soh/assets/objects/object_mm/object_mm.h +++ b/soh/assets/objects/object_mm/object_mm.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MM_H +#define OBJECTS_OBJECT_MM_H 1 #include "align_asset_macro.h" @@ -102,4 +103,6 @@ static const ALIGN_ASSET(2) char object_mmTex_0009F0[] = dobject_mmTex_0009F0; static const ALIGN_ASSET(2) char object_mmTex_000A30[] = dobject_mmTex_000A30; #define dobject_mmTex_000B30 "__OTR__objects/object_mm/object_mmTex_000B30" -static const ALIGN_ASSET(2) char object_mmTex_000B30[] = dobject_mmTex_000B30; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mmTex_000B30[] = dobject_mmTex_000B30; + +#endif // OBJECTS_OBJECT_MM_H diff --git a/soh/assets/objects/object_mo/object_mo.h b/soh/assets/objects/object_mo/object_mo.h index 07fb70c36..61983a400 100644 --- a/soh/assets/objects/object_mo/object_mo.h +++ b/soh/assets/objects/object_mo/object_mo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MO_H +#define OBJECTS_OBJECT_MO_H 1 #include "align_asset_macro.h" @@ -186,4 +187,6 @@ static const ALIGN_ASSET(2) char object_moTex_005520[] = dobject_moTex_005520; static const ALIGN_ASSET(2) char object_moTex_000000[] = dobject_moTex_000000; #define dobject_moTex_000680 "__OTR__objects/object_mo/object_moTex_000680" -static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680; \ No newline at end of file +static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680; + +#endif // OBJECTS_OBJECT_MO_H diff --git a/soh/assets/objects/object_mori_hineri1/object_mori_hineri1.h b/soh/assets/objects/object_mori_hineri1/object_mori_hineri1.h index c133abb6d..4b2d6de40 100644 --- a/soh/assets/objects/object_mori_hineri1/object_mori_hineri1.h +++ b/soh/assets/objects/object_mori_hineri1/object_mori_hineri1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MORI_HINERI1_H +#define OBJECTS_OBJECT_MORI_HINERI1_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_mori_hineri1_DL_0024E0[] = dobject_mori_hineri1_DL_0024E0; #define dobject_mori_hineri1_Col_0054B8 "__OTR__objects/object_mori_hineri1/object_mori_hineri1_Col_0054B8" -static const ALIGN_ASSET(2) char object_mori_hineri1_Col_0054B8[] = dobject_mori_hineri1_Col_0054B8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mori_hineri1_Col_0054B8[] = dobject_mori_hineri1_Col_0054B8; + +#endif // OBJECTS_OBJECT_MORI_HINERI1_H diff --git a/soh/assets/objects/object_mori_hineri1a/object_mori_hineri1a.h b/soh/assets/objects/object_mori_hineri1a/object_mori_hineri1a.h index 35ac0f8e9..23c650863 100644 --- a/soh/assets/objects/object_mori_hineri1a/object_mori_hineri1a.h +++ b/soh/assets/objects/object_mori_hineri1a/object_mori_hineri1a.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MORI_HINERI1A_H +#define OBJECTS_OBJECT_MORI_HINERI1A_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_mori_hineri1a_DL_001980[] = dobject_mori_hineri1a_DL_001980; #define dobject_mori_hineri1a_Col_003490 "__OTR__objects/object_mori_hineri1a/object_mori_hineri1a_Col_003490" -static const ALIGN_ASSET(2) char object_mori_hineri1a_Col_003490[] = dobject_mori_hineri1a_Col_003490; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mori_hineri1a_Col_003490[] = dobject_mori_hineri1a_Col_003490; + +#endif // OBJECTS_OBJECT_MORI_HINERI1A_H diff --git a/soh/assets/objects/object_mori_hineri2/object_mori_hineri2.h b/soh/assets/objects/object_mori_hineri2/object_mori_hineri2.h index 3de482459..88d536e78 100644 --- a/soh/assets/objects/object_mori_hineri2/object_mori_hineri2.h +++ b/soh/assets/objects/object_mori_hineri2/object_mori_hineri2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MORI_HINERI2_H +#define OBJECTS_OBJECT_MORI_HINERI2_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_mori_hineri2_DL_0020F0[] = dobject_mori_hineri2_DL_0020F0; #define dobject_mori_hineri2_Col_0043D0 "__OTR__objects/object_mori_hineri2/object_mori_hineri2_Col_0043D0" -static const ALIGN_ASSET(2) char object_mori_hineri2_Col_0043D0[] = dobject_mori_hineri2_Col_0043D0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mori_hineri2_Col_0043D0[] = dobject_mori_hineri2_Col_0043D0; + +#endif // OBJECTS_OBJECT_MORI_HINERI2_H diff --git a/soh/assets/objects/object_mori_hineri2a/object_mori_hineri2a.h b/soh/assets/objects/object_mori_hineri2a/object_mori_hineri2a.h index 62c1d0036..44cc4ae8b 100644 --- a/soh/assets/objects/object_mori_hineri2a/object_mori_hineri2a.h +++ b/soh/assets/objects/object_mori_hineri2a/object_mori_hineri2a.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MORI_HINERI2A_H +#define OBJECTS_OBJECT_MORI_HINERI2A_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_mori_hineri2a_DL_002B70[] = dobject_mori_hineri2a_DL_002B70; #define dobject_mori_hineri2a_Col_006078 "__OTR__objects/object_mori_hineri2a/object_mori_hineri2a_Col_006078" -static const ALIGN_ASSET(2) char object_mori_hineri2a_Col_006078[] = dobject_mori_hineri2a_Col_006078; \ No newline at end of file +static const ALIGN_ASSET(2) char object_mori_hineri2a_Col_006078[] = dobject_mori_hineri2a_Col_006078; + +#endif // OBJECTS_OBJECT_MORI_HINERI2A_H diff --git a/soh/assets/objects/object_mori_objects/object_mori_objects.h b/soh/assets/objects/object_mori_objects/object_mori_objects.h index bf6a5f21a..8be7f5e6a 100644 --- a/soh/assets/objects/object_mori_objects/object_mori_objects.h +++ b/soh/assets/objects/object_mori_objects/object_mori_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MORI_OBJECTS_H +#define OBJECTS_OBJECT_MORI_OBJECTS_H 1 #include "align_asset_macro.h" @@ -60,4 +61,6 @@ static const ALIGN_ASSET(2) char gMoriKaitenkabeDL[] = dgMoriKaitenkabeDL; static const ALIGN_ASSET(2) char gMoriRakkatenjoCol[] = dgMoriRakkatenjoCol; #define dgMoriRakkatenjoDL "__OTR__objects/object_mori_objects/gMoriRakkatenjoDL" -static const ALIGN_ASSET(2) char gMoriRakkatenjoDL[] = dgMoriRakkatenjoDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gMoriRakkatenjoDL[] = dgMoriRakkatenjoDL; + +#endif // OBJECTS_OBJECT_MORI_OBJECTS_H diff --git a/soh/assets/objects/object_mori_tex/object_mori_tex.h b/soh/assets/objects/object_mori_tex/object_mori_tex.h index 2780e6fa5..be4290bf4 100644 --- a/soh/assets/objects/object_mori_tex/object_mori_tex.h +++ b/soh/assets/objects/object_mori_tex/object_mori_tex.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MORI_TEX_H +#define OBJECTS_OBJECT_MORI_TEX_H 1 #include "align_asset_macro.h" @@ -11,8 +12,8 @@ static const ALIGN_ASSET(2) char gMoriElevatorTopTex[] = dgMoriElevatorTopTex; #define dgMoriElevatorSideTex "__OTR__objects/object_mori_tex/gMoriElevatorSideTex" static const ALIGN_ASSET(2) char gMoriElevatorSideTex[] = dgMoriElevatorSideTex; -#define dgMorieStoneWallTex "__OTR__objects/object_mori_tex/gMorieStoneWallTex" -static const ALIGN_ASSET(2) char gMorieStoneWallTex[] = dgMorieStoneWallTex; +#define dgMoriStoneWallTex "__OTR__objects/object_mori_tex/gMoriStoneWallTex" +static const ALIGN_ASSET(2) char gMoriStoneWallTex[] = dgMoriStoneWallTex; #define dgMoriKaitenkabeMetalWallTex "__OTR__objects/object_mori_tex/gMoriKaitenkabeMetalWallTex" static const ALIGN_ASSET(2) char gMoriKaitenkabeMetalWallTex[] = dgMoriKaitenkabeMetalWallTex; @@ -54,4 +55,6 @@ static const ALIGN_ASSET(2) char gForestTwistedHallLadderTex[] = dgForestTwisted static const ALIGN_ASSET(2) char gForestTwistedHallBrickTex[] = dgForestTwistedHallBrickTex; #define dgMoriHashiraGateTex "__OTR__objects/object_mori_tex/gMoriHashiraGateTex" -static const ALIGN_ASSET(2) char gMoriHashiraGateTex[] = dgMoriHashiraGateTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMoriHashiraGateTex[] = dgMoriHashiraGateTex; + +#endif // OBJECTS_OBJECT_MORI_TEX_H diff --git a/soh/assets/objects/object_ms/object_ms.h b/soh/assets/objects/object_ms/object_ms.h index f6ccd936f..3ac936e4b 100644 --- a/soh/assets/objects/object_ms/object_ms.h +++ b/soh/assets/objects/object_ms/object_ms.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MS_H +#define OBJECTS_OBJECT_MS_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char gBeanSalesmanSkinGradientTex[] = dgBeanSalesman static const ALIGN_ASSET(2) char gBeanSalesmanBeanbagTex[] = dgBeanSalesmanBeanbagTex; #define dgBeanSalesmanEatingAnim "__OTR__objects/object_ms/gBeanSalesmanEatingAnim" -static const ALIGN_ASSET(2) char gBeanSalesmanEatingAnim[] = dgBeanSalesmanEatingAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gBeanSalesmanEatingAnim[] = dgBeanSalesmanEatingAnim; + + +#endif // OBJECTS_OBJECT_MS_H diff --git a/soh/assets/objects/object_mu/object_mu.h b/soh/assets/objects/object_mu/object_mu.h index 307ae6d17..ee73cd2e4 100644 --- a/soh/assets/objects/object_mu/object_mu.h +++ b/soh/assets/objects/object_mu/object_mu.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_MU_H +#define OBJECTS_OBJECT_MU_H 1 #include "align_asset_macro.h" @@ -171,4 +172,7 @@ static const ALIGN_ASSET(2) char object_mu_DL_00AAB8[] = dobject_mu_DL_00AAB8; static const ALIGN_ASSET(2) char object_mu_DL_00ABB8[] = dobject_mu_DL_00ABB8; #define dgDancingCoupleSkel "__OTR__objects/object_mu/gDancingCoupleSkel" -static const ALIGN_ASSET(2) char gDancingCoupleSkel[] = dgDancingCoupleSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gDancingCoupleSkel[] = dgDancingCoupleSkel; + + +#endif // OBJECTS_OBJECT_MU_H diff --git a/soh/assets/objects/object_nb/object_nb.h b/soh/assets/objects/object_nb/object_nb.h index f960dcc27..023ff176c 100644 --- a/soh/assets/objects/object_nb/object_nb.h +++ b/soh/assets/objects/object_nb/object_nb.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_NB_H +#define OBJECTS_OBJECT_NB_H 1 #include "align_asset_macro.h" @@ -234,4 +235,7 @@ static const ALIGN_ASSET(2) char gNabooruWalkingAnim[] = dgNabooruWalkingAnim; static const ALIGN_ASSET(2) char gNabooruStandingHandsOnHipsChamberOfSagesAnim[] = dgNabooruStandingHandsOnHipsChamberOfSagesAnim; #define dgNabooruUnusedVtx_00EFF8 "__OTR__objects/object_nb/gNabooruUnusedVtx_00EFF8" -static const ALIGN_ASSET(2) char gNabooruUnusedVtx_00EFF8[] = dgNabooruUnusedVtx_00EFF8; \ No newline at end of file +static const ALIGN_ASSET(2) char gNabooruUnusedVtx_00EFF8[] = dgNabooruUnusedVtx_00EFF8; + + +#endif // OBJECTS_OBJECT_NB_H diff --git a/soh/assets/objects/object_niw/object_niw.h b/soh/assets/objects/object_niw/object_niw.h index cdac4b02b..0f932c5ea 100644 --- a/soh/assets/objects/object_niw/object_niw.h +++ b/soh/assets/objects/object_niw/object_niw.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_NIW_H +#define OBJECTS_OBJECT_NIW_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char gCuccoClawTex[] = dgCuccoClawTex; static const ALIGN_ASSET(2) char gCuccoTex_2180[] = dgCuccoTex_2180; #define dgCuccoAnim "__OTR__objects/object_niw/gCuccoAnim" -static const ALIGN_ASSET(2) char gCuccoAnim[] = dgCuccoAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gCuccoAnim[] = dgCuccoAnim; + + +#endif // OBJECTS_OBJECT_NIW_H diff --git a/soh/assets/objects/object_nwc/object_nwc.h b/soh/assets/objects/object_nwc/object_nwc.h index 03442ec62..2edc1436a 100644 --- a/soh/assets/objects/object_nwc/object_nwc.h +++ b/soh/assets/objects/object_nwc/object_nwc.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_NWC_H +#define OBJECTS_OBJECT_NWC_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char gCuccoChickBeakDL[] = dgCuccoChickBeakDL; static const ALIGN_ASSET(2) char gCuccoChickSetupShadowDL[] = dgCuccoChickSetupShadowDL; #define dgCuccoChickShadowDL "__OTR__objects/object_nwc/gCuccoChickShadowDL" -static const ALIGN_ASSET(2) char gCuccoChickShadowDL[] = dgCuccoChickShadowDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gCuccoChickShadowDL[] = dgCuccoChickShadowDL; + +#endif // OBJECTS_OBJECT_NWC_H diff --git a/soh/assets/objects/object_ny/object_ny.h b/soh/assets/objects/object_ny/object_ny.h index 251262591..cd27a9c62 100644 --- a/soh/assets/objects/object_ny/object_ny.h +++ b/soh/assets/objects/object_ny/object_ny.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_NY_H +#define OBJECTS_OBJECT_NY_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gEnNyRockBodyDL[] = dgEnNyRockBodyDL; static const ALIGN_ASSET(2) char gEnNyMetalBodyDL[] = dgEnNyMetalBodyDL; #define dgEnNySpikeDL "__OTR__objects/object_ny/gEnNySpikeDL" -static const ALIGN_ASSET(2) char gEnNySpikeDL[] = dgEnNySpikeDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gEnNySpikeDL[] = dgEnNySpikeDL; + +#endif // OBJECTS_OBJECT_NY_H diff --git a/soh/assets/objects/object_oA1/object_oA1.h b/soh/assets/objects/object_oA1/object_oA1.h index 0fb6bbc62..88c9b714e 100644 --- a/soh/assets/objects/object_oA1/object_oA1.h +++ b/soh/assets/objects/object_oA1/object_oA1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA1_H +#define OBJECTS_OBJECT_OA1_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char object_oA1_Tex_00004208[] = dobject_oA1_Tex_000 static const ALIGN_ASSET(2) char object_oA1_Tex_00004308[] = dobject_oA1_Tex_00004308; #define dobject_oA1_Tex_00004508 "__OTR__objects/object_oA1/object_oA1_Tex_00004508" -static const ALIGN_ASSET(2) char object_oA1_Tex_00004508[] = dobject_oA1_Tex_00004508; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA1_Tex_00004508[] = dobject_oA1_Tex_00004508; + + +#endif // OBJECTS_OBJECT_OA1_H diff --git a/soh/assets/objects/object_oA10/object_oA10.h b/soh/assets/objects/object_oA10/object_oA10.h index ab34c52e7..b62941295 100644 --- a/soh/assets/objects/object_oA10/object_oA10.h +++ b/soh/assets/objects/object_oA10/object_oA10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA10_H +#define OBJECTS_OBJECT_OA10_H 1 #include "align_asset_macro.h" @@ -72,4 +73,7 @@ static const ALIGN_ASSET(2) char object_oA10_Tex_00002D30[] = dobject_oA10_Tex_0 static const ALIGN_ASSET(2) char object_oA10_Tex_00002DB0[] = dobject_oA10_Tex_00002DB0; #define dobject_oA10_Tex_00002E30 "__OTR__objects/object_oA10/object_oA10_Tex_00002E30" -static const ALIGN_ASSET(2) char object_oA10_Tex_00002E30[] = dobject_oA10_Tex_00002E30; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA10_Tex_00002E30[] = dobject_oA10_Tex_00002E30; + + +#endif // OBJECTS_OBJECT_OA10_H diff --git a/soh/assets/objects/object_oA11/object_oA11.h b/soh/assets/objects/object_oA11/object_oA11.h index 699647e5d..50e564600 100644 --- a/soh/assets/objects/object_oA11/object_oA11.h +++ b/soh/assets/objects/object_oA11/object_oA11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA11_H +#define OBJECTS_OBJECT_OA11_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_oA11_Tex_001100[] = dobject_oA11_Tex_001 static const ALIGN_ASSET(2) char object_oA11_Tex_001140[] = dobject_oA11_Tex_001140; #define dobject_oA11_Tex_001540 "__OTR__objects/object_oA11/object_oA11_Tex_001540" -static const ALIGN_ASSET(2) char object_oA11_Tex_001540[] = dobject_oA11_Tex_001540; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA11_Tex_001540[] = dobject_oA11_Tex_001540; + +#endif // OBJECTS_OBJECT_OA11_H diff --git a/soh/assets/objects/object_oA2/object_oA2.h b/soh/assets/objects/object_oA2/object_oA2.h index 17d55d584..68861e509 100644 --- a/soh/assets/objects/object_oA2/object_oA2.h +++ b/soh/assets/objects/object_oA2/object_oA2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA2_H +#define OBJECTS_OBJECT_OA2_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char object_oA2_DL_000046A0[] = dobject_oA2_DL_00004 static const ALIGN_ASSET(2) char object_oA2_DL_00004B70[] = dobject_oA2_DL_00004B70; #define dobject_oA2_DL_000054F8 "__OTR__objects/object_oA2/object_oA2_DL_000054F8" -static const ALIGN_ASSET(2) char object_oA2_DL_000054F8[] = dobject_oA2_DL_000054F8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA2_DL_000054F8[] = dobject_oA2_DL_000054F8; + + +#endif // OBJECTS_OBJECT_OA2_H diff --git a/soh/assets/objects/object_oA3/object_oA3.h b/soh/assets/objects/object_oA3/object_oA3.h index 1ea513fe2..fd5e8140e 100644 --- a/soh/assets/objects/object_oA3/object_oA3.h +++ b/soh/assets/objects/object_oA3/object_oA3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA3_H +#define OBJECTS_OBJECT_OA3_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char object_oA3_Tex_00001CF0[] = dobject_oA3_Tex_000 static const ALIGN_ASSET(2) char object_oA3_Tex_00001EF0[] = dobject_oA3_Tex_00001EF0; #define dobject_oA3_Tex_000020F0 "__OTR__objects/object_oA3/object_oA3_Tex_000020F0" -static const ALIGN_ASSET(2) char object_oA3_Tex_000020F0[] = dobject_oA3_Tex_000020F0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA3_Tex_000020F0[] = dobject_oA3_Tex_000020F0; + +#endif // OBJECTS_OBJECT_OA3_H diff --git a/soh/assets/objects/object_oA4/object_oA4.h b/soh/assets/objects/object_oA4/object_oA4.h index 7a1b23672..aaead0cc4 100644 --- a/soh/assets/objects/object_oA4/object_oA4.h +++ b/soh/assets/objects/object_oA4/object_oA4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA4_H +#define OBJECTS_OBJECT_OA4_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char object_oA4_Tex_000015A8[] = dobject_oA4_Tex_000 static const ALIGN_ASSET(2) char object_oA4_Tex_00001628[] = dobject_oA4_Tex_00001628; #define dobject_oA4_Tex_000016A8 "__OTR__objects/object_oA4/object_oA4_Tex_000016A8" -static const ALIGN_ASSET(2) char object_oA4_Tex_000016A8[] = dobject_oA4_Tex_000016A8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA4_Tex_000016A8[] = dobject_oA4_Tex_000016A8; + + +#endif // OBJECTS_OBJECT_OA4_H diff --git a/soh/assets/objects/object_oA5/object_oA5.h b/soh/assets/objects/object_oA5/object_oA5.h index 65e86b6b8..ba9965114 100644 --- a/soh/assets/objects/object_oA5/object_oA5.h +++ b/soh/assets/objects/object_oA5/object_oA5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA5_H +#define OBJECTS_OBJECT_OA5_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char object_oA5_Tex_00001530[] = dobject_oA5_Tex_000 static const ALIGN_ASSET(2) char object_oA5_Tex_000015B0[] = dobject_oA5_Tex_000015B0; #define dobject_oA5_Tex_00001630 "__OTR__objects/object_oA5/object_oA5_Tex_00001630" -static const ALIGN_ASSET(2) char object_oA5_Tex_00001630[] = dobject_oA5_Tex_00001630; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA5_Tex_00001630[] = dobject_oA5_Tex_00001630; + + +#endif // OBJECTS_OBJECT_OA5_H diff --git a/soh/assets/objects/object_oA6/object_oA6.h b/soh/assets/objects/object_oA6/object_oA6.h index ed5a1a2f8..adb5330e7 100644 --- a/soh/assets/objects/object_oA6/object_oA6.h +++ b/soh/assets/objects/object_oA6/object_oA6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA6_H +#define OBJECTS_OBJECT_OA6_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char object_oA6_Tex_00001800[] = dobject_oA6_Tex_000 static const ALIGN_ASSET(2) char object_oA6_Tex_00001900[] = dobject_oA6_Tex_00001900; #define dobject_oA6_Tex_00001980 "__OTR__objects/object_oA6/object_oA6_Tex_00001980" -static const ALIGN_ASSET(2) char object_oA6_Tex_00001980[] = dobject_oA6_Tex_00001980; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA6_Tex_00001980[] = dobject_oA6_Tex_00001980; + + +#endif // OBJECTS_OBJECT_OA6_H diff --git a/soh/assets/objects/object_oA7/object_oA7.h b/soh/assets/objects/object_oA7/object_oA7.h index 70382ec7a..c31148caf 100644 --- a/soh/assets/objects/object_oA7/object_oA7.h +++ b/soh/assets/objects/object_oA7/object_oA7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA7_H +#define OBJECTS_OBJECT_OA7_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char object_oA7_Tex_00001348[] = dobject_oA7_Tex_000 static const ALIGN_ASSET(2) char object_oA7_Tex_000013C8[] = dobject_oA7_Tex_000013C8; #define dobject_oA7_Tex_000014C8 "__OTR__objects/object_oA7/object_oA7_Tex_000014C8" -static const ALIGN_ASSET(2) char object_oA7_Tex_000014C8[] = dobject_oA7_Tex_000014C8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA7_Tex_000014C8[] = dobject_oA7_Tex_000014C8; + + +#endif // OBJECTS_OBJECT_OA7_H diff --git a/soh/assets/objects/object_oA8/object_oA8.h b/soh/assets/objects/object_oA8/object_oA8.h index 48a5d36f7..32f3b5769 100644 --- a/soh/assets/objects/object_oA8/object_oA8.h +++ b/soh/assets/objects/object_oA8/object_oA8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA8_H +#define OBJECTS_OBJECT_OA8_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char object_oA8_Tex_00001570[] = dobject_oA8_Tex_000 static const ALIGN_ASSET(2) char object_oA8_Tex_00001670[] = dobject_oA8_Tex_00001670; #define dobject_oA8_Tex_00001770 "__OTR__objects/object_oA8/object_oA8_Tex_00001770" -static const ALIGN_ASSET(2) char object_oA8_Tex_00001770[] = dobject_oA8_Tex_00001770; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA8_Tex_00001770[] = dobject_oA8_Tex_00001770; + + +#endif // OBJECTS_OBJECT_OA8_H diff --git a/soh/assets/objects/object_oA9/object_oA9.h b/soh/assets/objects/object_oA9/object_oA9.h index 39e8426c8..139f6403f 100644 --- a/soh/assets/objects/object_oA9/object_oA9.h +++ b/soh/assets/objects/object_oA9/object_oA9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OA9_H +#define OBJECTS_OBJECT_OA9_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char object_oA9_DL_00000250[] = dobject_oA9_DL_00000 static const ALIGN_ASSET(2) char object_oA9_Tex_000003A0[] = dobject_oA9_Tex_000003A0; #define dobject_oA9_Tex_000004A0 "__OTR__objects/object_oA9/object_oA9_Tex_000004A0" -static const ALIGN_ASSET(2) char object_oA9_Tex_000004A0[] = dobject_oA9_Tex_000004A0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oA9_Tex_000004A0[] = dobject_oA9_Tex_000004A0; + +#endif // OBJECTS_OBJECT_OA9_H diff --git a/soh/assets/objects/object_oB1/object_oB1.h b/soh/assets/objects/object_oB1/object_oB1.h index 2f091a5c6..97196d4fa 100644 --- a/soh/assets/objects/object_oB1/object_oB1.h +++ b/soh/assets/objects/object_oB1/object_oB1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OB1_H +#define OBJECTS_OBJECT_OB1_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char object_oB1_Tex_000060B0[] = dobject_oB1_Tex_000 static const ALIGN_ASSET(2) char object_oB1_Tex_000062B0[] = dobject_oB1_Tex_000062B0; #define dobject_oB1_Tex_000064B0 "__OTR__objects/object_oB1/object_oB1_Tex_000064B0" -static const ALIGN_ASSET(2) char object_oB1_Tex_000064B0[] = dobject_oB1_Tex_000064B0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oB1_Tex_000064B0[] = dobject_oB1_Tex_000064B0; + + +#endif // OBJECTS_OBJECT_OB1_H diff --git a/soh/assets/objects/object_oB2/object_oB2.h b/soh/assets/objects/object_oB2/object_oB2.h index d2c60de10..37df6ced4 100644 --- a/soh/assets/objects/object_oB2/object_oB2.h +++ b/soh/assets/objects/object_oB2/object_oB2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OB2_H +#define OBJECTS_OBJECT_OB2_H 1 #include "align_asset_macro.h" @@ -54,4 +55,6 @@ static const ALIGN_ASSET(2) char object_oB2_Tex_003C58[] = dobject_oB2_Tex_003C5 static const ALIGN_ASSET(2) char object_oB2_Tex_003E58[] = dobject_oB2_Tex_003E58; #define dobject_oB2_Tex_004058 "__OTR__objects/object_oB2/object_oB2_Tex_004058" -static const ALIGN_ASSET(2) char object_oB2_Tex_004058[] = dobject_oB2_Tex_004058; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oB2_Tex_004058[] = dobject_oB2_Tex_004058; + +#endif // OBJECTS_OBJECT_OB2_H diff --git a/soh/assets/objects/object_oB3/object_oB3.h b/soh/assets/objects/object_oB3/object_oB3.h index ead2159cf..5e0e295d0 100644 --- a/soh/assets/objects/object_oB3/object_oB3.h +++ b/soh/assets/objects/object_oB3/object_oB3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OB3_H +#define OBJECTS_OBJECT_OB3_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char object_oB3_Tex_00004308[] = dobject_oB3_Tex_000 static const ALIGN_ASSET(2) char object_oB3_Tex_00004388[] = dobject_oB3_Tex_00004388; #define dobject_oB3_Tex_00004408 "__OTR__objects/object_oB3/object_oB3_Tex_00004408" -static const ALIGN_ASSET(2) char object_oB3_Tex_00004408[] = dobject_oB3_Tex_00004408; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oB3_Tex_00004408[] = dobject_oB3_Tex_00004408; + + +#endif // OBJECTS_OBJECT_OB3_H diff --git a/soh/assets/objects/object_oB4/object_oB4.h b/soh/assets/objects/object_oB4/object_oB4.h index b0c196534..b521411ac 100644 --- a/soh/assets/objects/object_oB4/object_oB4.h +++ b/soh/assets/objects/object_oB4/object_oB4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OB4_H +#define OBJECTS_OBJECT_OB4_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char object_oB4_Tex_00001668[] = dobject_oB4_Tex_000 static const ALIGN_ASSET(2) char object_oB4_Tex_00001768[] = dobject_oB4_Tex_00001768; #define dobject_oB4_Tex_000017E8 "__OTR__objects/object_oB4/object_oB4_Tex_000017E8" -static const ALIGN_ASSET(2) char object_oB4_Tex_000017E8[] = dobject_oB4_Tex_000017E8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oB4_Tex_000017E8[] = dobject_oB4_Tex_000017E8; + + +#endif // OBJECTS_OBJECT_OB4_H diff --git a/soh/assets/objects/object_oE1/object_oE1.h b/soh/assets/objects/object_oE1/object_oE1.h index 769bbeed6..e5e431f57 100644 --- a/soh/assets/objects/object_oE1/object_oE1.h +++ b/soh/assets/objects/object_oE1/object_oE1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE1_H +#define OBJECTS_OBJECT_OE1_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char object_oE1_Tex_006648[] = dobject_oE1_Tex_00664 static const ALIGN_ASSET(2) char object_oE1_Tex_006688[] = dobject_oE1_Tex_006688; #define dobject_oE1_Tex_006708 "__OTR__objects/object_oE1/object_oE1_Tex_006708" -static const ALIGN_ASSET(2) char object_oE1_Tex_006708[] = dobject_oE1_Tex_006708; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE1_Tex_006708[] = dobject_oE1_Tex_006708; + + +#endif // OBJECTS_OBJECT_OE1_H diff --git a/soh/assets/objects/object_oE10/object_oE10.h b/soh/assets/objects/object_oE10/object_oE10.h index ed9c06fd3..e2b16d0f1 100644 --- a/soh/assets/objects/object_oE10/object_oE10.h +++ b/soh/assets/objects/object_oE10/object_oE10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE10_H +#define OBJECTS_OBJECT_OE10_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_oE10_Tex_001D90[] = dobject_oE10_Tex_001 static const ALIGN_ASSET(2) char object_oE10_Tex_001DD0[] = dobject_oE10_Tex_001DD0; #define dobject_oE10_Tex_0021D0 "__OTR__objects/object_oE10/object_oE10_Tex_0021D0" -static const ALIGN_ASSET(2) char object_oE10_Tex_0021D0[] = dobject_oE10_Tex_0021D0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE10_Tex_0021D0[] = dobject_oE10_Tex_0021D0; + +#endif // OBJECTS_OBJECT_OE10_H diff --git a/soh/assets/objects/object_oE11/object_oE11.h b/soh/assets/objects/object_oE11/object_oE11.h index 529021cac..556c07fa7 100644 --- a/soh/assets/objects/object_oE11/object_oE11.h +++ b/soh/assets/objects/object_oE11/object_oE11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE11_H +#define OBJECTS_OBJECT_OE11_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_oE11_Tex_0021B0[] = dobject_oE11_Tex_002 static const ALIGN_ASSET(2) char object_oE11_Tex_0029B0[] = dobject_oE11_Tex_0029B0; #define dobject_oE11_Tex_0031B0 "__OTR__objects/object_oE11/object_oE11_Tex_0031B0" -static const ALIGN_ASSET(2) char object_oE11_Tex_0031B0[] = dobject_oE11_Tex_0031B0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE11_Tex_0031B0[] = dobject_oE11_Tex_0031B0; + +#endif // OBJECTS_OBJECT_OE11_H diff --git a/soh/assets/objects/object_oE12/object_oE12.h b/soh/assets/objects/object_oE12/object_oE12.h index d5d87fcfe..18d4ab363 100644 --- a/soh/assets/objects/object_oE12/object_oE12.h +++ b/soh/assets/objects/object_oE12/object_oE12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE12_H +#define OBJECTS_OBJECT_OE12_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_oE12_Tex_002B80[] = dobject_oE12_Tex_002 static const ALIGN_ASSET(2) char object_oE12_Tex_003380[] = dobject_oE12_Tex_003380; #define dobject_oE12_Tex_003780 "__OTR__objects/object_oE12/object_oE12_Tex_003780" -static const ALIGN_ASSET(2) char object_oE12_Tex_003780[] = dobject_oE12_Tex_003780; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE12_Tex_003780[] = dobject_oE12_Tex_003780; + +#endif // OBJECTS_OBJECT_OE12_H diff --git a/soh/assets/objects/object_oE1s/object_oE1s.h b/soh/assets/objects/object_oE1s/object_oE1s.h index aea2c848d..4e1911ac9 100644 --- a/soh/assets/objects/object_oE1s/object_oE1s.h +++ b/soh/assets/objects/object_oE1s/object_oE1s.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE1S_H +#define OBJECTS_OBJECT_OE1S_H 1 #include "align_asset_macro.h" @@ -90,4 +91,6 @@ static const ALIGN_ASSET(2) char object_oE1s_DL_006490[] = dobject_oE1s_DL_00649 static const ALIGN_ASSET(2) char object_oE1sTex_000478[] = dobject_oE1sTex_000478; #define dobject_oE1sTLUT_0001A8 "__OTR__objects/object_oE1s/object_oE1sTLUT_0001A8" -static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8; + +#endif // OBJECTS_OBJECT_OE1S_H diff --git a/soh/assets/objects/object_oE2/object_oE2.h b/soh/assets/objects/object_oE2/object_oE2.h index c773c0937..10ca20e99 100644 --- a/soh/assets/objects/object_oE2/object_oE2.h +++ b/soh/assets/objects/object_oE2/object_oE2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE2_H +#define OBJECTS_OBJECT_OE2_H 1 #include "align_asset_macro.h" @@ -87,4 +88,7 @@ static const ALIGN_ASSET(2) char object_oE2_Tex_005970[] = dobject_oE2_Tex_00597 static const ALIGN_ASSET(2) char object_oE2_Tex_0059F0[] = dobject_oE2_Tex_0059F0; #define dobject_oE2_Tex_005A30 "__OTR__objects/object_oE2/object_oE2_Tex_005A30" -static const ALIGN_ASSET(2) char object_oE2_Tex_005A30[] = dobject_oE2_Tex_005A30; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE2_Tex_005A30[] = dobject_oE2_Tex_005A30; + + +#endif // OBJECTS_OBJECT_OE2_H diff --git a/soh/assets/objects/object_oE3/object_oE3.h b/soh/assets/objects/object_oE3/object_oE3.h index 3db4c88da..871bf0660 100644 --- a/soh/assets/objects/object_oE3/object_oE3.h +++ b/soh/assets/objects/object_oE3/object_oE3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE3_H +#define OBJECTS_OBJECT_OE3_H 1 #include "align_asset_macro.h" @@ -93,4 +94,7 @@ static const ALIGN_ASSET(2) char object_oE3_Tex_006EA0[] = dobject_oE3_Tex_006EA static const ALIGN_ASSET(2) char object_oE3_Tex_0070A0[] = dobject_oE3_Tex_0070A0; #define dobject_oE3_Tex_0070E0 "__OTR__objects/object_oE3/object_oE3_Tex_0070E0" -static const ALIGN_ASSET(2) char object_oE3_Tex_0070E0[] = dobject_oE3_Tex_0070E0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE3_Tex_0070E0[] = dobject_oE3_Tex_0070E0; + + +#endif // OBJECTS_OBJECT_OE3_H diff --git a/soh/assets/objects/object_oE4/object_oE4.h b/soh/assets/objects/object_oE4/object_oE4.h index 56c84ac31..2a0c74dc5 100644 --- a/soh/assets/objects/object_oE4/object_oE4.h +++ b/soh/assets/objects/object_oE4/object_oE4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE4_H +#define OBJECTS_OBJECT_OE4_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char object_oE4_Tex_004CC8[] = dobject_oE4_Tex_004CC static const ALIGN_ASSET(2) char object_oE4_Tex_004D48[] = dobject_oE4_Tex_004D48; #define dobject_oE4_Tex_004DC8 "__OTR__objects/object_oE4/object_oE4_Tex_004DC8" -static const ALIGN_ASSET(2) char object_oE4_Tex_004DC8[] = dobject_oE4_Tex_004DC8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE4_Tex_004DC8[] = dobject_oE4_Tex_004DC8; + + +#endif // OBJECTS_OBJECT_OE4_H diff --git a/soh/assets/objects/object_oE4s/object_oE4s.h b/soh/assets/objects/object_oE4s/object_oE4s.h index 197b37026..28d7182a7 100644 --- a/soh/assets/objects/object_oE4s/object_oE4s.h +++ b/soh/assets/objects/object_oE4s/object_oE4s.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE4S_H +#define OBJECTS_OBJECT_OE4S_H 1 #include "align_asset_macro.h" @@ -84,4 +85,6 @@ static const ALIGN_ASSET(2) char object_oE4s_DL_004D00[] = dobject_oE4s_DL_004D0 static const ALIGN_ASSET(2) char object_oE4sTex_0002A0[] = dobject_oE4sTex_0002A0; #define dobject_oE4sTex_0003A0 "__OTR__objects/object_oE4s/object_oE4sTex_0003A0" -static const ALIGN_ASSET(2) char object_oE4sTex_0003A0[] = dobject_oE4sTex_0003A0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE4sTex_0003A0[] = dobject_oE4sTex_0003A0; + +#endif // OBJECTS_OBJECT_OE4S_H diff --git a/soh/assets/objects/object_oE5/object_oE5.h b/soh/assets/objects/object_oE5/object_oE5.h index 255682887..4d9273c42 100644 --- a/soh/assets/objects/object_oE5/object_oE5.h +++ b/soh/assets/objects/object_oE5/object_oE5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE5_H +#define OBJECTS_OBJECT_OE5_H 1 #include "align_asset_macro.h" @@ -63,4 +64,6 @@ static const ALIGN_ASSET(2) char object_oE5_Tex_004BC0[] = dobject_oE5_Tex_004BC static const ALIGN_ASSET(2) char object_oE5_Tex_0053C0[] = dobject_oE5_Tex_0053C0; #define dobject_oE5_Tex_0054C0 "__OTR__objects/object_oE5/object_oE5_Tex_0054C0" -static const ALIGN_ASSET(2) char object_oE5_Tex_0054C0[] = dobject_oE5_Tex_0054C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE5_Tex_0054C0[] = dobject_oE5_Tex_0054C0; + +#endif // OBJECTS_OBJECT_OE5_H diff --git a/soh/assets/objects/object_oE6/object_oE6.h b/soh/assets/objects/object_oE6/object_oE6.h index 4824908d0..b17576845 100644 --- a/soh/assets/objects/object_oE6/object_oE6.h +++ b/soh/assets/objects/object_oE6/object_oE6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE6_H +#define OBJECTS_OBJECT_OE6_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_oE6_Tex_002210[] = dobject_oE6_Tex_00221 static const ALIGN_ASSET(2) char object_oE6_Tex_002A10[] = dobject_oE6_Tex_002A10; #define dobject_oE6_Tex_002E10 "__OTR__objects/object_oE6/object_oE6_Tex_002E10" -static const ALIGN_ASSET(2) char object_oE6_Tex_002E10[] = dobject_oE6_Tex_002E10; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE6_Tex_002E10[] = dobject_oE6_Tex_002E10; + +#endif // OBJECTS_OBJECT_OE6_H diff --git a/soh/assets/objects/object_oE7/object_oE7.h b/soh/assets/objects/object_oE7/object_oE7.h index 21add2f91..39fa0ebb3 100644 --- a/soh/assets/objects/object_oE7/object_oE7.h +++ b/soh/assets/objects/object_oE7/object_oE7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE7_H +#define OBJECTS_OBJECT_OE7_H 1 #include "align_asset_macro.h" @@ -30,4 +31,6 @@ static const ALIGN_ASSET(2) char object_oE7_Blob_001858[] = dobject_oE7_Blob_001 static const ALIGN_ASSET(2) char object_oE7_Tex_002058[] = dobject_oE7_Tex_002058; #define dobject_oE7_Tex_002858 "__OTR__objects/object_oE7/object_oE7_Tex_002858" -static const ALIGN_ASSET(2) char object_oE7_Tex_002858[] = dobject_oE7_Tex_002858; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE7_Tex_002858[] = dobject_oE7_Tex_002858; + +#endif // OBJECTS_OBJECT_OE7_H diff --git a/soh/assets/objects/object_oE8/object_oE8.h b/soh/assets/objects/object_oE8/object_oE8.h index 76ac8b750..5b24cde35 100644 --- a/soh/assets/objects/object_oE8/object_oE8.h +++ b/soh/assets/objects/object_oE8/object_oE8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE8_H +#define OBJECTS_OBJECT_OE8_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_oE8_Tex_002788[] = dobject_oE8_Tex_00278 static const ALIGN_ASSET(2) char object_oE8_Tex_002B88[] = dobject_oE8_Tex_002B88; #define dobject_oE8_Tex_002BC8 "__OTR__objects/object_oE8/object_oE8_Tex_002BC8" -static const ALIGN_ASSET(2) char object_oE8_Tex_002BC8[] = dobject_oE8_Tex_002BC8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE8_Tex_002BC8[] = dobject_oE8_Tex_002BC8; + +#endif // OBJECTS_OBJECT_OE8_H diff --git a/soh/assets/objects/object_oE9/object_oE9.h b/soh/assets/objects/object_oE9/object_oE9.h index ac783e211..9f7c52859 100644 --- a/soh/assets/objects/object_oE9/object_oE9.h +++ b/soh/assets/objects/object_oE9/object_oE9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE9_H +#define OBJECTS_OBJECT_OE9_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char object_oE9_Tex_001ED0[] = dobject_oE9_Tex_001ED static const ALIGN_ASSET(2) char object_oE9_Tex_0026D0[] = dobject_oE9_Tex_0026D0; #define dobject_oE9_Tex_002ED0 "__OTR__objects/object_oE9/object_oE9_Tex_002ED0" -static const ALIGN_ASSET(2) char object_oE9_Tex_002ED0[] = dobject_oE9_Tex_002ED0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE9_Tex_002ED0[] = dobject_oE9_Tex_002ED0; + +#endif // OBJECTS_OBJECT_OE9_H diff --git a/soh/assets/objects/object_oE_anime/object_oE_anime.h b/soh/assets/objects/object_oE_anime/object_oE_anime.h index 85391c1fe..6f123f158 100644 --- a/soh/assets/objects/object_oE_anime/object_oE_anime.h +++ b/soh/assets/objects/object_oE_anime/object_oE_anime.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OE_ANIME_H +#define OBJECTS_OBJECT_OE_ANIME_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char object_oE_anime_Anim_00002DC8[] = dobject_oE_an static const ALIGN_ASSET(2) char object_oE_anime_Anim_000047D4[] = dobject_oE_anime_Anim_000047D4; #define dobject_oE_anime_Anim_00005044 "__OTR__objects/object_oE_anime/object_oE_anime_Anim_00005044" -static const ALIGN_ASSET(2) char object_oE_anime_Anim_00005044[] = dobject_oE_anime_Anim_00005044; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oE_anime_Anim_00005044[] = dobject_oE_anime_Anim_00005044; + +#endif // OBJECTS_OBJECT_OE_ANIME_H diff --git a/soh/assets/objects/object_oF1d_map/object_oF1d_map.h b/soh/assets/objects/object_oF1d_map/object_oF1d_map.h index 6fab82e7f..7d232190c 100644 --- a/soh/assets/objects/object_oF1d_map/object_oF1d_map.h +++ b/soh/assets/objects/object_oF1d_map/object_oF1d_map.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OF1D_MAP_H +#define OBJECTS_OBJECT_OF1D_MAP_H 1 #include "align_asset_macro.h" @@ -165,4 +166,6 @@ static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F8C0[] = dobject_oF1d_mapT static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F7C0[] = dobject_oF1d_mapTex_00F7C0; #define dobject_oF1d_mapTex_00F6C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F6C0" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F6C0[] = dobject_oF1d_mapTex_00F6C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F6C0[] = dobject_oF1d_mapTex_00F6C0; + +#endif // OBJECTS_OBJECT_OF1D_MAP_H diff --git a/soh/assets/objects/object_oF1s/object_oF1s.h b/soh/assets/objects/object_oF1s/object_oF1s.h index 9a183eac0..b0cb014c3 100644 --- a/soh/assets/objects/object_oF1s/object_oF1s.h +++ b/soh/assets/objects/object_oF1s/object_oF1s.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OF1S_H +#define OBJECTS_OBJECT_OF1S_H 1 #include "align_asset_macro.h" @@ -96,4 +97,7 @@ static const ALIGN_ASSET(2) char object_oF1s_DL_0082C8[] = dobject_oF1s_DL_0082C static const ALIGN_ASSET(2) char object_oF1s_DL_008488[] = dobject_oF1s_DL_008488; #define dobject_oF1s_DL_0084E0 "__OTR__objects/object_oF1s/object_oF1s_DL_0084E0" -static const ALIGN_ASSET(2) char object_oF1s_DL_0084E0[] = dobject_oF1s_DL_0084E0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_oF1s_DL_0084E0[] = dobject_oF1s_DL_0084E0; + + +#endif // OBJECTS_OBJECT_OF1S_H diff --git a/soh/assets/objects/object_o_anime/object_o_anime.h b/soh/assets/objects/object_o_anime/object_o_anime.h index c943753a2..df6933e59 100644 --- a/soh/assets/objects/object_o_anime/object_o_anime.h +++ b/soh/assets/objects/object_o_anime/object_o_anime.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_O_ANIME_H +#define OBJECTS_OBJECT_O_ANIME_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char object_o_anime_Anim_0018F0[] = dobject_o_anime_ static const ALIGN_ASSET(2) char object_o_anime_Anim_001E80[] = dobject_o_anime_Anim_001E80; #define dobject_o_anime_Anim_00213C "__OTR__objects/object_o_anime/object_o_anime_Anim_00213C" -static const ALIGN_ASSET(2) char object_o_anime_Anim_00213C[] = dobject_o_anime_Anim_00213C; \ No newline at end of file +static const ALIGN_ASSET(2) char object_o_anime_Anim_00213C[] = dobject_o_anime_Anim_00213C; + +#endif // OBJECTS_OBJECT_O_ANIME_H diff --git a/soh/assets/objects/object_okuta/object_okuta.h b/soh/assets/objects/object_okuta/object_okuta.h index e8b87c4b4..8affa6627 100644 --- a/soh/assets/objects/object_okuta/object_okuta.h +++ b/soh/assets/objects/object_okuta/object_okuta.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OKUTA_H +#define OBJECTS_OBJECT_OKUTA_H 1 #include "align_asset_macro.h" @@ -99,4 +100,7 @@ static const ALIGN_ASSET(2) char gOctorokSkelLimbsLimb_0035A8DL_001DB8[] = dgOct static const ALIGN_ASSET(2) char gOctorokSkelLimbsLimb_0035B4DL_001E50[] = dgOctorokSkelLimbsLimb_0035B4DL_001E50; #define dgOctorokSkelLimbsLimb_0035C0DL_0016D0 "__OTR__objects/object_okuta/gOctorokSkelLimbsLimb_0035C0DL_0016D0" -static const ALIGN_ASSET(2) char gOctorokSkelLimbsLimb_0035C0DL_0016D0[] = dgOctorokSkelLimbsLimb_0035C0DL_0016D0; \ No newline at end of file +static const ALIGN_ASSET(2) char gOctorokSkelLimbsLimb_0035C0DL_0016D0[] = dgOctorokSkelLimbsLimb_0035C0DL_0016D0; + + +#endif // OBJECTS_OBJECT_OKUTA_H diff --git a/soh/assets/objects/object_opening_demo1/object_opening_demo1.h b/soh/assets/objects/object_opening_demo1/object_opening_demo1.h index 12f9d2066..9e0d2f42d 100644 --- a/soh/assets/objects/object_opening_demo1/object_opening_demo1.h +++ b/soh/assets/objects/object_opening_demo1/object_opening_demo1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OPENING_DEMO1_H +#define OBJECTS_OBJECT_OPENING_DEMO1_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char object_opening_demo1_Anim_00420C[] = dobject_op static const ALIGN_ASSET(2) char object_opening_demo1_Anim_0048FC[] = dobject_opening_demo1_Anim_0048FC; #define dobject_opening_demo1_Anim_00504C "__OTR__objects/object_opening_demo1/object_opening_demo1_Anim_00504C" -static const ALIGN_ASSET(2) char object_opening_demo1_Anim_00504C[] = dobject_opening_demo1_Anim_00504C; \ No newline at end of file +static const ALIGN_ASSET(2) char object_opening_demo1_Anim_00504C[] = dobject_opening_demo1_Anim_00504C; + +#endif // OBJECTS_OBJECT_OPENING_DEMO1_H diff --git a/soh/assets/objects/object_os/object_os.h b/soh/assets/objects/object_os/object_os.h index e3c561257..bf4c8ff00 100644 --- a/soh/assets/objects/object_os/object_os.h +++ b/soh/assets/objects/object_os/object_os.h @@ -1,75 +1,79 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OS_H +#define OBJECTS_OBJECT_OS_H 1 #include "align_asset_macro.h" -#define dobject_os_Anim_0002E4 "__OTR__objects/object_os/object_os_Anim_0002E4" -static const ALIGN_ASSET(2) char object_os_Anim_0002E4[] = dobject_os_Anim_0002E4; +#define dgHappyMaskSalesmanIdleAnim "__OTR__objects/object_os/gHappyMaskSalesmanIdleAnim" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanIdleAnim[] = dgHappyMaskSalesmanIdleAnim; -#define dobject_os_DL_001D80 "__OTR__objects/object_os/object_os_DL_001D80" -static const ALIGN_ASSET(2) char object_os_DL_001D80[] = dobject_os_DL_001D80; +#define dgHappyMaskSalesmanTorsoDL "__OTR__objects/object_os/gHappyMaskSalesmanTorsoDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanTorsoDL[] = dgHappyMaskSalesmanTorsoDL; -#define dobject_os_DL_0020A8 "__OTR__objects/object_os/object_os_DL_0020A8" -static const ALIGN_ASSET(2) char object_os_DL_0020A8[] = dobject_os_DL_0020A8; +#define dgHappyMaskSalesmanHeadDL "__OTR__objects/object_os/gHappyMaskSalesmanHeadDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanHeadDL[] = dgHappyMaskSalesmanHeadDL; -#define dobject_os_DL_0025E8 "__OTR__objects/object_os/object_os_DL_0025E8" -static const ALIGN_ASSET(2) char object_os_DL_0025E8[] = dobject_os_DL_0025E8; +#define dgHappyMaskSalesmanRightUpperArmDL "__OTR__objects/object_os/gHappyMaskSalesmanRightUpperArmDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanRightUpperArmDL[] = dgHappyMaskSalesmanRightUpperArmDL; -#define dobject_os_DL_002718 "__OTR__objects/object_os/object_os_DL_002718" -static const ALIGN_ASSET(2) char object_os_DL_002718[] = dobject_os_DL_002718; +#define dgHappyMaskSalesmanRightForearmDL "__OTR__objects/object_os/gHappyMaskSalesmanRightForearmDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanRightForearmDL[] = dgHappyMaskSalesmanRightForearmDL; -#define dobject_os_DL_002848 "__OTR__objects/object_os/object_os_DL_002848" -static const ALIGN_ASSET(2) char object_os_DL_002848[] = dobject_os_DL_002848; +#define dgHappyMaskSalesmanRightHandDL "__OTR__objects/object_os/gHappyMaskSalesmanRightHandDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanRightHandDL[] = dgHappyMaskSalesmanRightHandDL; -#define dobject_os_DL_002A00 "__OTR__objects/object_os/object_os_DL_002A00" -static const ALIGN_ASSET(2) char object_os_DL_002A00[] = dobject_os_DL_002A00; +#define dgHappyMaskSalesmanLeftUpperArmDL "__OTR__objects/object_os/gHappyMaskSalesmanLeftUpperArmDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanLeftUpperArmDL[] = dgHappyMaskSalesmanLeftUpperArmDL; -#define dobject_os_DL_002B30 "__OTR__objects/object_os/object_os_DL_002B30" -static const ALIGN_ASSET(2) char object_os_DL_002B30[] = dobject_os_DL_002B30; +#define dgHappyMaskSalesmanLeftForearmDL "__OTR__objects/object_os/gHappyMaskSalesmanLeftForearmDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanLeftForearmDL[] = dgHappyMaskSalesmanLeftForearmDL; -#define dobject_os_DL_002C60 "__OTR__objects/object_os/object_os_DL_002C60" -static const ALIGN_ASSET(2) char object_os_DL_002C60[] = dobject_os_DL_002C60; +#define dgHappyMaskSalesmanLeftHandDL "__OTR__objects/object_os/gHappyMaskSalesmanLeftHandDL" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanLeftHandDL[] = dgHappyMaskSalesmanLeftHandDL; -#define dobject_os_TLUT_002E18 "__OTR__objects/object_os/object_os_TLUT_002E18" -static const ALIGN_ASSET(2) char object_os_TLUT_002E18[] = dobject_os_TLUT_002E18; +#define dgHappyMaskSalesmanTLUT "__OTR__objects/object_os/gHappyMaskSalesmanTLUT" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanTLUT[] = dgHappyMaskSalesmanTLUT; -#define dobject_os_TLUT_003018 "__OTR__objects/object_os/object_os_TLUT_003018" -static const ALIGN_ASSET(2) char object_os_TLUT_003018[] = dobject_os_TLUT_003018; +#define dgHappyMaskSalesmanEyeMouthTLUT "__OTR__objects/object_os/gHappyMaskSalesmanEyeMouthTLUT" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanEyeMouthTLUT[] = dgHappyMaskSalesmanEyeMouthTLUT; -#define dobject_os_Tex_003218 "__OTR__objects/object_os/object_os_Tex_003218" -static const ALIGN_ASSET(2) char object_os_Tex_003218[] = dobject_os_Tex_003218; +#define dgHappyMaskSalesmanSkinTex "__OTR__objects/object_os/gHappyMaskSalesmanSkinTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanSkinTex[] = dgHappyMaskSalesmanSkinTex; -#define dobject_os_Tex_003258 "__OTR__objects/object_os/object_os_Tex_003258" -static const ALIGN_ASSET(2) char object_os_Tex_003258[] = dobject_os_Tex_003258; +#define dgHappyMaskSalesmanHairTex "__OTR__objects/object_os/gHappyMaskSalesmanHairTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanHairTex[] = dgHappyMaskSalesmanHairTex; -#define dobject_os_Tex_003358 "__OTR__objects/object_os/object_os_Tex_003358" -static const ALIGN_ASSET(2) char object_os_Tex_003358[] = dobject_os_Tex_003358; +#define dgHappyMaskSalesmanEarTex "__OTR__objects/object_os/gHappyMaskSalesmanEarTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanEarTex[] = dgHappyMaskSalesmanEarTex; -#define dobject_os_Tex_003398 "__OTR__objects/object_os/object_os_Tex_003398" -static const ALIGN_ASSET(2) char object_os_Tex_003398[] = dobject_os_Tex_003398; +#define dgHappyMaskSalesmanNostrilTex "__OTR__objects/object_os/gHappyMaskSalesmanNostrilTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanNostrilTex[] = dgHappyMaskSalesmanNostrilTex; -#define dobject_os_Tex_0033D8 "__OTR__objects/object_os/object_os_Tex_0033D8" -static const ALIGN_ASSET(2) char object_os_Tex_0033D8[] = dobject_os_Tex_0033D8; +#define dgHappyMaskSalesmanMouthTex "__OTR__objects/object_os/gHappyMaskSalesmanMouthTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanMouthTex[] = dgHappyMaskSalesmanMouthTex; -#define dgOsEyeClosedTex "__OTR__objects/object_os/gOsEyeClosedTex" -static const ALIGN_ASSET(2) char gOsEyeClosedTex[] = dgOsEyeClosedTex; +#define dgHappyMaskSalesmanEyeClosedTex "__OTR__objects/object_os/gHappyMaskSalesmanEyeClosedTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanEyeClosedTex[] = dgHappyMaskSalesmanEyeClosedTex; -#define dgOsEyeOpenTex "__OTR__objects/object_os/gOsEyeOpenTex" -static const ALIGN_ASSET(2) char gOsEyeOpenTex[] = dgOsEyeOpenTex; +#define dgHappyMaskSalesmanEyeOpenTex "__OTR__objects/object_os/gHappyMaskSalesmanEyeOpenTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanEyeOpenTex[] = dgHappyMaskSalesmanEyeOpenTex; -#define dobject_os_Tex_003DD8 "__OTR__objects/object_os/object_os_Tex_003DD8" -static const ALIGN_ASSET(2) char object_os_Tex_003DD8[] = dobject_os_Tex_003DD8; +#define dgHappyMaskSalesmanFingersTex "__OTR__objects/object_os/gHappyMaskSalesmanFingersTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanFingersTex[] = dgHappyMaskSalesmanFingersTex; -#define dobject_os_Tex_003ED8 "__OTR__objects/object_os/object_os_Tex_003ED8" -static const ALIGN_ASSET(2) char object_os_Tex_003ED8[] = dobject_os_Tex_003ED8; +#define dgHappyMaskSalesmanSleeveTex "__OTR__objects/object_os/gHappyMaskSalesmanSleeveTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanSleeveTex[] = dgHappyMaskSalesmanSleeveTex; -#define dobject_os_Tex_0040D8 "__OTR__objects/object_os/object_os_Tex_0040D8" -static const ALIGN_ASSET(2) char object_os_Tex_0040D8[] = dobject_os_Tex_0040D8; +#define dgHappyMaskSalesmanShirtTex "__OTR__objects/object_os/gHappyMaskSalesmanShirtTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanShirtTex[] = dgHappyMaskSalesmanShirtTex; -#define dobject_os_Tex_0044D8 "__OTR__objects/object_os/object_os_Tex_0044D8" -static const ALIGN_ASSET(2) char object_os_Tex_0044D8[] = dobject_os_Tex_0044D8; +#define dgHappyMaskSalesmanGoldFabricTex "__OTR__objects/object_os/gHappyMaskSalesmanGoldFabricTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanGoldFabricTex[] = dgHappyMaskSalesmanGoldFabricTex; -#define dobject_os_Tex_004558 "__OTR__objects/object_os/object_os_Tex_004558" -static const ALIGN_ASSET(2) char object_os_Tex_004558[] = dobject_os_Tex_004558; +#define dgHappyMaskSalesmanGoldFabricCenterTex "__OTR__objects/object_os/gHappyMaskSalesmanGoldFabricCenterTex" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanGoldFabricCenterTex[] = dgHappyMaskSalesmanGoldFabricCenterTex; -#define dobject_os_Skel_004658 "__OTR__objects/object_os/object_os_Skel_004658" -static const ALIGN_ASSET(2) char object_os_Skel_004658[] = dobject_os_Skel_004658; \ No newline at end of file +#define dgHappyMaskSalesmanSkel "__OTR__objects/object_os/gHappyMaskSalesmanSkel" +static const ALIGN_ASSET(2) char gHappyMaskSalesmanSkel[] = dgHappyMaskSalesmanSkel; + + +#endif // OBJECTS_OBJECT_OS_H diff --git a/soh/assets/objects/object_os_anime/object_os_anime.h b/soh/assets/objects/object_os_anime/object_os_anime.h index 6a0b01991..a1c05f07f 100644 --- a/soh/assets/objects/object_os_anime/object_os_anime.h +++ b/soh/assets/objects/object_os_anime/object_os_anime.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OS_ANIME_H +#define OBJECTS_OBJECT_OS_ANIME_H 1 #include "align_asset_macro.h" @@ -107,11 +108,11 @@ static const ALIGN_ASSET(2) char gObjOsAnim_4E90[] = dgObjOsAnim_4E90; #define dgObjOsAnim_4F28 "__OTR__objects/object_os_anime/gObjOsAnim_4F28" static const ALIGN_ASSET(2) char gObjOsAnim_4F28[] = dgObjOsAnim_4F28; -#define dgObjOsAnim_5808 "__OTR__objects/object_os_anime/gObjOsAnim_5808" -static const ALIGN_ASSET(2) char gObjOsAnim_5808[] = dgObjOsAnim_5808; +#define dgKokiriLaughingAnim "__OTR__objects/object_os_anime/gKokiriLaughingAnim" +static const ALIGN_ASSET(2) char gKokiriLaughingAnim[] = dgKokiriLaughingAnim; -#define dgObjOsAnim_62DC "__OTR__objects/object_os_anime/gObjOsAnim_62DC" -static const ALIGN_ASSET(2) char gObjOsAnim_62DC[] = dgObjOsAnim_62DC; +#define dgKokiriIdleAnim "__OTR__objects/object_os_anime/gKokiriIdleAnim" +static const ALIGN_ASSET(2) char gKokiriIdleAnim[] = dgKokiriIdleAnim; #define dgObjOsAnim_6458 "__OTR__objects/object_os_anime/gObjOsAnim_6458" static const ALIGN_ASSET(2) char gObjOsAnim_6458[] = dgObjOsAnim_6458; @@ -119,80 +120,82 @@ static const ALIGN_ASSET(2) char gObjOsAnim_6458[] = dgObjOsAnim_6458; #define dgObjOsAnim_6518 "__OTR__objects/object_os_anime/gObjOsAnim_6518" static const ALIGN_ASSET(2) char gObjOsAnim_6518[] = dgObjOsAnim_6518; -#define dgObjOsAnim_65E0 "__OTR__objects/object_os_anime/gObjOsAnim_65E0" -static const ALIGN_ASSET(2) char gObjOsAnim_65E0[] = dgObjOsAnim_65E0; +#define dgKokiriRecliningSittingUpAnim "__OTR__objects/object_os_anime/gKokiriRecliningSittingUpAnim" +static const ALIGN_ASSET(2) char gKokiriRecliningSittingUpAnim[] = dgKokiriRecliningSittingUpAnim; -#define dgObjOsAnim_6A60 "__OTR__objects/object_os_anime/gObjOsAnim_6A60" -static const ALIGN_ASSET(2) char gObjOsAnim_6A60[] = dgObjOsAnim_6A60; +#define dgKokiriWipingForeheadAnim "__OTR__objects/object_os_anime/gKokiriWipingForeheadAnim" +static const ALIGN_ASSET(2) char gKokiriWipingForeheadAnim[] = dgKokiriWipingForeheadAnim; -#define dgObjOsAnim_6EE0 "__OTR__objects/object_os_anime/gObjOsAnim_6EE0" -static const ALIGN_ASSET(2) char gObjOsAnim_6EE0[] = dgObjOsAnim_6EE0; +#define dgKokiriBackflipAnim "__OTR__objects/object_os_anime/gKokiriBackflipAnim" +static const ALIGN_ASSET(2) char gKokiriBackflipAnim[] = dgKokiriBackflipAnim; -#define dgObjOsAnim_6F9C "__OTR__objects/object_os_anime/gObjOsAnim_6F9C" -static const ALIGN_ASSET(2) char gObjOsAnim_6F9C[] = dgObjOsAnim_6F9C; +#define dgKokiriSittingCrossedArmsLegsAnim "__OTR__objects/object_os_anime/gKokiriSittingCrossedArmsLegsAnim" +static const ALIGN_ASSET(2) char gKokiriSittingCrossedArmsLegsAnim[] = dgKokiriSittingCrossedArmsLegsAnim; -#define dgObjOsAnim_7064 "__OTR__objects/object_os_anime/gObjOsAnim_7064" -static const ALIGN_ASSET(2) char gObjOsAnim_7064[] = dgObjOsAnim_7064; +#define dgKokiriStandingApprehensiveAnim "__OTR__objects/object_os_anime/gKokiriStandingApprehensiveAnim" +static const ALIGN_ASSET(2) char gKokiriStandingApprehensiveAnim[] = dgKokiriStandingApprehensiveAnim; -#define dgObjOsAnim_7120 "__OTR__objects/object_os_anime/gObjOsAnim_7120" -static const ALIGN_ASSET(2) char gObjOsAnim_7120[] = dgObjOsAnim_7120; +#define dgKokiriLeaningOnArmsAnim "__OTR__objects/object_os_anime/gKokiriLeaningOnArmsAnim" +static const ALIGN_ASSET(2) char gKokiriLeaningOnArmsAnim[] = dgKokiriLeaningOnArmsAnim; -#define dgObjOsAnim_7454 "__OTR__objects/object_os_anime/gObjOsAnim_7454" -static const ALIGN_ASSET(2) char gObjOsAnim_7454[] = dgObjOsAnim_7454; +#define dgKokiriSittingDiggingAnim "__OTR__objects/object_os_anime/gKokiriSittingDiggingAnim" +static const ALIGN_ASSET(2) char gKokiriSittingDiggingAnim[] = dgKokiriSittingDiggingAnim; -#define dgObjOsAnim_7830 "__OTR__objects/object_os_anime/gObjOsAnim_7830" -static const ALIGN_ASSET(2) char gObjOsAnim_7830[] = dgObjOsAnim_7830; +#define dgKokiriLiftingRockAnim "__OTR__objects/object_os_anime/gKokiriLiftingRockAnim" +static const ALIGN_ASSET(2) char gKokiriLiftingRockAnim[] = dgKokiriLiftingRockAnim; -#define dgObjOsAnim_7D94 "__OTR__objects/object_os_anime/gObjOsAnim_7D94" -static const ALIGN_ASSET(2) char gObjOsAnim_7D94[] = dgObjOsAnim_7D94; +#define dgKokiriCuttingGrassAnim "__OTR__objects/object_os_anime/gKokiriCuttingGrassAnim" +static const ALIGN_ASSET(2) char gKokiriCuttingGrassAnim[] = dgKokiriCuttingGrassAnim; -#define dgObjOsAnim_7E64 "__OTR__objects/object_os_anime/gObjOsAnim_7E64" -static const ALIGN_ASSET(2) char gObjOsAnim_7E64[] = dgObjOsAnim_7E64; +#define dgKokiriSittingHeadOnHandAnim "__OTR__objects/object_os_anime/gKokiriSittingHeadOnHandAnim" +static const ALIGN_ASSET(2) char gKokiriSittingHeadOnHandAnim[] = dgKokiriSittingHeadOnHandAnim; -#define dgObjOsAnim_7F38 "__OTR__objects/object_os_anime/gObjOsAnim_7F38" -static const ALIGN_ASSET(2) char gObjOsAnim_7F38[] = dgObjOsAnim_7F38; +#define dgKokiriRecliningLeaningBackAnim "__OTR__objects/object_os_anime/gKokiriRecliningLeaningBackAnim" +static const ALIGN_ASSET(2) char gKokiriRecliningLeaningBackAnim[] = dgKokiriRecliningLeaningBackAnim; -#define dgObjOsAnim_7FFC "__OTR__objects/object_os_anime/gObjOsAnim_7FFC" -static const ALIGN_ASSET(2) char gObjOsAnim_7FFC[] = dgObjOsAnim_7FFC; +#define dgKokiriStandingHandOnChestAnim "__OTR__objects/object_os_anime/gKokiriStandingHandOnChestAnim" +static const ALIGN_ASSET(2) char gKokiriStandingHandOnChestAnim[] = dgKokiriStandingHandOnChestAnim; -#define dgObjOsAnim_80B4 "__OTR__objects/object_os_anime/gObjOsAnim_80B4" -static const ALIGN_ASSET(2) char gObjOsAnim_80B4[] = dgObjOsAnim_80B4; +#define dgKokiriStandingHandsOnHipsAnim "__OTR__objects/object_os_anime/gKokiriStandingHandsOnHipsAnim" +static const ALIGN_ASSET(2) char gKokiriStandingHandsOnHipsAnim[] = dgKokiriStandingHandsOnHipsAnim; -#define dgObjOsAnim_8178 "__OTR__objects/object_os_anime/gObjOsAnim_8178" -static const ALIGN_ASSET(2) char gObjOsAnim_8178[] = dgObjOsAnim_8178; +#define dgKokiriRecliningStandingAnim "__OTR__objects/object_os_anime/gKokiriRecliningStandingAnim" +static const ALIGN_ASSET(2) char gKokiriRecliningStandingAnim[] = dgKokiriRecliningStandingAnim; -#define dgObjOsAnim_879C "__OTR__objects/object_os_anime/gObjOsAnim_879C" -static const ALIGN_ASSET(2) char gObjOsAnim_879C[] = dgObjOsAnim_879C; +#define dgKokiriPunchingAnim "__OTR__objects/object_os_anime/gKokiriPunchingAnim" +static const ALIGN_ASSET(2) char gKokiriPunchingAnim[] = dgKokiriPunchingAnim; -#define dgObjOsAnim_8F6C "__OTR__objects/object_os_anime/gObjOsAnim_8F6C" -static const ALIGN_ASSET(2) char gObjOsAnim_8F6C[] = dgObjOsAnim_8F6C; +#define dgKokiriBlockingAnim "__OTR__objects/object_os_anime/gKokiriBlockingAnim" +static const ALIGN_ASSET(2) char gKokiriBlockingAnim[] = dgKokiriBlockingAnim; -#define dgObjOsAnim_9028 "__OTR__objects/object_os_anime/gObjOsAnim_9028" -static const ALIGN_ASSET(2) char gObjOsAnim_9028[] = dgObjOsAnim_9028; +#define dgKokiriSittingArmsUpAnim "__OTR__objects/object_os_anime/gKokiriSittingArmsUpAnim" +static const ALIGN_ASSET(2) char gKokiriSittingArmsUpAnim[] = dgKokiriSittingArmsUpAnim; -#define dgObjOsAnim_90EC "__OTR__objects/object_os_anime/gObjOsAnim_90EC" -static const ALIGN_ASSET(2) char gObjOsAnim_90EC[] = dgObjOsAnim_90EC; +#define dgKokiriStandingRightArmUpAnim "__OTR__objects/object_os_anime/gKokiriStandingRightArmUpAnim" +static const ALIGN_ASSET(2) char gKokiriStandingRightArmUpAnim[] = dgKokiriStandingRightArmUpAnim; -#define dgObjOsAnim_91AC "__OTR__objects/object_os_anime/gObjOsAnim_91AC" -static const ALIGN_ASSET(2) char gObjOsAnim_91AC[] = dgObjOsAnim_91AC; +#define dgKokiriSittingAnim "__OTR__objects/object_os_anime/gKokiriSittingAnim" +static const ALIGN_ASSET(2) char gKokiriSittingAnim[] = dgKokiriSittingAnim; -#define dgObjOsAnim_9274 "__OTR__objects/object_os_anime/gObjOsAnim_9274" -static const ALIGN_ASSET(2) char gObjOsAnim_9274[] = dgObjOsAnim_9274; +#define dgKokiriStandingAnim "__OTR__objects/object_os_anime/gKokiriStandingAnim" +static const ALIGN_ASSET(2) char gKokiriStandingAnim[] = dgKokiriStandingAnim; -#define dgObjOsAnim_982C "__OTR__objects/object_os_anime/gObjOsAnim_982C" -static const ALIGN_ASSET(2) char gObjOsAnim_982C[] = dgObjOsAnim_982C; +#define dgKokiriStandingArmsBehindBackAnim "__OTR__objects/object_os_anime/gKokiriStandingArmsBehindBackAnim" +static const ALIGN_ASSET(2) char gKokiriStandingArmsBehindBackAnim[] = dgKokiriStandingArmsBehindBackAnim; -#define dgObjOsAnim_98EC "__OTR__objects/object_os_anime/gObjOsAnim_98EC" -static const ALIGN_ASSET(2) char gObjOsAnim_98EC[] = dgObjOsAnim_98EC; +#define dgKokiriLeaningForwardAnim "__OTR__objects/object_os_anime/gKokiriLeaningForwardAnim" +static const ALIGN_ASSET(2) char gKokiriLeaningForwardAnim[] = dgKokiriLeaningForwardAnim; -#define dgObjOsAnim_99A4 "__OTR__objects/object_os_anime/gObjOsAnim_99A4" -static const ALIGN_ASSET(2) char gObjOsAnim_99A4[] = dgObjOsAnim_99A4; +#define dgKokiriSittingCrossedLegsAnim "__OTR__objects/object_os_anime/gKokiriSittingCrossedLegsAnim" +static const ALIGN_ASSET(2) char gKokiriSittingCrossedLegsAnim[] = dgKokiriSittingCrossedLegsAnim; -#define dgObjOsAnim_9B64 "__OTR__objects/object_os_anime/gObjOsAnim_9B64" -static const ALIGN_ASSET(2) char gObjOsAnim_9B64[] = dgObjOsAnim_9B64; +#define dgKokiriStandUpAnim "__OTR__objects/object_os_anime/gKokiriStandUpAnim" +static const ALIGN_ASSET(2) char gKokiriStandUpAnim[] = dgKokiriStandUpAnim; #define dgObjOsAnim_9F94 "__OTR__objects/object_os_anime/gObjOsAnim_9F94" static const ALIGN_ASSET(2) char gObjOsAnim_9F94[] = dgObjOsAnim_9F94; #define dgObjOsAnim_A630 "__OTR__objects/object_os_anime/gObjOsAnim_A630" -static const ALIGN_ASSET(2) char gObjOsAnim_A630[] = dgObjOsAnim_A630; \ No newline at end of file +static const ALIGN_ASSET(2) char gObjOsAnim_A630[] = dgObjOsAnim_A630; + +#endif // OBJECTS_OBJECT_OS_ANIME_H diff --git a/soh/assets/objects/object_ossan/object_ossan.h b/soh/assets/objects/object_ossan/object_ossan.h index 9401e1c96..c19bb0095 100644 --- a/soh/assets/objects/object_ossan/object_ossan.h +++ b/soh/assets/objects/object_ossan/object_ossan.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OSSAN_H +#define OBJECTS_OBJECT_OSSAN_H 1 #include "align_asset_macro.h" @@ -81,4 +82,6 @@ static const ALIGN_ASSET(2) char object_ossanTex_0098B8[] = dobject_ossanTex_009 static const ALIGN_ASSET(2) char object_ossanTex_008AB8[] = dobject_ossanTex_008AB8; #define dobject_ossanTex_008CB8 "__OTR__objects/object_ossan/object_ossanTex_008CB8" -static const ALIGN_ASSET(2) char object_ossanTex_008CB8[] = dobject_ossanTex_008CB8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ossanTex_008CB8[] = dobject_ossanTex_008CB8; + +#endif // OBJECTS_OBJECT_OSSAN_H diff --git a/soh/assets/objects/object_ouke_haka/object_ouke_haka.h b/soh/assets/objects/object_ouke_haka/object_ouke_haka.h index 79db96ea6..bb057b601 100644 --- a/soh/assets/objects/object_ouke_haka/object_ouke_haka.h +++ b/soh/assets/objects/object_ouke_haka/object_ouke_haka.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OUKE_HAKA_H +#define OBJECTS_OBJECT_OUKE_HAKA_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_ouke_haka_DL_0000C0[] = dobject_ouke_haka_DL_0000C0; #define dobject_ouke_haka_Tex_000170 "__OTR__objects/object_ouke_haka/object_ouke_haka_Tex_000170" -static const ALIGN_ASSET(2) char object_ouke_haka_Tex_000170[] = dobject_ouke_haka_Tex_000170; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ouke_haka_Tex_000170[] = dobject_ouke_haka_Tex_000170; + +#endif // OBJECTS_OBJECT_OUKE_HAKA_H diff --git a/soh/assets/objects/object_owl/object_owl.h b/soh/assets/objects/object_owl/object_owl.h index e0ec139ea..3e4bc7fc3 100644 --- a/soh/assets/objects/object_owl/object_owl.h +++ b/soh/assets/objects/object_owl/object_owl.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_OWL_H +#define OBJECTS_OBJECT_OWL_H 1 #include "align_asset_macro.h" @@ -162,4 +163,7 @@ static const ALIGN_ASSET(2) char gOwlPerchingSkelLimbsLimb_010050DL_00FD38[] = d static const ALIGN_ASSET(2) char gOwlPerchingSkelLimbsLimb_01005CDL_00FE28[] = dgOwlPerchingSkelLimbsLimb_01005CDL_00FE28; #define dgOwlPerchingSkelLimbsLimb_010068DL_00F030 "__OTR__objects/object_owl/gOwlPerchingSkelLimbsLimb_010068DL_00F030" -static const ALIGN_ASSET(2) char gOwlPerchingSkelLimbsLimb_010068DL_00F030[] = dgOwlPerchingSkelLimbsLimb_010068DL_00F030; \ No newline at end of file +static const ALIGN_ASSET(2) char gOwlPerchingSkelLimbsLimb_010068DL_00F030[] = dgOwlPerchingSkelLimbsLimb_010068DL_00F030; + + +#endif // OBJECTS_OBJECT_OWL_H diff --git a/soh/assets/objects/object_peehat/object_peehat.h b/soh/assets/objects/object_peehat/object_peehat.h index d180dfcab..20bc83436 100644 --- a/soh/assets/objects/object_peehat/object_peehat.h +++ b/soh/assets/objects/object_peehat/object_peehat.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_PEEHAT_H +#define OBJECTS_OBJECT_PEEHAT_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char gPeehatFlyingAnim[] = dgPeehatFlyingAnim; static const ALIGN_ASSET(2) char gPeehatRecoilAnim[] = dgPeehatRecoilAnim; #define dgPeehatRisingAnim "__OTR__objects/object_peehat/gPeehatRisingAnim" -static const ALIGN_ASSET(2) char gPeehatRisingAnim[] = dgPeehatRisingAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gPeehatRisingAnim[] = dgPeehatRisingAnim; + + +#endif // OBJECTS_OBJECT_PEEHAT_H diff --git a/soh/assets/objects/object_po_composer/object_po_composer.h b/soh/assets/objects/object_po_composer/object_po_composer.h index bbe59ef62..9db85ca52 100644 --- a/soh/assets/objects/object_po_composer/object_po_composer.h +++ b/soh/assets/objects/object_po_composer/object_po_composer.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_PO_COMPOSER_H +#define OBJECTS_OBJECT_PO_COMPOSER_H 1 #include "align_asset_macro.h" @@ -108,4 +109,6 @@ static const ALIGN_ASSET(2) char gPoeComposerSkelLimbsLimb_006F58DL_002B70[] = d static const ALIGN_ASSET(2) char object_po_composerTex_0054E0[] = dobject_po_composerTex_0054E0; #define dobject_po_composerTex_0066E0 "__OTR__objects/object_po_composer/object_po_composerTex_0066E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0066E0[] = dobject_po_composerTex_0066E0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_po_composerTex_0066E0[] = dobject_po_composerTex_0066E0; + +#endif // OBJECTS_OBJECT_PO_COMPOSER_H diff --git a/soh/assets/objects/object_po_field/object_po_field.h b/soh/assets/objects/object_po_field/object_po_field.h index 018dc311e..c6c2f1f5a 100644 --- a/soh/assets/objects/object_po_field/object_po_field.h +++ b/soh/assets/objects/object_po_field/object_po_field.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_PO_FIELD_H +#define OBJECTS_OBJECT_PO_FIELD_H 1 #include "align_asset_macro.h" @@ -105,4 +106,6 @@ static const ALIGN_ASSET(2) char gPoeFieldSkelLimbsLimb_006A00DL_004DF8[] = dgPo static const ALIGN_ASSET(2) char object_po_fieldTex_0035F0[] = dobject_po_fieldTex_0035F0; #define dobject_po_fieldTex_003070 "__OTR__objects/object_po_field/object_po_fieldTex_003070" -static const ALIGN_ASSET(2) char object_po_fieldTex_003070[] = dobject_po_fieldTex_003070; \ No newline at end of file +static const ALIGN_ASSET(2) char object_po_fieldTex_003070[] = dobject_po_fieldTex_003070; + +#endif // OBJECTS_OBJECT_PO_FIELD_H diff --git a/soh/assets/objects/object_po_sisters/object_po_sisters.h b/soh/assets/objects/object_po_sisters/object_po_sisters.h index 5fbd87318..f958aa3bb 100644 --- a/soh/assets/objects/object_po_sisters/object_po_sisters.h +++ b/soh/assets/objects/object_po_sisters/object_po_sisters.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_PO_SISTERS_H +#define OBJECTS_OBJECT_PO_SISTERS_H 1 #include "align_asset_macro.h" @@ -113,24 +114,6 @@ static const ALIGN_ASSET(2) char object_po_sistersTex_0062F8[] = dobject_po_sist #define dobject_po_sistersTex_006318 "__OTR__objects/object_po_sisters/object_po_sistersTex_006318" static const ALIGN_ASSET(2) char object_po_sistersTex_006318[] = dobject_po_sistersTex_006318; -#define dgPoeSistersSkelLimbsLimb_006524DL_002718 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006524DL_002718" -static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006524DL_002718[] = dgPoeSistersSkelLimbsLimb_006524DL_002718; - -#define dgPoeSistersSkelLimbsLimb_006530DL_002870 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006530DL_002870" -static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006530DL_002870[] = dgPoeSistersSkelLimbsLimb_006530DL_002870; - -#define dgPoeSistersSkelLimbsLimb_00653CDL_002680 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_00653CDL_002680" -static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_00653CDL_002680[] = dgPoeSistersSkelLimbsLimb_00653CDL_002680; - -#define dgPoeSistersSkelLimbsLimb_006548DL_0025E8 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006548DL_0025E8" -static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006548DL_0025E8[] = dgPoeSistersSkelLimbsLimb_006548DL_0025E8; - -#define dgPoeSistersSkelLimbsLimb_006560DL_002570 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006560DL_002570" -static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006560DL_002570[] = dgPoeSistersSkelLimbsLimb_006560DL_002570; - -#define dgPoeSistersSkelLimbsLimb_006590DL_0024A8 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006590DL_0024A8" -static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006590DL_0024A8[] = dgPoeSistersSkelLimbsLimb_006590DL_0024A8; - #define dobject_po_sistersTex_0082C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0082C0" static const ALIGN_ASSET(2) char object_po_sistersTex_0082C0[] = dobject_po_sistersTex_0082C0; @@ -173,5 +156,25 @@ static const ALIGN_ASSET(2) char object_po_sistersTex_00CBC0[] = dobject_po_sist #define dobject_po_sistersTex_00C3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00C3C0" static const ALIGN_ASSET(2) char object_po_sistersTex_00C3C0[] = dobject_po_sistersTex_00C3C0; +#define dgPoeSistersSkelLimbsLimb_006524DL_002718 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006524DL_002718" +static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006524DL_002718[] = dgPoeSistersSkelLimbsLimb_006524DL_002718; + +#define dgPoeSistersSkelLimbsLimb_006530DL_002870 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006530DL_002870" +static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006530DL_002870[] = dgPoeSistersSkelLimbsLimb_006530DL_002870; + +#define dgPoeSistersSkelLimbsLimb_00653CDL_002680 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_00653CDL_002680" +static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_00653CDL_002680[] = dgPoeSistersSkelLimbsLimb_00653CDL_002680; + +#define dgPoeSistersSkelLimbsLimb_006548DL_0025E8 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006548DL_0025E8" +static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006548DL_0025E8[] = dgPoeSistersSkelLimbsLimb_006548DL_0025E8; + +#define dgPoeSistersSkelLimbsLimb_006560DL_002570 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006560DL_002570" +static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006560DL_002570[] = dgPoeSistersSkelLimbsLimb_006560DL_002570; + +#define dgPoeSistersSkelLimbsLimb_006590DL_0024A8 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006590DL_0024A8" +static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006590DL_0024A8[] = dgPoeSistersSkelLimbsLimb_006590DL_0024A8; + #define dobject_po_sistersTex_0052D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0052D8" -static const ALIGN_ASSET(2) char object_po_sistersTex_0052D8[] = dobject_po_sistersTex_0052D8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_po_sistersTex_0052D8[] = dobject_po_sistersTex_0052D8; + +#endif // OBJECTS_OBJECT_PO_SISTERS_H diff --git a/soh/assets/objects/object_poh/object_poh.h b/soh/assets/objects/object_poh/object_poh.h index 1d8c80b07..da3693b45 100644 --- a/soh/assets/objects/object_poh/object_poh.h +++ b/soh/assets/objects/object_poh/object_poh.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_POH_H +#define OBJECTS_OBJECT_POH_H 1 #include "align_asset_macro.h" @@ -87,4 +88,6 @@ static const ALIGN_ASSET(2) char object_pohTex_004510[] = dobject_pohTex_004510; static const ALIGN_ASSET(2) char object_pohTex_003910[] = dobject_pohTex_003910; #define dobject_pohTex_004790 "__OTR__objects/object_poh/object_pohTex_004790" -static const ALIGN_ASSET(2) char object_pohTex_004790[] = dobject_pohTex_004790; \ No newline at end of file +static const ALIGN_ASSET(2) char object_pohTex_004790[] = dobject_pohTex_004790; + +#endif // OBJECTS_OBJECT_POH_H diff --git a/soh/assets/objects/object_ps/object_ps.h b/soh/assets/objects/object_ps/object_ps.h index df363766c..bba360f73 100644 --- a/soh/assets/objects/object_ps/object_ps.h +++ b/soh/assets/objects/object_ps/object_ps.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_PS_H +#define OBJECTS_OBJECT_PS_H 1 #include "align_asset_macro.h" @@ -144,4 +145,6 @@ static const ALIGN_ASSET(2) char object_psTex_007A40[] = dobject_psTex_007A40; static const ALIGN_ASSET(2) char object_psTex_007C40[] = dobject_psTex_007C40; #define dobject_psTex_0071C0 "__OTR__objects/object_ps/object_psTex_0071C0" -static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0; + +#endif // OBJECTS_OBJECT_PS_H diff --git a/soh/assets/objects/object_pu_box/object_pu_box.h b/soh/assets/objects/object_pu_box/object_pu_box.h index f48ba98a3..81afe261b 100644 --- a/soh/assets/objects/object_pu_box/object_pu_box.h +++ b/soh/assets/objects/object_pu_box/object_pu_box.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_PU_BOX_H +#define OBJECTS_OBJECT_PU_BOX_H 1 #include "align_asset_macro.h" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gBlockTallestDL[] = dgBlockTallestDL; static const ALIGN_ASSET(2) char gBlockTallestCol[] = dgBlockTallestCol; #define dgBlockTex "__OTR__objects/object_pu_box/gBlockTex" -static const ALIGN_ASSET(2) char gBlockTex[] = dgBlockTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBlockTex[] = dgBlockTex; + +#endif // OBJECTS_OBJECT_PU_BOX_H diff --git a/soh/assets/objects/object_rd/object_rd.h b/soh/assets/objects/object_rd/object_rd.h index 6bcd7787f..ebc8767ba 100644 --- a/soh/assets/objects/object_rd/object_rd.h +++ b/soh/assets/objects/object_rd/object_rd.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_RD_H +#define OBJECTS_OBJECT_RD_H 1 #include "align_asset_macro.h" @@ -156,4 +157,7 @@ static const ALIGN_ASSET(2) char gRedeadRightFootDL[] = dgRedeadRightFootDL; static const ALIGN_ASSET(2) char gRedeadSkel[] = dgRedeadSkel; #define dgGibdoRedeadWalkAnim "__OTR__objects/object_rd/gGibdoRedeadWalkAnim" -static const ALIGN_ASSET(2) char gGibdoRedeadWalkAnim[] = dgGibdoRedeadWalkAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gGibdoRedeadWalkAnim[] = dgGibdoRedeadWalkAnim; + + +#endif // OBJECTS_OBJECT_RD_H diff --git a/soh/assets/objects/object_reeba/object_reeba.h b/soh/assets/objects/object_reeba/object_reeba.h index b2eb9bada..791f7caf3 100644 --- a/soh/assets/objects/object_reeba/object_reeba.h +++ b/soh/assets/objects/object_reeba/object_reeba.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_REEBA_H +#define OBJECTS_OBJECT_REEBA_H 1 #include "align_asset_macro.h" @@ -69,4 +70,7 @@ static const ALIGN_ASSET(2) char object_reeba_Tex_000DD8[] = dobject_reeba_Tex_0 static const ALIGN_ASSET(2) char object_reeba_Tex_0015D8[] = dobject_reeba_Tex_0015D8; #define dobject_reeba_Skel_001EE8 "__OTR__objects/object_reeba/object_reeba_Skel_001EE8" -static const ALIGN_ASSET(2) char object_reeba_Skel_001EE8[] = dobject_reeba_Skel_001EE8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_reeba_Skel_001EE8[] = dobject_reeba_Skel_001EE8; + + +#endif // OBJECTS_OBJECT_REEBA_H diff --git a/soh/assets/objects/object_relay_objects/object_relay_objects.h b/soh/assets/objects/object_relay_objects/object_relay_objects.h index 6bb5594d8..315f73d4e 100644 --- a/soh/assets/objects/object_relay_objects/object_relay_objects.h +++ b/soh/assets/objects/object_relay_objects/object_relay_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_RELAY_OBJECTS_H +#define OBJECTS_OBJECT_RELAY_OBJECTS_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gDampeRaceDoorTex[] = dgDampeRaceDoorTex; static const ALIGN_ASSET(2) char gDampeRaceDoorCol[] = dgDampeRaceDoorCol; #define dgWindmillRotatingPlatformCol "__OTR__objects/object_relay_objects/gWindmillRotatingPlatformCol" -static const ALIGN_ASSET(2) char gWindmillRotatingPlatformCol[] = dgWindmillRotatingPlatformCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gWindmillRotatingPlatformCol[] = dgWindmillRotatingPlatformCol; + +#endif // OBJECTS_OBJECT_RELAY_OBJECTS_H diff --git a/soh/assets/objects/object_rl/object_rl.h b/soh/assets/objects/object_rl/object_rl.h index ceaf4a949..f0137db11 100644 --- a/soh/assets/objects/object_rl/object_rl.h +++ b/soh/assets/objects/object_rl/object_rl.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_RL_H +#define OBJECTS_OBJECT_RL_H 1 #include "align_asset_macro.h" @@ -105,4 +106,7 @@ static const ALIGN_ASSET(2) char object_rl_Skel_007B38[] = dobject_rl_Skel_007B3 static const ALIGN_ASSET(2) char object_rlTex_0033E0[] = dobject_rlTex_0033E0; #define dobject_rlTex_003420 "__OTR__objects/object_rl/object_rlTex_003420" -static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420; \ No newline at end of file +static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420; + + +#endif // OBJECTS_OBJECT_RL_H diff --git a/soh/assets/objects/object_rr/object_rr.h b/soh/assets/objects/object_rr/object_rr.h index 664274bde..9960e6969 100644 --- a/soh/assets/objects/object_rr/object_rr.h +++ b/soh/assets/objects/object_rr/object_rr.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_RR_H +#define OBJECTS_OBJECT_RR_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gLikeLikeBodyPattern1Tex[] = dgLikeLikeBodyPatt static const ALIGN_ASSET(2) char gLikeLikeBodyPattern2Tex[] = dgLikeLikeBodyPattern2Tex; #define dgLikeLikeHoleTex "__OTR__objects/object_rr/gLikeLikeHoleTex" -static const ALIGN_ASSET(2) char gLikeLikeHoleTex[] = dgLikeLikeHoleTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLikeLikeHoleTex[] = dgLikeLikeHoleTex; + +#endif // OBJECTS_OBJECT_RR_H diff --git a/soh/assets/objects/object_rs/object_rs.h b/soh/assets/objects/object_rs/object_rs.h index 23c7b03cb..5355c5079 100644 --- a/soh/assets/objects/object_rs/object_rs.h +++ b/soh/assets/objects/object_rs/object_rs.h @@ -1,45 +1,46 @@ -#pragma once +#ifndef OBJECTS_OBJECT_RS_H +#define OBJECTS_OBJECT_RS_H 1 #include "align_asset_macro.h" -#define dobject_rs_Anim_00065C "__OTR__objects/object_rs/object_rs_Anim_00065C" -static const ALIGN_ASSET(2) char object_rs_Anim_00065C[] = dobject_rs_Anim_00065C; +#define dgBombchuShopkeeperIdleAnim "__OTR__objects/object_rs/gBombchuShopkeeperIdleAnim" +static const ALIGN_ASSET(2) char gBombchuShopkeeperIdleAnim[] = dgBombchuShopkeeperIdleAnim; -#define dobject_rs_DL_001FA0 "__OTR__objects/object_rs/object_rs_DL_001FA0" -static const ALIGN_ASSET(2) char object_rs_DL_001FA0[] = dobject_rs_DL_001FA0; +#define dgBombchuShopkeeperTorsoDL "__OTR__objects/object_rs/gBombchuShopkeeperTorsoDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperTorsoDL[] = dgBombchuShopkeeperTorsoDL; -#define dobject_rs_DL_0021F8 "__OTR__objects/object_rs/object_rs_DL_0021F8" -static const ALIGN_ASSET(2) char object_rs_DL_0021F8[] = dobject_rs_DL_0021F8; +#define dgBombchuShopkeeperHeadDL "__OTR__objects/object_rs/gBombchuShopkeeperHeadDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperHeadDL[] = dgBombchuShopkeeperHeadDL; -#define dobject_rs_DL_0025F8 "__OTR__objects/object_rs/object_rs_DL_0025F8" -static const ALIGN_ASSET(2) char object_rs_DL_0025F8[] = dobject_rs_DL_0025F8; +#define dgBombchuShopkeeperRightUpperArmDL "__OTR__objects/object_rs/gBombchuShopkeeperRightUpperArmDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperRightUpperArmDL[] = dgBombchuShopkeeperRightUpperArmDL; -#define dobject_rs_DL_002730 "__OTR__objects/object_rs/object_rs_DL_002730" -static const ALIGN_ASSET(2) char object_rs_DL_002730[] = dobject_rs_DL_002730; +#define dgBombchuShopkeeperRightForearmDL "__OTR__objects/object_rs/gBombchuShopkeeperRightForearmDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperRightForearmDL[] = dgBombchuShopkeeperRightForearmDL; -#define dobject_rs_DL_002860 "__OTR__objects/object_rs/object_rs_DL_002860" -static const ALIGN_ASSET(2) char object_rs_DL_002860[] = dobject_rs_DL_002860; +#define dgBombchuShopkeeperRightHandDL "__OTR__objects/object_rs/gBombchuShopkeeperRightHandDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperRightHandDL[] = dgBombchuShopkeeperRightHandDL; -#define dobject_rs_DL_002A70 "__OTR__objects/object_rs/object_rs_DL_002A70" -static const ALIGN_ASSET(2) char object_rs_DL_002A70[] = dobject_rs_DL_002A70; +#define dgBombchuShopkeeperLeftUpperArmDL "__OTR__objects/object_rs/gBombchuShopkeeperLeftUpperArmDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperLeftUpperArmDL[] = dgBombchuShopkeeperLeftUpperArmDL; -#define dobject_rs_DL_002BA8 "__OTR__objects/object_rs/object_rs_DL_002BA8" -static const ALIGN_ASSET(2) char object_rs_DL_002BA8[] = dobject_rs_DL_002BA8; +#define dgBombchuShopkeeperLeftForearmDL "__OTR__objects/object_rs/gBombchuShopkeeperLeftForearmDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperLeftForearmDL[] = dgBombchuShopkeeperLeftForearmDL; -#define dobject_rs_DL_002CD8 "__OTR__objects/object_rs/object_rs_DL_002CD8" -static const ALIGN_ASSET(2) char object_rs_DL_002CD8[] = dobject_rs_DL_002CD8; +#define dgBombchuShopkeeperLeftHandDL "__OTR__objects/object_rs/gBombchuShopkeeperLeftHandDL" +static const ALIGN_ASSET(2) char gBombchuShopkeeperLeftHandDL[] = dgBombchuShopkeeperLeftHandDL; -#define dobject_rs_TLUT_002EE8 "__OTR__objects/object_rs/object_rs_TLUT_002EE8" -static const ALIGN_ASSET(2) char object_rs_TLUT_002EE8[] = dobject_rs_TLUT_002EE8; +#define dgBombchuShopkeeperTLUT "__OTR__objects/object_rs/gBombchuShopkeeperTLUT" +static const ALIGN_ASSET(2) char gBombchuShopkeeperTLUT[] = dgBombchuShopkeeperTLUT; -#define dobject_rs_Tex_0030E8 "__OTR__objects/object_rs/object_rs_Tex_0030E8" -static const ALIGN_ASSET(2) char object_rs_Tex_0030E8[] = dobject_rs_Tex_0030E8; +#define dgBombchuShopkeeperSkinTex "__OTR__objects/object_rs/gBombchuShopkeeperSkinTex" +static const ALIGN_ASSET(2) char gBombchuShopkeeperSkinTex[] = dgBombchuShopkeeperSkinTex; -#define dobject_rs_Tex_003128 "__OTR__objects/object_rs/object_rs_Tex_003128" -static const ALIGN_ASSET(2) char object_rs_Tex_003128[] = dobject_rs_Tex_003128; +#define dgBombchuShopkeeperEarTex "__OTR__objects/object_rs/gBombchuShopkeeperEarTex" +static const ALIGN_ASSET(2) char gBombchuShopkeeperEarTex[] = dgBombchuShopkeeperEarTex; -#define dobject_rs_Tex_003168 "__OTR__objects/object_rs/object_rs_Tex_003168" -static const ALIGN_ASSET(2) char object_rs_Tex_003168[] = dobject_rs_Tex_003168; +#define dgBombchuShopkeeperTattooTex "__OTR__objects/object_rs/gBombchuShopkeeperTattooTex" +static const ALIGN_ASSET(2) char gBombchuShopkeeperTattooTex[] = dgBombchuShopkeeperTattooTex; #define dgBombchuShopkeeperEyeOpenTex "__OTR__objects/object_rs/gBombchuShopkeeperEyeOpenTex" static const ALIGN_ASSET(2) char gBombchuShopkeeperEyeOpenTex[] = dgBombchuShopkeeperEyeOpenTex; @@ -50,14 +51,17 @@ static const ALIGN_ASSET(2) char gBombchuShopkeeperEyeHalfTex[] = dgBombchuShopk #define dgBombchuShopkeeperEyeClosedTex "__OTR__objects/object_rs/gBombchuShopkeeperEyeClosedTex" static const ALIGN_ASSET(2) char gBombchuShopkeeperEyeClosedTex[] = dgBombchuShopkeeperEyeClosedTex; -#define dobject_rs_Tex_004568 "__OTR__objects/object_rs/object_rs_Tex_004568" -static const ALIGN_ASSET(2) char object_rs_Tex_004568[] = dobject_rs_Tex_004568; +#define dgBombchuShopkeeperFingersTex "__OTR__objects/object_rs/gBombchuShopkeeperFingersTex" +static const ALIGN_ASSET(2) char gBombchuShopkeeperFingersTex[] = dgBombchuShopkeeperFingersTex; -#define dobject_rs_Tex_004668 "__OTR__objects/object_rs/object_rs_Tex_004668" -static const ALIGN_ASSET(2) char object_rs_Tex_004668[] = dobject_rs_Tex_004668; +#define dgBombchuShopkeeperVestTex "__OTR__objects/object_rs/gBombchuShopkeeperVestTex" +static const ALIGN_ASSET(2) char gBombchuShopkeeperVestTex[] = dgBombchuShopkeeperVestTex; -#define dobject_rs_Tex_0046E8 "__OTR__objects/object_rs/object_rs_Tex_0046E8" -static const ALIGN_ASSET(2) char object_rs_Tex_0046E8[] = dobject_rs_Tex_0046E8; +#define dgBombchuShopkeeperTorsoTex "__OTR__objects/object_rs/gBombchuShopkeeperTorsoTex" +static const ALIGN_ASSET(2) char gBombchuShopkeeperTorsoTex[] = dgBombchuShopkeeperTorsoTex; -#define dobject_rs_Skel_004868 "__OTR__objects/object_rs/object_rs_Skel_004868" -static const ALIGN_ASSET(2) char object_rs_Skel_004868[] = dobject_rs_Skel_004868; \ No newline at end of file +#define dgBombchuShopkeeperSkel "__OTR__objects/object_rs/gBombchuShopkeeperSkel" +static const ALIGN_ASSET(2) char gBombchuShopkeeperSkel[] = dgBombchuShopkeeperSkel; + + +#endif // OBJECTS_OBJECT_RS_H diff --git a/soh/assets/objects/object_ru1/object_ru1.h b/soh/assets/objects/object_ru1/object_ru1.h index 4cf5d25ba..f5092e3b4 100644 --- a/soh/assets/objects/object_ru1/object_ru1.h +++ b/soh/assets/objects/object_ru1/object_ru1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_RU1_H +#define OBJECTS_OBJECT_RU1_H 1 #include "align_asset_macro.h" @@ -165,4 +166,7 @@ static const ALIGN_ASSET(2) char gRutoChildFingersTex[] = dgRutoChildFingersTex; static const ALIGN_ASSET(2) char gRutoChildCircleGradientTex[] = dgRutoChildCircleGradientTex; #define dgRutoChildSkel "__OTR__objects/object_ru1/gRutoChildSkel" -static const ALIGN_ASSET(2) char gRutoChildSkel[] = dgRutoChildSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gRutoChildSkel[] = dgRutoChildSkel; + + +#endif // OBJECTS_OBJECT_RU1_H diff --git a/soh/assets/objects/object_ru2/object_ru2.h b/soh/assets/objects/object_ru2/object_ru2.h index 969062a9e..237be4fe7 100644 --- a/soh/assets/objects/object_ru2/object_ru2.h +++ b/soh/assets/objects/object_ru2/object_ru2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_RU2_H +#define OBJECTS_OBJECT_RU2_H 1 #include "align_asset_macro.h" @@ -159,4 +160,6 @@ static const ALIGN_ASSET(2) char gAdultRutoSwimmingUpAnim[] = dgAdultRutoSwimmin static const ALIGN_ASSET(2) char object_ru2Tex_0055C0[] = dobject_ru2Tex_0055C0; #define dobject_ru2Tex_0056C0 "__OTR__objects/object_ru2/object_ru2Tex_0056C0" -static const ALIGN_ASSET(2) char object_ru2Tex_0056C0[] = dobject_ru2Tex_0056C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ru2Tex_0056C0[] = dobject_ru2Tex_0056C0; + +#endif // OBJECTS_OBJECT_RU2_H diff --git a/soh/assets/objects/object_sa/object_sa.h b/soh/assets/objects/object_sa/object_sa.h index b41605113..bed18b041 100644 --- a/soh/assets/objects/object_sa/object_sa.h +++ b/soh/assets/objects/object_sa/object_sa.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SA_H +#define OBJECTS_OBJECT_SA_H 1 #include "align_asset_macro.h" @@ -225,4 +226,6 @@ static const ALIGN_ASSET(2) char gSariaMouthSuprisedTex[] = dgSariaMouthSuprised static const ALIGN_ASSET(2) char gSariaEyeSadTex[] = dgSariaEyeSadTex; #define dobject_saTex_002530 "__OTR__objects/object_sa/object_saTex_002530" -static const ALIGN_ASSET(2) char object_saTex_002530[] = dobject_saTex_002530; \ No newline at end of file +static const ALIGN_ASSET(2) char object_saTex_002530[] = dobject_saTex_002530; + +#endif // OBJECTS_OBJECT_SA_H diff --git a/soh/assets/objects/object_sb/object_sb.h b/soh/assets/objects/object_sb/object_sb.h index a9f9d0667..b383d9d44 100644 --- a/soh/assets/objects/object_sb/object_sb.h +++ b/soh/assets/objects/object_sb/object_sb.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SB_H +#define OBJECTS_OBJECT_SB_H 1 #include "align_asset_macro.h" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char object_sb_Tex_002AF0[] = dobject_sb_Tex_002AF0; static const ALIGN_ASSET(2) char object_sb_Skel_002BF0[] = dobject_sb_Skel_002BF0; #define dobject_sb_Anim_002C8C "__OTR__objects/object_sb/object_sb_Anim_002C8C" -static const ALIGN_ASSET(2) char object_sb_Anim_002C8C[] = dobject_sb_Anim_002C8C; \ No newline at end of file +static const ALIGN_ASSET(2) char object_sb_Anim_002C8C[] = dobject_sb_Anim_002C8C; + + +#endif // OBJECTS_OBJECT_SB_H diff --git a/soh/assets/objects/object_sd/object_sd.h b/soh/assets/objects/object_sd/object_sd.h index 131be1dd6..0cbbdd00f 100644 --- a/soh/assets/objects/object_sd/object_sd.h +++ b/soh/assets/objects/object_sd/object_sd.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SD_H +#define OBJECTS_OBJECT_SD_H 1 #include "align_asset_macro.h" @@ -132,4 +133,7 @@ static const ALIGN_ASSET(2) char gEnHeishiLegTex[] = dgEnHeishiLegTex; static const ALIGN_ASSET(2) char gEnHeishiTex_0067C0[] = dgEnHeishiTex_0067C0; #define dgEnHeishiHandTex "__OTR__objects/object_sd/gEnHeishiHandTex" -static const ALIGN_ASSET(2) char gEnHeishiHandTex[] = dgEnHeishiHandTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gEnHeishiHandTex[] = dgEnHeishiHandTex; + + +#endif // OBJECTS_OBJECT_SD_H diff --git a/soh/assets/objects/object_shop_dungen/object_shop_dungen.h b/soh/assets/objects/object_shop_dungen/object_shop_dungen.h index 2a7054064..534787bd6 100644 --- a/soh/assets/objects/object_shop_dungen/object_shop_dungen.h +++ b/soh/assets/objects/object_shop_dungen/object_shop_dungen.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SHOP_DUNGEN_H +#define OBJECTS_OBJECT_SHOP_DUNGEN_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gShopDungenStone2Tex[] = dgShopDungenStone2Tex; static const ALIGN_ASSET(2) char gShopDungenStoneShelvesDL[] = dgShopDungenStoneShelvesDL; #define dgShopDungenWoodPlankTex "__OTR__objects/object_shop_dungen/gShopDungenWoodPlankTex" -static const ALIGN_ASSET(2) char gShopDungenWoodPlankTex[] = dgShopDungenWoodPlankTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gShopDungenWoodPlankTex[] = dgShopDungenWoodPlankTex; + +#endif // OBJECTS_OBJECT_SHOP_DUNGEN_H diff --git a/soh/assets/objects/object_shopnuts/object_shopnuts.h b/soh/assets/objects/object_shopnuts/object_shopnuts.h index 241a80f62..f7408c648 100644 --- a/soh/assets/objects/object_shopnuts/object_shopnuts.h +++ b/soh/assets/objects/object_shopnuts/object_shopnuts.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SHOPNUTS_H +#define OBJECTS_OBJECT_SHOPNUTS_H 1 #include "align_asset_macro.h" @@ -105,4 +106,7 @@ static const ALIGN_ASSET(2) char gBusinessScrubAnim_139C[] = dgBusinessScrubAnim static const ALIGN_ASSET(2) char gBusinessScrubAnim_4404[] = dgBusinessScrubAnim_4404; #define dgBusinessScrubAnim_4574 "__OTR__objects/object_shopnuts/gBusinessScrubAnim_4574" -static const ALIGN_ASSET(2) char gBusinessScrubAnim_4574[] = dgBusinessScrubAnim_4574; \ No newline at end of file +static const ALIGN_ASSET(2) char gBusinessScrubAnim_4574[] = dgBusinessScrubAnim_4574; + + +#endif // OBJECTS_OBJECT_SHOPNUTS_H diff --git a/soh/assets/objects/object_siofuki/object_siofuki.h b/soh/assets/objects/object_siofuki/object_siofuki.h index 15b97aceb..1b478745b 100644 --- a/soh/assets/objects/object_siofuki/object_siofuki.h +++ b/soh/assets/objects/object_siofuki/object_siofuki.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SIOFUKI_H +#define OBJECTS_OBJECT_SIOFUKI_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char object_siofuki_Tex_000000[] = dobject_siofuki_T static const ALIGN_ASSET(2) char object_siofuki_DL_000B70[] = dobject_siofuki_DL_000B70; #define dobject_siofuki_Col_000D78 "__OTR__objects/object_siofuki/object_siofuki_Col_000D78" -static const ALIGN_ASSET(2) char object_siofuki_Col_000D78[] = dobject_siofuki_Col_000D78; \ No newline at end of file +static const ALIGN_ASSET(2) char object_siofuki_Col_000D78[] = dobject_siofuki_Col_000D78; + +#endif // OBJECTS_OBJECT_SIOFUKI_H diff --git a/soh/assets/objects/object_sk2/object_sk2.h b/soh/assets/objects/object_sk2/object_sk2.h index 7e7e66834..d5177e1e0 100644 --- a/soh/assets/objects/object_sk2/object_sk2.h +++ b/soh/assets/objects/object_sk2/object_sk2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SK2_H +#define OBJECTS_OBJECT_SK2_H 1 #include "align_asset_macro.h" @@ -174,4 +175,7 @@ static const ALIGN_ASSET(2) char gStalfosLookAroundAnim[] = dgStalfosLookAroundA static const ALIGN_ASSET(2) char gStalfosSidestepAnim[] = dgStalfosSidestepAnim; #define dgStalfosReleaseAttentionAnim "__OTR__objects/object_sk2/gStalfosReleaseAttentionAnim" -static const ALIGN_ASSET(2) char gStalfosReleaseAttentionAnim[] = dgStalfosReleaseAttentionAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gStalfosReleaseAttentionAnim[] = dgStalfosReleaseAttentionAnim; + + +#endif // OBJECTS_OBJECT_SK2_H diff --git a/soh/assets/objects/object_skb/object_skb.h b/soh/assets/objects/object_skb/object_skb.h index a453190b1..dab7a1f12 100644 --- a/soh/assets/objects/object_skb/object_skb.h +++ b/soh/assets/objects/object_skb/object_skb.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SKB_H +#define OBJECTS_OBJECT_SKB_H 1 #include "align_asset_macro.h" @@ -96,4 +97,7 @@ static const ALIGN_ASSET(2) char gStalchildDamagedAnim[] = dgStalchildDamagedAni static const ALIGN_ASSET(2) char gStalchildWalkingAnim[] = dgStalchildWalkingAnim; #define dgStalchildAttackingAnim "__OTR__objects/object_skb/gStalchildAttackingAnim" -static const ALIGN_ASSET(2) char gStalchildAttackingAnim[] = dgStalchildAttackingAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gStalchildAttackingAnim[] = dgStalchildAttackingAnim; + + +#endif // OBJECTS_OBJECT_SKB_H diff --git a/soh/assets/objects/object_skj/object_skj.h b/soh/assets/objects/object_skj/object_skj.h index 921f58057..bc1ec3dd5 100644 --- a/soh/assets/objects/object_skj/object_skj.h +++ b/soh/assets/objects/object_skj/object_skj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SKJ_H +#define OBJECTS_OBJECT_SKJ_H 1 #include "align_asset_macro.h" @@ -144,4 +145,6 @@ static const ALIGN_ASSET(2) char object_skjTex_005B80[] = dobject_skjTex_005B80; static const ALIGN_ASSET(2) char object_skjTex_005D80[] = dobject_skjTex_005D80; #define dobject_skjTex_005DA0 "__OTR__objects/object_skj/object_skjTex_005DA0" -static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0; + +#endif // OBJECTS_OBJECT_SKJ_H diff --git a/soh/assets/objects/object_spot00_break/object_spot00_break.h b/soh/assets/objects/object_spot00_break/object_spot00_break.h index 4d3263c56..3d6e643e8 100644 --- a/soh/assets/objects/object_spot00_break/object_spot00_break.h +++ b/soh/assets/objects/object_spot00_break/object_spot00_break.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT00_BREAK_H +#define OBJECTS_OBJECT_SPOT00_BREAK_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gBarbedWireFenceDL[] = dgBarbedWireFenceDL; static const ALIGN_ASSET(2) char gBarbedWireFenceTex[] = dgBarbedWireFenceTex; #define dgBarbedWireFenceCol "__OTR__objects/object_spot00_break/gBarbedWireFenceCol" -static const ALIGN_ASSET(2) char gBarbedWireFenceCol[] = dgBarbedWireFenceCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gBarbedWireFenceCol[] = dgBarbedWireFenceCol; + +#endif // OBJECTS_OBJECT_SPOT00_BREAK_H diff --git a/soh/assets/objects/object_spot00_objects/object_spot00_objects.h b/soh/assets/objects/object_spot00_objects/object_spot00_objects.h index 73080b94b..99ab24c95 100644 --- a/soh/assets/objects/object_spot00_objects/object_spot00_objects.h +++ b/soh/assets/objects/object_spot00_objects/object_spot00_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT00_OBJECTS_H +#define OBJECTS_OBJECT_SPOT00_OBJECTS_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gHyruleFieldCastleDrawbridgeChainsDL[] = dgHyru static const ALIGN_ASSET(2) char gHyruleFieldCastleDrawbridgeChainsTex[] = dgHyruleFieldCastleDrawbridgeChainsTex; #define dgHyruleFieldCastleDrawbridgeChainsCol "__OTR__objects/object_spot00_objects/gHyruleFieldCastleDrawbridgeChainsCol" -static const ALIGN_ASSET(2) char gHyruleFieldCastleDrawbridgeChainsCol[] = dgHyruleFieldCastleDrawbridgeChainsCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gHyruleFieldCastleDrawbridgeChainsCol[] = dgHyruleFieldCastleDrawbridgeChainsCol; + +#endif // OBJECTS_OBJECT_SPOT00_OBJECTS_H diff --git a/soh/assets/objects/object_spot01_matoya/object_spot01_matoya.h b/soh/assets/objects/object_spot01_matoya/object_spot01_matoya.h index 7f86962b4..2e48975d3 100644 --- a/soh/assets/objects/object_spot01_matoya/object_spot01_matoya.h +++ b/soh/assets/objects/object_spot01_matoya/object_spot01_matoya.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT01_MATOYA_H +#define OBJECTS_OBJECT_SPOT01_MATOYA_H 1 #include "align_asset_macro.h" @@ -51,4 +52,6 @@ static const ALIGN_ASSET(2) char gKakarikoBOTWStoneCol[] = dgKakarikoBOTWStoneCo static const ALIGN_ASSET(2) char gKakarikoShootingGalleryTLUT[] = dgKakarikoShootingGalleryTLUT; #define dgKakarikoBazaarSignTLUT "__OTR__objects/object_spot01_matoya/gKakarikoBazaarSignTLUT" -static const ALIGN_ASSET(2) char gKakarikoBazaarSignTLUT[] = dgKakarikoBazaarSignTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gKakarikoBazaarSignTLUT[] = dgKakarikoBazaarSignTLUT; + +#endif // OBJECTS_OBJECT_SPOT01_MATOYA_H diff --git a/soh/assets/objects/object_spot01_matoyab/object_spot01_matoyab.h b/soh/assets/objects/object_spot01_matoyab/object_spot01_matoyab.h index 949690dc3..4ee1325a1 100644 --- a/soh/assets/objects/object_spot01_matoyab/object_spot01_matoyab.h +++ b/soh/assets/objects/object_spot01_matoyab/object_spot01_matoyab.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT01_MATOYAB_H +#define OBJECTS_OBJECT_SPOT01_MATOYAB_H 1 #include "align_asset_macro.h" @@ -30,4 +31,6 @@ static const ALIGN_ASSET(2) char gKakarikoConstructionSiteBrickTex[] = dgKakarik static const ALIGN_ASSET(2) char gKakarikoConstructionSitRailingTex[] = dgKakarikoConstructionSitRailingTex; #define dgKakarikoConstructionSiteWoodTex "__OTR__objects/object_spot01_matoyab/gKakarikoConstructionSiteWoodTex" -static const ALIGN_ASSET(2) char gKakarikoConstructionSiteWoodTex[] = dgKakarikoConstructionSiteWoodTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKakarikoConstructionSiteWoodTex[] = dgKakarikoConstructionSiteWoodTex; + +#endif // OBJECTS_OBJECT_SPOT01_MATOYAB_H diff --git a/soh/assets/objects/object_spot01_objects/object_spot01_objects.h b/soh/assets/objects/object_spot01_objects/object_spot01_objects.h index 707451657..e5c09c10d 100644 --- a/soh/assets/objects/object_spot01_objects/object_spot01_objects.h +++ b/soh/assets/objects/object_spot01_objects/object_spot01_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT01_OBJECTS_H +#define OBJECTS_OBJECT_SPOT01_OBJECTS_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gKakarikoWellWaterDL[] = dgKakarikoWellWaterDL; static const ALIGN_ASSET(2) char gKakarikoWellWaterTex[] = dgKakarikoWellWaterTex; #define dgKakarikoWellArchCol "__OTR__objects/object_spot01_objects/gKakarikoWellArchCol" -static const ALIGN_ASSET(2) char gKakarikoWellArchCol[] = dgKakarikoWellArchCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gKakarikoWellArchCol[] = dgKakarikoWellArchCol; + +#endif // OBJECTS_OBJECT_SPOT01_OBJECTS_H diff --git a/soh/assets/objects/object_spot01_objects2/object_spot01_objects2.h b/soh/assets/objects/object_spot01_objects2/object_spot01_objects2.h index 80233bcb1..cc12736ab 100644 --- a/soh/assets/objects/object_spot01_objects2/object_spot01_objects2.h +++ b/soh/assets/objects/object_spot01_objects2/object_spot01_objects2.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT01_OBJECTS2_H +#define OBJECTS_OBJECT_SPOT01_OBJECTS2_H 1 #include "align_asset_macro.h" #define dobject_spot01_objects2_Blob_000000 "__OTR__objects/object_spot01_objects2/object_spot01_objects2_Blob_000000" -static const ALIGN_ASSET(2) char object_spot01_objects2_Blob_000000[] = dobject_spot01_objects2_Blob_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char object_spot01_objects2_Blob_000000[] = dobject_spot01_objects2_Blob_000000; + +#endif // OBJECTS_OBJECT_SPOT01_OBJECTS2_H diff --git a/soh/assets/objects/object_spot02_objects/object_spot02_objects.h b/soh/assets/objects/object_spot02_objects/object_spot02_objects.h index 91170d804..f60f2a161 100644 --- a/soh/assets/objects/object_spot02_objects/object_spot02_objects.h +++ b/soh/assets/objects/object_spot02_objects/object_spot02_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT02_OBJECTS_H +#define OBJECTS_OBJECT_SPOT02_OBJECTS_H 1 #include "align_asset_macro.h" @@ -120,4 +121,6 @@ static const ALIGN_ASSET(2) char object_spot02_objects_Tex_0102B0[] = dobject_sp static const ALIGN_ASSET(2) char object_spot02_objects_Tex_010EB0[] = dobject_spot02_objects_Tex_010EB0; #define dobject_spot02_objects_Tex_011AB0 "__OTR__objects/object_spot02_objects/object_spot02_objects_Tex_011AB0" -static const ALIGN_ASSET(2) char object_spot02_objects_Tex_011AB0[] = dobject_spot02_objects_Tex_011AB0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_spot02_objects_Tex_011AB0[] = dobject_spot02_objects_Tex_011AB0; + +#endif // OBJECTS_OBJECT_SPOT02_OBJECTS_H diff --git a/soh/assets/objects/object_spot03_object/object_spot03_object.h b/soh/assets/objects/object_spot03_object/object_spot03_object.h index 92b5db1fb..0313a6e06 100644 --- a/soh/assets/objects/object_spot03_object/object_spot03_object.h +++ b/soh/assets/objects/object_spot03_object/object_spot03_object.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT03_OBJECT_H +#define OBJECTS_OBJECT_SPOT03_OBJECT_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char object_spot03_object_Col_000C98[] = dobject_spo static const ALIGN_ASSET(2) char object_spot03_object_Tex_000CD0[] = dobject_spot03_object_Tex_000CD0; #define dobject_spot03_object_DL_001580 "__OTR__objects/object_spot03_object/object_spot03_object_DL_001580" -static const ALIGN_ASSET(2) char object_spot03_object_DL_001580[] = dobject_spot03_object_DL_001580; \ No newline at end of file +static const ALIGN_ASSET(2) char object_spot03_object_DL_001580[] = dobject_spot03_object_DL_001580; + +#endif // OBJECTS_OBJECT_SPOT03_OBJECT_H diff --git a/soh/assets/objects/object_spot04_objects/object_spot04_objects.h b/soh/assets/objects/object_spot04_objects/object_spot04_objects.h index 87bcc094d..bb6d1f2b9 100644 --- a/soh/assets/objects/object_spot04_objects/object_spot04_objects.h +++ b/soh/assets/objects/object_spot04_objects/object_spot04_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT04_OBJECTS_H +#define OBJECTS_OBJECT_SPOT04_OBJECTS_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gDekuTreeUnusedMouthTex_12C0[] = dgDekuTreeUnus static const ALIGN_ASSET(2) char gDekuTreeMouthDL[] = dgDekuTreeMouthDL; #define dgDekuTreeMouthCol "__OTR__objects/object_spot04_objects/gDekuTreeMouthCol" -static const ALIGN_ASSET(2) char gDekuTreeMouthCol[] = dgDekuTreeMouthCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gDekuTreeMouthCol[] = dgDekuTreeMouthCol; + +#endif // OBJECTS_OBJECT_SPOT04_OBJECTS_H diff --git a/soh/assets/objects/object_spot05_objects/object_spot05_objects.h b/soh/assets/objects/object_spot05_objects/object_spot05_objects.h index 7371737a4..7f904f301 100644 --- a/soh/assets/objects/object_spot05_objects/object_spot05_objects.h +++ b/soh/assets/objects/object_spot05_objects/object_spot05_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT05_OBJECTS_H +#define OBJECTS_OBJECT_SPOT05_OBJECTS_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char object_spot05_objects_Tex_000950[] = dobject_sp static const ALIGN_ASSET(2) char object_spot05_objects_DL_001190[] = dobject_spot05_objects_DL_001190; #define dobject_spot05_objects_Col_0012C0 "__OTR__objects/object_spot05_objects/object_spot05_objects_Col_0012C0" -static const ALIGN_ASSET(2) char object_spot05_objects_Col_0012C0[] = dobject_spot05_objects_Col_0012C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_spot05_objects_Col_0012C0[] = dobject_spot05_objects_Col_0012C0; + +#endif // OBJECTS_OBJECT_SPOT05_OBJECTS_H diff --git a/soh/assets/objects/object_spot06_objects/object_spot06_objects.h b/soh/assets/objects/object_spot06_objects/object_spot06_objects.h index c11ed031c..202e0ee29 100644 --- a/soh/assets/objects/object_spot06_objects/object_spot06_objects.h +++ b/soh/assets/objects/object_spot06_objects/object_spot06_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT06_OBJECTS_H +#define OBJECTS_OBJECT_SPOT06_OBJECTS_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char gLakeHyliaZoraShortcutIceblockCol[] = dgLakeHyl static const ALIGN_ASSET(2) char gLakeHyliaWaterTempleKeyDL[] = dgLakeHyliaWaterTempleKeyDL; #define dgLakeHyliaWaterTempleKeyTex "__OTR__objects/object_spot06_objects/gLakeHyliaWaterTempleKeyTex" -static const ALIGN_ASSET(2) char gLakeHyliaWaterTempleKeyTex[] = dgLakeHyliaWaterTempleKeyTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLakeHyliaWaterTempleKeyTex[] = dgLakeHyliaWaterTempleKeyTex; + +#endif // OBJECTS_OBJECT_SPOT06_OBJECTS_H diff --git a/soh/assets/objects/object_spot07_object/object_spot07_object.h b/soh/assets/objects/object_spot07_object/object_spot07_object.h index 24a2c8e91..768621d5a 100644 --- a/soh/assets/objects/object_spot07_object/object_spot07_object.h +++ b/soh/assets/objects/object_spot07_object/object_spot07_object.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT07_OBJECT_H +#define OBJECTS_OBJECT_SPOT07_OBJECT_H 1 #include "align_asset_macro.h" @@ -57,4 +58,6 @@ static const ALIGN_ASSET(2) char object_spot07_object_Tex_005530[] = dobject_spo static const ALIGN_ASSET(2) char object_spot07_object_Tex_005D30[] = dobject_spot07_object_Tex_005D30; #define dobject_spot07_object_Tex_006530 "__OTR__objects/object_spot07_object/object_spot07_object_Tex_006530" -static const ALIGN_ASSET(2) char object_spot07_object_Tex_006530[] = dobject_spot07_object_Tex_006530; \ No newline at end of file +static const ALIGN_ASSET(2) char object_spot07_object_Tex_006530[] = dobject_spot07_object_Tex_006530; + +#endif // OBJECTS_OBJECT_SPOT07_OBJECT_H diff --git a/soh/assets/objects/object_spot08_obj/object_spot08_obj.h b/soh/assets/objects/object_spot08_obj/object_spot08_obj.h index f527428a8..5e5ac2875 100644 --- a/soh/assets/objects/object_spot08_obj/object_spot08_obj.h +++ b/soh/assets/objects/object_spot08_obj/object_spot08_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT08_OBJ_H +#define OBJECTS_OBJECT_SPOT08_OBJ_H 1 #include "align_asset_macro.h" @@ -54,4 +55,6 @@ static const ALIGN_ASSET(2) char gZorasFountainBombableWallTLUT[] = dgZorasFount static const ALIGN_ASSET(2) char gZorasFountainBombableWallTex[] = dgZorasFountainBombableWallTex; #define dgZorasFountainBombableWallCol "__OTR__objects/object_spot08_obj/gZorasFountainBombableWallCol" -static const ALIGN_ASSET(2) char gZorasFountainBombableWallCol[] = dgZorasFountainBombableWallCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gZorasFountainBombableWallCol[] = dgZorasFountainBombableWallCol; + +#endif // OBJECTS_OBJECT_SPOT08_OBJ_H diff --git a/soh/assets/objects/object_spot09_obj/object_spot09_obj.h b/soh/assets/objects/object_spot09_obj/object_spot09_obj.h index 78668baf8..12cc0df15 100644 --- a/soh/assets/objects/object_spot09_obj/object_spot09_obj.h +++ b/soh/assets/objects/object_spot09_obj/object_spot09_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT09_OBJ_H +#define OBJECTS_OBJECT_SPOT09_OBJ_H 1 #include "align_asset_macro.h" @@ -93,4 +94,6 @@ static const ALIGN_ASSET(2) char object_spot09_objTex_009490[] = dobject_spot09_ static const ALIGN_ASSET(2) char object_spot09_objTex_017490[] = dobject_spot09_objTex_017490; #define dobject_spot09_objTex_017090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017090" -static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090; \ No newline at end of file +static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090; + +#endif // OBJECTS_OBJECT_SPOT09_OBJ_H diff --git a/soh/assets/objects/object_spot11_obj/object_spot11_obj.h b/soh/assets/objects/object_spot11_obj/object_spot11_obj.h index e2a28bbfa..bba0b02e8 100644 --- a/soh/assets/objects/object_spot11_obj/object_spot11_obj.h +++ b/soh/assets/objects/object_spot11_obj/object_spot11_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT11_OBJ_H +#define OBJECTS_OBJECT_SPOT11_OBJ_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gDesertColossusBombableWallTex[] = dgDesertColo static const ALIGN_ASSET(2) char gDesertColossusBombableWallDL[] = dgDesertColossusBombableWallDL; #define dgDesertColossusBombableWallCol "__OTR__objects/object_spot11_obj/gDesertColossusBombableWallCol" -static const ALIGN_ASSET(2) char gDesertColossusBombableWallCol[] = dgDesertColossusBombableWallCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gDesertColossusBombableWallCol[] = dgDesertColossusBombableWallCol; + +#endif // OBJECTS_OBJECT_SPOT11_OBJ_H diff --git a/soh/assets/objects/object_spot12_obj/object_spot12_obj.h b/soh/assets/objects/object_spot12_obj/object_spot12_obj.h index ad8181a8f..391c3bff4 100644 --- a/soh/assets/objects/object_spot12_obj/object_spot12_obj.h +++ b/soh/assets/objects/object_spot12_obj/object_spot12_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT12_OBJ_H +#define OBJECTS_OBJECT_SPOT12_OBJ_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gGerudoFortressGTGShutterDL[] = dgGerudoFortres static const ALIGN_ASSET(2) char gGerudoFortressGTGShutterTex[] = dgGerudoFortressGTGShutterTex; #define dgGerudoFortressGTGShutterCol "__OTR__objects/object_spot12_obj/gGerudoFortressGTGShutterCol" -static const ALIGN_ASSET(2) char gGerudoFortressGTGShutterCol[] = dgGerudoFortressGTGShutterCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gGerudoFortressGTGShutterCol[] = dgGerudoFortressGTGShutterCol; + +#endif // OBJECTS_OBJECT_SPOT12_OBJ_H diff --git a/soh/assets/objects/object_spot15_obj/object_spot15_obj.h b/soh/assets/objects/object_spot15_obj/object_spot15_obj.h index fa83e1b51..d2ffb42c7 100644 --- a/soh/assets/objects/object_spot15_obj/object_spot15_obj.h +++ b/soh/assets/objects/object_spot15_obj/object_spot15_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT15_OBJ_H +#define OBJECTS_OBJECT_SPOT15_OBJ_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gLonLonCorralFenceDL[] = dgLonLonCorralFenceDL; static const ALIGN_ASSET(2) char gLonLonCorralFenceTex[] = dgLonLonCorralFenceTex; #define dgLonLonCorralFenceCol "__OTR__objects/object_spot15_obj/gLonLonCorralFenceCol" -static const ALIGN_ASSET(2) char gLonLonCorralFenceCol[] = dgLonLonCorralFenceCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gLonLonCorralFenceCol[] = dgLonLonCorralFenceCol; + +#endif // OBJECTS_OBJECT_SPOT15_OBJ_H diff --git a/soh/assets/objects/object_spot16_obj/object_spot16_obj.h b/soh/assets/objects/object_spot16_obj/object_spot16_obj.h index 729557870..7a7743fac 100644 --- a/soh/assets/objects/object_spot16_obj/object_spot16_obj.h +++ b/soh/assets/objects/object_spot16_obj/object_spot16_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT16_OBJ_H +#define OBJECTS_OBJECT_SPOT16_OBJ_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gDeathMountainRingDL[] = dgDeathMountainRingDL; static const ALIGN_ASSET(2) char gDodongosCavernRockTex[] = dgDodongosCavernRockTex; #define dgDeathMountainRingTex "__OTR__objects/object_spot16_obj/gDeathMountainRingTex" -static const ALIGN_ASSET(2) char gDeathMountainRingTex[] = dgDeathMountainRingTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDeathMountainRingTex[] = dgDeathMountainRingTex; + +#endif // OBJECTS_OBJECT_SPOT16_OBJ_H diff --git a/soh/assets/objects/object_spot17_obj/object_spot17_obj.h b/soh/assets/objects/object_spot17_obj/object_spot17_obj.h index ee37dd713..16e7b7c65 100644 --- a/soh/assets/objects/object_spot17_obj/object_spot17_obj.h +++ b/soh/assets/objects/object_spot17_obj/object_spot17_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT17_OBJ_H +#define OBJECTS_OBJECT_SPOT17_OBJ_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gCraterSmokeConeDL[] = dgCraterSmokeConeDL; static const ALIGN_ASSET(2) char gCraterSmokeConeTex[] = dgCraterSmokeConeTex; #define dgCraterBombableWallCracksTex "__OTR__objects/object_spot17_obj/gCraterBombableWallCracksTex" -static const ALIGN_ASSET(2) char gCraterBombableWallCracksTex[] = dgCraterBombableWallCracksTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCraterBombableWallCracksTex[] = dgCraterBombableWallCracksTex; + +#endif // OBJECTS_OBJECT_SPOT17_OBJ_H diff --git a/soh/assets/objects/object_spot18_obj/object_spot18_obj.h b/soh/assets/objects/object_spot18_obj/object_spot18_obj.h index 62d0a97f9..282bdb30c 100644 --- a/soh/assets/objects/object_spot18_obj/object_spot18_obj.h +++ b/soh/assets/objects/object_spot18_obj/object_spot18_obj.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SPOT18_OBJ_H +#define OBJECTS_OBJECT_SPOT18_OBJ_H 1 #include "align_asset_macro.h" @@ -75,4 +76,6 @@ static const ALIGN_ASSET(2) char gGoronCityVaseCol[] = dgGoronCityVaseCol; static const ALIGN_ASSET(2) char gGoronCityStatueSpearCol[] = dgGoronCityStatueSpearCol; #define dgGoronCityStatueCol "__OTR__objects/object_spot18_obj/gGoronCityStatueCol" -static const ALIGN_ASSET(2) char gGoronCityStatueCol[] = dgGoronCityStatueCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoronCityStatueCol[] = dgGoronCityStatueCol; + +#endif // OBJECTS_OBJECT_SPOT18_OBJ_H diff --git a/soh/assets/objects/object_ssh/object_ssh.h b/soh/assets/objects/object_ssh/object_ssh.h index 457301745..aea64f4df 100644 --- a/soh/assets/objects/object_ssh/object_ssh.h +++ b/soh/assets/objects/object_ssh/object_ssh.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SSH_H +#define OBJECTS_OBJECT_SSH_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char object_ssh_Skel_0052E0[] = dobject_ssh_Skel_005 static const ALIGN_ASSET(2) char object_ssh_Anim_0055F8[] = dobject_ssh_Anim_0055F8; #define dobject_ssh_Anim_005BE8 "__OTR__objects/object_ssh/object_ssh_Anim_005BE8" -static const ALIGN_ASSET(2) char object_ssh_Anim_005BE8[] = dobject_ssh_Anim_005BE8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ssh_Anim_005BE8[] = dobject_ssh_Anim_005BE8; + + +#endif // OBJECTS_OBJECT_SSH_H diff --git a/soh/assets/objects/object_sst/object_sst.h b/soh/assets/objects/object_sst/object_sst.h index 7a9880798..a3b60a8be 100644 --- a/soh/assets/objects/object_sst/object_sst.h +++ b/soh/assets/objects/object_sst/object_sst.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SST_H +#define OBJECTS_OBJECT_SST_H 1 #include "align_asset_macro.h" @@ -110,6 +111,9 @@ static const ALIGN_ASSET(2) char gBongoUnused1Tex[] = dgBongoUnused1Tex; #define dgBongoUnused2Tex "__OTR__objects/object_sst/gBongoUnused2Tex" static const ALIGN_ASSET(2) char gBongoUnused2Tex[] = dgBongoUnused2Tex; +#define dobject_sstTex_017FE0 "__OTR__objects/object_sst/object_sstTex_017FE0" +static const ALIGN_ASSET(2) char object_sstTex_017FE0[] = dobject_sstTex_017FE0; + #define dgBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8 "__OTR__objects/object_sst/gBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8" static const ALIGN_ASSET(2) char gBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8[] = dgBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8; @@ -290,9 +294,6 @@ static const ALIGN_ASSET(2) char gBongoHeadSkelLimbsLimb_017B78DL_011658[] = dgB #define dgBongoHeadSkelLimbsLimb_017B84DL_0119B0 "__OTR__objects/object_sst/gBongoHeadSkelLimbsLimb_017B84DL_0119B0" static const ALIGN_ASSET(2) char gBongoHeadSkelLimbsLimb_017B84DL_0119B0[] = dgBongoHeadSkelLimbsLimb_017B84DL_0119B0; -#define dobject_sstTex_017FE0 "__OTR__objects/object_sst/object_sstTex_017FE0" -static const ALIGN_ASSET(2) char object_sstTex_017FE0[] = dobject_sstTex_017FE0; - #define dobject_sstTex_01A730 "__OTR__objects/object_sst/object_sstTex_01A730" static const ALIGN_ASSET(2) char object_sstTex_01A730[] = dobject_sstTex_01A730; @@ -336,4 +337,6 @@ static const ALIGN_ASSET(2) char object_sstTex_019670[] = dobject_sstTex_019670; static const ALIGN_ASSET(2) char object_sstTex_019770[] = dobject_sstTex_019770; #define dobject_sstTex_01A0B0 "__OTR__objects/object_sst/object_sstTex_01A0B0" -static const ALIGN_ASSET(2) char object_sstTex_01A0B0[] = dobject_sstTex_01A0B0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_sstTex_01A0B0[] = dobject_sstTex_01A0B0; + +#endif // OBJECTS_OBJECT_SST_H diff --git a/soh/assets/objects/object_st/object_st.h b/soh/assets/objects/object_st/object_st.h index 742250578..b245c0ab1 100644 --- a/soh/assets/objects/object_st/object_st.h +++ b/soh/assets/objects/object_st/object_st.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ST_H +#define OBJECTS_OBJECT_ST_H 1 #include "align_asset_macro.h" @@ -114,4 +115,7 @@ static const ALIGN_ASSET(2) char object_st_Skel_005298[] = dobject_st_Skel_00529 static const ALIGN_ASSET(2) char object_st_Anim_0055A8[] = dobject_st_Anim_0055A8; #define dobject_st_Anim_005B98 "__OTR__objects/object_st/object_st_Anim_005B98" -static const ALIGN_ASSET(2) char object_st_Anim_005B98[] = dobject_st_Anim_005B98; \ No newline at end of file +static const ALIGN_ASSET(2) char object_st_Anim_005B98[] = dobject_st_Anim_005B98; + + +#endif // OBJECTS_OBJECT_ST_H diff --git a/soh/assets/objects/object_stream/object_stream.h b/soh/assets/objects/object_stream/object_stream.h index c9072b8ce..0173f2432 100644 --- a/soh/assets/objects/object_stream/object_stream.h +++ b/soh/assets/objects/object_stream/object_stream.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_STREAM_H +#define OBJECTS_OBJECT_STREAM_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char object_stream_Tex_000000[] = dobject_stream_Tex_000000; #define dobject_stream_DL_000950 "__OTR__objects/object_stream/object_stream_DL_000950" -static const ALIGN_ASSET(2) char object_stream_DL_000950[] = dobject_stream_DL_000950; \ No newline at end of file +static const ALIGN_ASSET(2) char object_stream_DL_000950[] = dobject_stream_DL_000950; + +#endif // OBJECTS_OBJECT_STREAM_H diff --git a/soh/assets/objects/object_syokudai/object_syokudai.h b/soh/assets/objects/object_syokudai/object_syokudai.h index 5cd6f92c1..3b03efd5f 100644 --- a/soh/assets/objects/object_syokudai/object_syokudai.h +++ b/soh/assets/objects/object_syokudai/object_syokudai.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_SYOKUDAI_H +#define OBJECTS_OBJECT_SYOKUDAI_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gTorchFlameGuardTex[] = dgTorchFlameGuardTex; static const ALIGN_ASSET(2) char gTimedTorchTex[] = dgTimedTorchTex; #define dgWoodenTorchTex "__OTR__objects/object_syokudai/gWoodenTorchTex" -static const ALIGN_ASSET(2) char gWoodenTorchTex[] = dgWoodenTorchTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gWoodenTorchTex[] = dgWoodenTorchTex; + +#endif // OBJECTS_OBJECT_SYOKUDAI_H diff --git a/soh/assets/objects/object_ta/object_ta.h b/soh/assets/objects/object_ta/object_ta.h index a446181ec..486e0a4e2 100644 --- a/soh/assets/objects/object_ta/object_ta.h +++ b/soh/assets/objects/object_ta/object_ta.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TA_H +#define OBJECTS_OBJECT_TA_H 1 #include "align_asset_macro.h" @@ -153,4 +154,7 @@ static const ALIGN_ASSET(2) char gTalonBowserTex[] = dgTalonBowserTex; static const ALIGN_ASSET(2) char gTalonNecklaceLowerStringsTex[] = dgTalonNecklaceLowerStringsTex; #define dobject_ta_Blob_00B4B8 "__OTR__objects/object_ta/object_ta_Blob_00B4B8" -static const ALIGN_ASSET(2) char object_ta_Blob_00B4B8[] = dobject_ta_Blob_00B4B8; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ta_Blob_00B4B8[] = dobject_ta_Blob_00B4B8; + + +#endif // OBJECTS_OBJECT_TA_H diff --git a/soh/assets/objects/object_timeblock/object_timeblock.h b/soh/assets/objects/object_timeblock/object_timeblock.h index c9d776f8a..8b7785402 100644 --- a/soh/assets/objects/object_timeblock/object_timeblock.h +++ b/soh/assets/objects/object_timeblock/object_timeblock.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TIMEBLOCK_H +#define OBJECTS_OBJECT_TIMEBLOCK_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gSongOfTimeBlockDL[] = dgSongOfTimeBlockDL; static const ALIGN_ASSET(2) char gSongOfTimeBlockTex[] = dgSongOfTimeBlockTex; #define dgSongOfTimeBlockCol "__OTR__objects/object_timeblock/gSongOfTimeBlockCol" -static const ALIGN_ASSET(2) char gSongOfTimeBlockCol[] = dgSongOfTimeBlockCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gSongOfTimeBlockCol[] = dgSongOfTimeBlockCol; + +#endif // OBJECTS_OBJECT_TIMEBLOCK_H diff --git a/soh/assets/objects/object_tite/object_tite.h b/soh/assets/objects/object_tite/object_tite.h index 8c7ad6451..fd78970db 100644 --- a/soh/assets/objects/object_tite/object_tite.h +++ b/soh/assets/objects/object_tite/object_tite.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TITE_H +#define OBJECTS_OBJECT_TITE_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char object_tite_DL_0036D0[] = dobject_tite_DL_0036D static const ALIGN_ASSET(2) char object_tite_DL_003800[] = dobject_tite_DL_003800; #define dobject_tite_Skel_003A20 "__OTR__objects/object_tite/object_tite_Skel_003A20" -static const ALIGN_ASSET(2) char object_tite_Skel_003A20[] = dobject_tite_Skel_003A20; \ No newline at end of file +static const ALIGN_ASSET(2) char object_tite_Skel_003A20[] = dobject_tite_Skel_003A20; + + +#endif // OBJECTS_OBJECT_TITE_H diff --git a/soh/assets/objects/object_tk/object_tk.h b/soh/assets/objects/object_tk/object_tk.h index 1d7756333..a5ad11494 100644 --- a/soh/assets/objects/object_tk/object_tk.h +++ b/soh/assets/objects/object_tk/object_tk.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TK_H +#define OBJECTS_OBJECT_TK_H 1 #include "align_asset_macro.h" @@ -144,4 +145,6 @@ static const ALIGN_ASSET(2) char object_tkTex_003A40[] = dobject_tkTex_003A40; static const ALIGN_ASSET(2) char object_tkTex_0039C0[] = dobject_tkTex_0039C0; #define dobject_tkTex_003A00 "__OTR__objects/object_tk/object_tkTex_003A00" -static const ALIGN_ASSET(2) char object_tkTex_003A00[] = dobject_tkTex_003A00; \ No newline at end of file +static const ALIGN_ASSET(2) char object_tkTex_003A00[] = dobject_tkTex_003A00; + +#endif // OBJECTS_OBJECT_TK_H diff --git a/soh/assets/objects/object_toki_objects/object_toki_objects.h b/soh/assets/objects/object_toki_objects/object_toki_objects.h index e7f38813f..d606c6084 100644 --- a/soh/assets/objects/object_toki_objects/object_toki_objects.h +++ b/soh/assets/objects/object_toki_objects/object_toki_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TOKI_OBJECTS_H +#define OBJECTS_OBJECT_TOKI_OBJECTS_H 1 #include "align_asset_macro.h" @@ -63,4 +64,6 @@ static const ALIGN_ASSET(2) char object_toki_objects_DL_007EE0[] = dobject_toki_ static const ALIGN_ASSET(2) char object_toki_objects_DL_008190[] = dobject_toki_objects_DL_008190; #define dobject_toki_objects_DL_008390 "__OTR__objects/object_toki_objects/object_toki_objects_DL_008390" -static const ALIGN_ASSET(2) char object_toki_objects_DL_008390[] = dobject_toki_objects_DL_008390; \ No newline at end of file +static const ALIGN_ASSET(2) char object_toki_objects_DL_008390[] = dobject_toki_objects_DL_008390; + +#endif // OBJECTS_OBJECT_TOKI_OBJECTS_H diff --git a/soh/assets/objects/object_torch2/object_torch2.h b/soh/assets/objects/object_torch2/object_torch2.h index b58baaa8a..7c79eb4b4 100644 --- a/soh/assets/objects/object_torch2/object_torch2.h +++ b/soh/assets/objects/object_torch2/object_torch2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TORCH2_H +#define OBJECTS_OBJECT_TORCH2_H 1 #include "align_asset_macro.h" @@ -8,6 +9,9 @@ static const ALIGN_ASSET(2) char gDarkLinkSkel[] = dgDarkLinkSkel; #define dsDarkLinkSheathDL "__OTR__objects/object_torch2/sDarkLinkSheathDL" static const ALIGN_ASSET(2) char sDarkLinkSheathDL[] = dsDarkLinkSheathDL; +#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0" +static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0; + #define dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0" static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0[] = dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0; @@ -59,8 +63,7 @@ static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0046E0FarDL_003C10[] = d #define dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_004700FarDL_0038D0" static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_004700FarDL_0038D0[] = dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0; -#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0" -static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0; - #define dobject_torch2Tex_0043C0 "__OTR__objects/object_torch2/object_torch2Tex_0043C0" -static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0; + +#endif // OBJECTS_OBJECT_TORCH2_H diff --git a/soh/assets/objects/object_toryo/object_toryo.h b/soh/assets/objects/object_toryo/object_toryo.h index 08a216e7a..94fa67731 100644 --- a/soh/assets/objects/object_toryo/object_toryo.h +++ b/soh/assets/objects/object_toryo/object_toryo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TORYO_H +#define OBJECTS_OBJECT_TORYO_H 1 #include "align_asset_macro.h" @@ -99,4 +100,7 @@ static const ALIGN_ASSET(2) char object_toryo_DL_006DA8[] = dobject_toryo_DL_006 static const ALIGN_ASSET(2) char object_toryo_DL_006EB0[] = dobject_toryo_DL_006EB0; #define dobject_toryo_Skel_007150 "__OTR__objects/object_toryo/object_toryo_Skel_007150" -static const ALIGN_ASSET(2) char object_toryo_Skel_007150[] = dobject_toryo_Skel_007150; \ No newline at end of file +static const ALIGN_ASSET(2) char object_toryo_Skel_007150[] = dobject_toryo_Skel_007150; + + +#endif // OBJECTS_OBJECT_TORYO_H diff --git a/soh/assets/objects/object_tp/object_tp.h b/soh/assets/objects/object_tp/object_tp.h index f02997ca5..40d4771b2 100644 --- a/soh/assets/objects/object_tp/object_tp.h +++ b/soh/assets/objects/object_tp/object_tp.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TP_H +#define OBJECTS_OBJECT_TP_H 1 #include "align_asset_macro.h" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char gTailpasaranHeadClawTex[] = dgTailpasaranHeadCl static const ALIGN_ASSET(2) char gTailpasaranTailSegmentTex[] = dgTailpasaranTailSegmentTex; #define dgTailpasaranHeadMouthpartsTex "__OTR__objects/object_tp/gTailpasaranHeadMouthpartsTex" -static const ALIGN_ASSET(2) char gTailpasaranHeadMouthpartsTex[] = dgTailpasaranHeadMouthpartsTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gTailpasaranHeadMouthpartsTex[] = dgTailpasaranHeadMouthpartsTex; + +#endif // OBJECTS_OBJECT_TP_H diff --git a/soh/assets/objects/object_tr/object_tr.h b/soh/assets/objects/object_tr/object_tr.h index 1c3ce3c71..94c66db5f 100644 --- a/soh/assets/objects/object_tr/object_tr.h +++ b/soh/assets/objects/object_tr/object_tr.h @@ -1,282 +1,286 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TR_H +#define OBJECTS_OBJECT_TR_H 1 #include "align_asset_macro.h" -#define dobject_tr_Anim_000BFC "__OTR__objects/object_tr/object_tr_Anim_000BFC" -static const ALIGN_ASSET(2) char object_tr_Anim_000BFC[] = dobject_tr_Anim_000BFC; +#define dgKotakeKoumeLookOverRightShoulderAnim "__OTR__objects/object_tr/gKotakeKoumeLookOverRightShoulderAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeLookOverRightShoulderAnim[] = dgKotakeKoumeLookOverRightShoulderAnim; -#define dobject_tr_Anim_0013CC "__OTR__objects/object_tr/object_tr_Anim_0013CC" -static const ALIGN_ASSET(2) char object_tr_Anim_0013CC[] = dobject_tr_Anim_0013CC; +#define dgKotakeKoumeLookingOverRightShoulderAnim "__OTR__objects/object_tr/gKotakeKoumeLookingOverRightShoulderAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeLookingOverRightShoulderAnim[] = dgKotakeKoumeLookingOverRightShoulderAnim; -#define dobject_tr_Anim_001CDC "__OTR__objects/object_tr/object_tr_Anim_001CDC" -static const ALIGN_ASSET(2) char object_tr_Anim_001CDC[] = dobject_tr_Anim_001CDC; +#define dgKotakeKoumeStandingBroomOverLeftShoulderAnim "__OTR__objects/object_tr/gKotakeKoumeStandingBroomOverLeftShoulderAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeStandingBroomOverLeftShoulderAnim[] = dgKotakeKoumeStandingBroomOverLeftShoulderAnim; -#define dobject_tr_Anim_002BC4 "__OTR__objects/object_tr/object_tr_Anim_002BC4" -static const ALIGN_ASSET(2) char object_tr_Anim_002BC4[] = dobject_tr_Anim_002BC4; +#define dgKotakeKoumeLookOverLeftShoulderAnim "__OTR__objects/object_tr/gKotakeKoumeLookOverLeftShoulderAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeLookOverLeftShoulderAnim[] = dgKotakeKoumeLookOverLeftShoulderAnim; -#define dobject_tr_Anim_0035CC "__OTR__objects/object_tr/object_tr_Anim_0035CC" -static const ALIGN_ASSET(2) char object_tr_Anim_0035CC[] = dobject_tr_Anim_0035CC; +#define dgKotakeKoumeLookingOverLeftShoulderAnim "__OTR__objects/object_tr/gKotakeKoumeLookingOverLeftShoulderAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeLookingOverLeftShoulderAnim[] = dgKotakeKoumeLookingOverLeftShoulderAnim; -#define dobject_tr_Anim_003FC8 "__OTR__objects/object_tr/object_tr_Anim_003FC8" -static const ALIGN_ASSET(2) char object_tr_Anim_003FC8[] = dobject_tr_Anim_003FC8; +#define dgKotakeKoumeStandingBroomOverRightShoulderAnim "__OTR__objects/object_tr/gKotakeKoumeStandingBroomOverRightShoulderAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeStandingBroomOverRightShoulderAnim[] = dgKotakeKoumeStandingBroomOverRightShoulderAnim; -#define dobject_tr_Anim_0049C8 "__OTR__objects/object_tr/object_tr_Anim_0049C8" -static const ALIGN_ASSET(2) char object_tr_Anim_0049C8[] = dobject_tr_Anim_0049C8; +#define dgKotakeKoumeFlyAnim "__OTR__objects/object_tr/gKotakeKoumeFlyAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeFlyAnim[] = dgKotakeKoumeFlyAnim; -#define dobject_tr_Anim_005308 "__OTR__objects/object_tr/object_tr_Anim_005308" -static const ALIGN_ASSET(2) char object_tr_Anim_005308[] = dobject_tr_Anim_005308; +#define dgKotakeKoumeStandingBroomOverRightShoulderUnusedAnim "__OTR__objects/object_tr/gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim[] = dgKotakeKoumeStandingBroomOverRightShoulderUnusedAnim; #define dobject_tr_Blob_0062E0 "__OTR__objects/object_tr/object_tr_Blob_0062E0" static const ALIGN_ASSET(2) char object_tr_Blob_0062E0[] = dobject_tr_Blob_0062E0; -#define dobject_tr_DL_006520 "__OTR__objects/object_tr/object_tr_DL_006520" -static const ALIGN_ASSET(2) char object_tr_DL_006520[] = dobject_tr_DL_006520; +#define dgKotakePelvisDL "__OTR__objects/object_tr/gKotakePelvisDL" +static const ALIGN_ASSET(2) char gKotakePelvisDL[] = dgKotakePelvisDL; -#define dobject_tr_DL_0066A0 "__OTR__objects/object_tr/object_tr_DL_0066A0" -static const ALIGN_ASSET(2) char object_tr_DL_0066A0[] = dobject_tr_DL_0066A0; +#define dgKotakeTorsoDL "__OTR__objects/object_tr/gKotakeTorsoDL" +static const ALIGN_ASSET(2) char gKotakeTorsoDL[] = dgKotakeTorsoDL; -#define dobject_tr_DL_006800 "__OTR__objects/object_tr/object_tr_DL_006800" -static const ALIGN_ASSET(2) char object_tr_DL_006800[] = dobject_tr_DL_006800; +#define dgKotakeNeckDL "__OTR__objects/object_tr/gKotakeNeckDL" +static const ALIGN_ASSET(2) char gKotakeNeckDL[] = dgKotakeNeckDL; -#define dobject_tr_DL_006940 "__OTR__objects/object_tr/object_tr_DL_006940" -static const ALIGN_ASSET(2) char object_tr_DL_006940[] = dobject_tr_DL_006940; +#define dgKotakeLeftBraidStartDL "__OTR__objects/object_tr/gKotakeLeftBraidStartDL" +static const ALIGN_ASSET(2) char gKotakeLeftBraidStartDL[] = dgKotakeLeftBraidStartDL; -#define dobject_tr_DL_006A50 "__OTR__objects/object_tr/object_tr_DL_006A50" -static const ALIGN_ASSET(2) char object_tr_DL_006A50[] = dobject_tr_DL_006A50; +#define dgKotakeLeftBraidEndDL "__OTR__objects/object_tr/gKotakeLeftBraidEndDL" +static const ALIGN_ASSET(2) char gKotakeLeftBraidEndDL[] = dgKotakeLeftBraidEndDL; -#define dobject_tr_DL_006B48 "__OTR__objects/object_tr/object_tr_DL_006B48" -static const ALIGN_ASSET(2) char object_tr_DL_006B48[] = dobject_tr_DL_006B48; +#define dgKotakeRightBraidStartDL "__OTR__objects/object_tr/gKotakeRightBraidStartDL" +static const ALIGN_ASSET(2) char gKotakeRightBraidStartDL[] = dgKotakeRightBraidStartDL; -#define dobject_tr_DL_006C58 "__OTR__objects/object_tr/object_tr_DL_006C58" -static const ALIGN_ASSET(2) char object_tr_DL_006C58[] = dobject_tr_DL_006C58; +#define dgKotakeRightBraidEndDL "__OTR__objects/object_tr/gKotakeRightBraidEndDL" +static const ALIGN_ASSET(2) char gKotakeRightBraidEndDL[] = dgKotakeRightBraidEndDL; -#define dobject_tr_DL_006D50 "__OTR__objects/object_tr/object_tr_DL_006D50" -static const ALIGN_ASSET(2) char object_tr_DL_006D50[] = dobject_tr_DL_006D50; +#define dgKotakeRightSleeveStartDL "__OTR__objects/object_tr/gKotakeRightSleeveStartDL" +static const ALIGN_ASSET(2) char gKotakeRightSleeveStartDL[] = dgKotakeRightSleeveStartDL; -#define dobject_tr_DL_006E70 "__OTR__objects/object_tr/object_tr_DL_006E70" -static const ALIGN_ASSET(2) char object_tr_DL_006E70[] = dobject_tr_DL_006E70; +#define dgKotakeRightSleeveFrontDL "__OTR__objects/object_tr/gKotakeRightSleeveFrontDL" +static const ALIGN_ASSET(2) char gKotakeRightSleeveFrontDL[] = dgKotakeRightSleeveFrontDL; -#define dobject_tr_DL_006FF0 "__OTR__objects/object_tr/object_tr_DL_006FF0" -static const ALIGN_ASSET(2) char object_tr_DL_006FF0[] = dobject_tr_DL_006FF0; +#define dgKotakeRightSleeveMidDL "__OTR__objects/object_tr/gKotakeRightSleeveMidDL" +static const ALIGN_ASSET(2) char gKotakeRightSleeveMidDL[] = dgKotakeRightSleeveMidDL; -#define dobject_tr_DL_007118 "__OTR__objects/object_tr/object_tr_DL_007118" -static const ALIGN_ASSET(2) char object_tr_DL_007118[] = dobject_tr_DL_007118; +#define dgKotakeRightSleeveEndDL "__OTR__objects/object_tr/gKotakeRightSleeveEndDL" +static const ALIGN_ASSET(2) char gKotakeRightSleeveEndDL[] = dgKotakeRightSleeveEndDL; -#define dobject_tr_DL_007238 "__OTR__objects/object_tr/object_tr_DL_007238" -static const ALIGN_ASSET(2) char object_tr_DL_007238[] = dobject_tr_DL_007238; +#define dgKotakeLeftSleeveStartDL "__OTR__objects/object_tr/gKotakeLeftSleeveStartDL" +static const ALIGN_ASSET(2) char gKotakeLeftSleeveStartDL[] = dgKotakeLeftSleeveStartDL; -#define dobject_tr_DL_007358 "__OTR__objects/object_tr/object_tr_DL_007358" -static const ALIGN_ASSET(2) char object_tr_DL_007358[] = dobject_tr_DL_007358; +#define dgKotakeLeftSleeveFrontDL "__OTR__objects/object_tr/gKotakeLeftSleeveFrontDL" +static const ALIGN_ASSET(2) char gKotakeLeftSleeveFrontDL[] = dgKotakeLeftSleeveFrontDL; -#define dobject_tr_DL_0074D8 "__OTR__objects/object_tr/object_tr_DL_0074D8" -static const ALIGN_ASSET(2) char object_tr_DL_0074D8[] = dobject_tr_DL_0074D8; +#define dgKotakeLeftSleeveMidDL "__OTR__objects/object_tr/gKotakeLeftSleeveMidDL" +static const ALIGN_ASSET(2) char gKotakeLeftSleeveMidDL[] = dgKotakeLeftSleeveMidDL; -#define dobject_tr_DL_007600 "__OTR__objects/object_tr/object_tr_DL_007600" -static const ALIGN_ASSET(2) char object_tr_DL_007600[] = dobject_tr_DL_007600; +#define dgKotakeLeftSleeveEndDL "__OTR__objects/object_tr/gKotakeLeftSleeveEndDL" +static const ALIGN_ASSET(2) char gKotakeLeftSleeveEndDL[] = dgKotakeLeftSleeveEndDL; -#define dobject_tr_DL_007720 "__OTR__objects/object_tr/object_tr_DL_007720" -static const ALIGN_ASSET(2) char object_tr_DL_007720[] = dobject_tr_DL_007720; +#define dgKotakeRightThighDL "__OTR__objects/object_tr/gKotakeRightThighDL" +static const ALIGN_ASSET(2) char gKotakeRightThighDL[] = dgKotakeRightThighDL; -#define dobject_tr_DL_007728 "__OTR__objects/object_tr/object_tr_DL_007728" -static const ALIGN_ASSET(2) char object_tr_DL_007728[] = dobject_tr_DL_007728; +#define dgKotakeLeftThighDL "__OTR__objects/object_tr/gKotakeLeftThighDL" +static const ALIGN_ASSET(2) char gKotakeLeftThighDL[] = dgKotakeLeftThighDL; -#define dobject_tr_TLUT_007730 "__OTR__objects/object_tr/object_tr_TLUT_007730" -static const ALIGN_ASSET(2) char object_tr_TLUT_007730[] = dobject_tr_TLUT_007730; +#define dgKotakeKoumeTLUT "__OTR__objects/object_tr/gKotakeKoumeTLUT" +static const ALIGN_ASSET(2) char gKotakeKoumeTLUT[] = dgKotakeKoumeTLUT; -#define dobject_tr_Tex_0078D8 "__OTR__objects/object_tr/object_tr_Tex_0078D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0078D8[] = dobject_tr_Tex_0078D8; +#define dgKotakeGerudoFabricTex "__OTR__objects/object_tr/gKotakeGerudoFabricTex" +static const ALIGN_ASSET(2) char gKotakeGerudoFabricTex[] = dgKotakeGerudoFabricTex; -#define dobject_tr_Tex_0080D8 "__OTR__objects/object_tr/object_tr_Tex_0080D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0080D8[] = dobject_tr_Tex_0080D8; +#define dgKotakeRobeTex "__OTR__objects/object_tr/gKotakeRobeTex" +static const ALIGN_ASSET(2) char gKotakeRobeTex[] = dgKotakeRobeTex; -#define dobject_tr_Tex_0082D8 "__OTR__objects/object_tr/object_tr_Tex_0082D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0082D8[] = dobject_tr_Tex_0082D8; +#define dgKotakeKoumeRobePatternTex "__OTR__objects/object_tr/gKotakeKoumeRobePatternTex" +static const ALIGN_ASSET(2) char gKotakeKoumeRobePatternTex[] = dgKotakeKoumeRobePatternTex; -#define dobject_tr_Tex_0084D8 "__OTR__objects/object_tr/object_tr_Tex_0084D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0084D8[] = dobject_tr_Tex_0084D8; +#define dgKotakeKoumeRobeTrimTex "__OTR__objects/object_tr/gKotakeKoumeRobeTrimTex" +static const ALIGN_ASSET(2) char gKotakeKoumeRobeTrimTex[] = dgKotakeKoumeRobeTrimTex; -#define dobject_tr_Tex_0086D8 "__OTR__objects/object_tr/object_tr_Tex_0086D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0086D8[] = dobject_tr_Tex_0086D8; +#define dgKotakeKoumeEyeOpenTex "__OTR__objects/object_tr/gKotakeKoumeEyeOpenTex" +static const ALIGN_ASSET(2) char gKotakeKoumeEyeOpenTex[] = dgKotakeKoumeEyeOpenTex; -#define dobject_tr_Tex_008AD8 "__OTR__objects/object_tr/object_tr_Tex_008AD8" -static const ALIGN_ASSET(2) char object_tr_Tex_008AD8[] = dobject_tr_Tex_008AD8; +#define dgKotakeKoumeSkinTex "__OTR__objects/object_tr/gKotakeKoumeSkinTex" +static const ALIGN_ASSET(2) char gKotakeKoumeSkinTex[] = dgKotakeKoumeSkinTex; -#define dobject_tr_Tex_008B58 "__OTR__objects/object_tr/object_tr_Tex_008B58" -static const ALIGN_ASSET(2) char object_tr_Tex_008B58[] = dobject_tr_Tex_008B58; +#define dgKotakeKoumeMouthTex "__OTR__objects/object_tr/gKotakeKoumeMouthTex" +static const ALIGN_ASSET(2) char gKotakeKoumeMouthTex[] = dgKotakeKoumeMouthTex; -#define dobject_tr_Tex_008B98 "__OTR__objects/object_tr/object_tr_Tex_008B98" -static const ALIGN_ASSET(2) char object_tr_Tex_008B98[] = dobject_tr_Tex_008B98; +#define dgKotakeKoumeHairTex "__OTR__objects/object_tr/gKotakeKoumeHairTex" +static const ALIGN_ASSET(2) char gKotakeKoumeHairTex[] = dgKotakeKoumeHairTex; -#define dobject_tr_Tex_008D98 "__OTR__objects/object_tr/object_tr_Tex_008D98" -static const ALIGN_ASSET(2) char object_tr_Tex_008D98[] = dobject_tr_Tex_008D98; +#define dgKotakeKoumeEarTex "__OTR__objects/object_tr/gKotakeKoumeEarTex" +static const ALIGN_ASSET(2) char gKotakeKoumeEarTex[] = dgKotakeKoumeEarTex; -#define dobject_tr_Tex_008DD8 "__OTR__objects/object_tr/object_tr_Tex_008DD8" -static const ALIGN_ASSET(2) char object_tr_Tex_008DD8[] = dobject_tr_Tex_008DD8; +#define dgKotakeKoumeFingerTex "__OTR__objects/object_tr/gKotakeKoumeFingerTex" +static const ALIGN_ASSET(2) char gKotakeKoumeFingerTex[] = dgKotakeKoumeFingerTex; -#define dobject_tr_Tex_008E58 "__OTR__objects/object_tr/object_tr_Tex_008E58" -static const ALIGN_ASSET(2) char object_tr_Tex_008E58[] = dobject_tr_Tex_008E58; +#define dgKotakeKoumeBroomHandleTex "__OTR__objects/object_tr/gKotakeKoumeBroomHandleTex" +static const ALIGN_ASSET(2) char gKotakeKoumeBroomHandleTex[] = dgKotakeKoumeBroomHandleTex; -#define dobject_tr_Tex_008ED8 "__OTR__objects/object_tr/object_tr_Tex_008ED8" -static const ALIGN_ASSET(2) char object_tr_Tex_008ED8[] = dobject_tr_Tex_008ED8; +#define dgKotakeKoumeBroomHeadTex "__OTR__objects/object_tr/gKotakeKoumeBroomHeadTex" +static const ALIGN_ASSET(2) char gKotakeKoumeBroomHeadTex[] = dgKotakeKoumeBroomHeadTex; -#define dobject_tr_Tex_0092D8 "__OTR__objects/object_tr/object_tr_Tex_0092D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0092D8[] = dobject_tr_Tex_0092D8; +#define dgKotakeKoumeJewelHolderTex "__OTR__objects/object_tr/gKotakeKoumeJewelHolderTex" +static const ALIGN_ASSET(2) char gKotakeKoumeJewelHolderTex[] = dgKotakeKoumeJewelHolderTex; -#define dobject_tr_Tex_0093D8 "__OTR__objects/object_tr/object_tr_Tex_0093D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0093D8[] = dobject_tr_Tex_0093D8; +#define dgKotakeJewelTex "__OTR__objects/object_tr/gKotakeJewelTex" +static const ALIGN_ASSET(2) char gKotakeJewelTex[] = dgKotakeJewelTex; -#define dobject_tr_Tex_009458 "__OTR__objects/object_tr/object_tr_Tex_009458" -static const ALIGN_ASSET(2) char object_tr_Tex_009458[] = dobject_tr_Tex_009458; +#define dgKotakeKoumeNeckTex "__OTR__objects/object_tr/gKotakeKoumeNeckTex" +static const ALIGN_ASSET(2) char gKotakeKoumeNeckTex[] = dgKotakeKoumeNeckTex; -#define dobject_tr_Tex_009498 "__OTR__objects/object_tr/object_tr_Tex_009498" -static const ALIGN_ASSET(2) char object_tr_Tex_009498[] = dobject_tr_Tex_009498; +#define dgKotakeKoumeNostrilsTex "__OTR__objects/object_tr/gKotakeKoumeNostrilsTex" +static const ALIGN_ASSET(2) char gKotakeKoumeNostrilsTex[] = dgKotakeKoumeNostrilsTex; -#define dobject_tr_Tex_0094D8 "__OTR__objects/object_tr/object_tr_Tex_0094D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0094D8[] = dobject_tr_Tex_0094D8; +#define dgKotakeKoumeEyeHalfTex "__OTR__objects/object_tr/gKotakeKoumeEyeHalfTex" +static const ALIGN_ASSET(2) char gKotakeKoumeEyeHalfTex[] = dgKotakeKoumeEyeHalfTex; -#define dobject_tr_Tex_0098D8 "__OTR__objects/object_tr/object_tr_Tex_0098D8" -static const ALIGN_ASSET(2) char object_tr_Tex_0098D8[] = dobject_tr_Tex_0098D8; +#define dgKotakeKoumeEyeClosedTex "__OTR__objects/object_tr/gKotakeKoumeEyeClosedTex" +static const ALIGN_ASSET(2) char gKotakeKoumeEyeClosedTex[] = dgKotakeKoumeEyeClosedTex; -#define dobject_tr_DL_00AF38 "__OTR__objects/object_tr/object_tr_DL_00AF38" -static const ALIGN_ASSET(2) char object_tr_DL_00AF38[] = dobject_tr_DL_00AF38; +#define dgKotakeHeadDL "__OTR__objects/object_tr/gKotakeHeadDL" +static const ALIGN_ASSET(2) char gKotakeHeadDL[] = dgKotakeHeadDL; -#define dobject_tr_DL_00B568 "__OTR__objects/object_tr/object_tr_DL_00B568" -static const ALIGN_ASSET(2) char object_tr_DL_00B568[] = dobject_tr_DL_00B568; +#define dgKotakeTeethDL "__OTR__objects/object_tr/gKotakeTeethDL" +static const ALIGN_ASSET(2) char gKotakeTeethDL[] = dgKotakeTeethDL; -#define dobject_tr_DL_00B5C8 "__OTR__objects/object_tr/object_tr_DL_00B5C8" -static const ALIGN_ASSET(2) char object_tr_DL_00B5C8[] = dobject_tr_DL_00B5C8; +#define dgKotakeRightShinDL "__OTR__objects/object_tr/gKotakeRightShinDL" +static const ALIGN_ASSET(2) char gKotakeRightShinDL[] = dgKotakeRightShinDL; -#define dobject_tr_DL_00B678 "__OTR__objects/object_tr/object_tr_DL_00B678" -static const ALIGN_ASSET(2) char object_tr_DL_00B678[] = dobject_tr_DL_00B678; +#define dgKotakeLeftShinDL "__OTR__objects/object_tr/gKotakeLeftShinDL" +static const ALIGN_ASSET(2) char gKotakeLeftShinDL[] = dgKotakeLeftShinDL; -#define dobject_tr_DL_00B728 "__OTR__objects/object_tr/object_tr_DL_00B728" -static const ALIGN_ASSET(2) char object_tr_DL_00B728[] = dobject_tr_DL_00B728; +#define dgKotakeBroomDL "__OTR__objects/object_tr/gKotakeBroomDL" +static const ALIGN_ASSET(2) char gKotakeBroomDL[] = dgKotakeBroomDL; -#define dobject_tr_DL_00B8D0 "__OTR__objects/object_tr/object_tr_DL_00B8D0" -static const ALIGN_ASSET(2) char object_tr_DL_00B8D0[] = dobject_tr_DL_00B8D0; +#define dgKotakeRightFootDL "__OTR__objects/object_tr/gKotakeRightFootDL" +static const ALIGN_ASSET(2) char gKotakeRightFootDL[] = dgKotakeRightFootDL; -#define dobject_tr_DL_00B968 "__OTR__objects/object_tr/object_tr_DL_00B968" -static const ALIGN_ASSET(2) char object_tr_DL_00B968[] = dobject_tr_DL_00B968; +#define dgKotakeLeftFootDL "__OTR__objects/object_tr/gKotakeLeftFootDL" +static const ALIGN_ASSET(2) char gKotakeLeftFootDL[] = dgKotakeLeftFootDL; -#define dobject_tr_DL_00BA00 "__OTR__objects/object_tr/object_tr_DL_00BA00" -static const ALIGN_ASSET(2) char object_tr_DL_00BA00[] = dobject_tr_DL_00BA00; +#define dgKotakeRightHandDL "__OTR__objects/object_tr/gKotakeRightHandDL" +static const ALIGN_ASSET(2) char gKotakeRightHandDL[] = dgKotakeRightHandDL; -#define dobject_tr_DL_00BB68 "__OTR__objects/object_tr/object_tr_DL_00BB68" -static const ALIGN_ASSET(2) char object_tr_DL_00BB68[] = dobject_tr_DL_00BB68; +#define dgKotakeLeftHandDL "__OTR__objects/object_tr/gKotakeLeftHandDL" +static const ALIGN_ASSET(2) char gKotakeLeftHandDL[] = dgKotakeLeftHandDL; -#define dobject_tr_Tex_00BCD0 "__OTR__objects/object_tr/object_tr_Tex_00BCD0" -static const ALIGN_ASSET(2) char object_tr_Tex_00BCD0[] = dobject_tr_Tex_00BCD0; +#define dgKotakeKoumeBraidEndTex "__OTR__objects/object_tr/gKotakeKoumeBraidEndTex" +static const ALIGN_ASSET(2) char gKotakeKoumeBraidEndTex[] = dgKotakeKoumeBraidEndTex; #define dobject_tr_Blob_00BD50 "__OTR__objects/object_tr/object_tr_Blob_00BD50" static const ALIGN_ASSET(2) char object_tr_Blob_00BD50[] = dobject_tr_Blob_00BD50; -#define dobject_tr_Tex_00C2D0 "__OTR__objects/object_tr/object_tr_Tex_00C2D0" -static const ALIGN_ASSET(2) char object_tr_Tex_00C2D0[] = dobject_tr_Tex_00C2D0; +#define dgKotakeCollarNeckTex "__OTR__objects/object_tr/gKotakeCollarNeckTex" +static const ALIGN_ASSET(2) char gKotakeCollarNeckTex[] = dgKotakeCollarNeckTex; #define dobject_tr_Blob_00C310 "__OTR__objects/object_tr/object_tr_Blob_00C310" static const ALIGN_ASSET(2) char object_tr_Blob_00C310[] = dobject_tr_Blob_00C310; -#define dobject_tr_Skel_00C530 "__OTR__objects/object_tr/object_tr_Skel_00C530" -static const ALIGN_ASSET(2) char object_tr_Skel_00C530[] = dobject_tr_Skel_00C530; +#define dgKotakeSkel "__OTR__objects/object_tr/gKotakeSkel" +static const ALIGN_ASSET(2) char gKotakeSkel[] = dgKotakeSkel; -#define dobject_tr_Anim_00C60C "__OTR__objects/object_tr/object_tr_Anim_00C60C" -static const ALIGN_ASSET(2) char object_tr_Anim_00C60C[] = dobject_tr_Anim_00C60C; +#define dgKotakeKoumeTPoseAnim "__OTR__objects/object_tr/gKotakeKoumeTPoseAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeTPoseAnim[] = dgKotakeKoumeTPoseAnim; #define dobject_tr_Blob_00D5E0 "__OTR__objects/object_tr/object_tr_Blob_00D5E0" static const ALIGN_ASSET(2) char object_tr_Blob_00D5E0[] = dobject_tr_Blob_00D5E0; -#define dobject_tr_DL_00D820 "__OTR__objects/object_tr/object_tr_DL_00D820" -static const ALIGN_ASSET(2) char object_tr_DL_00D820[] = dobject_tr_DL_00D820; +#define dgKoumePelvisDL "__OTR__objects/object_tr/gKoumePelvisDL" +static const ALIGN_ASSET(2) char gKoumePelvisDL[] = dgKoumePelvisDL; -#define dobject_tr_DL_00D9A0 "__OTR__objects/object_tr/object_tr_DL_00D9A0" -static const ALIGN_ASSET(2) char object_tr_DL_00D9A0[] = dobject_tr_DL_00D9A0; +#define dgKoumeTorsoDL "__OTR__objects/object_tr/gKoumeTorsoDL" +static const ALIGN_ASSET(2) char gKoumeTorsoDL[] = dgKoumeTorsoDL; -#define dobject_tr_DL_00DB00 "__OTR__objects/object_tr/object_tr_DL_00DB00" -static const ALIGN_ASSET(2) char object_tr_DL_00DB00[] = dobject_tr_DL_00DB00; +#define dgKoumeNeckDL "__OTR__objects/object_tr/gKoumeNeckDL" +static const ALIGN_ASSET(2) char gKoumeNeckDL[] = dgKoumeNeckDL; -#define dobject_tr_DL_00DC40 "__OTR__objects/object_tr/object_tr_DL_00DC40" -static const ALIGN_ASSET(2) char object_tr_DL_00DC40[] = dobject_tr_DL_00DC40; +#define dgKoumeLeftBraidStartDL "__OTR__objects/object_tr/gKoumeLeftBraidStartDL" +static const ALIGN_ASSET(2) char gKoumeLeftBraidStartDL[] = dgKoumeLeftBraidStartDL; -#define dobject_tr_DL_00DD50 "__OTR__objects/object_tr/object_tr_DL_00DD50" -static const ALIGN_ASSET(2) char object_tr_DL_00DD50[] = dobject_tr_DL_00DD50; +#define dgKoumeLeftBraidEndDL "__OTR__objects/object_tr/gKoumeLeftBraidEndDL" +static const ALIGN_ASSET(2) char gKoumeLeftBraidEndDL[] = dgKoumeLeftBraidEndDL; -#define dobject_tr_DL_00DE48 "__OTR__objects/object_tr/object_tr_DL_00DE48" -static const ALIGN_ASSET(2) char object_tr_DL_00DE48[] = dobject_tr_DL_00DE48; +#define dgKoumeRightBraidStartDL "__OTR__objects/object_tr/gKoumeRightBraidStartDL" +static const ALIGN_ASSET(2) char gKoumeRightBraidStartDL[] = dgKoumeRightBraidStartDL; -#define dobject_tr_DL_00DF58 "__OTR__objects/object_tr/object_tr_DL_00DF58" -static const ALIGN_ASSET(2) char object_tr_DL_00DF58[] = dobject_tr_DL_00DF58; +#define dgKoumeRightBraidEndDL "__OTR__objects/object_tr/gKoumeRightBraidEndDL" +static const ALIGN_ASSET(2) char gKoumeRightBraidEndDL[] = dgKoumeRightBraidEndDL; -#define dobject_tr_DL_00E050 "__OTR__objects/object_tr/object_tr_DL_00E050" -static const ALIGN_ASSET(2) char object_tr_DL_00E050[] = dobject_tr_DL_00E050; +#define dgKoumeRightSleeveStartDL "__OTR__objects/object_tr/gKoumeRightSleeveStartDL" +static const ALIGN_ASSET(2) char gKoumeRightSleeveStartDL[] = dgKoumeRightSleeveStartDL; -#define dobject_tr_DL_00E170 "__OTR__objects/object_tr/object_tr_DL_00E170" -static const ALIGN_ASSET(2) char object_tr_DL_00E170[] = dobject_tr_DL_00E170; +#define dgKoumeRightSleeveFrontDL "__OTR__objects/object_tr/gKoumeRightSleeveFrontDL" +static const ALIGN_ASSET(2) char gKoumeRightSleeveFrontDL[] = dgKoumeRightSleeveFrontDL; -#define dobject_tr_DL_00E2F0 "__OTR__objects/object_tr/object_tr_DL_00E2F0" -static const ALIGN_ASSET(2) char object_tr_DL_00E2F0[] = dobject_tr_DL_00E2F0; +#define dgKoumeRightSleeveMidDL "__OTR__objects/object_tr/gKoumeRightSleeveMidDL" +static const ALIGN_ASSET(2) char gKoumeRightSleeveMidDL[] = dgKoumeRightSleeveMidDL; -#define dobject_tr_DL_00E418 "__OTR__objects/object_tr/object_tr_DL_00E418" -static const ALIGN_ASSET(2) char object_tr_DL_00E418[] = dobject_tr_DL_00E418; +#define dgKoumeRightSleeveEndDL "__OTR__objects/object_tr/gKoumeRightSleeveEndDL" +static const ALIGN_ASSET(2) char gKoumeRightSleeveEndDL[] = dgKoumeRightSleeveEndDL; -#define dobject_tr_DL_00E538 "__OTR__objects/object_tr/object_tr_DL_00E538" -static const ALIGN_ASSET(2) char object_tr_DL_00E538[] = dobject_tr_DL_00E538; +#define dgKoumeLeftSleeveStartDL "__OTR__objects/object_tr/gKoumeLeftSleeveStartDL" +static const ALIGN_ASSET(2) char gKoumeLeftSleeveStartDL[] = dgKoumeLeftSleeveStartDL; -#define dobject_tr_DL_00E658 "__OTR__objects/object_tr/object_tr_DL_00E658" -static const ALIGN_ASSET(2) char object_tr_DL_00E658[] = dobject_tr_DL_00E658; +#define dgKoumeLeftSleeveFrontDL "__OTR__objects/object_tr/gKoumeLeftSleeveFrontDL" +static const ALIGN_ASSET(2) char gKoumeLeftSleeveFrontDL[] = dgKoumeLeftSleeveFrontDL; -#define dobject_tr_DL_00E7D8 "__OTR__objects/object_tr/object_tr_DL_00E7D8" -static const ALIGN_ASSET(2) char object_tr_DL_00E7D8[] = dobject_tr_DL_00E7D8; +#define dgKoumeLeftSleeveMidDL "__OTR__objects/object_tr/gKoumeLeftSleeveMidDL" +static const ALIGN_ASSET(2) char gKoumeLeftSleeveMidDL[] = dgKoumeLeftSleeveMidDL; -#define dobject_tr_DL_00E900 "__OTR__objects/object_tr/object_tr_DL_00E900" -static const ALIGN_ASSET(2) char object_tr_DL_00E900[] = dobject_tr_DL_00E900; +#define dgKoumeLeftSleeveEndDL "__OTR__objects/object_tr/gKoumeLeftSleeveEndDL" +static const ALIGN_ASSET(2) char gKoumeLeftSleeveEndDL[] = dgKoumeLeftSleeveEndDL; -#define dobject_tr_DL_00EA20 "__OTR__objects/object_tr/object_tr_DL_00EA20" -static const ALIGN_ASSET(2) char object_tr_DL_00EA20[] = dobject_tr_DL_00EA20; +#define dgKoumeRightThighDL "__OTR__objects/object_tr/gKoumeRightThighDL" +static const ALIGN_ASSET(2) char gKoumeRightThighDL[] = dgKoumeRightThighDL; -#define dobject_tr_DL_00EA28 "__OTR__objects/object_tr/object_tr_DL_00EA28" -static const ALIGN_ASSET(2) char object_tr_DL_00EA28[] = dobject_tr_DL_00EA28; +#define dgKoumeLeftThighDL "__OTR__objects/object_tr/gKoumeLeftThighDL" +static const ALIGN_ASSET(2) char gKoumeLeftThighDL[] = dgKoumeLeftThighDL; -#define dobject_tr_Tex_00EA30 "__OTR__objects/object_tr/object_tr_Tex_00EA30" -static const ALIGN_ASSET(2) char object_tr_Tex_00EA30[] = dobject_tr_Tex_00EA30; +#define dgKoumeGerudoFabricTex "__OTR__objects/object_tr/gKoumeGerudoFabricTex" +static const ALIGN_ASSET(2) char gKoumeGerudoFabricTex[] = dgKoumeGerudoFabricTex; -#define dobject_tr_Tex_00F230 "__OTR__objects/object_tr/object_tr_Tex_00F230" -static const ALIGN_ASSET(2) char object_tr_Tex_00F230[] = dobject_tr_Tex_00F230; +#define dgKoumeRobeTex "__OTR__objects/object_tr/gKoumeRobeTex" +static const ALIGN_ASSET(2) char gKoumeRobeTex[] = dgKoumeRobeTex; -#define dobject_tr_Tex_00F430 "__OTR__objects/object_tr/object_tr_Tex_00F430" -static const ALIGN_ASSET(2) char object_tr_Tex_00F430[] = dobject_tr_Tex_00F430; +#define dgKoumeJewelTex "__OTR__objects/object_tr/gKoumeJewelTex" +static const ALIGN_ASSET(2) char gKoumeJewelTex[] = dgKoumeJewelTex; -#define dobject_tr_DL_010710 "__OTR__objects/object_tr/object_tr_DL_010710" -static const ALIGN_ASSET(2) char object_tr_DL_010710[] = dobject_tr_DL_010710; +#define dgKoumeHeadDL "__OTR__objects/object_tr/gKoumeHeadDL" +static const ALIGN_ASSET(2) char gKoumeHeadDL[] = dgKoumeHeadDL; -#define dobject_tr_DL_010D40 "__OTR__objects/object_tr/object_tr_DL_010D40" -static const ALIGN_ASSET(2) char object_tr_DL_010D40[] = dobject_tr_DL_010D40; +#define dgKoumeTeethDL "__OTR__objects/object_tr/gKoumeTeethDL" +static const ALIGN_ASSET(2) char gKoumeTeethDL[] = dgKoumeTeethDL; -#define dobject_tr_DL_010DA0 "__OTR__objects/object_tr/object_tr_DL_010DA0" -static const ALIGN_ASSET(2) char object_tr_DL_010DA0[] = dobject_tr_DL_010DA0; +#define dgKoumeRightShinDL "__OTR__objects/object_tr/gKoumeRightShinDL" +static const ALIGN_ASSET(2) char gKoumeRightShinDL[] = dgKoumeRightShinDL; -#define dobject_tr_DL_010E50 "__OTR__objects/object_tr/object_tr_DL_010E50" -static const ALIGN_ASSET(2) char object_tr_DL_010E50[] = dobject_tr_DL_010E50; +#define dgKoumeLeftShinDL "__OTR__objects/object_tr/gKoumeLeftShinDL" +static const ALIGN_ASSET(2) char gKoumeLeftShinDL[] = dgKoumeLeftShinDL; -#define dobject_tr_DL_010F00 "__OTR__objects/object_tr/object_tr_DL_010F00" -static const ALIGN_ASSET(2) char object_tr_DL_010F00[] = dobject_tr_DL_010F00; +#define dgKoumeBroomDL "__OTR__objects/object_tr/gKoumeBroomDL" +static const ALIGN_ASSET(2) char gKoumeBroomDL[] = dgKoumeBroomDL; -#define dobject_tr_DL_0110A8 "__OTR__objects/object_tr/object_tr_DL_0110A8" -static const ALIGN_ASSET(2) char object_tr_DL_0110A8[] = dobject_tr_DL_0110A8; +#define dgKoumeRightFootDL "__OTR__objects/object_tr/gKoumeRightFootDL" +static const ALIGN_ASSET(2) char gKoumeRightFootDL[] = dgKoumeRightFootDL; -#define dobject_tr_DL_011140 "__OTR__objects/object_tr/object_tr_DL_011140" -static const ALIGN_ASSET(2) char object_tr_DL_011140[] = dobject_tr_DL_011140; +#define dgKoumeLeftFootDL "__OTR__objects/object_tr/gKoumeLeftFootDL" +static const ALIGN_ASSET(2) char gKoumeLeftFootDL[] = dgKoumeLeftFootDL; -#define dobject_tr_DL_0111D8 "__OTR__objects/object_tr/object_tr_DL_0111D8" -static const ALIGN_ASSET(2) char object_tr_DL_0111D8[] = dobject_tr_DL_0111D8; +#define dgKoumeRightHandDL "__OTR__objects/object_tr/gKoumeRightHandDL" +static const ALIGN_ASSET(2) char gKoumeRightHandDL[] = dgKoumeRightHandDL; -#define dobject_tr_DL_011340 "__OTR__objects/object_tr/object_tr_DL_011340" -static const ALIGN_ASSET(2) char object_tr_DL_011340[] = dobject_tr_DL_011340; +#define dgKoumeLeftHandDL "__OTR__objects/object_tr/gKoumeLeftHandDL" +static const ALIGN_ASSET(2) char gKoumeLeftHandDL[] = dgKoumeLeftHandDL; -#define dobject_tr_Tex_0114A8 "__OTR__objects/object_tr/object_tr_Tex_0114A8" -static const ALIGN_ASSET(2) char object_tr_Tex_0114A8[] = dobject_tr_Tex_0114A8; +#define dgKoumeCollarNeckTex "__OTR__objects/object_tr/gKoumeCollarNeckTex" +static const ALIGN_ASSET(2) char gKoumeCollarNeckTex[] = dgKoumeCollarNeckTex; -#define dobject_tr_Skel_011688 "__OTR__objects/object_tr/object_tr_Skel_011688" -static const ALIGN_ASSET(2) char object_tr_Skel_011688[] = dobject_tr_Skel_011688; +#define dgKoumeSkel "__OTR__objects/object_tr/gKoumeSkel" +static const ALIGN_ASSET(2) char gKoumeSkel[] = dgKoumeSkel; -#define dobject_tr_Anim_012E1C "__OTR__objects/object_tr/object_tr_Anim_012E1C" -static const ALIGN_ASSET(2) char object_tr_Anim_012E1C[] = dobject_tr_Anim_012E1C; \ No newline at end of file +#define dgKotakeKoumeCastMagicAnim "__OTR__objects/object_tr/gKotakeKoumeCastMagicAnim" +static const ALIGN_ASSET(2) char gKotakeKoumeCastMagicAnim[] = dgKotakeKoumeCastMagicAnim; + + +#endif // OBJECTS_OBJECT_TR_H diff --git a/soh/assets/objects/object_trap/object_trap.h b/soh/assets/objects/object_trap/object_trap.h index ef9b2304a..3940eb21d 100644 --- a/soh/assets/objects/object_trap/object_trap.h +++ b/soh/assets/objects/object_trap/object_trap.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TRAP_H +#define OBJECTS_OBJECT_TRAP_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gSlidingBladeTrapDL[] = dgSlidingBladeTrapDL; static const ALIGN_ASSET(2) char gLandmineBillboardDL[] = dgLandmineBillboardDL; #define dgUnusedSpikeDL "__OTR__objects/object_trap/gUnusedSpikeDL" -static const ALIGN_ASSET(2) char gUnusedSpikeDL[] = dgUnusedSpikeDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gUnusedSpikeDL[] = dgUnusedSpikeDL; + +#endif // OBJECTS_OBJECT_TRAP_H diff --git a/soh/assets/objects/object_triforce_spot/object_triforce_spot.h b/soh/assets/objects/object_triforce_spot/object_triforce_spot.h index e7da30803..1e3224fb9 100644 --- a/soh/assets/objects/object_triforce_spot/object_triforce_spot.h +++ b/soh/assets/objects/object_triforce_spot/object_triforce_spot.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TRIFORCE_SPOT_H +#define OBJECTS_OBJECT_TRIFORCE_SPOT_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gTriforceTex[] = dgTriforceTex; static const ALIGN_ASSET(2) char gTriforceColumnSide1Tex[] = dgTriforceColumnSide1Tex; #define dgTriforceColumnSide2Tex "__OTR__objects/object_triforce_spot/gTriforceColumnSide2Tex" -static const ALIGN_ASSET(2) char gTriforceColumnSide2Tex[] = dgTriforceColumnSide2Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gTriforceColumnSide2Tex[] = dgTriforceColumnSide2Tex; + +#endif // OBJECTS_OBJECT_TRIFORCE_SPOT_H diff --git a/soh/assets/objects/object_ts/object_ts.h b/soh/assets/objects/object_ts/object_ts.h index c7ec37233..75e858512 100644 --- a/soh/assets/objects/object_ts/object_ts.h +++ b/soh/assets/objects/object_ts/object_ts.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TS_H +#define OBJECTS_OBJECT_TS_H 1 #include "align_asset_macro.h" @@ -63,4 +64,7 @@ static const ALIGN_ASSET(2) char object_ts_DL_004C70[] = dobject_ts_DL_004C70; static const ALIGN_ASSET(2) char object_ts_DL_004DD0[] = dobject_ts_DL_004DD0; #define dobject_ts_Skel_004FE0 "__OTR__objects/object_ts/object_ts_Skel_004FE0" -static const ALIGN_ASSET(2) char object_ts_Skel_004FE0[] = dobject_ts_Skel_004FE0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_ts_Skel_004FE0[] = dobject_ts_Skel_004FE0; + + +#endif // OBJECTS_OBJECT_TS_H diff --git a/soh/assets/objects/object_tsubo/object_tsubo.h b/soh/assets/objects/object_tsubo/object_tsubo.h index 7de320af7..fd62747df 100644 --- a/soh/assets/objects/object_tsubo/object_tsubo.h +++ b/soh/assets/objects/object_tsubo/object_tsubo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TSUBO_H +#define OBJECTS_OBJECT_TSUBO_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char object_tsubo_Tex_001200[] = dobject_tsubo_Tex_0 static const ALIGN_ASSET(2) char object_tsubo_DL_0017C0[] = dobject_tsubo_DL_0017C0; #define dobject_tsubo_DL_001960 "__OTR__objects/object_tsubo/object_tsubo_DL_001960" -static const ALIGN_ASSET(2) char object_tsubo_DL_001960[] = dobject_tsubo_DL_001960; \ No newline at end of file +static const ALIGN_ASSET(2) char object_tsubo_DL_001960[] = dobject_tsubo_DL_001960; + +#endif // OBJECTS_OBJECT_TSUBO_H diff --git a/soh/assets/objects/object_tw/object_tw.h b/soh/assets/objects/object_tw/object_tw.h index ad658c05b..0c714d1bf 100644 --- a/soh/assets/objects/object_tw/object_tw.h +++ b/soh/assets/objects/object_tw/object_tw.h @@ -1,690 +1,694 @@ -#pragma once +#ifndef OBJECTS_OBJECT_TW_H +#define OBJECTS_OBJECT_TW_H 1 #include "align_asset_macro.h" -#define dobject_tw_Anim_0004A4 "__OTR__objects/object_tw/object_tw_Anim_0004A4" -static const ALIGN_ASSET(2) char object_tw_Anim_0004A4[] = dobject_tw_Anim_0004A4; +#define dgTwinrovaKotakeKoumeIdleLoopAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeIdleLoopAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeIdleLoopAnim[] = dgTwinrovaKotakeKoumeIdleLoopAnim; -#define dobject_tw_Anim_000AAC "__OTR__objects/object_tw/object_tw_Anim_000AAC" -static const ALIGN_ASSET(2) char object_tw_Anim_000AAC[] = dobject_tw_Anim_000AAC; +#define dgTwinrovaKotakeKoumeIdleEndAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeIdleEndAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeIdleEndAnim[] = dgTwinrovaKotakeKoumeIdleEndAnim; -#define dobject_tw_Anim_0012A4 "__OTR__objects/object_tw/object_tw_Anim_0012A4" -static const ALIGN_ASSET(2) char object_tw_Anim_0012A4[] = dobject_tw_Anim_0012A4; +#define dgTwinrovaKotakeKoumeBickerAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeBickerAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeBickerAnim[] = dgTwinrovaKotakeKoumeBickerAnim; -#define dobject_tw_Anim_0017E0 "__OTR__objects/object_tw/object_tw_Anim_0017E0" -static const ALIGN_ASSET(2) char object_tw_Anim_0017E0[] = dobject_tw_Anim_0017E0; +#define dgTwinrovaKotakeKoumeFloatLookUpAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeFloatLookUpAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeFloatLookUpAnim[] = dgTwinrovaKotakeKoumeFloatLookUpAnim; -#define dobject_tw_Anim_001D10 "__OTR__objects/object_tw/object_tw_Anim_001D10" -static const ALIGN_ASSET(2) char object_tw_Anim_001D10[] = dobject_tw_Anim_001D10; +#define dgTwinrovaKotakeKoumeFloatLookForwardAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeFloatLookForwardAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeFloatLookForwardAnim[] = dgTwinrovaKotakeKoumeFloatLookForwardAnim; -#define dobject_tw_Anim_00230C "__OTR__objects/object_tw/object_tw_Anim_00230C" -static const ALIGN_ASSET(2) char object_tw_Anim_00230C[] = dobject_tw_Anim_00230C; +#define dgTwinrovaKotakeKoumeShakeHandAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeShakeHandAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeShakeHandAnim[] = dgTwinrovaKotakeKoumeShakeHandAnim; -#define dobject_tw_Anim_003614 "__OTR__objects/object_tw/object_tw_Anim_003614" -static const ALIGN_ASSET(2) char object_tw_Anim_003614[] = dobject_tw_Anim_003614; +#define dgTwinrovaKotakeKoumeAttackStartAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeAttackStartAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeAttackStartAnim[] = dgTwinrovaKotakeKoumeAttackStartAnim; -#define dobject_tw_Anim_003E34 "__OTR__objects/object_tw/object_tw_Anim_003E34" -static const ALIGN_ASSET(2) char object_tw_Anim_003E34[] = dobject_tw_Anim_003E34; +#define dgTwinrovaKotakeKoumeAttackLoopAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeAttackLoopAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeAttackLoopAnim[] = dgTwinrovaKotakeKoumeAttackLoopAnim; -#define dobject_tw_Anim_004548 "__OTR__objects/object_tw/object_tw_Anim_004548" -static const ALIGN_ASSET(2) char object_tw_Anim_004548[] = dobject_tw_Anim_004548; +#define dgTwinrovaKotakeKoumeAttackEndAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeAttackEndAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeAttackEndAnim[] = dgTwinrovaKotakeKoumeAttackEndAnim; -#define dobject_tw_Anim_00578C "__OTR__objects/object_tw/object_tw_Anim_00578C" -static const ALIGN_ASSET(2) char object_tw_Anim_00578C[] = dobject_tw_Anim_00578C; +#define dgTwinrovaKotakeKoumeDamageStartAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeDamageStartAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeDamageStartAnim[] = dgTwinrovaKotakeKoumeDamageStartAnim; -#define dobject_tw_Anim_006530 "__OTR__objects/object_tw/object_tw_Anim_006530" -static const ALIGN_ASSET(2) char object_tw_Anim_006530[] = dobject_tw_Anim_006530; +#define dgTwinrovaKotakeKoumeDamageEndAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeDamageEndAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeDamageEndAnim[] = dgTwinrovaKotakeKoumeDamageEndAnim; -#define dobject_tw_Anim_006F28 "__OTR__objects/object_tw/object_tw_Anim_006F28" -static const ALIGN_ASSET(2) char object_tw_Anim_006F28[] = dobject_tw_Anim_006F28; +#define dgTwinrovaKotakeKoumeFlyAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeFlyAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeFlyAnim[] = dgTwinrovaKotakeKoumeFlyAnim; -#define dobject_tw_Skel_0070E0 "__OTR__objects/object_tw/object_tw_Skel_0070E0" -static const ALIGN_ASSET(2) char object_tw_Skel_0070E0[] = dobject_tw_Skel_0070E0; +#define dgTwinrovaKotakeSkel "__OTR__objects/object_tw/gTwinrovaKotakeSkel" +static const ALIGN_ASSET(2) char gTwinrovaKotakeSkel[] = dgTwinrovaKotakeSkel; -#define dobject_tw_Anim_007688 "__OTR__objects/object_tw/object_tw_Anim_007688" -static const ALIGN_ASSET(2) char object_tw_Anim_007688[] = dobject_tw_Anim_007688; +#define dgTwinrovaKotakeKoumeChargeUpAttackStartAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeChargeUpAttackStartAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeChargeUpAttackStartAnim[] = dgTwinrovaKotakeKoumeChargeUpAttackStartAnim; -#define dobject_tw_Anim_007CA8 "__OTR__objects/object_tw/object_tw_Anim_007CA8" -static const ALIGN_ASSET(2) char object_tw_Anim_007CA8[] = dobject_tw_Anim_007CA8; +#define dgTwinrovaKotakeKoumeSpinAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeSpinAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeSpinAnim[] = dgTwinrovaKotakeKoumeSpinAnim; -#define dobject_tw_Anim_0088C8 "__OTR__objects/object_tw/object_tw_Anim_0088C8" -static const ALIGN_ASSET(2) char object_tw_Anim_0088C8[] = dobject_tw_Anim_0088C8; +#define dgTwinrovaKotakeKoumeLaughAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeLaughAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeLaughAnim[] = dgTwinrovaKotakeKoumeLaughAnim; -#define dobject_tw_Anim_009398 "__OTR__objects/object_tw/object_tw_Anim_009398" -static const ALIGN_ASSET(2) char object_tw_Anim_009398[] = dobject_tw_Anim_009398; +#define dgTwinrovaKotakeKoumeChargeUpAttackLoopAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeChargeUpAttackLoopAnim[] = dgTwinrovaKotakeKoumeChargeUpAttackLoopAnim; -#define dobject_tw_Anim_00947C "__OTR__objects/object_tw/object_tw_Anim_00947C" -static const ALIGN_ASSET(2) char object_tw_Anim_00947C[] = dobject_tw_Anim_00947C; +#define dgTwinrovaKotakeKoumeTPoseAnim "__OTR__objects/object_tw/gTwinrovaKotakeKoumeTPoseAnim" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeTPoseAnim[] = dgTwinrovaKotakeKoumeTPoseAnim; -#define dobject_tw_TLUT_009490 "__OTR__objects/object_tw/object_tw_TLUT_009490" -static const ALIGN_ASSET(2) char object_tw_TLUT_009490[] = dobject_tw_TLUT_009490; +#define dgTwinrovaKoumeKotakeTLUT "__OTR__objects/object_tw/gTwinrovaKoumeKotakeTLUT" +static const ALIGN_ASSET(2) char gTwinrovaKoumeKotakeTLUT[] = dgTwinrovaKoumeKotakeTLUT; -#define dobject_tw_Tex_009638 "__OTR__objects/object_tw/object_tw_Tex_009638" -static const ALIGN_ASSET(2) char object_tw_Tex_009638[] = dobject_tw_Tex_009638; +#define dgTwinrovaKotakeGerudoFabricTex "__OTR__objects/object_tw/gTwinrovaKotakeGerudoFabricTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeGerudoFabricTex[] = dgTwinrovaKotakeGerudoFabricTex; -#define dobject_tw_Tex_009E38 "__OTR__objects/object_tw/object_tw_Tex_009E38" -static const ALIGN_ASSET(2) char object_tw_Tex_009E38[] = dobject_tw_Tex_009E38; +#define dgTwinrovaKotakeRobeTex "__OTR__objects/object_tw/gTwinrovaKotakeRobeTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRobeTex[] = dgTwinrovaKotakeRobeTex; -#define dobject_tw_Tex_00A038 "__OTR__objects/object_tw/object_tw_Tex_00A038" -static const ALIGN_ASSET(2) char object_tw_Tex_00A038[] = dobject_tw_Tex_00A038; +#define dgTwinrovaRobePatternTex "__OTR__objects/object_tw/gTwinrovaRobePatternTex" +static const ALIGN_ASSET(2) char gTwinrovaRobePatternTex[] = dgTwinrovaRobePatternTex; -#define dobject_tw_Tex_00A238 "__OTR__objects/object_tw/object_tw_Tex_00A238" -static const ALIGN_ASSET(2) char object_tw_Tex_00A238[] = dobject_tw_Tex_00A238; +#define dgTwinrovaRobeTrimTex "__OTR__objects/object_tw/gTwinrovaRobeTrimTex" +static const ALIGN_ASSET(2) char gTwinrovaRobeTrimTex[] = dgTwinrovaRobeTrimTex; -#define dobject_tw_Tex_00A438 "__OTR__objects/object_tw/object_tw_Tex_00A438" -static const ALIGN_ASSET(2) char object_tw_Tex_00A438[] = dobject_tw_Tex_00A438; +#define dgTwinrovaKotakeKoumeEyeOpenTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeEyeOpenTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeEyeOpenTex[] = dgTwinrovaKotakeKoumeEyeOpenTex; -#define dobject_tw_Tex_00A838 "__OTR__objects/object_tw/object_tw_Tex_00A838" -static const ALIGN_ASSET(2) char object_tw_Tex_00A838[] = dobject_tw_Tex_00A838; +#define dgTwinrovaKotakeKoumeSkinTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeSkinTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeSkinTex[] = dgTwinrovaKotakeKoumeSkinTex; -#define dobject_tw_Tex_00A8B8 "__OTR__objects/object_tw/object_tw_Tex_00A8B8" -static const ALIGN_ASSET(2) char object_tw_Tex_00A8B8[] = dobject_tw_Tex_00A8B8; +#define dgTwinrovaKotakeKoumeMouthTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeMouthTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeMouthTex[] = dgTwinrovaKotakeKoumeMouthTex; -#define dobject_tw_Tex_00A8F8 "__OTR__objects/object_tw/object_tw_Tex_00A8F8" -static const ALIGN_ASSET(2) char object_tw_Tex_00A8F8[] = dobject_tw_Tex_00A8F8; +#define dgTwinrovaHairTex "__OTR__objects/object_tw/gTwinrovaHairTex" +static const ALIGN_ASSET(2) char gTwinrovaHairTex[] = dgTwinrovaHairTex; -#define dobject_tw_Tex_00AAF8 "__OTR__objects/object_tw/object_tw_Tex_00AAF8" -static const ALIGN_ASSET(2) char object_tw_Tex_00AAF8[] = dobject_tw_Tex_00AAF8; +#define dgTwinrovaKotakeKoumeEarTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeEarTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeEarTex[] = dgTwinrovaKotakeKoumeEarTex; -#define dobject_tw_Tex_00AB38 "__OTR__objects/object_tw/object_tw_Tex_00AB38" -static const ALIGN_ASSET(2) char object_tw_Tex_00AB38[] = dobject_tw_Tex_00AB38; +#define dgTwinrovaKotakeKoumeFingerTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeFingerTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeFingerTex[] = dgTwinrovaKotakeKoumeFingerTex; -#define dobject_tw_Tex_00ABB8 "__OTR__objects/object_tw/object_tw_Tex_00ABB8" -static const ALIGN_ASSET(2) char object_tw_Tex_00ABB8[] = dobject_tw_Tex_00ABB8; +#define dgTwinrovaBroomHandleTex "__OTR__objects/object_tw/gTwinrovaBroomHandleTex" +static const ALIGN_ASSET(2) char gTwinrovaBroomHandleTex[] = dgTwinrovaBroomHandleTex; -#define dobject_tw_Tex_00AC38 "__OTR__objects/object_tw/object_tw_Tex_00AC38" -static const ALIGN_ASSET(2) char object_tw_Tex_00AC38[] = dobject_tw_Tex_00AC38; +#define dgTwinrovaBroomHeadTex "__OTR__objects/object_tw/gTwinrovaBroomHeadTex" +static const ALIGN_ASSET(2) char gTwinrovaBroomHeadTex[] = dgTwinrovaBroomHeadTex; -#define dobject_tw_Tex_00B038 "__OTR__objects/object_tw/object_tw_Tex_00B038" -static const ALIGN_ASSET(2) char object_tw_Tex_00B038[] = dobject_tw_Tex_00B038; +#define dgTwinrovaKotakeKoumeJewelHolderTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeJewelHolderTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeJewelHolderTex[] = dgTwinrovaKotakeKoumeJewelHolderTex; -#define dobject_tw_Tex_00B138 "__OTR__objects/object_tw/object_tw_Tex_00B138" -static const ALIGN_ASSET(2) char object_tw_Tex_00B138[] = dobject_tw_Tex_00B138; +#define dgTwinrovaKotakeJewelTex "__OTR__objects/object_tw/gTwinrovaKotakeJewelTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeJewelTex[] = dgTwinrovaKotakeJewelTex; -#define dobject_tw_Tex_00B1B8 "__OTR__objects/object_tw/object_tw_Tex_00B1B8" -static const ALIGN_ASSET(2) char object_tw_Tex_00B1B8[] = dobject_tw_Tex_00B1B8; +#define dgTwinrovaKotakeKoumeNeckTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeNeckTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeNeckTex[] = dgTwinrovaKotakeKoumeNeckTex; -#define dobject_tw_Tex_00B1F8 "__OTR__objects/object_tw/object_tw_Tex_00B1F8" -static const ALIGN_ASSET(2) char object_tw_Tex_00B1F8[] = dobject_tw_Tex_00B1F8; +#define dgTwinrovaKotakeKoumeNostrilsTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeNostrilsTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeNostrilsTex[] = dgTwinrovaKotakeKoumeNostrilsTex; -#define dobject_tw_Tex_00B238 "__OTR__objects/object_tw/object_tw_Tex_00B238" -static const ALIGN_ASSET(2) char object_tw_Tex_00B238[] = dobject_tw_Tex_00B238; +#define dgTwinrovaKotakeKoumeEyeHalfTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeEyeHalfTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeEyeHalfTex[] = dgTwinrovaKotakeKoumeEyeHalfTex; -#define dobject_tw_Tex_00B638 "__OTR__objects/object_tw/object_tw_Tex_00B638" -static const ALIGN_ASSET(2) char object_tw_Tex_00B638[] = dobject_tw_Tex_00B638; +#define dgTwinrovaKotakeKoumeEyeClosedTex "__OTR__objects/object_tw/gTwinrovaKotakeKoumeEyeClosedTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeKoumeEyeClosedTex[] = dgTwinrovaKotakeKoumeEyeClosedTex; -#define dobject_tw_Tex_00BA38 "__OTR__objects/object_tw/object_tw_Tex_00BA38" -static const ALIGN_ASSET(2) char object_tw_Tex_00BA38[] = dobject_tw_Tex_00BA38; +#define dgTwinrovaEffectTex "__OTR__objects/object_tw/gTwinrovaEffectTex" +static const ALIGN_ASSET(2) char gTwinrovaEffectTex[] = dgTwinrovaEffectTex; -#define dobject_tw_Tex_00BE38 "__OTR__objects/object_tw/object_tw_Tex_00BE38" -static const ALIGN_ASSET(2) char object_tw_Tex_00BE38[] = dobject_tw_Tex_00BE38; +#define dgTwinrovaEffectMaskTex "__OTR__objects/object_tw/gTwinrovaEffectMaskTex" +static const ALIGN_ASSET(2) char gTwinrovaEffectMaskTex[] = dgTwinrovaEffectMaskTex; -#define dobject_tw_Tex_00C238 "__OTR__objects/object_tw/object_tw_Tex_00C238" -static const ALIGN_ASSET(2) char object_tw_Tex_00C238[] = dobject_tw_Tex_00C238; +#define dgTwinrovaKoumeGerudoFabricTex "__OTR__objects/object_tw/gTwinrovaKoumeGerudoFabricTex" +static const ALIGN_ASSET(2) char gTwinrovaKoumeGerudoFabricTex[] = dgTwinrovaKoumeGerudoFabricTex; -#define dobject_tw_Tex_00CA38 "__OTR__objects/object_tw/object_tw_Tex_00CA38" -static const ALIGN_ASSET(2) char object_tw_Tex_00CA38[] = dobject_tw_Tex_00CA38; +#define dgTwinrovaKoumeJewelTex "__OTR__objects/object_tw/gTwinrovaKoumeJewelTex" +static const ALIGN_ASSET(2) char gTwinrovaKoumeJewelTex[] = dgTwinrovaKoumeJewelTex; -#define dobject_tw_Tex_00CAB8 "__OTR__objects/object_tw/object_tw_Tex_00CAB8" -static const ALIGN_ASSET(2) char object_tw_Tex_00CAB8[] = dobject_tw_Tex_00CAB8; +#define dgTwinrovaKoumeRobeTex "__OTR__objects/object_tw/gTwinrovaKoumeRobeTex" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRobeTex[] = dgTwinrovaKoumeRobeTex; -#define dobject_tw_DL_0110A8 "__OTR__objects/object_tw/object_tw_DL_0110A8" -static const ALIGN_ASSET(2) char object_tw_DL_0110A8[] = dobject_tw_DL_0110A8; +#define dgTwinrovaKotakeHeadInvisibleHairDL "__OTR__objects/object_tw/gTwinrovaKotakeHeadInvisibleHairDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeHeadInvisibleHairDL[] = dgTwinrovaKotakeHeadInvisibleHairDL; -#define dobject_tw_DL_0116A0 "__OTR__objects/object_tw/object_tw_DL_0116A0" -static const ALIGN_ASSET(2) char object_tw_DL_0116A0[] = dobject_tw_DL_0116A0; +#define dgTwinrovaKoumeHeadInvisibleHairDL "__OTR__objects/object_tw/gTwinrovaKoumeHeadInvisibleHairDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeHeadInvisibleHairDL[] = dgTwinrovaKoumeHeadInvisibleHairDL; -#define dobject_tw_DL_011C98 "__OTR__objects/object_tw/object_tw_DL_011C98" -static const ALIGN_ASSET(2) char object_tw_DL_011C98[] = dobject_tw_DL_011C98; +#define dgTwinrovaKotakeBroomInvisibleHeadDL "__OTR__objects/object_tw/gTwinrovaKotakeBroomInvisibleHeadDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeBroomInvisibleHeadDL[] = dgTwinrovaKotakeBroomInvisibleHeadDL; -#define dobject_tw_DL_011E28 "__OTR__objects/object_tw/object_tw_DL_011E28" -static const ALIGN_ASSET(2) char object_tw_DL_011E28[] = dobject_tw_DL_011E28; +#define dgTwinrovaKoumeBroomInvisibleHeadDL "__OTR__objects/object_tw/gTwinrovaKoumeBroomInvisibleHeadDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeBroomInvisibleHeadDL[] = dgTwinrovaKoumeBroomInvisibleHeadDL; -#define dobject_tw_DL_011FB8 "__OTR__objects/object_tw/object_tw_DL_011FB8" -static const ALIGN_ASSET(2) char object_tw_DL_011FB8[] = dobject_tw_DL_011FB8; +#define dgTwinrovaKotakeTeethDL "__OTR__objects/object_tw/gTwinrovaKotakeTeethDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeTeethDL[] = dgTwinrovaKotakeTeethDL; -#define dobject_tw_DL_012018 "__OTR__objects/object_tw/object_tw_DL_012018" -static const ALIGN_ASSET(2) char object_tw_DL_012018[] = dobject_tw_DL_012018; +#define dgTwinrovaKotakeRightShinDL "__OTR__objects/object_tw/gTwinrovaKotakeRightShinDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightShinDL[] = dgTwinrovaKotakeRightShinDL; -#define dobject_tw_DL_0120C8 "__OTR__objects/object_tw/object_tw_DL_0120C8" -static const ALIGN_ASSET(2) char object_tw_DL_0120C8[] = dobject_tw_DL_0120C8; +#define dgTwinrovaKotakeLeftShinDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftShinDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftShinDL[] = dgTwinrovaKotakeLeftShinDL; -#define dobject_tw_DL_012178 "__OTR__objects/object_tw/object_tw_DL_012178" -static const ALIGN_ASSET(2) char object_tw_DL_012178[] = dobject_tw_DL_012178; +#define dgTwinrovaKotakeRightFootDL "__OTR__objects/object_tw/gTwinrovaKotakeRightFootDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightFootDL[] = dgTwinrovaKotakeRightFootDL; -#define dobject_tw_DL_012210 "__OTR__objects/object_tw/object_tw_DL_012210" -static const ALIGN_ASSET(2) char object_tw_DL_012210[] = dobject_tw_DL_012210; +#define dgTwinrovaKotakeLeftFootDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftFootDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftFootDL[] = dgTwinrovaKotakeLeftFootDL; -#define dobject_tw_DL_0122A8 "__OTR__objects/object_tw/object_tw_DL_0122A8" -static const ALIGN_ASSET(2) char object_tw_DL_0122A8[] = dobject_tw_DL_0122A8; +#define dgTwinrovaKotakeRightHandDL "__OTR__objects/object_tw/gTwinrovaKotakeRightHandDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightHandDL[] = dgTwinrovaKotakeRightHandDL; -#define dobject_tw_DL_012410 "__OTR__objects/object_tw/object_tw_DL_012410" -static const ALIGN_ASSET(2) char object_tw_DL_012410[] = dobject_tw_DL_012410; +#define dgTwinrovaKotakeLeftHandDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftHandDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftHandDL[] = dgTwinrovaKotakeLeftHandDL; -#define dobject_tw_DL_012578 "__OTR__objects/object_tw/object_tw_DL_012578" -static const ALIGN_ASSET(2) char object_tw_DL_012578[] = dobject_tw_DL_012578; +#define dgTwinrovaKoumeRightHandDL "__OTR__objects/object_tw/gTwinrovaKoumeRightHandDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightHandDL[] = dgTwinrovaKoumeRightHandDL; -#define dobject_tw_DL_0126E0 "__OTR__objects/object_tw/object_tw_DL_0126E0" -static const ALIGN_ASSET(2) char object_tw_DL_0126E0[] = dobject_tw_DL_0126E0; +#define dgTwinrovaKoumeLeftHandDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftHandDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftHandDL[] = dgTwinrovaKoumeLeftHandDL; -#define dobject_tw_DL_012848 "__OTR__objects/object_tw/object_tw_DL_012848" -static const ALIGN_ASSET(2) char object_tw_DL_012848[] = dobject_tw_DL_012848; +#define dgTwinrovaKoumeLeftFootDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftFootDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftFootDL[] = dgTwinrovaKoumeLeftFootDL; -#define dobject_tw_DL_0128E0 "__OTR__objects/object_tw/object_tw_DL_0128E0" -static const ALIGN_ASSET(2) char object_tw_DL_0128E0[] = dobject_tw_DL_0128E0; +#define dgTwinrovaKoumeRightFootDL "__OTR__objects/object_tw/gTwinrovaKoumeRightFootDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightFootDL[] = dgTwinrovaKoumeRightFootDL; -#define dobject_tw_DL_012978 "__OTR__objects/object_tw/object_tw_DL_012978" -static const ALIGN_ASSET(2) char object_tw_DL_012978[] = dobject_tw_DL_012978; +#define dgTwinrovaKoumeLeftShinDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftShinDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftShinDL[] = dgTwinrovaKoumeLeftShinDL; -#define dobject_tw_DL_012A28 "__OTR__objects/object_tw/object_tw_DL_012A28" -static const ALIGN_ASSET(2) char object_tw_DL_012A28[] = dobject_tw_DL_012A28; +#define dgTwinrovaKoumeRightShinDL "__OTR__objects/object_tw/gTwinrovaKoumeRightShinDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightShinDL[] = dgTwinrovaKoumeRightShinDL; -#define dobject_tw_DL_012AD8 "__OTR__objects/object_tw/object_tw_DL_012AD8" -static const ALIGN_ASSET(2) char object_tw_DL_012AD8[] = dobject_tw_DL_012AD8; +#define dgTwinrovaKoumeTeethDL "__OTR__objects/object_tw/gTwinrovaKoumeTeethDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeTeethDL[] = dgTwinrovaKoumeTeethDL; -#define dobject_tw_DL_012B38 "__OTR__objects/object_tw/object_tw_DL_012B38" -static const ALIGN_ASSET(2) char object_tw_DL_012B38[] = dobject_tw_DL_012B38; +#define dgTwinrovaKotakeBroomDL "__OTR__objects/object_tw/gTwinrovaKotakeBroomDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeBroomDL[] = dgTwinrovaKotakeBroomDL; -#define dobject_tw_DL_012CE0 "__OTR__objects/object_tw/object_tw_DL_012CE0" -static const ALIGN_ASSET(2) char object_tw_DL_012CE0[] = dobject_tw_DL_012CE0; +#define dgTwinrovaKotakeHeadDL "__OTR__objects/object_tw/gTwinrovaKotakeHeadDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeHeadDL[] = dgTwinrovaKotakeHeadDL; -#define dobject_tw_DL_013310 "__OTR__objects/object_tw/object_tw_DL_013310" -static const ALIGN_ASSET(2) char object_tw_DL_013310[] = dobject_tw_DL_013310; +#define dgTwinrovaKoumeBroomDL "__OTR__objects/object_tw/gTwinrovaKoumeBroomDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeBroomDL[] = dgTwinrovaKoumeBroomDL; -#define dobject_tw_DL_0134B8 "__OTR__objects/object_tw/object_tw_DL_0134B8" -static const ALIGN_ASSET(2) char object_tw_DL_0134B8[] = dobject_tw_DL_0134B8; +#define dgTwinrovaKoumeHeadDL "__OTR__objects/object_tw/gTwinrovaKoumeHeadDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeHeadDL[] = dgTwinrovaKoumeHeadDL; -#define dobject_tw_DL_013AE8 "__OTR__objects/object_tw/object_tw_DL_013AE8" -static const ALIGN_ASSET(2) char object_tw_DL_013AE8[] = dobject_tw_DL_013AE8; +#define dgTwinrovaKotakeIceHairDL "__OTR__objects/object_tw/gTwinrovaKotakeIceHairDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeIceHairDL[] = dgTwinrovaKotakeIceHairDL; -#define dobject_tw_DL_013D68 "__OTR__objects/object_tw/object_tw_DL_013D68" -static const ALIGN_ASSET(2) char object_tw_DL_013D68[] = dobject_tw_DL_013D68; +#define dgTwinrovaKoumeFireHairDL "__OTR__objects/object_tw/gTwinrovaKoumeFireHairDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeFireHairDL[] = dgTwinrovaKoumeFireHairDL; -#define dobject_tw_DL_013E98 "__OTR__objects/object_tw/object_tw_DL_013E98" -static const ALIGN_ASSET(2) char object_tw_DL_013E98[] = dobject_tw_DL_013E98; +#define dgTwinrovaKotakeIceBroomHeadDL "__OTR__objects/object_tw/gTwinrovaKotakeIceBroomHeadDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeIceBroomHeadDL[] = dgTwinrovaKotakeIceBroomHeadDL; -#define dobject_tw_DL_013F98 "__OTR__objects/object_tw/object_tw_DL_013F98" -static const ALIGN_ASSET(2) char object_tw_DL_013F98[] = dobject_tw_DL_013F98; +#define dgTwinrovaKotakeIceBroomHeadOuterDL "__OTR__objects/object_tw/gTwinrovaKotakeIceBroomHeadOuterDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeIceBroomHeadOuterDL[] = dgTwinrovaKotakeIceBroomHeadOuterDL; -#define dobject_tw_DL_014070 "__OTR__objects/object_tw/object_tw_DL_014070" -static const ALIGN_ASSET(2) char object_tw_DL_014070[] = dobject_tw_DL_014070; +#define dgTwinrovaKotakeFireBroomHeadDL "__OTR__objects/object_tw/gTwinrovaKotakeFireBroomHeadDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeFireBroomHeadDL[] = dgTwinrovaKotakeFireBroomHeadDL; -#define dobject_tw_DL_014158 "__OTR__objects/object_tw/object_tw_DL_014158" -static const ALIGN_ASSET(2) char object_tw_DL_014158[] = dobject_tw_DL_014158; +#define dgTwinrovaKotakeFireBroomHeadOuterDL "__OTR__objects/object_tw/gTwinrovaKotakeFireBroomHeadOuterDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeFireBroomHeadOuterDL[] = dgTwinrovaKotakeFireBroomHeadOuterDL; -#define dobject_tw_DL_015440 "__OTR__objects/object_tw/object_tw_DL_015440" -static const ALIGN_ASSET(2) char object_tw_DL_015440[] = dobject_tw_DL_015440; +#define dgTwinrovaKotakeLeftBraidEndDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftBraidEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftBraidEndDL[] = dgTwinrovaKotakeLeftBraidEndDL; -#define dobject_tw_DL_015538 "__OTR__objects/object_tw/object_tw_DL_015538" -static const ALIGN_ASSET(2) char object_tw_DL_015538[] = dobject_tw_DL_015538; +#define dgTwinrovaKotakeLeftBraidStartDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftBraidStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftBraidStartDL[] = dgTwinrovaKotakeLeftBraidStartDL; -#define dobject_tw_DL_015648 "__OTR__objects/object_tw/object_tw_DL_015648" -static const ALIGN_ASSET(2) char object_tw_DL_015648[] = dobject_tw_DL_015648; +#define dgTwinrovaKotakeRightBraidEndDL "__OTR__objects/object_tw/gTwinrovaKotakeRightBraidEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightBraidEndDL[] = dgTwinrovaKotakeRightBraidEndDL; -#define dobject_tw_DL_015740 "__OTR__objects/object_tw/object_tw_DL_015740" -static const ALIGN_ASSET(2) char object_tw_DL_015740[] = dobject_tw_DL_015740; +#define dgTwinrovaKotakeRightBraidStartDL "__OTR__objects/object_tw/gTwinrovaKotakeRightBraidStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightBraidStartDL[] = dgTwinrovaKotakeRightBraidStartDL; -#define dobject_tw_DL_015850 "__OTR__objects/object_tw/object_tw_DL_015850" -static const ALIGN_ASSET(2) char object_tw_DL_015850[] = dobject_tw_DL_015850; +#define dgTwinrovaKotakeNeckDL "__OTR__objects/object_tw/gTwinrovaKotakeNeckDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeNeckDL[] = dgTwinrovaKotakeNeckDL; -#define dobject_tw_DL_015990 "__OTR__objects/object_tw/object_tw_DL_015990" -static const ALIGN_ASSET(2) char object_tw_DL_015990[] = dobject_tw_DL_015990; +#define dgTwinrovaKotakeRightSleeveFrontDL "__OTR__objects/object_tw/gTwinrovaKotakeRightSleeveFrontDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightSleeveFrontDL[] = dgTwinrovaKotakeRightSleeveFrontDL; -#define dobject_tw_DL_015B10 "__OTR__objects/object_tw/object_tw_DL_015B10" -static const ALIGN_ASSET(2) char object_tw_DL_015B10[] = dobject_tw_DL_015B10; +#define dgTwinrovaKotakeRightSleeveEndDL "__OTR__objects/object_tw/gTwinrovaKotakeRightSleeveEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightSleeveEndDL[] = dgTwinrovaKotakeRightSleeveEndDL; -#define dobject_tw_DL_015C30 "__OTR__objects/object_tw/object_tw_DL_015C30" -static const ALIGN_ASSET(2) char object_tw_DL_015C30[] = dobject_tw_DL_015C30; +#define dgTwinrovaKotakeRightSleeveMidDL "__OTR__objects/object_tw/gTwinrovaKotakeRightSleeveMidDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightSleeveMidDL[] = dgTwinrovaKotakeRightSleeveMidDL; -#define dobject_tw_DL_015D58 "__OTR__objects/object_tw/object_tw_DL_015D58" -static const ALIGN_ASSET(2) char object_tw_DL_015D58[] = dobject_tw_DL_015D58; +#define dgTwinrovaKotakeRightSleeveStartDL "__OTR__objects/object_tw/gTwinrovaKotakeRightSleeveStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightSleeveStartDL[] = dgTwinrovaKotakeRightSleeveStartDL; -#define dobject_tw_DL_015E78 "__OTR__objects/object_tw/object_tw_DL_015E78" -static const ALIGN_ASSET(2) char object_tw_DL_015E78[] = dobject_tw_DL_015E78; +#define dgTwinrovaKotakeLeftSleeveFrontDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftSleeveFrontDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftSleeveFrontDL[] = dgTwinrovaKotakeLeftSleeveFrontDL; -#define dobject_tw_DL_015FF8 "__OTR__objects/object_tw/object_tw_DL_015FF8" -static const ALIGN_ASSET(2) char object_tw_DL_015FF8[] = dobject_tw_DL_015FF8; +#define dgTwinrovaKotakeLeftSleeveEndDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftSleeveEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftSleeveEndDL[] = dgTwinrovaKotakeLeftSleeveEndDL; -#define dobject_tw_DL_016118 "__OTR__objects/object_tw/object_tw_DL_016118" -static const ALIGN_ASSET(2) char object_tw_DL_016118[] = dobject_tw_DL_016118; +#define dgTwinrovaKotakeLeftSleeveMidDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftSleeveMidDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftSleeveMidDL[] = dgTwinrovaKotakeLeftSleeveMidDL; -#define dobject_tw_DL_016240 "__OTR__objects/object_tw/object_tw_DL_016240" -static const ALIGN_ASSET(2) char object_tw_DL_016240[] = dobject_tw_DL_016240; +#define dgTwinrovaKotakeLeftSleeveStartDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftSleeveStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftSleeveStartDL[] = dgTwinrovaKotakeLeftSleeveStartDL; -#define dobject_tw_DL_016360 "__OTR__objects/object_tw/object_tw_DL_016360" -static const ALIGN_ASSET(2) char object_tw_DL_016360[] = dobject_tw_DL_016360; +#define dgTwinrovaKotakeTorsoDL "__OTR__objects/object_tw/gTwinrovaKotakeTorsoDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeTorsoDL[] = dgTwinrovaKotakeTorsoDL; -#define dobject_tw_DL_0164C0 "__OTR__objects/object_tw/object_tw_DL_0164C0" -static const ALIGN_ASSET(2) char object_tw_DL_0164C0[] = dobject_tw_DL_0164C0; +#define dgTwinrovaKotakeRightThighDL "__OTR__objects/object_tw/gTwinrovaKotakeRightThighDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeRightThighDL[] = dgTwinrovaKotakeRightThighDL; -#define dobject_tw_DL_0164C8 "__OTR__objects/object_tw/object_tw_DL_0164C8" -static const ALIGN_ASSET(2) char object_tw_DL_0164C8[] = dobject_tw_DL_0164C8; +#define dgTwinrovaKotakeLeftThighDL "__OTR__objects/object_tw/gTwinrovaKotakeLeftThighDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeLeftThighDL[] = dgTwinrovaKotakeLeftThighDL; -#define dobject_tw_DL_0164D0 "__OTR__objects/object_tw/object_tw_DL_0164D0" -static const ALIGN_ASSET(2) char object_tw_DL_0164D0[] = dobject_tw_DL_0164D0; +#define dgTwinrovaKotakePelvisDL "__OTR__objects/object_tw/gTwinrovaKotakePelvisDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakePelvisDL[] = dgTwinrovaKotakePelvisDL; -#define dobject_tw_Tex_016650 "__OTR__objects/object_tw/object_tw_Tex_016650" -static const ALIGN_ASSET(2) char object_tw_Tex_016650[] = dobject_tw_Tex_016650; +#define dgTwinrovaBraidEndTex "__OTR__objects/object_tw/gTwinrovaBraidEndTex" +static const ALIGN_ASSET(2) char gTwinrovaBraidEndTex[] = dgTwinrovaBraidEndTex; -#define dobject_tw_Tex_0166D0 "__OTR__objects/object_tw/object_tw_Tex_0166D0" -static const ALIGN_ASSET(2) char object_tw_Tex_0166D0[] = dobject_tw_Tex_0166D0; +#define dgTwinrovaLeftFootTex "__OTR__objects/object_tw/gTwinrovaLeftFootTex" +static const ALIGN_ASSET(2) char gTwinrovaLeftFootTex[] = dgTwinrovaLeftFootTex; -#define dobject_tw_DL_017910 "__OTR__objects/object_tw/object_tw_DL_017910" -static const ALIGN_ASSET(2) char object_tw_DL_017910[] = dobject_tw_DL_017910; +#define dgTwinrovaKoumeLeftBraidEndDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftBraidEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftBraidEndDL[] = dgTwinrovaKoumeLeftBraidEndDL; -#define dobject_tw_DL_017A08 "__OTR__objects/object_tw/object_tw_DL_017A08" -static const ALIGN_ASSET(2) char object_tw_DL_017A08[] = dobject_tw_DL_017A08; +#define dgTwinrovaKoumeLeftBraidStartDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftBraidStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftBraidStartDL[] = dgTwinrovaKoumeLeftBraidStartDL; -#define dobject_tw_DL_017B18 "__OTR__objects/object_tw/object_tw_DL_017B18" -static const ALIGN_ASSET(2) char object_tw_DL_017B18[] = dobject_tw_DL_017B18; +#define dgTwinrovaKoumeRightBraidEndDL "__OTR__objects/object_tw/gTwinrovaKoumeRightBraidEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightBraidEndDL[] = dgTwinrovaKoumeRightBraidEndDL; -#define dobject_tw_DL_017C10 "__OTR__objects/object_tw/object_tw_DL_017C10" -static const ALIGN_ASSET(2) char object_tw_DL_017C10[] = dobject_tw_DL_017C10; +#define dgTwinrovaKoumeRightBraidStartDL "__OTR__objects/object_tw/gTwinrovaKoumeRightBraidStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightBraidStartDL[] = dgTwinrovaKoumeRightBraidStartDL; -#define dobject_tw_DL_017D20 "__OTR__objects/object_tw/object_tw_DL_017D20" -static const ALIGN_ASSET(2) char object_tw_DL_017D20[] = dobject_tw_DL_017D20; +#define dgTwinrovaKoumeNeckDL "__OTR__objects/object_tw/gTwinrovaKoumeNeckDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeNeckDL[] = dgTwinrovaKoumeNeckDL; -#define dobject_tw_DL_017E60 "__OTR__objects/object_tw/object_tw_DL_017E60" -static const ALIGN_ASSET(2) char object_tw_DL_017E60[] = dobject_tw_DL_017E60; +#define dgTwinrovaKoumeRightSleeveFrontDL "__OTR__objects/object_tw/gTwinrovaKoumeRightSleeveFrontDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightSleeveFrontDL[] = dgTwinrovaKoumeRightSleeveFrontDL; -#define dobject_tw_DL_017FE0 "__OTR__objects/object_tw/object_tw_DL_017FE0" -static const ALIGN_ASSET(2) char object_tw_DL_017FE0[] = dobject_tw_DL_017FE0; +#define dgTwinrovaKoumeRightSleeveEndDL "__OTR__objects/object_tw/gTwinrovaKoumeRightSleeveEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightSleeveEndDL[] = dgTwinrovaKoumeRightSleeveEndDL; -#define dobject_tw_DL_018100 "__OTR__objects/object_tw/object_tw_DL_018100" -static const ALIGN_ASSET(2) char object_tw_DL_018100[] = dobject_tw_DL_018100; +#define dgTwinrovaKoumeRightSleeveMidDL "__OTR__objects/object_tw/gTwinrovaKoumeRightSleeveMidDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightSleeveMidDL[] = dgTwinrovaKoumeRightSleeveMidDL; -#define dobject_tw_DL_018228 "__OTR__objects/object_tw/object_tw_DL_018228" -static const ALIGN_ASSET(2) char object_tw_DL_018228[] = dobject_tw_DL_018228; +#define dgTwinrovaKoumeRightSleeveStartDL "__OTR__objects/object_tw/gTwinrovaKoumeRightSleeveStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightSleeveStartDL[] = dgTwinrovaKoumeRightSleeveStartDL; -#define dobject_tw_DL_018348 "__OTR__objects/object_tw/object_tw_DL_018348" -static const ALIGN_ASSET(2) char object_tw_DL_018348[] = dobject_tw_DL_018348; +#define dgTwinrovaKoumeLeftSleeveFrontDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftSleeveFrontDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftSleeveFrontDL[] = dgTwinrovaKoumeLeftSleeveFrontDL; -#define dobject_tw_DL_0184C8 "__OTR__objects/object_tw/object_tw_DL_0184C8" -static const ALIGN_ASSET(2) char object_tw_DL_0184C8[] = dobject_tw_DL_0184C8; +#define dgTwinrovaKoumeLeftSleeveEndDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftSleeveEndDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftSleeveEndDL[] = dgTwinrovaKoumeLeftSleeveEndDL; -#define dobject_tw_DL_0185E8 "__OTR__objects/object_tw/object_tw_DL_0185E8" -static const ALIGN_ASSET(2) char object_tw_DL_0185E8[] = dobject_tw_DL_0185E8; +#define dgTwinrovaKoumeLeftSleeveMidDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftSleeveMidDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftSleeveMidDL[] = dgTwinrovaKoumeLeftSleeveMidDL; -#define dobject_tw_DL_018710 "__OTR__objects/object_tw/object_tw_DL_018710" -static const ALIGN_ASSET(2) char object_tw_DL_018710[] = dobject_tw_DL_018710; +#define dgTwinrovaKoumeLeftSleeveStartDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftSleeveStartDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftSleeveStartDL[] = dgTwinrovaKoumeLeftSleeveStartDL; -#define dobject_tw_DL_018830 "__OTR__objects/object_tw/object_tw_DL_018830" -static const ALIGN_ASSET(2) char object_tw_DL_018830[] = dobject_tw_DL_018830; +#define dgTwinrovaKoumeTorsoDL "__OTR__objects/object_tw/gTwinrovaKoumeTorsoDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeTorsoDL[] = dgTwinrovaKoumeTorsoDL; -#define dobject_tw_DL_018990 "__OTR__objects/object_tw/object_tw_DL_018990" -static const ALIGN_ASSET(2) char object_tw_DL_018990[] = dobject_tw_DL_018990; +#define dgTwinrovaKoumeRightThighDL "__OTR__objects/object_tw/gTwinrovaKoumeRightThighDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeRightThighDL[] = dgTwinrovaKoumeRightThighDL; -#define dobject_tw_DL_018998 "__OTR__objects/object_tw/object_tw_DL_018998" -static const ALIGN_ASSET(2) char object_tw_DL_018998[] = dobject_tw_DL_018998; +#define dgTwinrovaKoumeLeftThighDL "__OTR__objects/object_tw/gTwinrovaKoumeLeftThighDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeLeftThighDL[] = dgTwinrovaKoumeLeftThighDL; -#define dobject_tw_DL_0189A0 "__OTR__objects/object_tw/object_tw_DL_0189A0" -static const ALIGN_ASSET(2) char object_tw_DL_0189A0[] = dobject_tw_DL_0189A0; +#define dgTwinrovaKoumePelvisDL "__OTR__objects/object_tw/gTwinrovaKoumePelvisDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumePelvisDL[] = dgTwinrovaKoumePelvisDL; -#define dobject_tw_Tex_018B20 "__OTR__objects/object_tw/object_tw_Tex_018B20" -static const ALIGN_ASSET(2) char object_tw_Tex_018B20[] = dobject_tw_Tex_018B20; +#define dgTwinrovaRightFootTex "__OTR__objects/object_tw/gTwinrovaRightFootTex" +static const ALIGN_ASSET(2) char gTwinrovaRightFootTex[] = dgTwinrovaRightFootTex; -#define dobject_tw_Tex_018B60 "__OTR__objects/object_tw/object_tw_Tex_018B60" -static const ALIGN_ASSET(2) char object_tw_Tex_018B60[] = dobject_tw_Tex_018B60; +#define dgTwinrovaFireSmokeTex "__OTR__objects/object_tw/gTwinrovaFireSmokeTex" +static const ALIGN_ASSET(2) char gTwinrovaFireSmokeTex[] = dgTwinrovaFireSmokeTex; -#define dobject_tw_DL_018FC0 "__OTR__objects/object_tw/object_tw_DL_018FC0" -static const ALIGN_ASSET(2) char object_tw_DL_018FC0[] = dobject_tw_DL_018FC0; +#define dgTwinrovaFireSmokeDL "__OTR__objects/object_tw/gTwinrovaFireSmokeDL" +static const ALIGN_ASSET(2) char gTwinrovaFireSmokeDL[] = dgTwinrovaFireSmokeDL; -#define dobject_tw_Tex_019078 "__OTR__objects/object_tw/object_tw_Tex_019078" -static const ALIGN_ASSET(2) char object_tw_Tex_019078[] = dobject_tw_Tex_019078; +#define dgTwinrovaBigFlameTex "__OTR__objects/object_tw/gTwinrovaBigFlameTex" +static const ALIGN_ASSET(2) char gTwinrovaBigFlameTex[] = dgTwinrovaBigFlameTex; -#define dobject_tw_Tex_019478 "__OTR__objects/object_tw/object_tw_Tex_019478" -static const ALIGN_ASSET(2) char object_tw_Tex_019478[] = dobject_tw_Tex_019478; +#define dgTwinrovaBigFlameMaskTex "__OTR__objects/object_tw/gTwinrovaBigFlameMaskTex" +static const ALIGN_ASSET(2) char gTwinrovaBigFlameMaskTex[] = dgTwinrovaBigFlameMaskTex; -#define dobject_tw_DL_019938 "__OTR__objects/object_tw/object_tw_DL_019938" -static const ALIGN_ASSET(2) char object_tw_DL_019938[] = dobject_tw_DL_019938; +#define dgTwinrovaBigFlameDL "__OTR__objects/object_tw/gTwinrovaBigFlameDL" +static const ALIGN_ASSET(2) char gTwinrovaBigFlameDL[] = dgTwinrovaBigFlameDL; -#define dobject_tw_Tex_019A20 "__OTR__objects/object_tw/object_tw_Tex_019A20" -static const ALIGN_ASSET(2) char object_tw_Tex_019A20[] = dobject_tw_Tex_019A20; +#define dgTwinrovaFirePoolAndShieldChargeCenterTex "__OTR__objects/object_tw/gTwinrovaFirePoolAndShieldChargeCenterTex" +static const ALIGN_ASSET(2) char gTwinrovaFirePoolAndShieldChargeCenterTex[] = dgTwinrovaFirePoolAndShieldChargeCenterTex; -#define dobject_tw_DL_019D40 "__OTR__objects/object_tw/object_tw_DL_019D40" -static const ALIGN_ASSET(2) char object_tw_DL_019D40[] = dobject_tw_DL_019D40; +#define dgTwinrovaFirePoolDL "__OTR__objects/object_tw/gTwinrovaFirePoolDL" +static const ALIGN_ASSET(2) char gTwinrovaFirePoolDL[] = dgTwinrovaFirePoolDL; -#define dobject_tw_Tex_019E00 "__OTR__objects/object_tw/object_tw_Tex_019E00" -static const ALIGN_ASSET(2) char object_tw_Tex_019E00[] = dobject_tw_Tex_019E00; +#define dgTwinrovaFireTex "__OTR__objects/object_tw/gTwinrovaFireTex" +static const ALIGN_ASSET(2) char gTwinrovaFireTex[] = dgTwinrovaFireTex; -#define dobject_tw_Tex_01A200 "__OTR__objects/object_tw/object_tw_Tex_01A200" -static const ALIGN_ASSET(2) char object_tw_Tex_01A200[] = dobject_tw_Tex_01A200; +#define dgTwinrovaFireMaskTex "__OTR__objects/object_tw/gTwinrovaFireMaskTex" +static const ALIGN_ASSET(2) char gTwinrovaFireMaskTex[] = dgTwinrovaFireMaskTex; -#define dobject_tw_DL_01A430 "__OTR__objects/object_tw/object_tw_DL_01A430" -static const ALIGN_ASSET(2) char object_tw_DL_01A430[] = dobject_tw_DL_01A430; +#define dgTwinrovaFireDL "__OTR__objects/object_tw/gTwinrovaFireDL" +static const ALIGN_ASSET(2) char gTwinrovaFireDL[] = dgTwinrovaFireDL; -#define dobject_tw_DL_01A528 "__OTR__objects/object_tw/object_tw_DL_01A528" -static const ALIGN_ASSET(2) char object_tw_DL_01A528[] = dobject_tw_DL_01A528; +#define dgTwinrovaMagicParticleMaterialDL "__OTR__objects/object_tw/gTwinrovaMagicParticleMaterialDL" +static const ALIGN_ASSET(2) char gTwinrovaMagicParticleMaterialDL[] = dgTwinrovaMagicParticleMaterialDL; -#define dobject_tw_DL_01A5A8 "__OTR__objects/object_tw/object_tw_DL_01A5A8" -static const ALIGN_ASSET(2) char object_tw_DL_01A5A8[] = dobject_tw_DL_01A5A8; +#define dgTwinrovaMagicParticleModelDL "__OTR__objects/object_tw/gTwinrovaMagicParticleModelDL" +static const ALIGN_ASSET(2) char gTwinrovaMagicParticleModelDL[] = dgTwinrovaMagicParticleModelDL; -#define dobject_tw_Tex_01A5C0 "__OTR__objects/object_tw/object_tw_Tex_01A5C0" -static const ALIGN_ASSET(2) char object_tw_Tex_01A5C0[] = dobject_tw_Tex_01A5C0; +#define dgTwinrovaMagicParticleTex "__OTR__objects/object_tw/gTwinrovaMagicParticleTex" +static const ALIGN_ASSET(2) char gTwinrovaMagicParticleTex[] = dgTwinrovaMagicParticleTex; -#define dobject_tw_DL_01A790 "__OTR__objects/object_tw/object_tw_DL_01A790" -static const ALIGN_ASSET(2) char object_tw_DL_01A790[] = dobject_tw_DL_01A790; +#define dgTwinrovaEffectHaloDL "__OTR__objects/object_tw/gTwinrovaEffectHaloDL" +static const ALIGN_ASSET(2) char gTwinrovaEffectHaloDL[] = dgTwinrovaEffectHaloDL; -#define dobject_tw_DL_01A8A0 "__OTR__objects/object_tw/object_tw_DL_01A8A0" -static const ALIGN_ASSET(2) char object_tw_DL_01A8A0[] = dobject_tw_DL_01A8A0; +#define dgTwinrovaUnusedIceSteamCloudDL "__OTR__objects/object_tw/gTwinrovaUnusedIceSteamCloudDL" +static const ALIGN_ASSET(2) char gTwinrovaUnusedIceSteamCloudDL[] = dgTwinrovaUnusedIceSteamCloudDL; -#define dobject_tw_DL_01A998 "__OTR__objects/object_tw/object_tw_DL_01A998" -static const ALIGN_ASSET(2) char object_tw_DL_01A998[] = dobject_tw_DL_01A998; +#define dgTwinrovaIceMaterialDL "__OTR__objects/object_tw/gTwinrovaIceMaterialDL" +static const ALIGN_ASSET(2) char gTwinrovaIceMaterialDL[] = dgTwinrovaIceMaterialDL; -#define dobject_tw_DL_01AA50 "__OTR__objects/object_tw/object_tw_DL_01AA50" -static const ALIGN_ASSET(2) char object_tw_DL_01AA50[] = dobject_tw_DL_01AA50; +#define dgTwinrovaIceSurroundingPlayerMaterialDL "__OTR__objects/object_tw/gTwinrovaIceSurroundingPlayerMaterialDL" +static const ALIGN_ASSET(2) char gTwinrovaIceSurroundingPlayerMaterialDL[] = dgTwinrovaIceSurroundingPlayerMaterialDL; -#define dobject_tw_DL_01AB00 "__OTR__objects/object_tw/object_tw_DL_01AB00" -static const ALIGN_ASSET(2) char object_tw_DL_01AB00[] = dobject_tw_DL_01AB00; +#define dgTwinrovaIceModelDL "__OTR__objects/object_tw/gTwinrovaIceModelDL" +static const ALIGN_ASSET(2) char gTwinrovaIceModelDL[] = dgTwinrovaIceModelDL; -#define dobject_tw_Tex_01AB20 "__OTR__objects/object_tw/object_tw_Tex_01AB20" -static const ALIGN_ASSET(2) char object_tw_Tex_01AB20[] = dobject_tw_Tex_01AB20; +#define dgTwinrovaIcePoolTex "__OTR__objects/object_tw/gTwinrovaIcePoolTex" +static const ALIGN_ASSET(2) char gTwinrovaIcePoolTex[] = dgTwinrovaIcePoolTex; -#define dobject_tw_DL_01BC00 "__OTR__objects/object_tw/object_tw_DL_01BC00" -static const ALIGN_ASSET(2) char object_tw_DL_01BC00[] = dobject_tw_DL_01BC00; +#define dgTwinrovaIcePoolDL "__OTR__objects/object_tw/gTwinrovaIcePoolDL" +static const ALIGN_ASSET(2) char gTwinrovaIcePoolDL[] = dgTwinrovaIcePoolDL; -#define dobject_tw_Tex_01BCA0 "__OTR__objects/object_tw/object_tw_Tex_01BCA0" -static const ALIGN_ASSET(2) char object_tw_Tex_01BCA0[] = dobject_tw_Tex_01BCA0; +#define dgTwinrovaIcePoolShineTex "__OTR__objects/object_tw/gTwinrovaIcePoolShineTex" +static const ALIGN_ASSET(2) char gTwinrovaIcePoolShineTex[] = dgTwinrovaIcePoolShineTex; -#define dobject_tw_Tex_01C0A0 "__OTR__objects/object_tw/object_tw_Tex_01C0A0" -static const ALIGN_ASSET(2) char object_tw_Tex_01C0A0[] = dobject_tw_Tex_01C0A0; +#define dgTwinrovaIcePoolShineMaskTex "__OTR__objects/object_tw/gTwinrovaIcePoolShineMaskTex" +static const ALIGN_ASSET(2) char gTwinrovaIcePoolShineMaskTex[] = dgTwinrovaIcePoolShineMaskTex; -#define dobject_tw_DL_01C1C0 "__OTR__objects/object_tw/object_tw_DL_01C1C0" -static const ALIGN_ASSET(2) char object_tw_DL_01C1C0[] = dobject_tw_DL_01C1C0; +#define dgTwinrovaIcePoolShineDL "__OTR__objects/object_tw/gTwinrovaIcePoolShineDL" +static const ALIGN_ASSET(2) char gTwinrovaIcePoolShineDL[] = dgTwinrovaIcePoolShineDL; -#define dobject_tw_Tex_01C2A0 "__OTR__objects/object_tw/object_tw_Tex_01C2A0" -static const ALIGN_ASSET(2) char object_tw_Tex_01C2A0[] = dobject_tw_Tex_01C2A0; +#define dgTwinrovaKotakeMagicSigilMaskTex "__OTR__objects/object_tw/gTwinrovaKotakeMagicSigilMaskTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeMagicSigilMaskTex[] = dgTwinrovaKotakeMagicSigilMaskTex; -#define dobject_tw_Tex_01C6A0 "__OTR__objects/object_tw/object_tw_Tex_01C6A0" -static const ALIGN_ASSET(2) char object_tw_Tex_01C6A0[] = dobject_tw_Tex_01C6A0; +#define dgTwinrovaKotakeMagicSigilTex "__OTR__objects/object_tw/gTwinrovaKotakeMagicSigilTex" +static const ALIGN_ASSET(2) char gTwinrovaKotakeMagicSigilTex[] = dgTwinrovaKotakeMagicSigilTex; -#define dobject_tw_DL_01CEE0 "__OTR__objects/object_tw/object_tw_DL_01CEE0" -static const ALIGN_ASSET(2) char object_tw_DL_01CEE0[] = dobject_tw_DL_01CEE0; +#define dgTwinrovaKotakeMagicSigilDL "__OTR__objects/object_tw/gTwinrovaKotakeMagicSigilDL" +static const ALIGN_ASSET(2) char gTwinrovaKotakeMagicSigilDL[] = dgTwinrovaKotakeMagicSigilDL; -#define dobject_tw_Tex_01CFA8 "__OTR__objects/object_tw/object_tw_Tex_01CFA8" -static const ALIGN_ASSET(2) char object_tw_Tex_01CFA8[] = dobject_tw_Tex_01CFA8; +#define dgTwinrovaKoumeMagicSigilMaskTex "__OTR__objects/object_tw/gTwinrovaKoumeMagicSigilMaskTex" +static const ALIGN_ASSET(2) char gTwinrovaKoumeMagicSigilMaskTex[] = dgTwinrovaKoumeMagicSigilMaskTex; -#define dobject_tw_Tex_01D3A8 "__OTR__objects/object_tw/object_tw_Tex_01D3A8" -static const ALIGN_ASSET(2) char object_tw_Tex_01D3A8[] = dobject_tw_Tex_01D3A8; +#define dgTwinrovaKoumeMagicSigilTex "__OTR__objects/object_tw/gTwinrovaKoumeMagicSigilTex" +static const ALIGN_ASSET(2) char gTwinrovaKoumeMagicSigilTex[] = dgTwinrovaKoumeMagicSigilTex; -#define dobject_tw_DL_01DBE8 "__OTR__objects/object_tw/object_tw_DL_01DBE8" -static const ALIGN_ASSET(2) char object_tw_DL_01DBE8[] = dobject_tw_DL_01DBE8; +#define dgTwinrovaKoumeMagicSigilDL "__OTR__objects/object_tw/gTwinrovaKoumeMagicSigilDL" +static const ALIGN_ASSET(2) char gTwinrovaKoumeMagicSigilDL[] = dgTwinrovaKoumeMagicSigilDL; -#define dobject_tw_DL_01DDF0 "__OTR__objects/object_tw/object_tw_DL_01DDF0" -static const ALIGN_ASSET(2) char object_tw_DL_01DDF0[] = dobject_tw_DL_01DDF0; +#define dgTwinrovaBeamDL "__OTR__objects/object_tw/gTwinrovaBeamDL" +static const ALIGN_ASSET(2) char gTwinrovaBeamDL[] = dgTwinrovaBeamDL; -#define dobject_tw_DL_01E020 "__OTR__objects/object_tw/object_tw_DL_01E020" -static const ALIGN_ASSET(2) char object_tw_DL_01E020[] = dobject_tw_DL_01E020; +#define dgTwinrovaMirrorShieldFireChargeCenterDL "__OTR__objects/object_tw/gTwinrovaMirrorShieldFireChargeCenterDL" +static const ALIGN_ASSET(2) char gTwinrovaMirrorShieldFireChargeCenterDL[] = dgTwinrovaMirrorShieldFireChargeCenterDL; -#define dobject_tw_DL_01E0E0 "__OTR__objects/object_tw/object_tw_DL_01E0E0" -static const ALIGN_ASSET(2) char object_tw_DL_01E0E0[] = dobject_tw_DL_01E0E0; +#define dgTwinrovaMirrorShieldFireChargeSidesDL "__OTR__objects/object_tw/gTwinrovaMirrorShieldFireChargeSidesDL" +static const ALIGN_ASSET(2) char gTwinrovaMirrorShieldFireChargeSidesDL[] = dgTwinrovaMirrorShieldFireChargeSidesDL; -#define dobject_tw_DL_01E2C0 "__OTR__objects/object_tw/object_tw_DL_01E2C0" -static const ALIGN_ASSET(2) char object_tw_DL_01E2C0[] = dobject_tw_DL_01E2C0; +#define dgTwinrovaMirrorShieldIceChargeCenterDL "__OTR__objects/object_tw/gTwinrovaMirrorShieldIceChargeCenterDL" +static const ALIGN_ASSET(2) char gTwinrovaMirrorShieldIceChargeCenterDL[] = dgTwinrovaMirrorShieldIceChargeCenterDL; -#define dobject_tw_DL_01E3A0 "__OTR__objects/object_tw/object_tw_DL_01E3A0" -static const ALIGN_ASSET(2) char object_tw_DL_01E3A0[] = dobject_tw_DL_01E3A0; +#define dgTwinrovaMirrorShieldIceChargeSidesDL "__OTR__objects/object_tw/gTwinrovaMirrorShieldIceChargeSidesDL" +static const ALIGN_ASSET(2) char gTwinrovaMirrorShieldIceChargeSidesDL[] = dgTwinrovaMirrorShieldIceChargeSidesDL; -#define dobject_tw_Tex_01E430 "__OTR__objects/object_tw/object_tw_Tex_01E430" -static const ALIGN_ASSET(2) char object_tw_Tex_01E430[] = dobject_tw_Tex_01E430; +#define dgTwinrovaCloudMaskTex "__OTR__objects/object_tw/gTwinrovaCloudMaskTex" +static const ALIGN_ASSET(2) char gTwinrovaCloudMaskTex[] = dgTwinrovaCloudMaskTex; -#define dobject_tw_DL_01E9F0 "__OTR__objects/object_tw/object_tw_DL_01E9F0" -static const ALIGN_ASSET(2) char object_tw_DL_01E9F0[] = dobject_tw_DL_01E9F0; +#define dgTwinrovaShieldAbsorbAndReflectEffectDL "__OTR__objects/object_tw/gTwinrovaShieldAbsorbAndReflectEffectDL" +static const ALIGN_ASSET(2) char gTwinrovaShieldAbsorbAndReflectEffectDL[] = dgTwinrovaShieldAbsorbAndReflectEffectDL; -#define dobject_tw_Tex_01EB28 "__OTR__objects/object_tw/object_tw_Tex_01EB28" -static const ALIGN_ASSET(2) char object_tw_Tex_01EB28[] = dobject_tw_Tex_01EB28; +#define dgTwinrovaCircleTex "__OTR__objects/object_tw/gTwinrovaCircleTex" +static const ALIGN_ASSET(2) char gTwinrovaCircleTex[] = dgTwinrovaCircleTex; -#define dobject_tw_DL_01EC68 "__OTR__objects/object_tw/object_tw_DL_01EC68" -static const ALIGN_ASSET(2) char object_tw_DL_01EC68[] = dobject_tw_DL_01EC68; +#define dgTwinrovaSpawnPortalShadowDL "__OTR__objects/object_tw/gTwinrovaSpawnPortalShadowDL" +static const ALIGN_ASSET(2) char gTwinrovaSpawnPortalShadowDL[] = dgTwinrovaSpawnPortalShadowDL; -#define dobject_tw_Tex_01ECF0 "__OTR__objects/object_tw/object_tw_Tex_01ECF0" -static const ALIGN_ASSET(2) char object_tw_Tex_01ECF0[] = dobject_tw_Tex_01ECF0; +#define dgTwinrovaLightPillarAndHaloTex "__OTR__objects/object_tw/gTwinrovaLightPillarAndHaloTex" +static const ALIGN_ASSET(2) char gTwinrovaLightPillarAndHaloTex[] = dgTwinrovaLightPillarAndHaloTex; -#define dobject_tw_DL_01EEB0 "__OTR__objects/object_tw/object_tw_DL_01EEB0" -static const ALIGN_ASSET(2) char object_tw_DL_01EEB0[] = dobject_tw_DL_01EEB0; +#define dgTwinrovaLightPillarDL "__OTR__objects/object_tw/gTwinrovaLightPillarDL" +static const ALIGN_ASSET(2) char gTwinrovaLightPillarDL[] = dgTwinrovaLightPillarDL; -#define dobject_tw_DL_01F238 "__OTR__objects/object_tw/object_tw_DL_01F238" -static const ALIGN_ASSET(2) char object_tw_DL_01F238[] = dobject_tw_DL_01F238; +#define dgTwinrovaLightRaysDL "__OTR__objects/object_tw/gTwinrovaLightRaysDL" +static const ALIGN_ASSET(2) char gTwinrovaLightRaysDL[] = dgTwinrovaLightRaysDL; -#define dobject_tw_DL_01F390 "__OTR__objects/object_tw/object_tw_DL_01F390" -static const ALIGN_ASSET(2) char object_tw_DL_01F390[] = dobject_tw_DL_01F390; +#define dgTwinrovaLightCircleDL "__OTR__objects/object_tw/gTwinrovaLightCircleDL" +static const ALIGN_ASSET(2) char gTwinrovaLightCircleDL[] = dgTwinrovaLightCircleDL; -#define dobject_tw_DL_01F608 "__OTR__objects/object_tw/object_tw_DL_01F608" -static const ALIGN_ASSET(2) char object_tw_DL_01F608[] = dobject_tw_DL_01F608; +#define dgTwinrovaHaloDL "__OTR__objects/object_tw/gTwinrovaHaloDL" +static const ALIGN_ASSET(2) char gTwinrovaHaloDL[] = dgTwinrovaHaloDL; -#define dobject_tw_Skel_01F888 "__OTR__objects/object_tw/object_tw_Skel_01F888" -static const ALIGN_ASSET(2) char object_tw_Skel_01F888[] = dobject_tw_Skel_01F888; +#define dgTwinrovaKoumeSkel "__OTR__objects/object_tw/gTwinrovaKoumeSkel" +static const ALIGN_ASSET(2) char gTwinrovaKoumeSkel[] = dgTwinrovaKoumeSkel; -#define dobject_tw_Tex_02A070 "__OTR__objects/object_tw/object_tw_Tex_02A070" -static const ALIGN_ASSET(2) char object_tw_Tex_02A070[] = dobject_tw_Tex_02A070; +#define dgTwinrovaEyeHalfTex "__OTR__objects/object_tw/gTwinrovaEyeHalfTex" +static const ALIGN_ASSET(2) char gTwinrovaEyeHalfTex[] = dgTwinrovaEyeHalfTex; -#define dobject_tw_Anim_0216DC "__OTR__objects/object_tw/object_tw_Anim_0216DC" -static const ALIGN_ASSET(2) char object_tw_Anim_0216DC[] = dobject_tw_Anim_0216DC; +#define dgTwinrovaDeathAnim "__OTR__objects/object_tw/gTwinrovaDeathAnim" +static const ALIGN_ASSET(2) char gTwinrovaDeathAnim[] = dgTwinrovaDeathAnim; -#define dobject_tw_Anim_022700 "__OTR__objects/object_tw/object_tw_Anim_022700" -static const ALIGN_ASSET(2) char object_tw_Anim_022700[] = dobject_tw_Anim_022700; +#define dgTwinrovaIceAttackAnim "__OTR__objects/object_tw/gTwinrovaIceAttackAnim" +static const ALIGN_ASSET(2) char gTwinrovaIceAttackAnim[] = dgTwinrovaIceAttackAnim; -#define dobject_tw_Anim_023750 "__OTR__objects/object_tw/object_tw_Anim_023750" -static const ALIGN_ASSET(2) char object_tw_Anim_023750[] = dobject_tw_Anim_023750; +#define dgTwinrovaFireAttackAnim "__OTR__objects/object_tw/gTwinrovaFireAttackAnim" +static const ALIGN_ASSET(2) char gTwinrovaFireAttackAnim[] = dgTwinrovaFireAttackAnim; -#define dobject_tw_Anim_024374 "__OTR__objects/object_tw/object_tw_Anim_024374" -static const ALIGN_ASSET(2) char object_tw_Anim_024374[] = dobject_tw_Anim_024374; +#define dgTwinrovaDamageAnim "__OTR__objects/object_tw/gTwinrovaDamageAnim" +static const ALIGN_ASSET(2) char gTwinrovaDamageAnim[] = dgTwinrovaDamageAnim; -#define dobject_tw_Anim_0244B4 "__OTR__objects/object_tw/object_tw_Anim_0244B4" -static const ALIGN_ASSET(2) char object_tw_Anim_0244B4[] = dobject_tw_Anim_0244B4; +#define dgTwinrovaTPoseAnim "__OTR__objects/object_tw/gTwinrovaTPoseAnim" +static const ALIGN_ASSET(2) char gTwinrovaTPoseAnim[] = dgTwinrovaTPoseAnim; -#define dobject_tw_Tex_0244D0 "__OTR__objects/object_tw/object_tw_Tex_0244D0" -static const ALIGN_ASSET(2) char object_tw_Tex_0244D0[] = dobject_tw_Tex_0244D0; +#define dgTwinrovaSkinAndBangleTex "__OTR__objects/object_tw/gTwinrovaSkinAndBangleTex" +static const ALIGN_ASSET(2) char gTwinrovaSkinAndBangleTex[] = dgTwinrovaSkinAndBangleTex; -#define dobject_tw_Tex_024510 "__OTR__objects/object_tw/object_tw_Tex_024510" -static const ALIGN_ASSET(2) char object_tw_Tex_024510[] = dobject_tw_Tex_024510; +#define dgTwinrovaEmblemTex "__OTR__objects/object_tw/gTwinrovaEmblemTex" +static const ALIGN_ASSET(2) char gTwinrovaEmblemTex[] = dgTwinrovaEmblemTex; -#define dobject_tw_Tex_024710 "__OTR__objects/object_tw/object_tw_Tex_024710" -static const ALIGN_ASSET(2) char object_tw_Tex_024710[] = dobject_tw_Tex_024710; +#define dgTwinrovaBreastTex "__OTR__objects/object_tw/gTwinrovaBreastTex" +static const ALIGN_ASSET(2) char gTwinrovaBreastTex[] = dgTwinrovaBreastTex; -#define dobject_tw_Tex_024910 "__OTR__objects/object_tw/object_tw_Tex_024910" -static const ALIGN_ASSET(2) char object_tw_Tex_024910[] = dobject_tw_Tex_024910; +#define dgTwinrovaRightPantLegTex "__OTR__objects/object_tw/gTwinrovaRightPantLegTex" +static const ALIGN_ASSET(2) char gTwinrovaRightPantLegTex[] = dgTwinrovaRightPantLegTex; -#define dobject_tw_Tex_024B10 "__OTR__objects/object_tw/object_tw_Tex_024B10" -static const ALIGN_ASSET(2) char object_tw_Tex_024B10[] = dobject_tw_Tex_024B10; +#define dgTwinrovaLeftPantLegTex "__OTR__objects/object_tw/gTwinrovaLeftPantLegTex" +static const ALIGN_ASSET(2) char gTwinrovaLeftPantLegTex[] = dgTwinrovaLeftPantLegTex; -#define dobject_tw_DL_027720 "__OTR__objects/object_tw/object_tw_DL_027720" -static const ALIGN_ASSET(2) char object_tw_DL_027720[] = dobject_tw_DL_027720; +#define dgTwinrovaRightFootDL "__OTR__objects/object_tw/gTwinrovaRightFootDL" +static const ALIGN_ASSET(2) char gTwinrovaRightFootDL[] = dgTwinrovaRightFootDL; -#define dobject_tw_DL_027820 "__OTR__objects/object_tw/object_tw_DL_027820" -static const ALIGN_ASSET(2) char object_tw_DL_027820[] = dobject_tw_DL_027820; +#define dgTwinrovaRightShinDL "__OTR__objects/object_tw/gTwinrovaRightShinDL" +static const ALIGN_ASSET(2) char gTwinrovaRightShinDL[] = dgTwinrovaRightShinDL; -#define dobject_tw_DL_027970 "__OTR__objects/object_tw/object_tw_DL_027970" -static const ALIGN_ASSET(2) char object_tw_DL_027970[] = dobject_tw_DL_027970; +#define dgTwinrovaRightThighDL "__OTR__objects/object_tw/gTwinrovaRightThighDL" +static const ALIGN_ASSET(2) char gTwinrovaRightThighDL[] = dgTwinrovaRightThighDL; -#define dobject_tw_DL_027A60 "__OTR__objects/object_tw/object_tw_DL_027A60" -static const ALIGN_ASSET(2) char object_tw_DL_027A60[] = dobject_tw_DL_027A60; +#define dgTwinrovaRightSleeveEndDL "__OTR__objects/object_tw/gTwinrovaRightSleeveEndDL" +static const ALIGN_ASSET(2) char gTwinrovaRightSleeveEndDL[] = dgTwinrovaRightSleeveEndDL; -#define dobject_tw_DL_027B78 "__OTR__objects/object_tw/object_tw_DL_027B78" -static const ALIGN_ASSET(2) char object_tw_DL_027B78[] = dobject_tw_DL_027B78; +#define dgTwinrovaRightSleeveStartDL "__OTR__objects/object_tw/gTwinrovaRightSleeveStartDL" +static const ALIGN_ASSET(2) char gTwinrovaRightSleeveStartDL[] = dgTwinrovaRightSleeveStartDL; -#define dobject_tw_DL_027C98 "__OTR__objects/object_tw/object_tw_DL_027C98" -static const ALIGN_ASSET(2) char object_tw_DL_027C98[] = dobject_tw_DL_027C98; +#define dgTwinrovaRightForearmDL "__OTR__objects/object_tw/gTwinrovaRightForearmDL" +static const ALIGN_ASSET(2) char gTwinrovaRightForearmDL[] = dgTwinrovaRightForearmDL; -#define dobject_tw_DL_027DE8 "__OTR__objects/object_tw/object_tw_DL_027DE8" -static const ALIGN_ASSET(2) char object_tw_DL_027DE8[] = dobject_tw_DL_027DE8; +#define dgTwinrovaRightUpperArmDL "__OTR__objects/object_tw/gTwinrovaRightUpperArmDL" +static const ALIGN_ASSET(2) char gTwinrovaRightUpperArmDL[] = dgTwinrovaRightUpperArmDL; -#define dobject_tw_DL_027EE0 "__OTR__objects/object_tw/object_tw_DL_027EE0" -static const ALIGN_ASSET(2) char object_tw_DL_027EE0[] = dobject_tw_DL_027EE0; +#define dgTwinrovaRightShoulderDL "__OTR__objects/object_tw/gTwinrovaRightShoulderDL" +static const ALIGN_ASSET(2) char gTwinrovaRightShoulderDL[] = dgTwinrovaRightShoulderDL; -#define dobject_tw_DL_027FE8 "__OTR__objects/object_tw/object_tw_DL_027FE8" -static const ALIGN_ASSET(2) char object_tw_DL_027FE8[] = dobject_tw_DL_027FE8; +#define dgTwinrovaLeftSleeveEndDL "__OTR__objects/object_tw/gTwinrovaLeftSleeveEndDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftSleeveEndDL[] = dgTwinrovaLeftSleeveEndDL; -#define dobject_tw_DL_028100 "__OTR__objects/object_tw/object_tw_DL_028100" -static const ALIGN_ASSET(2) char object_tw_DL_028100[] = dobject_tw_DL_028100; +#define dgTwinrovaLeftSleeveStartDL "__OTR__objects/object_tw/gTwinrovaLeftSleeveStartDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftSleeveStartDL[] = dgTwinrovaLeftSleeveStartDL; -#define dobject_tw_DL_028220 "__OTR__objects/object_tw/object_tw_DL_028220" -static const ALIGN_ASSET(2) char object_tw_DL_028220[] = dobject_tw_DL_028220; +#define dgTwinrovaLeftForearmDL "__OTR__objects/object_tw/gTwinrovaLeftForearmDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftForearmDL[] = dgTwinrovaLeftForearmDL; -#define dobject_tw_DL_028370 "__OTR__objects/object_tw/object_tw_DL_028370" -static const ALIGN_ASSET(2) char object_tw_DL_028370[] = dobject_tw_DL_028370; +#define dgTwinrovaLeftUpperArmDL "__OTR__objects/object_tw/gTwinrovaLeftUpperArmDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftUpperArmDL[] = dgTwinrovaLeftUpperArmDL; -#define dobject_tw_DL_028468 "__OTR__objects/object_tw/object_tw_DL_028468" -static const ALIGN_ASSET(2) char object_tw_DL_028468[] = dobject_tw_DL_028468; +#define dgTwinrovaLeftShoulderDL "__OTR__objects/object_tw/gTwinrovaLeftShoulderDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftShoulderDL[] = dgTwinrovaLeftShoulderDL; -#define dobject_tw_DL_028570 "__OTR__objects/object_tw/object_tw_DL_028570" -static const ALIGN_ASSET(2) char object_tw_DL_028570[] = dobject_tw_DL_028570; +#define dgTwinrovaLeftBraidEndDL "__OTR__objects/object_tw/gTwinrovaLeftBraidEndDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftBraidEndDL[] = dgTwinrovaLeftBraidEndDL; -#define dobject_tw_DL_028668 "__OTR__objects/object_tw/object_tw_DL_028668" -static const ALIGN_ASSET(2) char object_tw_DL_028668[] = dobject_tw_DL_028668; +#define dgTwinrovaLeftBraidStartDL "__OTR__objects/object_tw/gTwinrovaLeftBraidStartDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftBraidStartDL[] = dgTwinrovaLeftBraidStartDL; -#define dobject_tw_DL_028778 "__OTR__objects/object_tw/object_tw_DL_028778" -static const ALIGN_ASSET(2) char object_tw_DL_028778[] = dobject_tw_DL_028778; +#define dgTwinrovaRightBraidEndDL "__OTR__objects/object_tw/gTwinrovaRightBraidEndDL" +static const ALIGN_ASSET(2) char gTwinrovaRightBraidEndDL[] = dgTwinrovaRightBraidEndDL; -#define dobject_tw_DL_028870 "__OTR__objects/object_tw/object_tw_DL_028870" -static const ALIGN_ASSET(2) char object_tw_DL_028870[] = dobject_tw_DL_028870; +#define dgTwinrovaRightBraidStartDL "__OTR__objects/object_tw/gTwinrovaRightBraidStartDL" +static const ALIGN_ASSET(2) char gTwinrovaRightBraidStartDL[] = dgTwinrovaRightBraidStartDL; -#define dobject_tw_DL_028980 "__OTR__objects/object_tw/object_tw_DL_028980" -static const ALIGN_ASSET(2) char object_tw_DL_028980[] = dobject_tw_DL_028980; +#define dgTwinrovaRightBreastDL "__OTR__objects/object_tw/gTwinrovaRightBreastDL" +static const ALIGN_ASSET(2) char gTwinrovaRightBreastDL[] = dgTwinrovaRightBreastDL; -#define dobject_tw_DL_028B78 "__OTR__objects/object_tw/object_tw_DL_028B78" -static const ALIGN_ASSET(2) char object_tw_DL_028B78[] = dobject_tw_DL_028B78; +#define dgTwinrovaLeftBreastDL "__OTR__objects/object_tw/gTwinrovaLeftBreastDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftBreastDL[] = dgTwinrovaLeftBreastDL; -#define dobject_tw_DL_028D70 "__OTR__objects/object_tw/object_tw_DL_028D70" -static const ALIGN_ASSET(2) char object_tw_DL_028D70[] = dobject_tw_DL_028D70; +#define dgTwinrovaTorsoDL "__OTR__objects/object_tw/gTwinrovaTorsoDL" +static const ALIGN_ASSET(2) char gTwinrovaTorsoDL[] = dgTwinrovaTorsoDL; -#define dobject_tw_DL_029268 "__OTR__objects/object_tw/object_tw_DL_029268" -static const ALIGN_ASSET(2) char object_tw_DL_029268[] = dobject_tw_DL_029268; +#define dgTwinrovaLeftFootDL "__OTR__objects/object_tw/gTwinrovaLeftFootDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftFootDL[] = dgTwinrovaLeftFootDL; -#define dobject_tw_DL_0293E0 "__OTR__objects/object_tw/object_tw_DL_0293E0" -static const ALIGN_ASSET(2) char object_tw_DL_0293E0[] = dobject_tw_DL_0293E0; +#define dgTwinrovaLeftShinDL "__OTR__objects/object_tw/gTwinrovaLeftShinDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftShinDL[] = dgTwinrovaLeftShinDL; -#define dobject_tw_DL_029530 "__OTR__objects/object_tw/object_tw_DL_029530" -static const ALIGN_ASSET(2) char object_tw_DL_029530[] = dobject_tw_DL_029530; +#define dgTwinrovaLeftThighDL "__OTR__objects/object_tw/gTwinrovaLeftThighDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftThighDL[] = dgTwinrovaLeftThighDL; -#define dobject_tw_DL_029620 "__OTR__objects/object_tw/object_tw_DL_029620" -static const ALIGN_ASSET(2) char object_tw_DL_029620[] = dobject_tw_DL_029620; +#define dgTwinrovaSash4DL "__OTR__objects/object_tw/gTwinrovaSash4DL" +static const ALIGN_ASSET(2) char gTwinrovaSash4DL[] = dgTwinrovaSash4DL; -#define dobject_tw_DL_029738 "__OTR__objects/object_tw/object_tw_DL_029738" -static const ALIGN_ASSET(2) char object_tw_DL_029738[] = dobject_tw_DL_029738; +#define dgTwinrovaSash3DL "__OTR__objects/object_tw/gTwinrovaSash3DL" +static const ALIGN_ASSET(2) char gTwinrovaSash3DL[] = dgTwinrovaSash3DL; -#define dobject_tw_DL_029900 "__OTR__objects/object_tw/object_tw_DL_029900" -static const ALIGN_ASSET(2) char object_tw_DL_029900[] = dobject_tw_DL_029900; +#define dgTwinrovaSash2DL "__OTR__objects/object_tw/gTwinrovaSash2DL" +static const ALIGN_ASSET(2) char gTwinrovaSash2DL[] = dgTwinrovaSash2DL; -#define dobject_tw_DL_0299F8 "__OTR__objects/object_tw/object_tw_DL_0299F8" -static const ALIGN_ASSET(2) char object_tw_DL_0299F8[] = dobject_tw_DL_0299F8; +#define dgTwinrovaSash1DL "__OTR__objects/object_tw/gTwinrovaSash1DL" +static const ALIGN_ASSET(2) char gTwinrovaSash1DL[] = dgTwinrovaSash1DL; -#define dobject_tw_DL_029B10 "__OTR__objects/object_tw/object_tw_DL_029B10" -static const ALIGN_ASSET(2) char object_tw_DL_029B10[] = dobject_tw_DL_029B10; +#define dgTwinrovaPelvisDL "__OTR__objects/object_tw/gTwinrovaPelvisDL" +static const ALIGN_ASSET(2) char gTwinrovaPelvisDL[] = dgTwinrovaPelvisDL; -#define dobject_tw_TLUT_029E50 "__OTR__objects/object_tw/object_tw_TLUT_029E50" -static const ALIGN_ASSET(2) char object_tw_TLUT_029E50[] = dobject_tw_TLUT_029E50; +#define dgTwinrovaEyeAndMouthTLUT "__OTR__objects/object_tw/gTwinrovaEyeAndMouthTLUT" +static const ALIGN_ASSET(2) char gTwinrovaEyeAndMouthTLUT[] = dgTwinrovaEyeAndMouthTLUT; -#define dobject_tw_TLUT_02A020 "__OTR__objects/object_tw/object_tw_TLUT_02A020" -static const ALIGN_ASSET(2) char object_tw_TLUT_02A020[] = dobject_tw_TLUT_02A020; +#define dgTwinrovaEarAndFingerTLUT "__OTR__objects/object_tw/gTwinrovaEarAndFingerTLUT" +static const ALIGN_ASSET(2) char gTwinrovaEarAndFingerTLUT[] = dgTwinrovaEarAndFingerTLUT; -#define dobject_tw_Tex_02A470 "__OTR__objects/object_tw/object_tw_Tex_02A470" -static const ALIGN_ASSET(2) char object_tw_Tex_02A470[] = dobject_tw_Tex_02A470; +#define dgTwinrovaEyeClosedTex "__OTR__objects/object_tw/gTwinrovaEyeClosedTex" +static const ALIGN_ASSET(2) char gTwinrovaEyeClosedTex[] = dgTwinrovaEyeClosedTex; -#define dobject_tw_Tex_02A870 "__OTR__objects/object_tw/object_tw_Tex_02A870" -static const ALIGN_ASSET(2) char object_tw_Tex_02A870[] = dobject_tw_Tex_02A870; +#define dgTwinrovaGrimaceTex "__OTR__objects/object_tw/gTwinrovaGrimaceTex" +static const ALIGN_ASSET(2) char gTwinrovaGrimaceTex[] = dgTwinrovaGrimaceTex; -#define dobject_tw_Tex_02A970 "__OTR__objects/object_tw/object_tw_Tex_02A970" -static const ALIGN_ASSET(2) char object_tw_Tex_02A970[] = dobject_tw_Tex_02A970; +#define dgTwinrovaEyebrowTex "__OTR__objects/object_tw/gTwinrovaEyebrowTex" +static const ALIGN_ASSET(2) char gTwinrovaEyebrowTex[] = dgTwinrovaEyebrowTex; -#define dobject_tw_Tex_02A9B0 "__OTR__objects/object_tw/object_tw_Tex_02A9B0" -static const ALIGN_ASSET(2) char object_tw_Tex_02A9B0[] = dobject_tw_Tex_02A9B0; +#define dgTwinrovaEyeOpenTex "__OTR__objects/object_tw/gTwinrovaEyeOpenTex" +static const ALIGN_ASSET(2) char gTwinrovaEyeOpenTex[] = dgTwinrovaEyeOpenTex; -#define dobject_tw_Tex_02ADB0 "__OTR__objects/object_tw/object_tw_Tex_02ADB0" -static const ALIGN_ASSET(2) char object_tw_Tex_02ADB0[] = dobject_tw_Tex_02ADB0; +#define dgTwinrovaNoseTex "__OTR__objects/object_tw/gTwinrovaNoseTex" +static const ALIGN_ASSET(2) char gTwinrovaNoseTex[] = dgTwinrovaNoseTex; -#define dobject_tw_Tex_02ADF0 "__OTR__objects/object_tw/object_tw_Tex_02ADF0" -static const ALIGN_ASSET(2) char object_tw_Tex_02ADF0[] = dobject_tw_Tex_02ADF0; +#define dgTwinrovaEarTex "__OTR__objects/object_tw/gTwinrovaEarTex" +static const ALIGN_ASSET(2) char gTwinrovaEarTex[] = dgTwinrovaEarTex; -#define dobject_tw_Tex_02AE30 "__OTR__objects/object_tw/object_tw_Tex_02AE30" -static const ALIGN_ASSET(2) char object_tw_Tex_02AE30[] = dobject_tw_Tex_02AE30; +#define dgTwinrovaSmileTex "__OTR__objects/object_tw/gTwinrovaSmileTex" +static const ALIGN_ASSET(2) char gTwinrovaSmileTex[] = dgTwinrovaSmileTex; -#define dobject_tw_Tex_02AF30 "__OTR__objects/object_tw/object_tw_Tex_02AF30" -static const ALIGN_ASSET(2) char object_tw_Tex_02AF30[] = dobject_tw_Tex_02AF30; +#define dgTwinrovaFingerTex "__OTR__objects/object_tw/gTwinrovaFingerTex" +static const ALIGN_ASSET(2) char gTwinrovaFingerTex[] = dgTwinrovaFingerTex; -#define dobject_tw_DL_02CAF0 "__OTR__objects/object_tw/object_tw_DL_02CAF0" -static const ALIGN_ASSET(2) char object_tw_DL_02CAF0[] = dobject_tw_DL_02CAF0; +#define dgTwinrovaInvisibleLeftHairBunDL "__OTR__objects/object_tw/gTwinrovaInvisibleLeftHairBunDL" +static const ALIGN_ASSET(2) char gTwinrovaInvisibleLeftHairBunDL[] = dgTwinrovaInvisibleLeftHairBunDL; -#define dobject_tw_DL_02CB50 "__OTR__objects/object_tw/object_tw_DL_02CB50" -static const ALIGN_ASSET(2) char object_tw_DL_02CB50[] = dobject_tw_DL_02CB50; +#define dgTwinrovaInvisibleRightHairBunDL "__OTR__objects/object_tw/gTwinrovaInvisibleRightHairBunDL" +static const ALIGN_ASSET(2) char gTwinrovaInvisibleRightHairBunDL[] = dgTwinrovaInvisibleRightHairBunDL; -#define dobject_tw_DL_02CBB0 "__OTR__objects/object_tw/object_tw_DL_02CBB0" -static const ALIGN_ASSET(2) char object_tw_DL_02CBB0[] = dobject_tw_DL_02CBB0; +#define dgTwinrovaHeadDL "__OTR__objects/object_tw/gTwinrovaHeadDL" +static const ALIGN_ASSET(2) char gTwinrovaHeadDL[] = dgTwinrovaHeadDL; -#define dobject_tw_DL_02D320 "__OTR__objects/object_tw/object_tw_DL_02D320" -static const ALIGN_ASSET(2) char object_tw_DL_02D320[] = dobject_tw_DL_02D320; +#define dgTwinrovaLeftHandDL "__OTR__objects/object_tw/gTwinrovaLeftHandDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftHandDL[] = dgTwinrovaLeftHandDL; -#define dobject_tw_DL_02D4A0 "__OTR__objects/object_tw/object_tw_DL_02D4A0" -static const ALIGN_ASSET(2) char object_tw_DL_02D4A0[] = dobject_tw_DL_02D4A0; +#define dgTwinrovaRightBroomDL "__OTR__objects/object_tw/gTwinrovaRightBroomDL" +static const ALIGN_ASSET(2) char gTwinrovaRightBroomDL[] = dgTwinrovaRightBroomDL; -#define dobject_tw_DL_02D5D8 "__OTR__objects/object_tw/object_tw_DL_02D5D8" -static const ALIGN_ASSET(2) char object_tw_DL_02D5D8[] = dobject_tw_DL_02D5D8; +#define dgTwinrovaLeftBroomDL "__OTR__objects/object_tw/gTwinrovaLeftBroomDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftBroomDL[] = dgTwinrovaLeftBroomDL; -#define dobject_tw_DL_02D710 "__OTR__objects/object_tw/object_tw_DL_02D710" -static const ALIGN_ASSET(2) char object_tw_DL_02D710[] = dobject_tw_DL_02D710; +#define dgTwinrovaRightHandDL "__OTR__objects/object_tw/gTwinrovaRightHandDL" +static const ALIGN_ASSET(2) char gTwinrovaRightHandDL[] = dgTwinrovaRightHandDL; -#define dobject_tw_DL_02D890 "__OTR__objects/object_tw/object_tw_DL_02D890" -static const ALIGN_ASSET(2) char object_tw_DL_02D890[] = dobject_tw_DL_02D890; +#define dgTwinrovaRightHairBunDL "__OTR__objects/object_tw/gTwinrovaRightHairBunDL" +static const ALIGN_ASSET(2) char gTwinrovaRightHairBunDL[] = dgTwinrovaRightHairBunDL; -#define dobject_tw_DL_02D940 "__OTR__objects/object_tw/object_tw_DL_02D940" -static const ALIGN_ASSET(2) char object_tw_DL_02D940[] = dobject_tw_DL_02D940; +#define dgTwinrovaLeftHairBunDL "__OTR__objects/object_tw/gTwinrovaLeftHairBunDL" +static const ALIGN_ASSET(2) char gTwinrovaLeftHairBunDL[] = dgTwinrovaLeftHairBunDL; -#define dobject_tw_DL_02D9F0 "__OTR__objects/object_tw/object_tw_DL_02D9F0" -static const ALIGN_ASSET(2) char object_tw_DL_02D9F0[] = dobject_tw_DL_02D9F0; +#define dgTwinrovaHairIceJetDL "__OTR__objects/object_tw/gTwinrovaHairIceJetDL" +static const ALIGN_ASSET(2) char gTwinrovaHairIceJetDL[] = dgTwinrovaHairIceJetDL; -#define dobject_tw_DL_02DAE0 "__OTR__objects/object_tw/object_tw_DL_02DAE0" -static const ALIGN_ASSET(2) char object_tw_DL_02DAE0[] = dobject_tw_DL_02DAE0; +#define dgTwinrovaHairIceTrailDL "__OTR__objects/object_tw/gTwinrovaHairIceTrailDL" +static const ALIGN_ASSET(2) char gTwinrovaHairIceTrailDL[] = dgTwinrovaHairIceTrailDL; -#define dobject_tw_DL_02DBC8 "__OTR__objects/object_tw/object_tw_DL_02DBC8" -static const ALIGN_ASSET(2) char object_tw_DL_02DBC8[] = dobject_tw_DL_02DBC8; +#define dgTwinrovaHairFireJetDL "__OTR__objects/object_tw/gTwinrovaHairFireJetDL" +static const ALIGN_ASSET(2) char gTwinrovaHairFireJetDL[] = dgTwinrovaHairFireJetDL; -#define dobject_tw_DL_02DCB8 "__OTR__objects/object_tw/object_tw_DL_02DCB8" -static const ALIGN_ASSET(2) char object_tw_DL_02DCB8[] = dobject_tw_DL_02DCB8; +#define dgTwinrovaHairFireTrailDL "__OTR__objects/object_tw/gTwinrovaHairFireTrailDL" +static const ALIGN_ASSET(2) char gTwinrovaHairFireTrailDL[] = dgTwinrovaHairFireTrailDL; -#define dobject_tw_DL_02DDD8 "__OTR__objects/object_tw/object_tw_DL_02DDD8" -static const ALIGN_ASSET(2) char object_tw_DL_02DDD8[] = dobject_tw_DL_02DDD8; +#define dgTwinrovaBroomIceJetDL "__OTR__objects/object_tw/gTwinrovaBroomIceJetDL" +static const ALIGN_ASSET(2) char gTwinrovaBroomIceJetDL[] = dgTwinrovaBroomIceJetDL; -#define dobject_tw_DL_02DEB0 "__OTR__objects/object_tw/object_tw_DL_02DEB0" -static const ALIGN_ASSET(2) char object_tw_DL_02DEB0[] = dobject_tw_DL_02DEB0; +#define dgTwinrovaBroomIceTrailDL "__OTR__objects/object_tw/gTwinrovaBroomIceTrailDL" +static const ALIGN_ASSET(2) char gTwinrovaBroomIceTrailDL[] = dgTwinrovaBroomIceTrailDL; -#define dobject_tw_DL_02DFB0 "__OTR__objects/object_tw/object_tw_DL_02DFB0" -static const ALIGN_ASSET(2) char object_tw_DL_02DFB0[] = dobject_tw_DL_02DFB0; +#define dgTwinrovaBroomFireJetDL "__OTR__objects/object_tw/gTwinrovaBroomFireJetDL" +static const ALIGN_ASSET(2) char gTwinrovaBroomFireJetDL[] = dgTwinrovaBroomFireJetDL; -#define dobject_tw_DL_02E098 "__OTR__objects/object_tw/object_tw_DL_02E098" -static const ALIGN_ASSET(2) char object_tw_DL_02E098[] = dobject_tw_DL_02E098; +#define dgTwinrovaBroomFireTrailDL "__OTR__objects/object_tw/gTwinrovaBroomFireTrailDL" +static const ALIGN_ASSET(2) char gTwinrovaBroomFireTrailDL[] = dgTwinrovaBroomFireTrailDL; #define dgTwinrovaTitleCardTex "__OTR__objects/object_tw/gTwinrovaTitleCardTex" static const ALIGN_ASSET(2) char gTwinrovaTitleCardTex[] = dgTwinrovaTitleCardTex; -#define dobject_tw_Skel_032020 "__OTR__objects/object_tw/object_tw_Skel_032020" -static const ALIGN_ASSET(2) char object_tw_Skel_032020[] = dobject_tw_Skel_032020; +#define dgTwinrovaSkel "__OTR__objects/object_tw/gTwinrovaSkel" +static const ALIGN_ASSET(2) char gTwinrovaSkel[] = dgTwinrovaSkel; -#define dobject_tw_Anim_032BF8 "__OTR__objects/object_tw/object_tw_Anim_032BF8" -static const ALIGN_ASSET(2) char object_tw_Anim_032BF8[] = dobject_tw_Anim_032BF8; +#define dgTwinrovaHoverAnim "__OTR__objects/object_tw/gTwinrovaHoverAnim" +static const ALIGN_ASSET(2) char gTwinrovaHoverAnim[] = dgTwinrovaHoverAnim; -#define dobject_tw_Anim_0338F0 "__OTR__objects/object_tw/object_tw_Anim_0338F0" -static const ALIGN_ASSET(2) char object_tw_Anim_0338F0[] = dobject_tw_Anim_0338F0; +#define dgTwinrovaChargedAttackHitAnim "__OTR__objects/object_tw/gTwinrovaChargedAttackHitAnim" +static const ALIGN_ASSET(2) char gTwinrovaChargedAttackHitAnim[] = dgTwinrovaChargedAttackHitAnim; -#define dobject_tw_Anim_0343B4 "__OTR__objects/object_tw/object_tw_Anim_0343B4" -static const ALIGN_ASSET(2) char object_tw_Anim_0343B4[] = dobject_tw_Anim_0343B4; +#define dgTwinrovaStunStartAnim "__OTR__objects/object_tw/gTwinrovaStunStartAnim" +static const ALIGN_ASSET(2) char gTwinrovaStunStartAnim[] = dgTwinrovaStunStartAnim; -#define dobject_tw_Anim_035030 "__OTR__objects/object_tw/object_tw_Anim_035030" -static const ALIGN_ASSET(2) char object_tw_Anim_035030[] = dobject_tw_Anim_035030; +#define dgTwinrovaStunLoopAnim "__OTR__objects/object_tw/gTwinrovaStunLoopAnim" +static const ALIGN_ASSET(2) char gTwinrovaStunLoopAnim[] = dgTwinrovaStunLoopAnim; -#define dobject_tw_Anim_035988 "__OTR__objects/object_tw/object_tw_Anim_035988" -static const ALIGN_ASSET(2) char object_tw_Anim_035988[] = dobject_tw_Anim_035988; +#define dgTwinrovaStunEndAnim "__OTR__objects/object_tw/gTwinrovaStunEndAnim" +static const ALIGN_ASSET(2) char gTwinrovaStunEndAnim[] = dgTwinrovaStunEndAnim; -#define dobject_tw_Anim_036FBC "__OTR__objects/object_tw/object_tw_Anim_036FBC" -static const ALIGN_ASSET(2) char object_tw_Anim_036FBC[] = dobject_tw_Anim_036FBC; +#define dgTwinrovaWindUpAnim "__OTR__objects/object_tw/gTwinrovaWindUpAnim" +static const ALIGN_ASSET(2) char gTwinrovaWindUpAnim[] = dgTwinrovaWindUpAnim; -#define dobject_tw_Anim_038E2C "__OTR__objects/object_tw/object_tw_Anim_038E2C" -static const ALIGN_ASSET(2) char object_tw_Anim_038E2C[] = dobject_tw_Anim_038E2C; +#define dgTwinrovaIntroAnim "__OTR__objects/object_tw/gTwinrovaIntroAnim" +static const ALIGN_ASSET(2) char gTwinrovaIntroAnim[] = dgTwinrovaIntroAnim; -#define dobject_tw_Anim_03A2D0 "__OTR__objects/object_tw/object_tw_Anim_03A2D0" -static const ALIGN_ASSET(2) char object_tw_Anim_03A2D0[] = dobject_tw_Anim_03A2D0; +#define dgTwinrovaLaughAnim "__OTR__objects/object_tw/gTwinrovaLaughAnim" +static const ALIGN_ASSET(2) char gTwinrovaLaughAnim[] = dgTwinrovaLaughAnim; -#define dobject_tw_DL_03A680 "__OTR__objects/object_tw/object_tw_DL_03A680" -static const ALIGN_ASSET(2) char object_tw_DL_03A680[] = dobject_tw_DL_03A680; +#define dgTwinrovaUnusedBoulderDL "__OTR__objects/object_tw/gTwinrovaUnusedBoulderDL" +static const ALIGN_ASSET(2) char gTwinrovaUnusedBoulderDL[] = dgTwinrovaUnusedBoulderDL; -#define dobject_tw_Tex_03A7B0 "__OTR__objects/object_tw/object_tw_Tex_03A7B0" -static const ALIGN_ASSET(2) char object_tw_Tex_03A7B0[] = dobject_tw_Tex_03A7B0; \ No newline at end of file +#define dgTwinrovaUnusedBoulderTex "__OTR__objects/object_tw/gTwinrovaUnusedBoulderTex" +static const ALIGN_ASSET(2) char gTwinrovaUnusedBoulderTex[] = dgTwinrovaUnusedBoulderTex; + + +#endif // OBJECTS_OBJECT_TW_H diff --git a/soh/assets/objects/object_umajump/object_umajump.h b/soh/assets/objects/object_umajump/object_umajump.h index 4d69d77ba..1ced063ab 100644 --- a/soh/assets/objects/object_umajump/object_umajump.h +++ b/soh/assets/objects/object_umajump/object_umajump.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_UMAJUMP_H +#define OBJECTS_OBJECT_UMAJUMP_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gJumpableHorseFenceMetalBarTex[] = dgJumpableHo static const ALIGN_ASSET(2) char gJumpableHorseFenceDL[] = dgJumpableHorseFenceDL; #define dgJumpableHorseFenceCol "__OTR__objects/object_umajump/gJumpableHorseFenceCol" -static const ALIGN_ASSET(2) char gJumpableHorseFenceCol[] = dgJumpableHorseFenceCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gJumpableHorseFenceCol[] = dgJumpableHorseFenceCol; + +#endif // OBJECTS_OBJECT_UMAJUMP_H diff --git a/soh/assets/objects/object_vali/object_vali.h b/soh/assets/objects/object_vali/object_vali.h index 005e13f66..315cccf77 100644 --- a/soh/assets/objects/object_vali/object_vali.h +++ b/soh/assets/objects/object_vali/object_vali.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_VALI_H +#define OBJECTS_OBJECT_VALI_H 1 #include "align_asset_macro.h" @@ -72,4 +73,7 @@ static const ALIGN_ASSET(2) char gBariOuterHoodBottomTex[] = dgBariOuterHoodBott static const ALIGN_ASSET(2) char gBariInnerHoodTex[] = dgBariInnerHoodTex; #define dgBariSkel "__OTR__objects/object_vali/gBariSkel" -static const ALIGN_ASSET(2) char gBariSkel[] = dgBariSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gBariSkel[] = dgBariSkel; + + +#endif // OBJECTS_OBJECT_VALI_H diff --git a/soh/assets/objects/object_vase/object_vase.h b/soh/assets/objects/object_vase/object_vase.h index a5afec6a3..ce127a771 100644 --- a/soh/assets/objects/object_vase/object_vase.h +++ b/soh/assets/objects/object_vase/object_vase.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_VASE_H +#define OBJECTS_OBJECT_VASE_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gUnusedVaseDL[] = dgUnusedVaseDL; static const ALIGN_ASSET(2) char gUnusedVaseTopTex[] = dgUnusedVaseTopTex; #define dgUnusedVaseBodyTex "__OTR__objects/object_vase/gUnusedVaseBodyTex" -static const ALIGN_ASSET(2) char gUnusedVaseBodyTex[] = dgUnusedVaseBodyTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gUnusedVaseBodyTex[] = dgUnusedVaseBodyTex; + +#endif // OBJECTS_OBJECT_VASE_H diff --git a/soh/assets/objects/object_vm/object_vm.h b/soh/assets/objects/object_vm/object_vm.h index b14c9888d..217701d15 100644 --- a/soh/assets/objects/object_vm/object_vm.h +++ b/soh/assets/objects/object_vm/object_vm.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_VM_H +#define OBJECTS_OBJECT_VM_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char gBeamosTeethTex[] = dgBeamosTeethTex; static const ALIGN_ASSET(2) char gBeamosAnim[] = dgBeamosAnim; #define dgBeamosLaserDL "__OTR__objects/object_vm/gBeamosLaserDL" -static const ALIGN_ASSET(2) char gBeamosLaserDL[] = dgBeamosLaserDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gBeamosLaserDL[] = dgBeamosLaserDL; + + +#endif // OBJECTS_OBJECT_VM_H diff --git a/soh/assets/objects/object_wallmaster/object_wallmaster.h b/soh/assets/objects/object_wallmaster/object_wallmaster.h index 759669802..33d0a74bc 100644 --- a/soh/assets/objects/object_wallmaster/object_wallmaster.h +++ b/soh/assets/objects/object_wallmaster/object_wallmaster.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_WALLMASTER_H +#define OBJECTS_OBJECT_WALLMASTER_H 1 #include "align_asset_macro.h" @@ -105,4 +106,7 @@ static const ALIGN_ASSET(2) char gWallmasterSkelLimbsLimb_008F20DL_006A20[] = dg static const ALIGN_ASSET(2) char gWallmasterSkelLimbsLimb_008F38DL_006800[] = dgWallmasterSkelLimbsLimb_008F38DL_006800; #define dgWallmasterSkelLimbsLimb_008F44DL_006660 "__OTR__objects/object_wallmaster/gWallmasterSkelLimbsLimb_008F44DL_006660" -static const ALIGN_ASSET(2) char gWallmasterSkelLimbsLimb_008F44DL_006660[] = dgWallmasterSkelLimbsLimb_008F44DL_006660; \ No newline at end of file +static const ALIGN_ASSET(2) char gWallmasterSkelLimbsLimb_008F44DL_006660[] = dgWallmasterSkelLimbsLimb_008F44DL_006660; + + +#endif // OBJECTS_OBJECT_WALLMASTER_H diff --git a/soh/assets/objects/object_warp1/object_warp1.h b/soh/assets/objects/object_warp1/object_warp1.h index 6d4e239c2..697e30a6b 100644 --- a/soh/assets/objects/object_warp1/object_warp1.h +++ b/soh/assets/objects/object_warp1/object_warp1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_WARP1_H +#define OBJECTS_OBJECT_WARP1_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char gWarp1DL_001AD0[] = dgWarp1DL_001AD0; static const ALIGN_ASSET(2) char gWarpCrystalTex[] = dgWarpCrystalTex; #define dgWarpCrystalSkel "__OTR__objects/object_warp1/gWarpCrystalSkel" -static const ALIGN_ASSET(2) char gWarpCrystalSkel[] = dgWarpCrystalSkel; \ No newline at end of file +static const ALIGN_ASSET(2) char gWarpCrystalSkel[] = dgWarpCrystalSkel; + + +#endif // OBJECTS_OBJECT_WARP1_H diff --git a/soh/assets/objects/object_warp2/object_warp2.h b/soh/assets/objects/object_warp2/object_warp2.h index 858a8dab5..d1804b656 100644 --- a/soh/assets/objects/object_warp2/object_warp2.h +++ b/soh/assets/objects/object_warp2/object_warp2.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef OBJECTS_OBJECT_WARP2_H +#define OBJECTS_OBJECT_WARP2_H 1 #include "align_asset_macro.h" #define dgWarp2Blob_000000 "__OTR__objects/object_warp2/gWarp2Blob_000000" -static const ALIGN_ASSET(2) char gWarp2Blob_000000[] = dgWarp2Blob_000000; \ No newline at end of file +static const ALIGN_ASSET(2) char gWarp2Blob_000000[] = dgWarp2Blob_000000; + +#endif // OBJECTS_OBJECT_WARP2_H diff --git a/soh/assets/objects/object_wf/object_wf.h b/soh/assets/objects/object_wf/object_wf.h index 37c0f679c..c5f65653d 100644 --- a/soh/assets/objects/object_wf/object_wf.h +++ b/soh/assets/objects/object_wf/object_wf.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_WF_H +#define OBJECTS_OBJECT_WF_H 1 #include "align_asset_macro.h" @@ -210,4 +211,7 @@ static const ALIGN_ASSET(2) char gWolfosDamagedAnim[] = dgWolfosDamagedAnim; static const ALIGN_ASSET(2) char gWolfosWaitingAnim[] = dgWolfosWaitingAnim; #define dobject_wf_zeroes_Blob_00A4BC "__OTR__objects/object_wf/object_wf_zeroes_Blob_00A4BC" -static const ALIGN_ASSET(2) char object_wf_zeroes_Blob_00A4BC[] = dobject_wf_zeroes_Blob_00A4BC; \ No newline at end of file +static const ALIGN_ASSET(2) char object_wf_zeroes_Blob_00A4BC[] = dobject_wf_zeroes_Blob_00A4BC; + + +#endif // OBJECTS_OBJECT_WF_H diff --git a/soh/assets/objects/object_wood02/object_wood02.h b/soh/assets/objects/object_wood02/object_wood02.h index 471c47130..3f5cc38a8 100644 --- a/soh/assets/objects/object_wood02/object_wood02.h +++ b/soh/assets/objects/object_wood02/object_wood02.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_WOOD02_H +#define OBJECTS_OBJECT_WOOD02_H 1 #include "align_asset_macro.h" @@ -90,4 +91,6 @@ static const ALIGN_ASSET(2) char object_wood02_DL_008350[] = dobject_wood02_DL_0 static const ALIGN_ASSET(2) char object_wood02_DL_0083E0[] = dobject_wood02_DL_0083E0; #define dobject_wood02_DL_0085C0 "__OTR__objects/object_wood02/object_wood02_DL_0085C0" -static const ALIGN_ASSET(2) char object_wood02_DL_0085C0[] = dobject_wood02_DL_0085C0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_wood02_DL_0085C0[] = dobject_wood02_DL_0085C0; + +#endif // OBJECTS_OBJECT_WOOD02_H diff --git a/soh/assets/objects/object_xc/object_xc.h b/soh/assets/objects/object_xc/object_xc.h index a9c02413c..2a2bb4d19 100644 --- a/soh/assets/objects/object_xc/object_xc.h +++ b/soh/assets/objects/object_xc/object_xc.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_XC_H +#define OBJECTS_OBJECT_XC_H 1 #include "align_asset_macro.h" @@ -89,6 +90,39 @@ static const ALIGN_ASSET(2) char gSheikDL_011620[] = dgSheikDL_011620; #define dgSheikDL_012970 "__OTR__objects/object_xc/gSheikDL_012970" static const ALIGN_ASSET(2) char gSheikDL_012970[] = dgSheikDL_012970; +#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790" +static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790; + +#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0" +static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0; + +#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0" +static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0; + +#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720" +static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720; + +#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0" +static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0; + +#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10" +static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10; + +#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90" +static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90; + +#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0" +static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0; + +#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0" +static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0; + +#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0" +static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0; + +#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930" +static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930; + #define dgSheikSkelLimbsLimb_0129FCDL_00EA98 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_0129FCDL_00EA98" static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_0129FCDL_00EA98[] = dgSheikSkelLimbsLimb_0129FCDL_00EA98; @@ -134,39 +168,6 @@ static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012A98DL_00E220[] = dgSheik #define dgSheikSkelLimbsLimb_012AA4DL_00D710 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_012AA4DL_00D710" static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012AA4DL_00D710[] = dgSheikSkelLimbsLimb_012AA4DL_00D710; -#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790" -static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790; - -#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0" -static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0; - -#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0" -static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0; - -#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720" -static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720; - -#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0" -static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0; - -#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10" -static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10; - -#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90" -static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90; - -#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0" -static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0; - -#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0" -static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0; - -#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0" -static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0; - -#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930" -static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930; - #define dobject_xcTLUT_004840 "__OTR__objects/object_xc/object_xcTLUT_004840" static const ALIGN_ASSET(2) char object_xcTLUT_004840[] = dobject_xcTLUT_004840; @@ -213,4 +214,6 @@ static const ALIGN_ASSET(2) char object_xcTex_005CC0[] = dobject_xcTex_005CC0; static const ALIGN_ASSET(2) char object_xcTex_006CC0[] = dobject_xcTex_006CC0; #define dobject_xcTex_006D40 "__OTR__objects/object_xc/object_xcTex_006D40" -static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40; \ No newline at end of file +static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40; + +#endif // OBJECTS_OBJECT_XC_H diff --git a/soh/assets/objects/object_yabusame_point/object_yabusame_point.h b/soh/assets/objects/object_yabusame_point/object_yabusame_point.h index a92b4ec7f..79e8891e4 100644 --- a/soh/assets/objects/object_yabusame_point/object_yabusame_point.h +++ b/soh/assets/objects/object_yabusame_point/object_yabusame_point.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_YABUSAME_POINT_H +#define OBJECTS_OBJECT_YABUSAME_POINT_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char object_yabusame_point_Tex_000480[] = dobject_ya static const ALIGN_ASSET(2) char object_yabusame_point_Tex_000900[] = dobject_yabusame_point_Tex_000900; #define dobject_yabusame_point_DL_000DC0 "__OTR__objects/object_yabusame_point/object_yabusame_point_DL_000DC0" -static const ALIGN_ASSET(2) char object_yabusame_point_DL_000DC0[] = dobject_yabusame_point_DL_000DC0; \ No newline at end of file +static const ALIGN_ASSET(2) char object_yabusame_point_DL_000DC0[] = dobject_yabusame_point_DL_000DC0; + +#endif // OBJECTS_OBJECT_YABUSAME_POINT_H diff --git a/soh/assets/objects/object_ydan_objects/object_ydan_objects.h b/soh/assets/objects/object_ydan_objects/object_ydan_objects.h index 4b29849d3..251ad52ed 100644 --- a/soh/assets/objects/object_ydan_objects/object_ydan_objects.h +++ b/soh/assets/objects/object_ydan_objects/object_ydan_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_YDAN_OBJECTS_H +#define OBJECTS_OBJECT_YDAN_OBJECTS_H 1 #include "align_asset_macro.h" @@ -87,4 +88,6 @@ static const ALIGN_ASSET(2) char gDTWebFloorCol[] = dgDTWebFloorCol; static const ALIGN_ASSET(2) char gDTFallingLadderCol[] = dgDTFallingLadderCol; #define dgDTSlidingPlatformCol "__OTR__objects/object_ydan_objects/gDTSlidingPlatformCol" -static const ALIGN_ASSET(2) char gDTSlidingPlatformCol[] = dgDTSlidingPlatformCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gDTSlidingPlatformCol[] = dgDTSlidingPlatformCol; + +#endif // OBJECTS_OBJECT_YDAN_OBJECTS_H diff --git a/soh/assets/objects/object_yukabyun/object_yukabyun.h b/soh/assets/objects/object_yukabyun/object_yukabyun.h index 320adfaab..cf7b92b1c 100644 --- a/soh/assets/objects/object_yukabyun/object_yukabyun.h +++ b/soh/assets/objects/object_yukabyun/object_yukabyun.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_YUKABYUN_H +#define OBJECTS_OBJECT_YUKABYUN_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gFloorTileEnemyFragmentTex[] = dgFloorTileEnemy static const ALIGN_ASSET(2) char gFloorTileEnemyDL[] = dgFloorTileEnemyDL; #define dgFloorTileEnemyFragmentDL "__OTR__objects/object_yukabyun/gFloorTileEnemyFragmentDL" -static const ALIGN_ASSET(2) char gFloorTileEnemyFragmentDL[] = dgFloorTileEnemyFragmentDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gFloorTileEnemyFragmentDL[] = dgFloorTileEnemyFragmentDL; + +#endif // OBJECTS_OBJECT_YUKABYUN_H diff --git a/soh/assets/objects/object_zf/object_zf.h b/soh/assets/objects/object_zf/object_zf.h index 05eae0ac0..24a5c9d5b 100644 --- a/soh/assets/objects/object_zf/object_zf.h +++ b/soh/assets/objects/object_zf/object_zf.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZF_H +#define OBJECTS_OBJECT_ZF_H 1 #include "align_asset_macro.h" @@ -237,4 +238,7 @@ static const ALIGN_ASSET(2) char gZfDyingAnim[] = dgZfDyingAnim; static const ALIGN_ASSET(2) char gZfKnockedBackAnim[] = dgZfKnockedBackAnim; #define dgZfSidesteppingAnim "__OTR__objects/object_zf/gZfSidesteppingAnim" -static const ALIGN_ASSET(2) char gZfSidesteppingAnim[] = dgZfSidesteppingAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char gZfSidesteppingAnim[] = dgZfSidesteppingAnim; + + +#endif // OBJECTS_OBJECT_ZF_H diff --git a/soh/assets/objects/object_zg/object_zg.h b/soh/assets/objects/object_zg/object_zg.h index 12c52f651..3f7544605 100644 --- a/soh/assets/objects/object_zg/object_zg.h +++ b/soh/assets/objects/object_zg/object_zg.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZG_H +#define OBJECTS_OBJECT_ZG_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gTowerCollapseBarFlameTex[] = dgTowerCollapseBa static const ALIGN_ASSET(2) char gTowerCollapseBarsDL[] = dgTowerCollapseBarsDL; #define dgTowerCollapseBarsCol "__OTR__objects/object_zg/gTowerCollapseBarsCol" -static const ALIGN_ASSET(2) char gTowerCollapseBarsCol[] = dgTowerCollapseBarsCol; \ No newline at end of file +static const ALIGN_ASSET(2) char gTowerCollapseBarsCol[] = dgTowerCollapseBarsCol; + +#endif // OBJECTS_OBJECT_ZG_H diff --git a/soh/assets/objects/object_zl1/object_zl1.h b/soh/assets/objects/object_zl1/object_zl1.h index 28cc86d11..cd2326051 100644 --- a/soh/assets/objects/object_zl1/object_zl1.h +++ b/soh/assets/objects/object_zl1/object_zl1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZL1_H +#define OBJECTS_OBJECT_ZL1_H 1 #include "align_asset_macro.h" @@ -231,4 +232,6 @@ static const ALIGN_ASSET(2) char gChildZelda1Anim_13F10[] = dgChildZelda1Anim_13 static const ALIGN_ASSET(2) char gChildZelda1Anim_143A8[] = dgChildZelda1Anim_143A8; #define dobject_zl1Tex_00EE58 "__OTR__objects/object_zl1/object_zl1Tex_00EE58" -static const ALIGN_ASSET(2) char object_zl1Tex_00EE58[] = dobject_zl1Tex_00EE58; \ No newline at end of file +static const ALIGN_ASSET(2) char object_zl1Tex_00EE58[] = dobject_zl1Tex_00EE58; + +#endif // OBJECTS_OBJECT_ZL1_H diff --git a/soh/assets/objects/object_zl2/object_zl2.h b/soh/assets/objects/object_zl2/object_zl2.h index afcfcbdfa..fe038ad18 100644 --- a/soh/assets/objects/object_zl2/object_zl2.h +++ b/soh/assets/objects/object_zl2/object_zl2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZL2_H +#define OBJECTS_OBJECT_ZL2_H 1 #include "align_asset_macro.h" @@ -219,4 +220,6 @@ static const ALIGN_ASSET(2) char object_zl2Tex_006548[] = dobject_zl2Tex_006548; static const ALIGN_ASSET(2) char object_zl2Tex_003B48[] = dobject_zl2Tex_003B48; #define dobject_zl2Tex_003908 "__OTR__objects/object_zl2/object_zl2Tex_003908" -static const ALIGN_ASSET(2) char object_zl2Tex_003908[] = dobject_zl2Tex_003908; \ No newline at end of file +static const ALIGN_ASSET(2) char object_zl2Tex_003908[] = dobject_zl2Tex_003908; + +#endif // OBJECTS_OBJECT_ZL2_H diff --git a/soh/assets/objects/object_zl2_anime1/object_zl2_anime1.h b/soh/assets/objects/object_zl2_anime1/object_zl2_anime1.h index 329f1f713..66250ce9a 100644 --- a/soh/assets/objects/object_zl2_anime1/object_zl2_anime1.h +++ b/soh/assets/objects/object_zl2_anime1/object_zl2_anime1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZL2_ANIME1_H +#define OBJECTS_OBJECT_ZL2_ANIME1_H 1 #include "align_asset_macro.h" @@ -78,4 +79,6 @@ static const ALIGN_ASSET(2) char gZelda2Anime1Anim_00AFE0[] = dgZelda2Anime1Anim static const ALIGN_ASSET(2) char gZelda2Anime1Anim_00B224[] = dgZelda2Anime1Anim_00B224; #define dgZelda2Anime1Anim_00B5FC "__OTR__objects/object_zl2_anime1/gZelda2Anime1Anim_00B5FC" -static const ALIGN_ASSET(2) char gZelda2Anime1Anim_00B5FC[] = dgZelda2Anime1Anim_00B5FC; \ No newline at end of file +static const ALIGN_ASSET(2) char gZelda2Anime1Anim_00B5FC[] = dgZelda2Anime1Anim_00B5FC; + +#endif // OBJECTS_OBJECT_ZL2_ANIME1_H diff --git a/soh/assets/objects/object_zl2_anime2/object_zl2_anime2.h b/soh/assets/objects/object_zl2_anime2/object_zl2_anime2.h index 75edfb843..ef2c8be4c 100644 --- a/soh/assets/objects/object_zl2_anime2/object_zl2_anime2.h +++ b/soh/assets/objects/object_zl2_anime2/object_zl2_anime2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZL2_ANIME2_H +#define OBJECTS_OBJECT_ZL2_ANIME2_H 1 #include "align_asset_macro.h" @@ -108,4 +109,6 @@ static const ALIGN_ASSET(2) char gZelda2Anime2Anim_00A334[] = dgZelda2Anime2Anim static const ALIGN_ASSET(2) char gZelda2Anime2Anim_00A598[] = dgZelda2Anime2Anim_00A598; #define dgZelda2Anime2Anim_00AACC "__OTR__objects/object_zl2_anime2/gZelda2Anime2Anim_00AACC" -static const ALIGN_ASSET(2) char gZelda2Anime2Anim_00AACC[] = dgZelda2Anime2Anim_00AACC; \ No newline at end of file +static const ALIGN_ASSET(2) char gZelda2Anime2Anim_00AACC[] = dgZelda2Anime2Anim_00AACC; + +#endif // OBJECTS_OBJECT_ZL2_ANIME2_H diff --git a/soh/assets/objects/object_zl4/object_zl4.h b/soh/assets/objects/object_zl4/object_zl4.h index c1f56c177..45c887b54 100644 --- a/soh/assets/objects/object_zl4/object_zl4.h +++ b/soh/assets/objects/object_zl4/object_zl4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZL4_H +#define OBJECTS_OBJECT_ZL4_H 1 #include "align_asset_macro.h" @@ -143,6 +144,27 @@ static const ALIGN_ASSET(2) char gChildZeldaCutsceneDressDL[] = dgChildZeldaCuts #define dgChildZeldaOcarinaOfTimeDL "__OTR__objects/object_zl4/gChildZeldaOcarinaOfTimeDL" static const ALIGN_ASSET(2) char gChildZeldaOcarinaOfTimeDL[] = dgChildZeldaOcarinaOfTimeDL; +#define dobject_zl4TLUT_000670 "__OTR__objects/object_zl4/object_zl4TLUT_000670" +static const ALIGN_ASSET(2) char object_zl4TLUT_000670[] = dobject_zl4TLUT_000670; + +#define dobject_zl4Tex_0017B0 "__OTR__objects/object_zl4/object_zl4Tex_0017B0" +static const ALIGN_ASSET(2) char object_zl4Tex_0017B0[] = dobject_zl4Tex_0017B0; + +#define dobject_zl4Tex_0016B0 "__OTR__objects/object_zl4/object_zl4Tex_0016B0" +static const ALIGN_ASSET(2) char object_zl4Tex_0016B0[] = dobject_zl4Tex_0016B0; + +#define dobject_zl4Tex_001BF0 "__OTR__objects/object_zl4/object_zl4Tex_001BF0" +static const ALIGN_ASSET(2) char object_zl4Tex_001BF0[] = dobject_zl4Tex_001BF0; + +#define dobject_zl4Tex_001CF0 "__OTR__objects/object_zl4/object_zl4Tex_001CF0" +static const ALIGN_ASSET(2) char object_zl4Tex_001CF0[] = dobject_zl4Tex_001CF0; + +#define dobject_zl4Tex_001DF0 "__OTR__objects/object_zl4/object_zl4Tex_001DF0" +static const ALIGN_ASSET(2) char object_zl4Tex_001DF0[] = dobject_zl4Tex_001DF0; + +#define dobject_zl4Tex_00D8B8 "__OTR__objects/object_zl4/object_zl4Tex_00D8B8" +static const ALIGN_ASSET(2) char object_zl4Tex_00D8B8[] = dobject_zl4Tex_00D8B8; + #define dgChildZeldaSkelLimbsLimb_00DF34DL_00C8D0 "__OTR__objects/object_zl4/gChildZeldaSkelLimbsLimb_00DF34DL_00C8D0" static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DF34DL_00C8D0[] = dgChildZeldaSkelLimbsLimb_00DF34DL_00C8D0; @@ -191,27 +213,6 @@ static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DFDCDL_00BC90[] = dg #define dgChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8 "__OTR__objects/object_zl4/gChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8" static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8[] = dgChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8; -#define dobject_zl4TLUT_000670 "__OTR__objects/object_zl4/object_zl4TLUT_000670" -static const ALIGN_ASSET(2) char object_zl4TLUT_000670[] = dobject_zl4TLUT_000670; - -#define dobject_zl4Tex_0017B0 "__OTR__objects/object_zl4/object_zl4Tex_0017B0" -static const ALIGN_ASSET(2) char object_zl4Tex_0017B0[] = dobject_zl4Tex_0017B0; - -#define dobject_zl4Tex_0016B0 "__OTR__objects/object_zl4/object_zl4Tex_0016B0" -static const ALIGN_ASSET(2) char object_zl4Tex_0016B0[] = dobject_zl4Tex_0016B0; - -#define dobject_zl4Tex_001BF0 "__OTR__objects/object_zl4/object_zl4Tex_001BF0" -static const ALIGN_ASSET(2) char object_zl4Tex_001BF0[] = dobject_zl4Tex_001BF0; - -#define dobject_zl4Tex_001CF0 "__OTR__objects/object_zl4/object_zl4Tex_001CF0" -static const ALIGN_ASSET(2) char object_zl4Tex_001CF0[] = dobject_zl4Tex_001CF0; - -#define dobject_zl4Tex_001DF0 "__OTR__objects/object_zl4/object_zl4Tex_001DF0" -static const ALIGN_ASSET(2) char object_zl4Tex_001DF0[] = dobject_zl4Tex_001DF0; - -#define dobject_zl4Tex_00D8B8 "__OTR__objects/object_zl4/object_zl4Tex_00D8B8" -static const ALIGN_ASSET(2) char object_zl4Tex_00D8B8[] = dobject_zl4Tex_00D8B8; - #define dobject_zl4Tex_000C70 "__OTR__objects/object_zl4/object_zl4Tex_000C70" static const ALIGN_ASSET(2) char object_zl4Tex_000C70[] = dobject_zl4Tex_000C70; @@ -282,4 +283,6 @@ static const ALIGN_ASSET(2) char object_zl4Tex_0029F0[] = dobject_zl4Tex_0029F0; static const ALIGN_ASSET(2) char object_zl4TLUT_000870[] = dobject_zl4TLUT_000870; #define dobject_zl4TLUT_000A70 "__OTR__objects/object_zl4/object_zl4TLUT_000A70" -static const ALIGN_ASSET(2) char object_zl4TLUT_000A70[] = dobject_zl4TLUT_000A70; \ No newline at end of file +static const ALIGN_ASSET(2) char object_zl4TLUT_000A70[] = dobject_zl4TLUT_000A70; + +#endif // OBJECTS_OBJECT_ZL4_H diff --git a/soh/assets/objects/object_zo/object_zo.h b/soh/assets/objects/object_zo/object_zo.h index 84c19ba79..da9f4588c 100644 --- a/soh/assets/objects/object_zo/object_zo.h +++ b/soh/assets/objects/object_zo/object_zo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECTS_OBJECT_ZO_H +#define OBJECTS_OBJECT_ZO_H 1 #include "align_asset_macro.h" @@ -129,4 +130,7 @@ static const ALIGN_ASSET(2) char gZoraSplashesModelDL[] = dgZoraSplashesModelDL; static const ALIGN_ASSET(2) char gZoraRipplesMaterialDL[] = dgZoraRipplesMaterialDL; #define dgZoraRipplesModelDL "__OTR__objects/object_zo/gZoraRipplesModelDL" -static const ALIGN_ASSET(2) char gZoraRipplesModelDL[] = dgZoraRipplesModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gZoraRipplesModelDL[] = dgZoraRipplesModelDL; + + +#endif // OBJECTS_OBJECT_ZO_H diff --git a/soh/assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.h b/soh/assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.h index 28052c3ab..c021d1950 100644 --- a/soh/assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.h +++ b/soh/assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_ARROW_FIRE_H +#define OVERLAYS_OVL_ARROW_FIRE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char sVtx[] = dsVtx; static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; #define dsModelDL "__OTR__overlays/ovl_Arrow_Fire/sModelDL" -static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; + +#endif // OVERLAYS_OVL_ARROW_FIRE_H diff --git a/soh/assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.h b/soh/assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.h index a77b745d2..98a441650 100644 --- a/soh/assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.h +++ b/soh/assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_ARROW_ICE_H +#define OVERLAYS_OVL_ARROW_ICE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char sVtx[] = dsVtx; static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; #define dsModelDL "__OTR__overlays/ovl_Arrow_Ice/sModelDL" -static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; + +#endif // OVERLAYS_OVL_ARROW_ICE_H diff --git a/soh/assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.h b/soh/assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.h index e77f5dc6d..c23402c5d 100644 --- a/soh/assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.h +++ b/soh/assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_ARROW_LIGHT_H +#define OVERLAYS_OVL_ARROW_LIGHT_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char sVtx[] = dsVtx; static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; #define dsModelDL "__OTR__overlays/ovl_Arrow_Light/sModelDL" -static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; + +#endif // OVERLAYS_OVL_ARROW_LIGHT_H diff --git a/soh/assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.h b/soh/assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.h index 7e9568ad3..8c529cd4e 100644 --- a/soh/assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.h +++ b/soh/assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_BG_GANON_OTYUKA_H +#define OVERLAYS_OVL_BG_GANON_OTYUKA_H 1 #include "align_asset_macro.h" @@ -36,4 +37,6 @@ static const ALIGN_ASSET(2) char sFlashVtx[] = dsFlashVtx; static const ALIGN_ASSET(2) char sFlashDL[] = dsFlashDL; #define dsCol "__OTR__overlays/ovl_Bg_Ganon_Otyuka/sCol" -static const ALIGN_ASSET(2) char sCol[] = dsCol; \ No newline at end of file +static const ALIGN_ASSET(2) char sCol[] = dsCol; + +#endif // OVERLAYS_OVL_BG_GANON_OTYUKA_H diff --git a/soh/assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.h b/soh/assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.h index 3786470c5..142d4742a 100644 --- a/soh/assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.h +++ b/soh/assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_BG_JYA_COBRA_H +#define OVERLAYS_OVL_BG_JYA_COBRA_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char sShadowVtx[] = dsShadowVtx; #define dsShadowDL "__OTR__overlays/ovl_Bg_Jya_Cobra/sShadowDL" -static const ALIGN_ASSET(2) char sShadowDL[] = dsShadowDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sShadowDL[] = dsShadowDL; + +#endif // OVERLAYS_OVL_BG_JYA_COBRA_H diff --git a/soh/assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.h b/soh/assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.h index c6a2e2c1a..f517f8ae9 100644 --- a/soh/assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.h +++ b/soh/assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_BOSS_DODONGO_H +#define OVERLAYS_OVL_BOSS_DODONGO_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char sLavaFloorLavaTex[] = dsLavaFloorLavaTex; #define dsLavaFloorRockTex "__OTR__overlays/ovl_Boss_Dodongo/sLavaFloorRockTex" -static const ALIGN_ASSET(2) char sLavaFloorRockTex[] = dsLavaFloorRockTex; \ No newline at end of file +static const ALIGN_ASSET(2) char sLavaFloorRockTex[] = dsLavaFloorRockTex; + +#endif // OVERLAYS_OVL_BOSS_DODONGO_H diff --git a/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h b/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h index 15eae2546..fcca66ac5 100644 --- a/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h +++ b/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_BOSS_GANON_H +#define OVERLAYS_OVL_BOSS_GANON_H 1 #include "align_asset_macro.h" @@ -183,4 +184,6 @@ static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01FFF8[] = dovl_Boss_GanonTex static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020370[] = dovl_Boss_GanonTex_020370; #define dovl_Boss_GanonTex_020770 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020770" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020770[] = dovl_Boss_GanonTex_020770; \ No newline at end of file +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020770[] = dovl_Boss_GanonTex_020770; + +#endif // OVERLAYS_OVL_BOSS_GANON_H diff --git a/soh/assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h b/soh/assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h index 6d6e88602..1e13929ef 100644 --- a/soh/assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h +++ b/soh/assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h @@ -1,90 +1,91 @@ -#pragma once +#ifndef OVERLAYS_OVL_BOSS_GANON2_H +#define OVERLAYS_OVL_BOSS_GANON2_H 1 #include "align_asset_macro.h" -#define dovl_Boss_Ganon2_Tex_00A2C8 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00A2C8" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00A2C8[] = dovl_Boss_Ganon2_Tex_00A2C8; +#define dgGanonLightOrbTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonLightOrbTex" +static const ALIGN_ASSET(2) char gGanonLightOrbTex[] = dgGanonLightOrbTex; #define dovl_Boss_Ganon2_Vtx_00B2C8 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00B2C8" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00B2C8[] = dovl_Boss_Ganon2_Vtx_00B2C8; -#define dovl_Boss_Ganon2_DL_00B308 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00B308" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00B308[] = dovl_Boss_Ganon2_DL_00B308; +#define dgGanonLightOrbMaterialDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonLightOrbMaterialDL" +static const ALIGN_ASSET(2) char gGanonLightOrbMaterialDL[] = dgGanonLightOrbMaterialDL; -#define dovl_Boss_Ganon2_DL_00B378 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00B378" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00B378[] = dovl_Boss_Ganon2_DL_00B378; +#define dgGanonLightOrbModelDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonLightOrbModelDL" +static const ALIGN_ASSET(2) char gGanonLightOrbModelDL[] = dgGanonLightOrbModelDL; #define dovl_Boss_Ganon2_Vtx_00B390 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00B390" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00B390[] = dovl_Boss_Ganon2_Vtx_00B390; -#define dovl_Boss_Ganon2_DL_00B3D0 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00B3D0" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00B3D0[] = dovl_Boss_Ganon2_DL_00B3D0; +#define dgGanonShadowMaterialDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonShadowMaterialDL" +static const ALIGN_ASSET(2) char gGanonShadowMaterialDL[] = dgGanonShadowMaterialDL; -#define dovl_Boss_Ganon2_DL_00B3F0 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00B3F0" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00B3F0[] = dovl_Boss_Ganon2_DL_00B3F0; +#define dgGanonShadowModelDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonShadowModelDL" +static const ALIGN_ASSET(2) char gGanonShadowModelDL[] = dgGanonShadowModelDL; -#define dovl_Boss_Ganon2_Tex_00B420 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00B420" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00B420[] = dovl_Boss_Ganon2_Tex_00B420; +#define dgGanonSwordTrailTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonSwordTrailTex" +static const ALIGN_ASSET(2) char gGanonSwordTrailTex[] = dgGanonSwordTrailTex; -#define dovl_Boss_Ganon2_Tex_00B820 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00B820" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00B820[] = dovl_Boss_Ganon2_Tex_00B820; +#define dgGanonSwordTrailMaskTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonSwordTrailMaskTex" +static const ALIGN_ASSET(2) char gGanonSwordTrailMaskTex[] = dgGanonSwordTrailMaskTex; -#define dovl_Boss_Ganon2_Vtx_00BA20 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00BA20" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00BA20[] = dovl_Boss_Ganon2_Vtx_00BA20; +#define dgGanonSwordTrailVtx "__OTR__overlays/ovl_Boss_Ganon2/gGanonSwordTrailVtx" +static const ALIGN_ASSET(2) char gGanonSwordTrailVtx[] = dgGanonSwordTrailVtx; -#define dovl_Boss_Ganon2_DL_00BB80 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00BB80" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00BB80[] = dovl_Boss_Ganon2_DL_00BB80; +#define dgGanonSwordTrailDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonSwordTrailDL" +static const ALIGN_ASSET(2) char gGanonSwordTrailDL[] = dgGanonSwordTrailDL; -#define dovl_Boss_Ganon2_Tex_00BC98 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00BC98" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00BC98[] = dovl_Boss_Ganon2_Tex_00BC98; +#define dgGanonTriforceTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonTriforceTex" +static const ALIGN_ASSET(2) char gGanonTriforceTex[] = dgGanonTriforceTex; #define dovl_Boss_Ganon2_Vtx_00CC98 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00CC98" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00CC98[] = dovl_Boss_Ganon2_Vtx_00CC98; -#define dovl_Boss_Ganon2_DL_00CCD8 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00CCD8" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00CCD8[] = dovl_Boss_Ganon2_DL_00CCD8; +#define dgGanonTriforceDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonTriforceDL" +static const ALIGN_ASSET(2) char gGanonTriforceDL[] = dgGanonTriforceDL; -#define dovl_Boss_Ganon2_Tex_00CD58 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00CD58" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00CD58[] = dovl_Boss_Ganon2_Tex_00CD58; +#define dgGanonLightningTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonLightningTex" +static const ALIGN_ASSET(2) char gGanonLightningTex[] = dgGanonLightningTex; #define dovl_Boss_Ganon2_Vtx_00D758 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00D758" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00D758[] = dovl_Boss_Ganon2_Vtx_00D758; -#define dovl_Boss_Ganon2_DL_00D798 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00D798" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00D798[] = dovl_Boss_Ganon2_DL_00D798; +#define dgGanonLightningDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonLightningDL" +static const ALIGN_ASSET(2) char gGanonLightningDL[] = dgGanonLightningDL; -#define dovl_Boss_Ganon2_Tex_00D820 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00D820" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00D820[] = dovl_Boss_Ganon2_Tex_00D820; +#define dgGanonFireRingTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonFireRingTex" +static const ALIGN_ASSET(2) char gGanonFireRingTex[] = dgGanonFireRingTex; #define dovl_Boss_Ganon2_Vtx_00E020 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00E020" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00E020[] = dovl_Boss_Ganon2_Vtx_00E020; -#define dovl_Boss_Ganon2_DL_00E1C0 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00E1C0" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00E1C0[] = dovl_Boss_Ganon2_DL_00E1C0; +#define dgGanonFireRingDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonFireRingDL" +static const ALIGN_ASSET(2) char gGanonFireRingDL[] = dgGanonFireRingDL; -#define dovl_Boss_Ganon2_Tex_00E2E0 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00E2E0" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00E2E0[] = dovl_Boss_Ganon2_Tex_00E2E0; +#define dgGanonZeldaMagicTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonZeldaMagicTex" +static const ALIGN_ASSET(2) char gGanonZeldaMagicTex[] = dgGanonZeldaMagicTex; #define dovl_Boss_Ganon2_Vtx_00EAE0 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00EAE0" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00EAE0[] = dovl_Boss_Ganon2_Vtx_00EAE0; -#define dovl_Boss_Ganon2_DL_00EC40 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00EC40" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00EC40[] = dovl_Boss_Ganon2_DL_00EC40; +#define dgGanonZeldaMagicDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonZeldaMagicDL" +static const ALIGN_ASSET(2) char gGanonZeldaMagicDL[] = dgGanonZeldaMagicDL; -#define dovl_Boss_Ganon2_Tex_00ED48 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00ED48" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00ED48[] = dovl_Boss_Ganon2_Tex_00ED48; +#define dgGanonMasterSwordShadowTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonMasterSwordShadowTex" +static const ALIGN_ASSET(2) char gGanonMasterSwordShadowTex[] = dgGanonMasterSwordShadowTex; #define dovl_Boss_Ganon2_Vtx_00F148 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00F148" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00F148[] = dovl_Boss_Ganon2_Vtx_00F148; -#define dovl_Boss_Ganon2_DL_00F188 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_00F188" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_00F188[] = dovl_Boss_Ganon2_DL_00F188; +#define dgGanonMasterSwordShadowDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonMasterSwordShadowDL" +static const ALIGN_ASSET(2) char gGanonMasterSwordShadowDL[] = dgGanonMasterSwordShadowDL; -#define dovl_Boss_Ganon2_Tex_00F208 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00F208" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00F208[] = dovl_Boss_Ganon2_Tex_00F208; +#define dgGanonMasterSwordPommelTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonMasterSwordPommelTex" +static const ALIGN_ASSET(2) char gGanonMasterSwordPommelTex[] = dgGanonMasterSwordPommelTex; -#define dovl_Boss_Ganon2_Tex_00F408 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Tex_00F408" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Tex_00F408[] = dovl_Boss_Ganon2_Tex_00F408; +#define dgGanonMasterSwordGuardTex "__OTR__overlays/ovl_Boss_Ganon2/gGanonMasterSwordGuardTex" +static const ALIGN_ASSET(2) char gGanonMasterSwordGuardTex[] = dgGanonMasterSwordGuardTex; #define dovl_Boss_Ganon2_Vtx_00FC08 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_00FC08" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_00FC08[] = dovl_Boss_Ganon2_Vtx_00FC08; @@ -113,5 +114,7 @@ static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_010198[] = dovl_Boss_Ganon2 #define dovl_Boss_Ganon2_Vtx_010298 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_Vtx_010298" static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_Vtx_010298[] = dovl_Boss_Ganon2_Vtx_010298; -#define dovl_Boss_Ganon2_DL_0103A8 "__OTR__overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2_DL_0103A8" -static const ALIGN_ASSET(2) char ovl_Boss_Ganon2_DL_0103A8[] = dovl_Boss_Ganon2_DL_0103A8; \ No newline at end of file +#define dgGanonMasterSwordDL "__OTR__overlays/ovl_Boss_Ganon2/gGanonMasterSwordDL" +static const ALIGN_ASSET(2) char gGanonMasterSwordDL[] = dgGanonMasterSwordDL; + +#endif // OVERLAYS_OVL_BOSS_GANON2_H diff --git a/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h b/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h index 3bad7428a..cda7d6c88 100644 --- a/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h +++ b/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_BOSS_SST_H +#define OVERLAYS_OVL_BOSS_SST_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char sShadowDList[] = dsShadowDList; static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A438[] = dovl_Boss_SstTex_00A438; #define dovl_Boss_SstTex_00A8F0 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A8F0" -static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0; \ No newline at end of file +static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0; + +#endif // OVERLAYS_OVL_BOSS_SST_H diff --git a/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h b/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h index e7a35a108..1c0057530 100644 --- a/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h +++ b/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_DEMO_SHD_H +#define OVERLAYS_OVL_DEMO_SHD_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char D_809934B8[] = dD_809934B8; static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000450[] = dovl_Demo_ShdTex_000450; #define dovl_Demo_ShdTex_000C50 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000C50" -static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000C50[] = dovl_Demo_ShdTex_000C50; \ No newline at end of file +static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000C50[] = dovl_Demo_ShdTex_000C50; + +#endif // OVERLAYS_OVL_DEMO_SHD_H diff --git a/soh/assets/overlays/ovl_Elf_Msg/ovl_Elf_Msg.h b/soh/assets/overlays/ovl_Elf_Msg/ovl_Elf_Msg.h index ab0cb75f9..3a13aa907 100644 --- a/soh/assets/overlays/ovl_Elf_Msg/ovl_Elf_Msg.h +++ b/soh/assets/overlays/ovl_Elf_Msg/ovl_Elf_Msg.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_ELF_MSG_H +#define OVERLAYS_OVL_ELF_MSG_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char sCylinderDL[] = dsCylinderDL; static const ALIGN_ASSET(2) char sCubeVtx[] = dsCubeVtx; #define dsCubeDL "__OTR__overlays/ovl_Elf_Msg/sCubeDL" -static const ALIGN_ASSET(2) char sCubeDL[] = dsCubeDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sCubeDL[] = dsCubeDL; + +#endif // OVERLAYS_OVL_ELF_MSG_H diff --git a/soh/assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.h b/soh/assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.h index 2ca96a5ce..082bca402 100644 --- a/soh/assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.h +++ b/soh/assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_ELF_MSG2_H +#define OVERLAYS_OVL_ELF_MSG2_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char D_809ADC38[] = dD_809ADC38; static const ALIGN_ASSET(2) char sCubeVtx[] = dsCubeVtx; #define dsCubeDL "__OTR__overlays/ovl_Elf_Msg2/sCubeDL" -static const ALIGN_ASSET(2) char sCubeDL[] = dsCubeDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sCubeDL[] = dsCubeDL; + +#endif // OVERLAYS_OVL_ELF_MSG2_H diff --git a/soh/assets/overlays/ovl_En_Bili/ovl_En_Bili.h b/soh/assets/overlays/ovl_En_Bili/ovl_En_Bili.h index 4ae077aa8..071e2b34d 100644 --- a/soh/assets/overlays/ovl_En_Bili/ovl_En_Bili.h +++ b/soh/assets/overlays/ovl_En_Bili/ovl_En_Bili.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_BILI_H +#define OVERLAYS_OVL_EN_BILI_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char D_809C16F0[] = dD_809C16F0; #define dD_809C1700 "__OTR__overlays/ovl_En_Bili/D_809C1700" -static const ALIGN_ASSET(2) char D_809C1700[] = dD_809C1700; \ No newline at end of file +static const ALIGN_ASSET(2) char D_809C1700[] = dD_809C1700; + +#endif // OVERLAYS_OVL_EN_BILI_H diff --git a/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h b/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h index 55fe8ece7..f45fb8da3 100644 --- a/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h +++ b/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_CLEAR_TAG_H +#define OVERLAYS_OVL_EN_CLEAR_TAG_H 1 #include "align_asset_macro.h" @@ -72,4 +73,6 @@ static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_0071C8[] = dovl_En_Clear_Ta static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008288[] = dovl_En_Clear_TagTex_008288; #define dovl_En_Clear_TagTex_008540 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008540" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008540[] = dovl_En_Clear_TagTex_008540; \ No newline at end of file +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008540[] = dovl_En_Clear_TagTex_008540; + +#endif // OVERLAYS_OVL_EN_CLEAR_TAG_H diff --git a/soh/assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.h b/soh/assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.h index 4ed06fc90..2e9d56f7a 100644 --- a/soh/assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.h +++ b/soh/assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_GANON_MANT_H +#define OVERLAYS_OVL_EN_GANON_MANT_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gMantUnusedMaterialDL[] = dgMantUnusedMaterialD static const ALIGN_ASSET(2) char gMantDL[] = dgMantDL; #define dgMant2Vtx "__OTR__overlays/ovl_En_Ganon_Mant/gMant2Vtx" -static const ALIGN_ASSET(2) char gMant2Vtx[] = dgMant2Vtx; \ No newline at end of file +static const ALIGN_ASSET(2) char gMant2Vtx[] = dgMant2Vtx; + +#endif // OVERLAYS_OVL_EN_GANON_MANT_H diff --git a/soh/assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.h b/soh/assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.h index 8937e62df..15f23a6f7 100644 --- a/soh/assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.h +++ b/soh/assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_GANON_ORGAN_H +#define OVERLAYS_OVL_EN_GANON_ORGAN_H 1 #include "align_asset_macro.h" @@ -42,4 +43,6 @@ static const ALIGN_ASSET(2) char sRoomStepTex[] = dsRoomStepTex; static const ALIGN_ASSET(2) char sRoomOrganAndFloorDL[] = dsRoomOrganAndFloorDL; #define dsRoomStatuesDL "__OTR__overlays/ovl_En_Ganon_Organ/sRoomStatuesDL" -static const ALIGN_ASSET(2) char sRoomStatuesDL[] = dsRoomStatuesDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sRoomStatuesDL[] = dsRoomStatuesDL; + +#endif // OVERLAYS_OVL_EN_GANON_ORGAN_H diff --git a/soh/assets/overlays/ovl_En_Holl/ovl_En_Holl.h b/soh/assets/overlays/ovl_En_Holl/ovl_En_Holl.h index 958278f20..2403b5428 100644 --- a/soh/assets/overlays/ovl_En_Holl/ovl_En_Holl.h +++ b/soh/assets/overlays/ovl_En_Holl/ovl_En_Holl.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_HOLL_H +#define OVERLAYS_OVL_EN_HOLL_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char sPlaneVtx[] = dsPlaneVtx; #define dsPlaneDL "__OTR__overlays/ovl_En_Holl/sPlaneDL" -static const ALIGN_ASSET(2) char sPlaneDL[] = dsPlaneDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sPlaneDL[] = dsPlaneDL; + +#endif // OVERLAYS_OVL_EN_HOLL_H diff --git a/soh/assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.h b/soh/assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.h index 04912710c..404481d10 100644 --- a/soh/assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.h +++ b/soh/assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_JSJUTAN_H +#define OVERLAYS_OVL_EN_JSJUTAN_H 1 #include "align_asset_macro.h" @@ -29,4 +30,7 @@ static const ALIGN_ASSET(2) char sCarpetEvenVtx[] = dsCarpetEvenVtx; #define dsCol "__OTR__overlays/ovl_En_Jsjutan/sCol" static const ALIGN_ASSET(2) char sCol[] = dsCol; -extern u8 sShadowTex[2048]; \ No newline at end of file +extern u8 sShadowTex[2048]; + + +#endif // OVERLAYS_OVL_EN_JSJUTAN_H diff --git a/soh/assets/overlays/ovl_En_Kanban/ovl_En_Kanban.h b/soh/assets/overlays/ovl_En_Kanban/ovl_En_Kanban.h index bce8f86b2..38fad3e90 100644 --- a/soh/assets/overlays/ovl_En_Kanban/ovl_En_Kanban.h +++ b/soh/assets/overlays/ovl_En_Kanban/ovl_En_Kanban.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_KANBAN_H +#define OVERLAYS_OVL_EN_KANBAN_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char sShadowVtx[] = dsShadowVtx; #define dsShadowDL "__OTR__overlays/ovl_En_Kanban/sShadowDL" -static const ALIGN_ASSET(2) char sShadowDL[] = dsShadowDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sShadowDL[] = dsShadowDL; + +#endif // OVERLAYS_OVL_EN_KANBAN_H diff --git a/soh/assets/overlays/ovl_En_Sda/ovl_En_Sda.h b/soh/assets/overlays/ovl_En_Sda/ovl_En_Sda.h index 8cc267e6e..46cd1b616 100644 --- a/soh/assets/overlays/ovl_En_Sda/ovl_En_Sda.h +++ b/soh/assets/overlays/ovl_En_Sda/ovl_En_Sda.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_SDA_H +#define OVERLAYS_OVL_EN_SDA_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char D_80AFA398[] = dD_80AFA398; static const ALIGN_ASSET(2) char D_80AFA3D8[] = dD_80AFA3D8; #define dD_80AFA3F8 "__OTR__overlays/ovl_En_Sda/D_80AFA3F8" -static const ALIGN_ASSET(2) char D_80AFA3F8[] = dD_80AFA3F8; \ No newline at end of file +static const ALIGN_ASSET(2) char D_80AFA3F8[] = dD_80AFA3F8; + +#endif // OVERLAYS_OVL_EN_SDA_H diff --git a/soh/assets/overlays/ovl_En_Ssh/ovl_En_Ssh.h b/soh/assets/overlays/ovl_En_Ssh/ovl_En_Ssh.h index 694883a45..a16490c1e 100644 --- a/soh/assets/overlays/ovl_En_Ssh/ovl_En_Ssh.h +++ b/soh/assets/overlays/ovl_En_Ssh/ovl_En_Ssh.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_SSH_H +#define OVERLAYS_OVL_EN_SSH_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char D_80B043C0[] = dD_80B043C0; #define dD_80B04400 "__OTR__overlays/ovl_En_Ssh/D_80B04400" -static const ALIGN_ASSET(2) char D_80B04400[] = dD_80B04400; \ No newline at end of file +static const ALIGN_ASSET(2) char D_80B04400[] = dD_80B04400; + +#endif // OVERLAYS_OVL_EN_SSH_H diff --git a/soh/assets/overlays/ovl_En_St/ovl_En_St.h b/soh/assets/overlays/ovl_En_St/ovl_En_St.h index 982ad8e5a..a5eb6c297 100644 --- a/soh/assets/overlays/ovl_En_St/ovl_En_St.h +++ b/soh/assets/overlays/ovl_En_St/ovl_En_St.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_ST_H +#define OVERLAYS_OVL_EN_ST_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char sSkulltulaUnusedVtx[] = dsSkulltulaUnusedVtx; #define dsSkulltulaUnusedDL "__OTR__overlays/ovl_En_St/sSkulltulaUnusedDL" -static const ALIGN_ASSET(2) char sSkulltulaUnusedDL[] = dsSkulltulaUnusedDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sSkulltulaUnusedDL[] = dsSkulltulaUnusedDL; + +#endif // OVERLAYS_OVL_EN_ST_H diff --git a/soh/assets/overlays/ovl_En_Sth/ovl_En_Sth.h b/soh/assets/overlays/ovl_En_Sth/ovl_En_Sth.h index 742f58c59..89dc49c98 100644 --- a/soh/assets/overlays/ovl_En_Sth/ovl_En_Sth.h +++ b/soh/assets/overlays/ovl_En_Sth/ovl_En_Sth.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_EN_STH_H +#define OVERLAYS_OVL_EN_STH_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char D_80B0A3C0[] = dD_80B0A3C0; static const ALIGN_ASSET(2) char sChildDanceAnim[] = dsChildDanceAnim; #define dsParentDanceAnim "__OTR__overlays/ovl_En_Sth/sParentDanceAnim" -static const ALIGN_ASSET(2) char sParentDanceAnim[] = dsParentDanceAnim; \ No newline at end of file +static const ALIGN_ASSET(2) char sParentDanceAnim[] = dsParentDanceAnim; + +#endif // OVERLAYS_OVL_EN_STH_H diff --git a/soh/assets/overlays/ovl_End_Title/ovl_End_Title.h b/soh/assets/overlays/ovl_End_Title/ovl_End_Title.h index 2037f07bf..ccdb3133a 100644 --- a/soh/assets/overlays/ovl_End_Title/ovl_End_Title.h +++ b/soh/assets/overlays/ovl_End_Title/ovl_End_Title.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_END_TITLE_H +#define OVERLAYS_OVL_END_TITLE_H 1 #include "align_asset_macro.h" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char sTriforceVtx[] = dsTriforceVtx; static const ALIGN_ASSET(2) char sTriforceDL[] = dsTriforceDL; #define dsPresentedByNintendoDL "__OTR__overlays/ovl_End_Title/sPresentedByNintendoDL" -static const ALIGN_ASSET(2) char sPresentedByNintendoDL[] = dsPresentedByNintendoDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sPresentedByNintendoDL[] = dsPresentedByNintendoDL; + +#endif // OVERLAYS_OVL_END_TITLE_H diff --git a/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h b/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h index d2bffa465..9077b1ac5 100644 --- a/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h +++ b/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_FILE_CHOOSE_H +#define OVERLAYS_OVL_FILE_CHOOSE_H 1 #include "align_asset_macro.h" @@ -24,4 +25,6 @@ static const ALIGN_ASSET(2) char gOptionsDividerTopVtx[] = dgOptionsDividerTopVt static const ALIGN_ASSET(2) char gOptionsDividerMiddleVtx[] = dgOptionsDividerMiddleVtx; #define dgOptionsDividerBottomVtx "__OTR__overlays/ovl_file_choose/gOptionsDividerBottomVtx" -static const ALIGN_ASSET(2) char gOptionsDividerBottomVtx[] = dgOptionsDividerBottomVtx; \ No newline at end of file +static const ALIGN_ASSET(2) char gOptionsDividerBottomVtx[] = dgOptionsDividerBottomVtx; + +#endif // OVERLAYS_OVL_FILE_CHOOSE_H diff --git a/soh/assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.h b/soh/assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.h index 80313dd33..159c2fb55 100644 --- a/soh/assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.h +++ b/soh/assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_MAGIC_DARK_H +#define OVERLAYS_OVL_MAGIC_DARK_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char sDiamondVtx[] = dsDiamondVtx; static const ALIGN_ASSET(2) char sDiamondMaterialDL[] = dsDiamondMaterialDL; #define dsDiamondModelDL "__OTR__overlays/ovl_Magic_Dark/sDiamondModelDL" -static const ALIGN_ASSET(2) char sDiamondModelDL[] = dsDiamondModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sDiamondModelDL[] = dsDiamondModelDL; + +#endif // OVERLAYS_OVL_MAGIC_DARK_H diff --git a/soh/assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.h b/soh/assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.h index 60723abf0..802191c7a 100644 --- a/soh/assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.h +++ b/soh/assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_MAGIC_FIRE_H +#define OVERLAYS_OVL_MAGIC_FIRE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char sSphereVtx[] = dsSphereVtx; static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; #define dsModelDL "__OTR__overlays/ovl_Magic_Fire/sModelDL" -static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sModelDL[] = dsModelDL; + +#endif // OVERLAYS_OVL_MAGIC_FIRE_H diff --git a/soh/assets/overlays/ovl_Magic_Wind/ovl_Magic_Wind.h b/soh/assets/overlays/ovl_Magic_Wind/ovl_Magic_Wind.h index e7b7ce310..159350a76 100644 --- a/soh/assets/overlays/ovl_Magic_Wind/ovl_Magic_Wind.h +++ b/soh/assets/overlays/ovl_Magic_Wind/ovl_Magic_Wind.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_MAGIC_WIND_H +#define OVERLAYS_OVL_MAGIC_WIND_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char sTex[] = dsTex; static const ALIGN_ASSET(2) char sInnerCylinderDL[] = dsInnerCylinderDL; #define dsOuterCylinderDL "__OTR__overlays/ovl_Magic_Wind/sOuterCylinderDL" -static const ALIGN_ASSET(2) char sOuterCylinderDL[] = dsOuterCylinderDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sOuterCylinderDL[] = dsOuterCylinderDL; + + +#endif // OVERLAYS_OVL_MAGIC_WIND_H diff --git a/soh/assets/overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.h b/soh/assets/overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.h index 31de04626..e9babb7eb 100644 --- a/soh/assets/overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.h +++ b/soh/assets/overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_OCEFF_SPOT_H +#define OVERLAYS_OVL_OCEFF_SPOT_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char sCylinderVtx[] = dsCylinderVtx; static const ALIGN_ASSET(2) char sCylinderMaterialDL[] = dsCylinderMaterialDL; #define dsCylinderModelDL "__OTR__overlays/ovl_Oceff_Spot/sCylinderModelDL" -static const ALIGN_ASSET(2) char sCylinderModelDL[] = dsCylinderModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sCylinderModelDL[] = dsCylinderModelDL; + +#endif // OVERLAYS_OVL_OCEFF_SPOT_H diff --git a/soh/assets/overlays/ovl_Oceff_Storm/ovl_Oceff_Storm.h b/soh/assets/overlays/ovl_Oceff_Storm/ovl_Oceff_Storm.h index b392ed76b..80b3ffd56 100644 --- a/soh/assets/overlays/ovl_Oceff_Storm/ovl_Oceff_Storm.h +++ b/soh/assets/overlays/ovl_Oceff_Storm/ovl_Oceff_Storm.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_OCEFF_STORM_H +#define OVERLAYS_OVL_OCEFF_STORM_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char sCylinderVtx[] = dsCylinderVtx; static const ALIGN_ASSET(2) char sCylinderMaterialDL[] = dsCylinderMaterialDL; #define dsCylinderModelDL "__OTR__overlays/ovl_Oceff_Storm/sCylinderModelDL" -static const ALIGN_ASSET(2) char sCylinderModelDL[] = dsCylinderModelDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sCylinderModelDL[] = dsCylinderModelDL; + +#endif // OVERLAYS_OVL_OCEFF_STORM_H diff --git a/soh/assets/overlays/ovl_Oceff_Wipe/ovl_Oceff_Wipe.h b/soh/assets/overlays/ovl_Oceff_Wipe/ovl_Oceff_Wipe.h index 031538d5e..35a2c93c0 100644 --- a/soh/assets/overlays/ovl_Oceff_Wipe/ovl_Oceff_Wipe.h +++ b/soh/assets/overlays/ovl_Oceff_Wipe/ovl_Oceff_Wipe.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_OCEFF_WIPE_H +#define OVERLAYS_OVL_OCEFF_WIPE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char sFrustumVtx[] = dsFrustumVtx; static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; #define dsFrustumDL "__OTR__overlays/ovl_Oceff_Wipe/sFrustumDL" -static const ALIGN_ASSET(2) char sFrustumDL[] = dsFrustumDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sFrustumDL[] = dsFrustumDL; + +#endif // OVERLAYS_OVL_OCEFF_WIPE_H diff --git a/soh/assets/overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.h b/soh/assets/overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.h index d1a0521c3..da5a604c0 100644 --- a/soh/assets/overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.h +++ b/soh/assets/overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_OCEFF_WIPE2_H +#define OVERLAYS_OVL_OCEFF_WIPE2_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char sFrustumVtx[] = dsFrustumVtx; static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; #define dsFrustumDL "__OTR__overlays/ovl_Oceff_Wipe2/sFrustumDL" -static const ALIGN_ASSET(2) char sFrustumDL[] = dsFrustumDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sFrustumDL[] = dsFrustumDL; + +#endif // OVERLAYS_OVL_OCEFF_WIPE2_H diff --git a/soh/assets/overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.h b/soh/assets/overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.h index 9e7d4d22e..37c89c4cc 100644 --- a/soh/assets/overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.h +++ b/soh/assets/overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_OCEFF_WIPE3_H +#define OVERLAYS_OVL_OCEFF_WIPE3_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char sFrustumVtx[] = dsFrustumVtx; static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; #define dsFrustumDL "__OTR__overlays/ovl_Oceff_Wipe3/sFrustumDL" -static const ALIGN_ASSET(2) char sFrustumDL[] = dsFrustumDL; \ No newline at end of file +static const ALIGN_ASSET(2) char sFrustumDL[] = dsFrustumDL; + +#endif // OVERLAYS_OVL_OCEFF_WIPE3_H diff --git a/soh/assets/overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.h b/soh/assets/overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.h index fabab16b7..1d416f95d 100644 --- a/soh/assets/overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.h +++ b/soh/assets/overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERLAYS_OVL_OCEFF_WIPE4_H +#define OVERLAYS_OVL_OCEFF_WIPE4_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char sMaterialDL[] = dsMaterialDL; static const ALIGN_ASSET(2) char sUnusedMaterialDL[] = dsUnusedMaterialDL; #define dsMaterial2DL "__OTR__overlays/ovl_Oceff_Wipe4/sMaterial2DL" -static const ALIGN_ASSET(2) char sMaterial2DL[] = dsMaterial2DL; \ No newline at end of file +static const ALIGN_ASSET(2) char sMaterial2DL[] = dsMaterial2DL; + +#endif // OVERLAYS_OVL_OCEFF_WIPE4_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h index 6ce01bd0b..11c516005 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_0_H +#define DUNGEONS_BMORI1_ROOM_0_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0064F8[] = dBmori1_room_0Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_0DL_00CB70[] = dBmori1_room_0DL_00CB70; #define dBmori1_room_0Tex_00CB88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00CB88" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00CB88[] = dBmori1_room_0Tex_00CB88; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00CB88[] = dBmori1_room_0Tex_00CB88; + + +#endif // DUNGEONS_BMORI1_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h index 20a6379ea..171ddf755 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_1_H +#define DUNGEONS_BMORI1_ROOM_1_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_1Tex_003368[] = dBmori1_room_1Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_1Tex_005368[] = dBmori1_room_1Tex_005368; #define dBmori1_room_1Tex_004368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_004368" -static const ALIGN_ASSET(2) char Bmori1_room_1Tex_004368[] = dBmori1_room_1Tex_004368; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_1Tex_004368[] = dBmori1_room_1Tex_004368; + + +#endif // DUNGEONS_BMORI1_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h index 465bcaba9..03c8a5410 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_10_H +#define DUNGEONS_BMORI1_ROOM_10_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_10Tex_003A60[] = dBmori1_room_10Tex static const ALIGN_ASSET(2) char Bmori1_room_10DL_004BC8[] = dBmori1_room_10DL_004BC8; #define dBmori1_room_10Tex_004BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_004BD8" -static const ALIGN_ASSET(2) char Bmori1_room_10Tex_004BD8[] = dBmori1_room_10Tex_004BD8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_10Tex_004BD8[] = dBmori1_room_10Tex_004BD8; + + +#endif // DUNGEONS_BMORI1_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h index 352f67fd8..ba6073a21 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_11_H +#define DUNGEONS_BMORI1_ROOM_11_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009198[] = dBmori1_room_11Tex static const ALIGN_ASSET(2) char Bmori1_room_11Tex_008198[] = dBmori1_room_11Tex_008198; #define dBmori1_room_11DL_00ABD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11DL_00ABD0" -static const ALIGN_ASSET(2) char Bmori1_room_11DL_00ABD0[] = dBmori1_room_11DL_00ABD0; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_11DL_00ABD0[] = dBmori1_room_11DL_00ABD0; + + +#endif // DUNGEONS_BMORI1_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h index 94adeab13..79e268611 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_12_H +#define DUNGEONS_BMORI1_ROOM_12_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_12Tex_007200[] = dBmori1_room_12Tex static const ALIGN_ASSET(2) char Bmori1_room_12DL_007BC8[] = dBmori1_room_12DL_007BC8; #define dBmori1_room_12Tex_007BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_007BD8" -static const ALIGN_ASSET(2) char Bmori1_room_12Tex_007BD8[] = dBmori1_room_12Tex_007BD8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_12Tex_007BD8[] = dBmori1_room_12Tex_007BD8; + + +#endif // DUNGEONS_BMORI1_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h index 80c7d9d76..eab7767d3 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_13_H +#define DUNGEONS_BMORI1_ROOM_13_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0078D0[] = dBmori1_room_13Tex static const ALIGN_ASSET(2) char Bmori1_room_13DL_008298[] = dBmori1_room_13DL_008298; #define dBmori1_room_13Tex_0082A8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0082A8" -static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0082A8[] = dBmori1_room_13Tex_0082A8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0082A8[] = dBmori1_room_13Tex_0082A8; + + +#endif // DUNGEONS_BMORI1_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h index fa25dd838..5e8abdcd7 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_14_H +#define DUNGEONS_BMORI1_ROOM_14_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_14Tex_003960[] = dBmori1_room_14Tex static const ALIGN_ASSET(2) char Bmori1_room_14DL_005760[] = dBmori1_room_14DL_005760; #define dBmori1_room_14Tex_005770 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_005770" -static const ALIGN_ASSET(2) char Bmori1_room_14Tex_005770[] = dBmori1_room_14Tex_005770; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_14Tex_005770[] = dBmori1_room_14Tex_005770; + + +#endif // DUNGEONS_BMORI1_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h index 52d91e221..3937419fb 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_15_H +#define DUNGEONS_BMORI1_ROOM_15_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_15Tex_0012E0[] = dBmori1_room_15Tex static const ALIGN_ASSET(2) char Bmori1_room_15Tex_001AE0[] = dBmori1_room_15Tex_001AE0; #define dBmori1_room_15Tex_001EE0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15Tex_001EE0" -static const ALIGN_ASSET(2) char Bmori1_room_15Tex_001EE0[] = dBmori1_room_15Tex_001EE0; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_15Tex_001EE0[] = dBmori1_room_15Tex_001EE0; + + +#endif // DUNGEONS_BMORI1_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h index c592430b3..183a557b9 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_16_H +#define DUNGEONS_BMORI1_ROOM_16_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_16Tex_004798[] = dBmori1_room_16Tex static const ALIGN_ASSET(2) char Bmori1_room_16Tex_002F98[] = dBmori1_room_16Tex_002F98; #define dBmori1_room_16Tex_003798 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_003798" -static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003798[] = dBmori1_room_16Tex_003798; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003798[] = dBmori1_room_16Tex_003798; + + +#endif // DUNGEONS_BMORI1_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h index 85812f4a9..76784d887 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_17_H +#define DUNGEONS_BMORI1_ROOM_17_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_17Tex_006CE8[] = dBmori1_room_17Tex static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0074E8[] = dBmori1_room_17Tex_0074E8; #define dBmori1_room_17Tex_0078E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0078E8" -static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0078E8[] = dBmori1_room_17Tex_0078E8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0078E8[] = dBmori1_room_17Tex_0078E8; + + +#endif // DUNGEONS_BMORI1_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h index 2409b7668..fbe628da8 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_18_H +#define DUNGEONS_BMORI1_ROOM_18_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_18DL_000B20[] = dBmori1_room_18DL_000B20; #define dBmori1_room_18Tex_000B30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_18Tex_000B30" -static const ALIGN_ASSET(2) char Bmori1_room_18Tex_000B30[] = dBmori1_room_18Tex_000B30; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_18Tex_000B30[] = dBmori1_room_18Tex_000B30; + + +#endif // DUNGEONS_BMORI1_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_19.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_19.h index a96840148..55303944f 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_19.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_19.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_19_H +#define DUNGEONS_BMORI1_ROOM_19_H 1 #include "align_asset_macro.h" #define dBmori1_room_19DL_0004F0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_19DL_0004F0" -static const ALIGN_ASSET(2) char Bmori1_room_19DL_0004F0[] = dBmori1_room_19DL_0004F0; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_19DL_0004F0[] = dBmori1_room_19DL_0004F0; + + +#endif // DUNGEONS_BMORI1_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h index eb9227a7c..120300dec 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_2_H +#define DUNGEONS_BMORI1_ROOM_2_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00BF80[] = dBmori1_room_2Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00AF80[] = dBmori1_room_2Tex_00AF80; #define dBmori1_room_2Tex_00E980 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00E980" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E980[] = dBmori1_room_2Tex_00E980; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E980[] = dBmori1_room_2Tex_00E980; + + +#endif // DUNGEONS_BMORI1_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h index 9c4cf0a87..5562713f7 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_20_H +#define DUNGEONS_BMORI1_ROOM_20_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_20DL_0006E8[] = dBmori1_room_20DL_0 static const ALIGN_ASSET(2) char Bmori1_room_20Tex_0006F8[] = dBmori1_room_20Tex_0006F8; #define dBmori1_room_20Tex_000EF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20Tex_000EF8" -static const ALIGN_ASSET(2) char Bmori1_room_20Tex_000EF8[] = dBmori1_room_20Tex_000EF8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_20Tex_000EF8[] = dBmori1_room_20Tex_000EF8; + + +#endif // DUNGEONS_BMORI1_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h index f5dcc8935..6ea485025 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_21_H +#define DUNGEONS_BMORI1_ROOM_21_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_21DL_000F60[] = dBmori1_room_21DL_000F60; #define dBmori1_room_21Tex_000F70 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_21Tex_000F70" -static const ALIGN_ASSET(2) char Bmori1_room_21Tex_000F70[] = dBmori1_room_21Tex_000F70; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_21Tex_000F70[] = dBmori1_room_21Tex_000F70; + + +#endif // DUNGEONS_BMORI1_ROOM_21_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h index e01e15cf3..0561ec526 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_22_H +#define DUNGEONS_BMORI1_ROOM_22_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_22DL_0005D0[] = dBmori1_room_22DL_0 static const ALIGN_ASSET(2) char Bmori1_room_22Tex_0005E0[] = dBmori1_room_22Tex_0005E0; #define dBmori1_room_22Tex_0015E0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22Tex_0015E0" -static const ALIGN_ASSET(2) char Bmori1_room_22Tex_0015E0[] = dBmori1_room_22Tex_0015E0; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_22Tex_0015E0[] = dBmori1_room_22Tex_0015E0; + + +#endif // DUNGEONS_BMORI1_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h index 693543314..94c9a2d4a 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_3_H +#define DUNGEONS_BMORI1_ROOM_3_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_3Tex_002BD8[] = dBmori1_room_3Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0037D8[] = dBmori1_room_3Tex_0037D8; #define dBmori1_room_3Tex_0038D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0038D8" -static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0038D8[] = dBmori1_room_3Tex_0038D8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0038D8[] = dBmori1_room_3Tex_0038D8; + + +#endif // DUNGEONS_BMORI1_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h index ddaf9202f..d061768f9 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_4_H +#define DUNGEONS_BMORI1_ROOM_4_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_4DL_0022A8[] = dBmori1_room_4DL_002 static const ALIGN_ASSET(2) char Bmori1_room_4Tex_002AB8[] = dBmori1_room_4Tex_002AB8; #define dBmori1_room_4Tex_0022B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4Tex_0022B8" -static const ALIGN_ASSET(2) char Bmori1_room_4Tex_0022B8[] = dBmori1_room_4Tex_0022B8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_4Tex_0022B8[] = dBmori1_room_4Tex_0022B8; + + +#endif // DUNGEONS_BMORI1_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h index 3d36b74c3..383d0d20b 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_5_H +#define DUNGEONS_BMORI1_ROOM_5_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0027D0[] = dBmori1_room_5Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0034D0[] = dBmori1_room_5Tex_0034D0; #define dBmori1_room_5Tex_0033D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0033D0" -static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0033D0[] = dBmori1_room_5Tex_0033D0; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0033D0[] = dBmori1_room_5Tex_0033D0; + + +#endif // DUNGEONS_BMORI1_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h index 90e6645f8..069b8a998 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_6_H +#define DUNGEONS_BMORI1_ROOM_6_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_6Tex_008C30[] = dBmori1_room_6Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_6Tex_006630[] = dBmori1_room_6Tex_006630; #define dBmori1_room_6Tex_007630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007630" -static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007630[] = dBmori1_room_6Tex_007630; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007630[] = dBmori1_room_6Tex_007630; + + +#endif // DUNGEONS_BMORI1_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h index 375d4042e..f792aac57 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_7_H +#define DUNGEONS_BMORI1_ROOM_7_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_7Tex_011FD8[] = dBmori1_room_7Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00EFD8[] = dBmori1_room_7Tex_00EFD8; #define dBmori1_room_7Tex_010FD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_010FD8" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_010FD8[] = dBmori1_room_7Tex_010FD8; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_010FD8[] = dBmori1_room_7Tex_010FD8; + + +#endif // DUNGEONS_BMORI1_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h index bf3c8a435..41411aa8c 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_8_H +#define DUNGEONS_BMORI1_ROOM_8_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_8Tex_014AB0[] = dBmori1_room_8Tex_0 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_0152B0[] = dBmori1_room_8Tex_0152B0; #define dBmori1_room_8Tex_015AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_015AB0" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_015AB0[] = dBmori1_room_8Tex_015AB0; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_015AB0[] = dBmori1_room_8Tex_015AB0; + + +#endif // DUNGEONS_BMORI1_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h index 45e0612c5..a989f1119 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_ROOM_9_H +#define DUNGEONS_BMORI1_ROOM_9_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char Bmori1_room_9DL_008940[] = dBmori1_room_9DL_008 static const ALIGN_ASSET(2) char Bmori1_room_9Tex_008958[] = dBmori1_room_9Tex_008958; #define dBmori1_room_9Tex_009158 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_009158" -static const ALIGN_ASSET(2) char Bmori1_room_9Tex_009158[] = dBmori1_room_9Tex_009158; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_room_9Tex_009158[] = dBmori1_room_9Tex_009158; + + +#endif // DUNGEONS_BMORI1_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h index 5effeb714..5c3e0492e 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BMORI1_SCENE_H +#define DUNGEONS_BMORI1_SCENE_H 1 #include "align_asset_macro.h" @@ -30,4 +31,6 @@ static const ALIGN_ASSET(2) char Bmori1_sceneTex_015A90[] = dBmori1_sceneTex_015 static const ALIGN_ASSET(2) char Bmori1_sceneTex_015690[] = dBmori1_sceneTex_015690; #define dBmori1_sceneTex_015590 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015590" -static const ALIGN_ASSET(2) char Bmori1_sceneTex_015590[] = dBmori1_sceneTex_015590; \ No newline at end of file +static const ALIGN_ASSET(2) char Bmori1_sceneTex_015590[] = dBmori1_sceneTex_015590; + +#endif // DUNGEONS_BMORI1_SCENE_H diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h index e4e414dec..79bf76e74 100644 --- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h +++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_FIRE_BS_ROOM_0_H +#define DUNGEONS_FIRE_BS_ROOM_0_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003468[] = dFIRE_bs_room_0Tex static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_002E68[] = dFIRE_bs_room_0Tex_002E68; #define dFIRE_bs_room_0Tex_003068 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003068" -static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003068[] = dFIRE_bs_room_0Tex_003068; \ No newline at end of file +static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003068[] = dFIRE_bs_room_0Tex_003068; + + +#endif // DUNGEONS_FIRE_BS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h index e661f4fe1..a223e899b 100644 --- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h +++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_FIRE_BS_ROOM_1_H +#define DUNGEONS_FIRE_BS_ROOM_1_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0049D8[] = dFIRE_bs_room_1Tex static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0065D8[] = dFIRE_bs_room_1Tex_0065D8; #define dFIRE_bs_room_1Tex_0053D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0053D8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0053D8[] = dFIRE_bs_room_1Tex_0053D8; \ No newline at end of file +static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0053D8[] = dFIRE_bs_room_1Tex_0053D8; + + +#endif // DUNGEONS_FIRE_BS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h index d3aeed722..2f96ec96b 100644 --- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h +++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_FIRE_BS_SCENE_H +#define DUNGEONS_FIRE_BS_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_002C00[] = dFIRE_bs_sceneTex_0 static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_003C00[] = dFIRE_bs_sceneTex_003C00; #define dFIRE_bs_sceneTex_004400 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_004400" -static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_004400[] = dFIRE_bs_sceneTex_004400; \ No newline at end of file +static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_004400[] = dFIRE_bs_sceneTex_004400; + +#endif // DUNGEONS_FIRE_BS_SCENE_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h index a0b4d2775..87fc1832d 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_0_H +#define DUNGEONS_HAKADAN_ROOM_0_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_0DL_0045C0[] = dHAKAdan_room_0DL_0 static const ALIGN_ASSET(2) char HAKAdan_room_0DL_00AC40[] = dHAKAdan_room_0DL_00AC40; #define dHAKAdan_room_0Tex_00AD48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00AD48" -static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48; + + +#endif // DUNGEONS_HAKADAN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h index 73c45c0a4..5bd5de9bd 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_1_H +#define DUNGEONS_HAKADAN_ROOM_1_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_1Tex_0012E8[] = dHAKAdan_room_1Tex static const ALIGN_ASSET(2) char HAKAdan_room_1DL_000270[] = dHAKAdan_room_1DL_000270; #define dHAKAdan_room_1DL_0008F8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1DL_0008F8" -static const ALIGN_ASSET(2) char HAKAdan_room_1DL_0008F8[] = dHAKAdan_room_1DL_0008F8; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_1DL_0008F8[] = dHAKAdan_room_1DL_0008F8; + + +#endif // DUNGEONS_HAKADAN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h index 8ab354535..993a39b5d 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_10_H +#define DUNGEONS_HAKADAN_ROOM_10_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_005FF0[] = dHAKAdan_room_10T static const ALIGN_ASSET(2) char HAKAdan_room_10DL_003858[] = dHAKAdan_room_10DL_003858; #define dHAKAdan_room_10DL_001010 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_001010" -static const ALIGN_ASSET(2) char HAKAdan_room_10DL_001010[] = dHAKAdan_room_10DL_001010; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_10DL_001010[] = dHAKAdan_room_10DL_001010; + + +#endif // DUNGEONS_HAKADAN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h index aba4f9c35..e25cfb03b 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_11_H +#define DUNGEONS_HAKADAN_ROOM_11_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_11DL_000F30[] = dHAKAdan_room_11DL static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_003460[] = dHAKAdan_room_11Tex_003460; #define dHAKAdan_room_11DL_001D58 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001D58" -static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001D58[] = dHAKAdan_room_11DL_001D58; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001D58[] = dHAKAdan_room_11DL_001D58; + + +#endif // DUNGEONS_HAKADAN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h index b0e965e73..b71de72c1 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_12_H +#define DUNGEONS_HAKADAN_ROOM_12_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_005548[] = dHAKAdan_room_12T static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003348[] = dHAKAdan_room_12Tex_003348; #define dHAKAdan_room_12Tex_003548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003548" -static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003548[] = dHAKAdan_room_12Tex_003548; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003548[] = dHAKAdan_room_12Tex_003548; + + +#endif // DUNGEONS_HAKADAN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h index 0bd8defea..ef3b0cd41 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_13_H +#define DUNGEONS_HAKADAN_ROOM_13_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_13DL_0006E0[] = dHAKAdan_room_13DL static const ALIGN_ASSET(2) char HAKAdan_room_13Tex_000818[] = dHAKAdan_room_13Tex_000818; #define dHAKAdan_room_13DL_000450 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13DL_000450" -static const ALIGN_ASSET(2) char HAKAdan_room_13DL_000450[] = dHAKAdan_room_13DL_000450; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_13DL_000450[] = dHAKAdan_room_13DL_000450; + + +#endif // DUNGEONS_HAKADAN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h index d8c9f7cf1..7b99f6eb5 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_14_H +#define DUNGEONS_HAKADAN_ROOM_14_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_005700[] = dHAKAdan_room_14T static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000DC0[] = dHAKAdan_room_14DL_000DC0; #define dHAKAdan_room_14Tex_004F00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_004F00" -static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_004F00[] = dHAKAdan_room_14Tex_004F00; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_004F00[] = dHAKAdan_room_14Tex_004F00; + + +#endif // DUNGEONS_HAKADAN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h index e4c10b19c..5bae3d3dd 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_15_H +#define DUNGEONS_HAKADAN_ROOM_15_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_15DL_0053B0[] = dHAKAdan_room_15DL static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0068C0[] = dHAKAdan_room_15Tex_0068C0; #define dHAKAdan_room_15Tex_0060C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0060C0" -static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0060C0[] = dHAKAdan_room_15Tex_0060C0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0060C0[] = dHAKAdan_room_15Tex_0060C0; + + +#endif // DUNGEONS_HAKADAN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h index 79c37c32d..f6b0ce048 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_16_H +#define DUNGEONS_HAKADAN_ROOM_16_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001858[] = dHAKAdan_room_16DL static const ALIGN_ASSET(2) char HAKAdan_room_16Tex_001930[] = dHAKAdan_room_16Tex_001930; #define dHAKAdan_room_16DL_001400 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16DL_001400" -static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001400[] = dHAKAdan_room_16DL_001400; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001400[] = dHAKAdan_room_16DL_001400; + + +#endif // DUNGEONS_HAKADAN_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h index 6c5002c73..9a86ffebd 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_17_H +#define DUNGEONS_HAKADAN_ROOM_17_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000400[] = dHAKAdan_room_17DL static const ALIGN_ASSET(2) char HAKAdan_room_17DL_002510[] = dHAKAdan_room_17DL_002510; #define dHAKAdan_room_17Tex_0025D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_0025D8" -static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_0025D8[] = dHAKAdan_room_17Tex_0025D8; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_0025D8[] = dHAKAdan_room_17Tex_0025D8; + + +#endif // DUNGEONS_HAKADAN_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h index 92ca5d699..3bf496856 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_18_H +#define DUNGEONS_HAKADAN_ROOM_18_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BF08[] = dHAKAdan_room_18T static const ALIGN_ASSET(2) char HAKAdan_room_18DL_002708[] = dHAKAdan_room_18DL_002708; #define dHAKAdan_room_18DL_00B518 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_00B518" -static const ALIGN_ASSET(2) char HAKAdan_room_18DL_00B518[] = dHAKAdan_room_18DL_00B518; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_18DL_00B518[] = dHAKAdan_room_18DL_00B518; + + +#endif // DUNGEONS_HAKADAN_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h index f7daa5953..b6204a4fd 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_19_H +#define DUNGEONS_HAKADAN_ROOM_19_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_19Tex_001578[] = dHAKAdan_room_19T static const ALIGN_ASSET(2) char HAKAdan_room_19DL_000290[] = dHAKAdan_room_19DL_000290; #define dHAKAdan_room_19DL_000938 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_000938" -static const ALIGN_ASSET(2) char HAKAdan_room_19DL_000938[] = dHAKAdan_room_19DL_000938; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_19DL_000938[] = dHAKAdan_room_19DL_000938; + + +#endif // DUNGEONS_HAKADAN_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h index dfa757ebd..59e816a2e 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_2_H +#define DUNGEONS_HAKADAN_ROOM_2_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_009BD8[] = dHAKAdan_room_2Tex static const ALIGN_ASSET(2) char HAKAdan_room_2DL_006158[] = dHAKAdan_room_2DL_006158; #define dHAKAdan_room_2DL_000A50 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_000A50" -static const ALIGN_ASSET(2) char HAKAdan_room_2DL_000A50[] = dHAKAdan_room_2DL_000A50; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_2DL_000A50[] = dHAKAdan_room_2DL_000A50; + + +#endif // DUNGEONS_HAKADAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h index f9d2e87d5..227a653c7 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_20_H +#define DUNGEONS_HAKADAN_ROOM_20_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_20Tex_001640[] = dHAKAdan_room_20T static const ALIGN_ASSET(2) char HAKAdan_room_20DL_0002B0[] = dHAKAdan_room_20DL_0002B0; #define dHAKAdan_room_20DL_000818 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20DL_000818" -static const ALIGN_ASSET(2) char HAKAdan_room_20DL_000818[] = dHAKAdan_room_20DL_000818; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_20DL_000818[] = dHAKAdan_room_20DL_000818; + + +#endif // DUNGEONS_HAKADAN_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h index 9ee3a7aea..05e5a58bc 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_21_H +#define DUNGEONS_HAKADAN_ROOM_21_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_21DL_0010D0[] = dHAKAdan_room_21DL static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00A000[] = dHAKAdan_room_21Tex_00A000; #define dHAKAdan_room_21DL_0047A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_0047A0" -static const ALIGN_ASSET(2) char HAKAdan_room_21DL_0047A0[] = dHAKAdan_room_21DL_0047A0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_21DL_0047A0[] = dHAKAdan_room_21DL_0047A0; + + +#endif // DUNGEONS_HAKADAN_ROOM_21_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h index d34512448..ced6150dd 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_22_H +#define DUNGEONS_HAKADAN_ROOM_22_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_0011A8[] = dHAKAdan_room_22T static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_000FA8[] = dHAKAdan_room_22Tex_000FA8; #define dHAKAdan_room_22Tex_0021A8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_0021A8" -static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_0021A8[] = dHAKAdan_room_22Tex_0021A8; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_0021A8[] = dHAKAdan_room_22Tex_0021A8; + + +#endif // DUNGEONS_HAKADAN_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h index 32490aea7..8a0ddbec1 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_3_H +#define DUNGEONS_HAKADAN_ROOM_3_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001D78[] = dHAKAdan_room_3Tex static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001578[] = dHAKAdan_room_3Tex_001578; #define dHAKAdan_room_3DL_0011B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_0011B0" -static const ALIGN_ASSET(2) char HAKAdan_room_3DL_0011B0[] = dHAKAdan_room_3DL_0011B0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_3DL_0011B0[] = dHAKAdan_room_3DL_0011B0; + + +#endif // DUNGEONS_HAKADAN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h index 916255b0c..8398ab19e 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_4_H +#define DUNGEONS_HAKADAN_ROOM_4_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_4Tex_001458[] = dHAKAdan_room_4Tex static const ALIGN_ASSET(2) char HAKAdan_room_4DL_000280[] = dHAKAdan_room_4DL_000280; #define dHAKAdan_room_4DL_000858 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4DL_000858" -static const ALIGN_ASSET(2) char HAKAdan_room_4DL_000858[] = dHAKAdan_room_4DL_000858; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_4DL_000858[] = dHAKAdan_room_4DL_000858; + + +#endif // DUNGEONS_HAKADAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h index aa800c06f..76c87596f 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_5_H +#define DUNGEONS_HAKADAN_ROOM_5_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0052C0[] = dHAKAdan_room_5Tex static const ALIGN_ASSET(2) char HAKAdan_room_5DL_0019E8[] = dHAKAdan_room_5DL_0019E8; #define dHAKAdan_room_5DL_002098 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_002098" -static const ALIGN_ASSET(2) char HAKAdan_room_5DL_002098[] = dHAKAdan_room_5DL_002098; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_5DL_002098[] = dHAKAdan_room_5DL_002098; + + +#endif // DUNGEONS_HAKADAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h index 5b47b92b9..df746e0ef 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_6_H +#define DUNGEONS_HAKADAN_ROOM_6_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_6DL_001B40[] = dHAKAdan_room_6DL_0 static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004B18[] = dHAKAdan_room_6DL_004B18; #define dHAKAdan_room_6Tex_004BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_004BF0" -static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0; + + +#endif // DUNGEONS_HAKADAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h index 9c4db8c8b..220e443f5 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_7_H +#define DUNGEONS_HAKADAN_ROOM_7_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_7Tex_0012D8[] = dHAKAdan_room_7Tex static const ALIGN_ASSET(2) char HAKAdan_room_7DL_000260[] = dHAKAdan_room_7DL_000260; #define dHAKAdan_room_7DL_0008E8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7DL_0008E8" -static const ALIGN_ASSET(2) char HAKAdan_room_7DL_0008E8[] = dHAKAdan_room_7DL_0008E8; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_7DL_0008E8[] = dHAKAdan_room_7DL_0008E8; + + +#endif // DUNGEONS_HAKADAN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h index d260fa831..0c06b4805 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_8_H +#define DUNGEONS_HAKADAN_ROOM_8_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003298[] = dHAKAdan_room_8Tex static const ALIGN_ASSET(2) char HAKAdan_room_8DL_001CE8[] = dHAKAdan_room_8DL_001CE8; #define dHAKAdan_room_8Tex_004298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004298" -static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298; + + +#endif // DUNGEONS_HAKADAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h index 324f9f152..701377160 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_ROOM_9_H +#define DUNGEONS_HAKADAN_ROOM_9_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char HAKAdan_room_9DL_000868[] = dHAKAdan_room_9DL_0 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_007620[] = dHAKAdan_room_9DL_007620; #define dHAKAdan_room_9Tex_00BE90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BE90" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90; + + +#endif // DUNGEONS_HAKADAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h index 4897f466b..f9339f787 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_SCENE_H +#define DUNGEONS_HAKADAN_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char HAKAdan_sceneTex_017BC0[] = dHAKAdan_sceneTex_0 static const ALIGN_ASSET(2) char HAKAdan_sceneTex_016BC0[] = dHAKAdan_sceneTex_016BC0; #define dHAKAdan_sceneTex_0163C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_0163C0" -static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0163C0[] = dHAKAdan_sceneTex_0163C0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0163C0[] = dHAKAdan_sceneTex_0163C0; + +#endif // DUNGEONS_HAKADAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h index abb6848d2..4faff3d1f 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_ROOM_0_H +#define DUNGEONS_HAKADANCH_ROOM_0_H 1 #include "align_asset_macro.h" @@ -156,4 +157,7 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014610[] = dHAKAdanCH_room_0 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00B380[] = dHAKAdanCH_room_0DL_00B380; #define dHAKAdanCH_room_0DL_0025D0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0025D0" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0025D0[] = dHAKAdanCH_room_0DL_0025D0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0025D0[] = dHAKAdanCH_room_0DL_0025D0; + + +#endif // DUNGEONS_HAKADANCH_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h index d4e1ae94a..9719a3b54 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_ROOM_1_H +#define DUNGEONS_HAKADANCH_ROOM_1_H 1 #include "align_asset_macro.h" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008F58[] = dHAKAdanCH_room_ static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009158[] = dHAKAdanCH_room_1Tex_009158; #define dHAKAdanCH_room_1DL_00B040 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_00B040" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_00B040[] = dHAKAdanCH_room_1DL_00B040; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_00B040[] = dHAKAdanCH_room_1DL_00B040; + + +#endif // DUNGEONS_HAKADANCH_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h index 0421b4eff..072ff02de 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_ROOM_2_H +#define DUNGEONS_HAKADANCH_ROOM_2_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002D58[] = dHAKAdanCH_room_ static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002B58[] = dHAKAdanCH_room_2Tex_002B58; #define dHAKAdanCH_room_2DL_0006E0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_0006E0" -static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0006E0[] = dHAKAdanCH_room_2DL_0006E0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0006E0[] = dHAKAdanCH_room_2DL_0006E0; + + +#endif // DUNGEONS_HAKADANCH_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h index f16349e3e..f92842202 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_ROOM_3_H +#define DUNGEONS_HAKADANCH_ROOM_3_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_3Tex_0014C0[] = dHAKAdanCH_room_ static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_0013A0[] = dHAKAdanCH_room_3DL_0013A0; #define dHAKAdanCH_room_3DL_001198 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3DL_001198" -static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_001198[] = dHAKAdanCH_room_3DL_001198; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_001198[] = dHAKAdanCH_room_3DL_001198; + + +#endif // DUNGEONS_HAKADANCH_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h index 27e042a81..553ef384f 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_ROOM_4_H +#define DUNGEONS_HAKADANCH_ROOM_4_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_0002C0[] = dHAKAdanCH_room_4 static const ALIGN_ASSET(2) char HAKAdanCH_room_4Tex_001498[] = dHAKAdanCH_room_4Tex_001498; #define dHAKAdanCH_room_4DL_000898 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_000898" -static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_000898[] = dHAKAdanCH_room_4DL_000898; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_000898[] = dHAKAdanCH_room_4DL_000898; + + +#endif // DUNGEONS_HAKADANCH_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h index 56bfca27e..6d3b6d031 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_ROOM_5_H +#define DUNGEONS_HAKADANCH_ROOM_5_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_5Tex_002190[] = dHAKAdanCH_room_ static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000420[] = dHAKAdanCH_room_5DL_000420; #define dHAKAdanCH_room_5DL_000270 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_000270" -static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000270[] = dHAKAdanCH_room_5DL_000270; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000270[] = dHAKAdanCH_room_5DL_000270; + + +#endif // DUNGEONS_HAKADANCH_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h index 0af3cf719..9c9f28b98 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_ROOM_6_H +#define DUNGEONS_HAKADANCH_ROOM_6_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0026A0[] = dHAKAdanCH_room_ static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000410[] = dHAKAdanCH_room_6DL_000410; #define dHAKAdanCH_room_6Tex_000EA0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_000EA0" -static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0; + + +#endif // DUNGEONS_HAKADANCH_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h index 9d0cfb239..871325e38 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADANCH_SCENE_H +#define DUNGEONS_HAKADANCH_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00AD90[] = dHAKAdanCH_sceneT static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00A590[] = dHAKAdanCH_sceneTex_00A590; #define dHAKAdanCH_sceneTex_00B590 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00B590" -static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00B590[] = dHAKAdanCH_sceneTex_00B590; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00B590[] = dHAKAdanCH_sceneTex_00B590; + +#endif // DUNGEONS_HAKADANCH_SCENE_H diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h index 4d3691f1b..5f61f8dc5 100644 --- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h +++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_BS_ROOM_0_H +#define DUNGEONS_HAKADAN_BS_ROOM_0_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0023E0[] = dHAKAdan_bs_roo static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0021E0[] = dHAKAdan_bs_room_0Tex_0021E0; #define dHAKAdan_bs_room_0Tex_0027E0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0027E0" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0027E0[] = dHAKAdan_bs_room_0Tex_0027E0; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0027E0[] = dHAKAdan_bs_room_0Tex_0027E0; + + +#endif // DUNGEONS_HAKADAN_BS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h index 55a41b30c..1bce316d1 100644 --- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h +++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_BS_ROOM_1_H +#define DUNGEONS_HAKADAN_BS_ROOM_1_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002F50[] = dHAKAdan_bs_roo static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002D50[] = dHAKAdan_bs_room_1Tex_002D50; #define dHAKAdan_bs_room_1Tex_003F50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003F50" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003F50[] = dHAKAdan_bs_room_1Tex_003F50; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003F50[] = dHAKAdan_bs_room_1Tex_003F50; + + +#endif // DUNGEONS_HAKADAN_BS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h index f490427d3..40292e447 100644 --- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h +++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HAKADAN_BS_SCENE_H +#define DUNGEONS_HAKADAN_BS_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001580[] = dHAKAdan_bs_scen static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001380[] = dHAKAdan_bs_sceneTex_001380; #define dHAKAdan_bs_sceneTex_001780 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001780" -static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001780[] = dHAKAdan_bs_sceneTex_001780; \ No newline at end of file +static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001780[] = dHAKAdan_bs_sceneTex_001780; + +#endif // DUNGEONS_HAKADAN_BS_SCENE_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h index a492ecb65..731bccb75 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_0_H +#define DUNGEONS_HIDAN_ROOM_0_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_0Tex_004EF0[] = dHIDAN_room_0Tex_004 static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0052F0[] = dHIDAN_room_0Tex_0052F0; #define dHIDAN_room_0Tex_005EF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005EF0" -static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005EF0[] = dHIDAN_room_0Tex_005EF0; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005EF0[] = dHIDAN_room_0Tex_005EF0; + + +#endif // DUNGEONS_HIDAN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h index 352daa449..84d39a9cf 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_1_H +#define DUNGEONS_HIDAN_ROOM_1_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_1DL_0002D0[] = dHIDAN_room_1DL_0002D static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00C130[] = dHIDAN_room_1Tex_00C130; #define dHIDAN_room_1DL_008448 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_008448" -static const ALIGN_ASSET(2) char HIDAN_room_1DL_008448[] = dHIDAN_room_1DL_008448; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_1DL_008448[] = dHIDAN_room_1DL_008448; + + +#endif // DUNGEONS_HIDAN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h index 2b039210d..80e1af2c2 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_10_H +#define DUNGEONS_HIDAN_ROOM_10_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015418[] = dHIDAN_room_10Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012218[] = dHIDAN_room_10Tex_012218; #define dHIDAN_room_10DL_011610 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_011610" -static const ALIGN_ASSET(2) char HIDAN_room_10DL_011610[] = dHIDAN_room_10DL_011610; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_10DL_011610[] = dHIDAN_room_10DL_011610; + + +#endif // DUNGEONS_HIDAN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h index 31488b110..c49f0f91c 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_11_H +#define DUNGEONS_HIDAN_ROOM_11_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_11DL_001908[] = dHIDAN_room_11DL_001 static const ALIGN_ASSET(2) char HIDAN_room_11Tex_002FD8[] = dHIDAN_room_11Tex_002FD8; #define dHIDAN_room_11DL_002628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_002628" -static const ALIGN_ASSET(2) char HIDAN_room_11DL_002628[] = dHIDAN_room_11DL_002628; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_11DL_002628[] = dHIDAN_room_11DL_002628; + + +#endif // DUNGEONS_HIDAN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h index 9fc002040..691f1756b 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_12_H +#define DUNGEONS_HIDAN_ROOM_12_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_12DL_001A58[] = dHIDAN_room_12DL_001 static const ALIGN_ASSET(2) char HIDAN_room_12Tex_001D68[] = dHIDAN_room_12Tex_001D68; #define dHIDAN_room_12Tex_001F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_001F68" -static const ALIGN_ASSET(2) char HIDAN_room_12Tex_001F68[] = dHIDAN_room_12Tex_001F68; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_12Tex_001F68[] = dHIDAN_room_12Tex_001F68; + + +#endif // DUNGEONS_HIDAN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h index 99dcaad4c..5fa60bbc4 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_13_H +#define DUNGEONS_HIDAN_ROOM_13_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_13DL_009160[] = dHIDAN_room_13DL_009 static const ALIGN_ASSET(2) char HIDAN_room_13DL_00A228[] = dHIDAN_room_13DL_00A228; #define dHIDAN_room_13Tex_00B788 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B788" -static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B788[] = dHIDAN_room_13Tex_00B788; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B788[] = dHIDAN_room_13Tex_00B788; + + +#endif // DUNGEONS_HIDAN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h index 2d750d0c6..ced1a642a 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_14_H +#define DUNGEONS_HIDAN_ROOM_14_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_14DL_001030[] = dHIDAN_room_14DL_001 static const ALIGN_ASSET(2) char HIDAN_room_14Tex_001DF8[] = dHIDAN_room_14Tex_001DF8; #define dHIDAN_room_14Tex_0019F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14Tex_0019F8" -static const ALIGN_ASSET(2) char HIDAN_room_14Tex_0019F8[] = dHIDAN_room_14Tex_0019F8; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_14Tex_0019F8[] = dHIDAN_room_14Tex_0019F8; + + +#endif // DUNGEONS_HIDAN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h index 67cd72f99..715769058 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_15_H +#define DUNGEONS_HIDAN_ROOM_15_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_15DL_000910[] = dHIDAN_room_15DL_000910; #define dHIDAN_room_15Tex_000D88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_15Tex_000D88" -static const ALIGN_ASSET(2) char HIDAN_room_15Tex_000D88[] = dHIDAN_room_15Tex_000D88; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_15Tex_000D88[] = dHIDAN_room_15Tex_000D88; + + +#endif // DUNGEONS_HIDAN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h index 6f31e7622..ed501ffee 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_16_H +#define DUNGEONS_HIDAN_ROOM_16_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A9E0[] = dHIDAN_room_16Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_16DL_005ED8[] = dHIDAN_room_16DL_005ED8; #define dHIDAN_room_16Tex_008DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_008DE0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_008DE0[] = dHIDAN_room_16Tex_008DE0; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_008DE0[] = dHIDAN_room_16Tex_008DE0; + + +#endif // DUNGEONS_HIDAN_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h index 778041f65..eea1ecdd2 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_17_H +#define DUNGEONS_HIDAN_ROOM_17_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_17Tex_005168[] = dHIDAN_room_17Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_17Tex_005968[] = dHIDAN_room_17Tex_005968; #define dHIDAN_room_17Tex_006168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_006168" -static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006168[] = dHIDAN_room_17Tex_006168; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006168[] = dHIDAN_room_17Tex_006168; + + +#endif // DUNGEONS_HIDAN_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h index d384a5d23..e28427abf 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_18_H +#define DUNGEONS_HIDAN_ROOM_18_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0027F8[] = dHIDAN_room_18Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0037F8[] = dHIDAN_room_18Tex_0037F8; #define dHIDAN_room_18Tex_0039F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0039F8" -static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0039F8[] = dHIDAN_room_18Tex_0039F8; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0039F8[] = dHIDAN_room_18Tex_0039F8; + + +#endif // DUNGEONS_HIDAN_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h index d5fff86b1..b809f6f4f 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_19_H +#define DUNGEONS_HIDAN_ROOM_19_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003A28[] = dHIDAN_room_19Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_19Tex_004028[] = dHIDAN_room_19Tex_004028; #define dHIDAN_room_19Tex_003628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003628" -static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003628[] = dHIDAN_room_19Tex_003628; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003628[] = dHIDAN_room_19Tex_003628; + + +#endif // DUNGEONS_HIDAN_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h index aedb02734..131325d78 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_2_H +#define DUNGEONS_HIDAN_ROOM_2_H 1 #include "align_asset_macro.h" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009628[] = dHIDAN_room_2Tex_009 static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009828[] = dHIDAN_room_2Tex_009828; #define dHIDAN_room_2Tex_00EC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00EC28" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00EC28[] = dHIDAN_room_2Tex_00EC28; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00EC28[] = dHIDAN_room_2Tex_00EC28; + + +#endif // DUNGEONS_HIDAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h index d8aa5a34c..021845678 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_20_H +#define DUNGEONS_HIDAN_ROOM_20_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003508[] = dHIDAN_room_20Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003D08[] = dHIDAN_room_20Tex_003D08; #define dHIDAN_room_20Tex_002D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_002D08" -static const ALIGN_ASSET(2) char HIDAN_room_20Tex_002D08[] = dHIDAN_room_20Tex_002D08; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_20Tex_002D08[] = dHIDAN_room_20Tex_002D08; + + +#endif // DUNGEONS_HIDAN_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h index d9c9b6324..0974156e8 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_21_H +#define DUNGEONS_HIDAN_ROOM_21_H 1 #include "align_asset_macro.h" @@ -63,4 +64,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_21DL_000838[] = dHIDAN_room_21DL_000 static const ALIGN_ASSET(2) char HIDAN_room_21DL_000670[] = dHIDAN_room_21DL_000670; #define dHIDAN_room_21Tex_006A78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006A78" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006A78[] = dHIDAN_room_21Tex_006A78; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006A78[] = dHIDAN_room_21Tex_006A78; + + +#endif // DUNGEONS_HIDAN_ROOM_21_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h index 55f7d1895..63df6179d 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_22_H +#define DUNGEONS_HIDAN_ROOM_22_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_22Tex_002AE8[] = dHIDAN_room_22Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0032E8[] = dHIDAN_room_22Tex_0032E8; #define dHIDAN_room_22Tex_003AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_003AE8" -static const ALIGN_ASSET(2) char HIDAN_room_22Tex_003AE8[] = dHIDAN_room_22Tex_003AE8; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_22Tex_003AE8[] = dHIDAN_room_22Tex_003AE8; + + +#endif // DUNGEONS_HIDAN_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h index 43cc2a031..193e540fb 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_23_H +#define DUNGEONS_HIDAN_ROOM_23_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003518[] = dHIDAN_room_23Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003D18[] = dHIDAN_room_23Tex_003D18; #define dHIDAN_room_23Tex_002D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_002D18" -static const ALIGN_ASSET(2) char HIDAN_room_23Tex_002D18[] = dHIDAN_room_23Tex_002D18; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_23Tex_002D18[] = dHIDAN_room_23Tex_002D18; + + +#endif // DUNGEONS_HIDAN_ROOM_23_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h index a90e7aa63..730363386 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_24_H +#define DUNGEONS_HIDAN_ROOM_24_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004738[] = dHIDAN_room_24Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_24DL_003660[] = dHIDAN_room_24DL_003660; #define dHIDAN_room_24DL_0030C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_0030C0" -static const ALIGN_ASSET(2) char HIDAN_room_24DL_0030C0[] = dHIDAN_room_24DL_0030C0; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_24DL_0030C0[] = dHIDAN_room_24DL_0030C0; + + +#endif // DUNGEONS_HIDAN_ROOM_24_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h index 92157ee98..8f552fcdd 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_25_H +#define DUNGEONS_HIDAN_ROOM_25_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_25Tex_002AD8[] = dHIDAN_room_25Tex_0 static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0032D8[] = dHIDAN_room_25Tex_0032D8; #define dHIDAN_room_25Tex_003AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_003AD8" -static const ALIGN_ASSET(2) char HIDAN_room_25Tex_003AD8[] = dHIDAN_room_25Tex_003AD8; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_25Tex_003AD8[] = dHIDAN_room_25Tex_003AD8; + + +#endif // DUNGEONS_HIDAN_ROOM_25_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h index 15dc5a4d5..638e5d73f 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_26_H +#define DUNGEONS_HIDAN_ROOM_26_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_26DL_002F68[] = dHIDAN_room_26DL_002 static const ALIGN_ASSET(2) char HIDAN_room_26DL_0046B8[] = dHIDAN_room_26DL_0046B8; #define dHIDAN_room_26Tex_004A98 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_004A98" -static const ALIGN_ASSET(2) char HIDAN_room_26Tex_004A98[] = dHIDAN_room_26Tex_004A98; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_26Tex_004A98[] = dHIDAN_room_26Tex_004A98; + + +#endif // DUNGEONS_HIDAN_ROOM_26_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h index b20593f80..81e9b9170 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_3_H +#define DUNGEONS_HIDAN_ROOM_3_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_3DL_001840[] = dHIDAN_room_3DL_00184 static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001EC8[] = dHIDAN_room_3Tex_001EC8; #define dHIDAN_room_3Tex_001AC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001AC8" -static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001AC8[] = dHIDAN_room_3Tex_001AC8; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001AC8[] = dHIDAN_room_3Tex_001AC8; + + +#endif // DUNGEONS_HIDAN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h index b30c82f09..7516f21d0 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_4_H +#define DUNGEONS_HIDAN_ROOM_4_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_4DL_004758[] = dHIDAN_room_4DL_00475 static const ALIGN_ASSET(2) char HIDAN_room_4DL_004DA0[] = dHIDAN_room_4DL_004DA0; #define dHIDAN_room_4Tex_0070F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0070F0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0070F0[] = dHIDAN_room_4Tex_0070F0; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0070F0[] = dHIDAN_room_4Tex_0070F0; + + +#endif // DUNGEONS_HIDAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h index 129b70a83..10aa6f123 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_5_H +#define DUNGEONS_HIDAN_ROOM_5_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_5DL_005D80[] = dHIDAN_room_5DL_005D8 static const ALIGN_ASSET(2) char HIDAN_room_5DL_007130[] = dHIDAN_room_5DL_007130; #define dHIDAN_room_5Tex_0094E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0094E0" -static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0094E0[] = dHIDAN_room_5Tex_0094E0; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0094E0[] = dHIDAN_room_5Tex_0094E0; + + +#endif // DUNGEONS_HIDAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h index abb847ea7..9246611f6 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_6_H +#define DUNGEONS_HIDAN_ROOM_6_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_6Tex_006790[] = dHIDAN_room_6Tex_006 static const ALIGN_ASSET(2) char HIDAN_room_6DL_001350[] = dHIDAN_room_6DL_001350; #define dHIDAN_room_6Tex_004390 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_004390" -static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004390[] = dHIDAN_room_6Tex_004390; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004390[] = dHIDAN_room_6Tex_004390; + + +#endif // DUNGEONS_HIDAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h index 2fe8fe6d9..5eac179cd 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_7_H +#define DUNGEONS_HIDAN_ROOM_7_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_7DL_001948[] = dHIDAN_room_7DL_00194 static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001E48[] = dHIDAN_room_7Tex_001E48; #define dHIDAN_room_7Tex_001C48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001C48" -static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001C48[] = dHIDAN_room_7Tex_001C48; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001C48[] = dHIDAN_room_7Tex_001C48; + + +#endif // DUNGEONS_HIDAN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h index 591c7e648..21ebac291 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_8_H +#define DUNGEONS_HIDAN_ROOM_8_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_8Tex_006AD8[] = dHIDAN_room_8Tex_006 static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0050D8[] = dHIDAN_room_8Tex_0050D8; #define dHIDAN_room_8Tex_007AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_007AD8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_007AD8[] = dHIDAN_room_8Tex_007AD8; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_007AD8[] = dHIDAN_room_8Tex_007AD8; + + +#endif // DUNGEONS_HIDAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h index d546ac503..57f2eea69 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_ROOM_9_H +#define DUNGEONS_HIDAN_ROOM_9_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char HIDAN_room_9Tex_005768[] = dHIDAN_room_9Tex_005 static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004768[] = dHIDAN_room_9Tex_004768; #define dHIDAN_room_9Tex_007F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_007F68" -static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007F68[] = dHIDAN_room_9Tex_007F68; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007F68[] = dHIDAN_room_9Tex_007F68; + + +#endif // DUNGEONS_HIDAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h index d9e9d458a..41ef37126 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_HIDAN_SCENE_H +#define DUNGEONS_HIDAN_SCENE_H 1 #include "align_asset_macro.h" @@ -27,4 +28,6 @@ static const ALIGN_ASSET(2) char HIDAN_sceneTex_019DD0[] = dHIDAN_sceneTex_019DD static const ALIGN_ASSET(2) char HIDAN_sceneTex_0189D0[] = dHIDAN_sceneTex_0189D0; #define dHIDAN_sceneTex_019FD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_019FD0" -static const ALIGN_ASSET(2) char HIDAN_sceneTex_019FD0[] = dHIDAN_sceneTex_019FD0; \ No newline at end of file +static const ALIGN_ASSET(2) char HIDAN_sceneTex_019FD0[] = dHIDAN_sceneTex_019FD0; + +#endif // DUNGEONS_HIDAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h index 41fe97896..b4400b9f4 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_0_H +#define DUNGEONS_MIZUSIN_ROOM_0_H 1 #include "align_asset_macro.h" @@ -186,4 +187,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0135F8[] = dMIZUsin_room_0Tex static const ALIGN_ASSET(2) char MIZUsin_room_0DL_009D60[] = dMIZUsin_room_0DL_009D60; #define dMIZUsin_room_0Tex_0145F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0145F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8; + + +#endif // DUNGEONS_MIZUSIN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h index 484fb3d95..0d57dedd4 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_1_H +#define DUNGEONS_MIZUSIN_ROOM_1_H 1 #include "align_asset_macro.h" @@ -63,4 +64,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0081D0[] = dMIZUsin_room_1Tex static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0028D8[] = dMIZUsin_room_1DL_0028D8; #define dMIZUsin_room_1DL_0053E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_0053E8" -static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0053E8[] = dMIZUsin_room_1DL_0053E8; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0053E8[] = dMIZUsin_room_1DL_0053E8; + + +#endif // DUNGEONS_MIZUSIN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h index eab10f111..3731303d2 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_10_H +#define DUNGEONS_MIZUSIN_ROOM_10_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_10DL_002708[] = dMIZUsin_room_10DL static const ALIGN_ASSET(2) char MIZUsin_room_10DL_0021D0[] = dMIZUsin_room_10DL_0021D0; #define dMIZUsin_room_10DL_002FE0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_002FE0" -static const ALIGN_ASSET(2) char MIZUsin_room_10DL_002FE0[] = dMIZUsin_room_10DL_002FE0; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_10DL_002FE0[] = dMIZUsin_room_10DL_002FE0; + + +#endif // DUNGEONS_MIZUSIN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h index bbcc1f39f..d7aa9a0bf 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_11_H +#define DUNGEONS_MIZUSIN_ROOM_11_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_002220[] = dMIZUsin_room_11T static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_002A20[] = dMIZUsin_room_11Tex_002A20; #define dMIZUsin_room_11Tex_003220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_003220" -static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003220[] = dMIZUsin_room_11Tex_003220; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003220[] = dMIZUsin_room_11Tex_003220; + + +#endif // DUNGEONS_MIZUSIN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h index acfbd6fa9..2ed26b79e 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_12_H +#define DUNGEONS_MIZUSIN_ROOM_12_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0049C8[] = dMIZUsin_room_12T static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000AC8[] = dMIZUsin_room_12DL_000AC8; #define dMIZUsin_room_12DL_000720 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_000720" -static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000720[] = dMIZUsin_room_12DL_000720; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000720[] = dMIZUsin_room_12DL_000720; + + +#endif // DUNGEONS_MIZUSIN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h index 60859fda0..a185aef22 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_13_H +#define DUNGEONS_MIZUSIN_ROOM_13_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_13DL_000130[] = dMIZUsin_room_13DL_000130; #define dMIZUsin_room_13Tex_0001F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_13Tex_0001F8" -static const ALIGN_ASSET(2) char MIZUsin_room_13Tex_0001F8[] = dMIZUsin_room_13Tex_0001F8; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_13Tex_0001F8[] = dMIZUsin_room_13Tex_0001F8; + + +#endif // DUNGEONS_MIZUSIN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h index 6e1b49e6e..077589b46 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_14_H +#define DUNGEONS_MIZUSIN_ROOM_14_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003680[] = dMIZUsin_room_14T static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000C68[] = dMIZUsin_room_14DL_000C68; #define dMIZUsin_room_14DL_000450 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000450" -static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000450[] = dMIZUsin_room_14DL_000450; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000450[] = dMIZUsin_room_14DL_000450; + + +#endif // DUNGEONS_MIZUSIN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h index 2242833f1..70f65104c 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_15_H +#define DUNGEONS_MIZUSIN_ROOM_15_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003C68[] = dMIZUsin_room_15T static const ALIGN_ASSET(2) char MIZUsin_room_15DL_002B98[] = dMIZUsin_room_15DL_002B98; #define dMIZUsin_room_15Tex_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_002C68" -static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68; + + +#endif // DUNGEONS_MIZUSIN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h index 7054c91d8..0833a30ea 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_16_H +#define DUNGEONS_MIZUSIN_ROOM_16_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_001B30[] = dMIZUsin_room_16T static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_003330[] = dMIZUsin_room_16Tex_003330; #define dMIZUsin_room_16Tex_002B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_002B30" -static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002B30[] = dMIZUsin_room_16Tex_002B30; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002B30[] = dMIZUsin_room_16Tex_002B30; + + +#endif // DUNGEONS_MIZUSIN_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h index d231ac6eb..99c13d5fc 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_17_H +#define DUNGEONS_MIZUSIN_ROOM_17_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0054E0[] = dMIZUsin_room_17DL static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0020B8[] = dMIZUsin_room_17DL_0020B8; #define dMIZUsin_room_17DL_004B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_004B30" -static const ALIGN_ASSET(2) char MIZUsin_room_17DL_004B30[] = dMIZUsin_room_17DL_004B30; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_17DL_004B30[] = dMIZUsin_room_17DL_004B30; + + +#endif // DUNGEONS_MIZUSIN_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h index b481021ef..47eef912b 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_18_H +#define DUNGEONS_MIZUSIN_ROOM_18_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0028F8[] = dMIZUsin_room_18T static const ALIGN_ASSET(2) char MIZUsin_room_18DL_001740[] = dMIZUsin_room_18DL_001740; #define dMIZUsin_room_18Tex_0038F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0038F8" -static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0038F8[] = dMIZUsin_room_18Tex_0038F8; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0038F8[] = dMIZUsin_room_18Tex_0038F8; + + +#endif // DUNGEONS_MIZUSIN_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h index 920a606e1..58cb59dd8 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_19_H +#define DUNGEONS_MIZUSIN_ROOM_19_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_002130[] = dMIZUsin_room_19T static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_002930[] = dMIZUsin_room_19Tex_002930; #define dMIZUsin_room_19Tex_003130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19Tex_003130" -static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_003130[] = dMIZUsin_room_19Tex_003130; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_003130[] = dMIZUsin_room_19Tex_003130; + + +#endif // DUNGEONS_MIZUSIN_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h index 4d103a9d8..c3e1eaf87 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_2_H +#define DUNGEONS_MIZUSIN_ROOM_2_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_005488[] = dMIZUsin_room_2Tex static const ALIGN_ASSET(2) char MIZUsin_room_2DL_0004E0[] = dMIZUsin_room_2DL_0004E0; #define dMIZUsin_room_2DL_002000 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_002000" -static const ALIGN_ASSET(2) char MIZUsin_room_2DL_002000[] = dMIZUsin_room_2DL_002000; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_2DL_002000[] = dMIZUsin_room_2DL_002000; + + +#endif // DUNGEONS_MIZUSIN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h index 962988775..e3236ac82 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_20_H +#define DUNGEONS_MIZUSIN_ROOM_20_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_006040[] = dMIZUsin_room_20T static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002CB8[] = dMIZUsin_room_20DL_002CB8; #define dMIZUsin_room_20Tex_003040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003040" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003040[] = dMIZUsin_room_20Tex_003040; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003040[] = dMIZUsin_room_20Tex_003040; + + +#endif // DUNGEONS_MIZUSIN_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h index 0a2085b8b..92e908ed3 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_21_H +#define DUNGEONS_MIZUSIN_ROOM_21_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_21DL_004018[] = dMIZUsin_room_21DL static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004B60[] = dMIZUsin_room_21Tex_004B60; #define dMIZUsin_room_21DL_003A70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_003A70" -static const ALIGN_ASSET(2) char MIZUsin_room_21DL_003A70[] = dMIZUsin_room_21DL_003A70; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_21DL_003A70[] = dMIZUsin_room_21DL_003A70; + + +#endif // DUNGEONS_MIZUSIN_ROOM_21_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h index 38e40c5f0..0fc1a10b5 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_22_H +#define DUNGEONS_MIZUSIN_ROOM_22_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0088E8[] = dMIZUsin_room_22T static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0020C0[] = dMIZUsin_room_22DL_0020C0; #define dMIZUsin_room_22Tex_0070E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0070E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0070E8[] = dMIZUsin_room_22Tex_0070E8; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0070E8[] = dMIZUsin_room_22Tex_0070E8; + + +#endif // DUNGEONS_MIZUSIN_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h index 90cb2e2f4..d7b6b4650 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_3_H +#define DUNGEONS_MIZUSIN_ROOM_3_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_3DL_001658[] = dMIZUsin_room_3DL_0 static const ALIGN_ASSET(2) char MIZUsin_room_3DL_000AC0[] = dMIZUsin_room_3DL_000AC0; #define dMIZUsin_room_3DL_001E98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_001E98" -static const ALIGN_ASSET(2) char MIZUsin_room_3DL_001E98[] = dMIZUsin_room_3DL_001E98; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_3DL_001E98[] = dMIZUsin_room_3DL_001E98; + + +#endif // DUNGEONS_MIZUSIN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h index 94869e0b0..73e796c54 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_4_H +#define DUNGEONS_MIZUSIN_ROOM_4_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_4DL_000AD8[] = dMIZUsin_room_4DL_0 static const ALIGN_ASSET(2) char MIZUsin_room_4DL_001370[] = dMIZUsin_room_4DL_001370; #define dMIZUsin_room_4Tex_003820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003820" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003820[] = dMIZUsin_room_4Tex_003820; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003820[] = dMIZUsin_room_4Tex_003820; + + +#endif // DUNGEONS_MIZUSIN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h index 2e238496d..9badd3e10 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_5_H +#define DUNGEONS_MIZUSIN_ROOM_5_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_003A48[] = dMIZUsin_room_5Tex static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_004248[] = dMIZUsin_room_5Tex_004248; #define dMIZUsin_room_5DL_0004C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0004C0" -static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0004C0[] = dMIZUsin_room_5DL_0004C0; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0004C0[] = dMIZUsin_room_5DL_0004C0; + + +#endif // DUNGEONS_MIZUSIN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h index 9c9f3161e..c0b44487a 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_6_H +#define DUNGEONS_MIZUSIN_ROOM_6_H 1 #include "align_asset_macro.h" @@ -75,4 +76,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_6DL_004F28[] = dMIZUsin_room_6DL_0 static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003A58[] = dMIZUsin_room_6DL_003A58; #define dMIZUsin_room_6DL_003698 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003698" -static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003698[] = dMIZUsin_room_6DL_003698; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003698[] = dMIZUsin_room_6DL_003698; + + +#endif // DUNGEONS_MIZUSIN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h index fdafd7420..88b8e506c 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_7_H +#define DUNGEONS_MIZUSIN_ROOM_7_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003560[] = dMIZUsin_room_7Tex static const ALIGN_ASSET(2) char MIZUsin_room_7DL_002440[] = dMIZUsin_room_7DL_002440; #define dMIZUsin_room_7Tex_002D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002D60" -static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60; + + +#endif // DUNGEONS_MIZUSIN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h index 8515653ca..f87f427db 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_8_H +#define DUNGEONS_MIZUSIN_ROOM_8_H 1 #include "align_asset_macro.h" @@ -111,4 +112,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007D98[] = dMIZUsin_room_8Tex static const ALIGN_ASSET(2) char MIZUsin_room_8DL_002C68[] = dMIZUsin_room_8DL_002C68; #define dMIZUsin_room_8DL_0059B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_0059B0" -static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0059B0[] = dMIZUsin_room_8DL_0059B0; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0059B0[] = dMIZUsin_room_8DL_0059B0; + + +#endif // DUNGEONS_MIZUSIN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h index b301d672b..b41725882 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_ROOM_9_H +#define DUNGEONS_MIZUSIN_ROOM_9_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0036D8[] = dMIZUsin_room_9Tex static const ALIGN_ASSET(2) char MIZUsin_room_9DL_0030C0[] = dMIZUsin_room_9DL_0030C0; #define dMIZUsin_room_9DL_003408 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_003408" -static const ALIGN_ASSET(2) char MIZUsin_room_9DL_003408[] = dMIZUsin_room_9DL_003408; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_room_9DL_003408[] = dMIZUsin_room_9DL_003408; + + +#endif // DUNGEONS_MIZUSIN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h index 7d44a9c93..24897ddec 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_SCENE_H +#define DUNGEONS_MIZUSIN_SCENE_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char MIZUsin_sceneTex_014430[] = dMIZUsin_sceneTex_0 static const ALIGN_ASSET(2) char MIZUsin_sceneTex_013C30[] = dMIZUsin_sceneTex_013C30; #define dMIZUsin_sceneTex_015030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_015030" -static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030; + +#endif // DUNGEONS_MIZUSIN_SCENE_H diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h index bce080dae..3a57019b7 100644 --- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h +++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_BS_ROOM_0_H +#define DUNGEONS_MIZUSIN_BS_ROOM_0_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002470[] = dMIZUsin_bs_roo static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001C70[] = dMIZUsin_bs_room_0Tex_001C70; #define dMIZUsin_bs_room_0Tex_001470 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001470" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001470[] = dMIZUsin_bs_room_0Tex_001470; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001470[] = dMIZUsin_bs_room_0Tex_001470; + + +#endif // DUNGEONS_MIZUSIN_BS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h index 4a9fe2edf..a7861cb5e 100644 --- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h +++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_BS_ROOM_1_H +#define DUNGEONS_MIZUSIN_BS_ROOM_1_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_009AE8[] = dMIZUsin_bs_roo static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_00AAE8[] = dMIZUsin_bs_room_1Tex_00AAE8; #define dMIZUsin_bs_room_1Tex_008EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_008EE8" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_008EE8[] = dMIZUsin_bs_room_1Tex_008EE8; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_008EE8[] = dMIZUsin_bs_room_1Tex_008EE8; + + +#endif // DUNGEONS_MIZUSIN_BS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h index 2a086bc7d..f045c3662 100644 --- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h +++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef DUNGEONS_MIZUSIN_BS_SCENE_H +#define DUNGEONS_MIZUSIN_BS_SCENE_H 1 #include "align_asset_macro.h" #define dMIZUsin_bs_sceneCollisionHeader_001A34 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_sceneCollisionHeader_001A34" -static const ALIGN_ASSET(2) char MIZUsin_bs_sceneCollisionHeader_001A34[] = dMIZUsin_bs_sceneCollisionHeader_001A34; \ No newline at end of file +static const ALIGN_ASSET(2) char MIZUsin_bs_sceneCollisionHeader_001A34[] = dMIZUsin_bs_sceneCollisionHeader_001A34; + + +#endif // DUNGEONS_MIZUSIN_BS_SCENE_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_0.h b/soh/assets/scenes/dungeons/bdan/bdan_room_0.h index 1745307ae..162472187 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_0.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_0_H +#define DUNGEONS_BDAN_ROOM_0_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char bdan_room_0DL_004130[] = dbdan_room_0DL_004130; static const ALIGN_ASSET(2) char bdan_room_0Set_0001B0DL_002DA8[] = dbdan_room_0Set_0001B0DL_002DA8; #define dbdan_room_0Set_0001B0DL_004130 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0Set_0001B0DL_004130" -static const ALIGN_ASSET(2) char bdan_room_0Set_0001B0DL_004130[] = dbdan_room_0Set_0001B0DL_004130; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_0Set_0001B0DL_004130[] = dbdan_room_0Set_0001B0DL_004130; + + +#endif // DUNGEONS_BDAN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_1.h b/soh/assets/scenes/dungeons/bdan/bdan_room_1.h index 9a34fe0ae..33c707378 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_1.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_1_H +#define DUNGEONS_BDAN_ROOM_1_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char bdan_room_1DL_005FA8[] = dbdan_room_1DL_005FA8; static const ALIGN_ASSET(2) char bdan_room_1Set_000240DL_004DF0[] = dbdan_room_1Set_000240DL_004DF0; #define dbdan_room_1Set_000240DL_005FA8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1Set_000240DL_005FA8" -static const ALIGN_ASSET(2) char bdan_room_1Set_000240DL_005FA8[] = dbdan_room_1Set_000240DL_005FA8; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_1Set_000240DL_005FA8[] = dbdan_room_1Set_000240DL_005FA8; + + +#endif // DUNGEONS_BDAN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_10.h b/soh/assets/scenes/dungeons/bdan/bdan_room_10.h index 615660037..506747733 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_10.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_10_H +#define DUNGEONS_BDAN_ROOM_10_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char bdan_room_10DL_003780[] = dbdan_room_10DL_003780; #define dbdan_room_10Set_0000A0DL_003780 "__OTR__scenes/nonmq/bdan_scene/bdan_room_10Set_0000A0DL_003780" -static const ALIGN_ASSET(2) char bdan_room_10Set_0000A0DL_003780[] = dbdan_room_10Set_0000A0DL_003780; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_10Set_0000A0DL_003780[] = dbdan_room_10Set_0000A0DL_003780; + + +#endif // DUNGEONS_BDAN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_11.h b/soh/assets/scenes/dungeons/bdan/bdan_room_11.h index 35c93519e..3fa69b3a3 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_11.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_11_H +#define DUNGEONS_BDAN_ROOM_11_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char bdan_room_11DL_003958[] = dbdan_room_11DL_003958; #define dbdan_room_11Set_000290DL_003958 "__OTR__scenes/nonmq/bdan_scene/bdan_room_11Set_000290DL_003958" -static const ALIGN_ASSET(2) char bdan_room_11Set_000290DL_003958[] = dbdan_room_11Set_000290DL_003958; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_11Set_000290DL_003958[] = dbdan_room_11Set_000290DL_003958; + + +#endif // DUNGEONS_BDAN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_12.h b/soh/assets/scenes/dungeons/bdan/bdan_room_12.h index 5e15f02a4..f9bf57419 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_12.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_12_H +#define DUNGEONS_BDAN_ROOM_12_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char bdan_room_12DL_003848[] = dbdan_room_12DL_00384 static const ALIGN_ASSET(2) char bdan_room_12Tex_0038E0[] = dbdan_room_12Tex_0038E0; #define dbdan_room_12Set_000150DL_003848 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12Set_000150DL_003848" -static const ALIGN_ASSET(2) char bdan_room_12Set_000150DL_003848[] = dbdan_room_12Set_000150DL_003848; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_12Set_000150DL_003848[] = dbdan_room_12Set_000150DL_003848; + + +#endif // DUNGEONS_BDAN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_13.h b/soh/assets/scenes/dungeons/bdan/bdan_room_13.h index 1389d435f..8b555a2c8 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_13.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_13_H +#define DUNGEONS_BDAN_ROOM_13_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char bdan_room_13DL_002B68[] = dbdan_room_13DL_002B6 static const ALIGN_ASSET(2) char bdan_room_13Set_000140DL_0015A8[] = dbdan_room_13Set_000140DL_0015A8; #define dbdan_room_13Set_000140DL_002B68 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Set_000140DL_002B68" -static const ALIGN_ASSET(2) char bdan_room_13Set_000140DL_002B68[] = dbdan_room_13Set_000140DL_002B68; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_13Set_000140DL_002B68[] = dbdan_room_13Set_000140DL_002B68; + + +#endif // DUNGEONS_BDAN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_14.h b/soh/assets/scenes/dungeons/bdan/bdan_room_14.h index ca05ff8ad..ca44e1126 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_14.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_14_H +#define DUNGEONS_BDAN_ROOM_14_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char bdan_room_14Tex_004DC8[] = dbdan_room_14Tex_004 static const ALIGN_ASSET(2) char bdan_room_14Tex_0045C8[] = dbdan_room_14Tex_0045C8; #define dbdan_room_14Set_000190DL_0045B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Set_000190DL_0045B8" -static const ALIGN_ASSET(2) char bdan_room_14Set_000190DL_0045B8[] = dbdan_room_14Set_000190DL_0045B8; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_14Set_000190DL_0045B8[] = dbdan_room_14Set_000190DL_0045B8; + + +#endif // DUNGEONS_BDAN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_15.h b/soh/assets/scenes/dungeons/bdan/bdan_room_15.h index e8b6d04d7..f885daaae 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_15.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_15_H +#define DUNGEONS_BDAN_ROOM_15_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char bdan_room_15DL_002688[] = dbdan_room_15DL_002688; #define dbdan_room_15Set_000080DL_002688 "__OTR__scenes/nonmq/bdan_scene/bdan_room_15Set_000080DL_002688" -static const ALIGN_ASSET(2) char bdan_room_15Set_000080DL_002688[] = dbdan_room_15Set_000080DL_002688; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_15Set_000080DL_002688[] = dbdan_room_15Set_000080DL_002688; + + +#endif // DUNGEONS_BDAN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_2.h b/soh/assets/scenes/dungeons/bdan/bdan_room_2.h index 9f381541b..6e4f5c072 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_2.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_2_H +#define DUNGEONS_BDAN_ROOM_2_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char bdan_room_2Tex_008638[] = dbdan_room_2Tex_00863 static const ALIGN_ASSET(2) char bdan_room_2Tex_006E38[] = dbdan_room_2Tex_006E38; #define dbdan_room_2Set_000180DL_006DD8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Set_000180DL_006DD8" -static const ALIGN_ASSET(2) char bdan_room_2Set_000180DL_006DD8[] = dbdan_room_2Set_000180DL_006DD8; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_2Set_000180DL_006DD8[] = dbdan_room_2Set_000180DL_006DD8; + + +#endif // DUNGEONS_BDAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_3.h b/soh/assets/scenes/dungeons/bdan/bdan_room_3.h index e94478243..49e4d32a9 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_3.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_3_H +#define DUNGEONS_BDAN_ROOM_3_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char bdan_room_3DL_007250[] = dbdan_room_3DL_007250; static const ALIGN_ASSET(2) char bdan_room_3Set_000210DL_004858[] = dbdan_room_3Set_000210DL_004858; #define dbdan_room_3Set_000210DL_007250 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Set_000210DL_007250" -static const ALIGN_ASSET(2) char bdan_room_3Set_000210DL_007250[] = dbdan_room_3Set_000210DL_007250; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_3Set_000210DL_007250[] = dbdan_room_3Set_000210DL_007250; + + +#endif // DUNGEONS_BDAN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_4.h b/soh/assets/scenes/dungeons/bdan/bdan_room_4.h index d9da7782f..8256559d5 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_4.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_4_H +#define DUNGEONS_BDAN_ROOM_4_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char bdan_room_4DL_0040F0[] = dbdan_room_4DL_0040F0; static const ALIGN_ASSET(2) char bdan_room_4Set_000170DL_002B20[] = dbdan_room_4Set_000170DL_002B20; #define dbdan_room_4Set_000170DL_0040F0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4Set_000170DL_0040F0" -static const ALIGN_ASSET(2) char bdan_room_4Set_000170DL_0040F0[] = dbdan_room_4Set_000170DL_0040F0; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_4Set_000170DL_0040F0[] = dbdan_room_4Set_000170DL_0040F0; + + +#endif // DUNGEONS_BDAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_5.h b/soh/assets/scenes/dungeons/bdan/bdan_room_5.h index 50620148e..775950fba 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_5.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_5_H +#define DUNGEONS_BDAN_ROOM_5_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char bdan_room_5Tex_004090[] = dbdan_room_5Tex_00409 static const ALIGN_ASSET(2) char bdan_room_5Set_000180DL_002498[] = dbdan_room_5Set_000180DL_002498; #define dbdan_room_5Set_000180DL_004070 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Set_000180DL_004070" -static const ALIGN_ASSET(2) char bdan_room_5Set_000180DL_004070[] = dbdan_room_5Set_000180DL_004070; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_5Set_000180DL_004070[] = dbdan_room_5Set_000180DL_004070; + + +#endif // DUNGEONS_BDAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_6.h b/soh/assets/scenes/dungeons/bdan/bdan_room_6.h index 53cc1583f..a0be4719d 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_6.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_6_H +#define DUNGEONS_BDAN_ROOM_6_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char bdan_room_6DL_004230[] = dbdan_room_6DL_004230; static const ALIGN_ASSET(2) char bdan_room_6Set_000120DL_003048[] = dbdan_room_6Set_000120DL_003048; #define dbdan_room_6Set_000120DL_004230 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6Set_000120DL_004230" -static const ALIGN_ASSET(2) char bdan_room_6Set_000120DL_004230[] = dbdan_room_6Set_000120DL_004230; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_6Set_000120DL_004230[] = dbdan_room_6Set_000120DL_004230; + + +#endif // DUNGEONS_BDAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_7.h b/soh/assets/scenes/dungeons/bdan/bdan_room_7.h index 23d804eb0..1a7f6555b 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_7.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_7_H +#define DUNGEONS_BDAN_ROOM_7_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char bdan_room_7Tex_002CD0[] = dbdan_room_7Tex_002CD static const ALIGN_ASSET(2) char bdan_room_7Tex_0030D0[] = dbdan_room_7Tex_0030D0; #define dbdan_room_7Set_000150DL_002CB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7Set_000150DL_002CB8" -static const ALIGN_ASSET(2) char bdan_room_7Set_000150DL_002CB8[] = dbdan_room_7Set_000150DL_002CB8; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_7Set_000150DL_002CB8[] = dbdan_room_7Set_000150DL_002CB8; + + +#endif // DUNGEONS_BDAN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_8.h b/soh/assets/scenes/dungeons/bdan/bdan_room_8.h index 22ac558d0..838145756 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_8.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_8_H +#define DUNGEONS_BDAN_ROOM_8_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char bdan_room_8DL_0037A8[] = dbdan_room_8DL_0037A8; #define dbdan_room_8Set_0000A0DL_0037A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_8Set_0000A0DL_0037A8" -static const ALIGN_ASSET(2) char bdan_room_8Set_0000A0DL_0037A8[] = dbdan_room_8Set_0000A0DL_0037A8; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_8Set_0000A0DL_0037A8[] = dbdan_room_8Set_0000A0DL_0037A8; + + +#endif // DUNGEONS_BDAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_9.h b/soh/assets/scenes/dungeons/bdan/bdan_room_9.h index 990ed82e7..186b21f3e 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_9.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_ROOM_9_H +#define DUNGEONS_BDAN_ROOM_9_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char bdan_room_9DL_003790[] = dbdan_room_9DL_003790; static const ALIGN_ASSET(2) char bdan_room_9Tex_003828[] = dbdan_room_9Tex_003828; #define dbdan_room_9Set_0000A0DL_003790 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9Set_0000A0DL_003790" -static const ALIGN_ASSET(2) char bdan_room_9Set_0000A0DL_003790[] = dbdan_room_9Set_0000A0DL_003790; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_room_9Set_0000A0DL_003790[] = dbdan_room_9Set_0000A0DL_003790; + + +#endif // DUNGEONS_BDAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/bdan/bdan_scene.h b/soh/assets/scenes/dungeons/bdan/bdan_scene.h index bde3ef908..6cf171fdc 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_scene.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_SCENE_H +#define DUNGEONS_BDAN_SCENE_H 1 #include "align_asset_macro.h" @@ -26,4 +27,7 @@ static const ALIGN_ASSET(2) char bdan_sceneTex_014600[] = dbdan_sceneTex_014600; #define dbdan_sceneTex_013E00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_013E00" static const ALIGN_ASSET(2) char bdan_sceneTex_013E00[] = dbdan_sceneTex_013E00; -#define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074" \ No newline at end of file +#define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074" + + +#endif // DUNGEONS_BDAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h index b285c81fd..0311e3c48 100644 --- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h +++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_BOSS_ROOM_0_H +#define DUNGEONS_BDAN_BOSS_ROOM_0_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char bdan_boss_room_0DL_002A00[] = dbdan_boss_room_0 static const ALIGN_ASSET(2) char bdan_boss_room_0Tex_002C18[] = dbdan_boss_room_0Tex_002C18; #define dbdan_boss_room_0TLUT_002A10 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0TLUT_002A10" -static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_002A10[] = dbdan_boss_room_0TLUT_002A10; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_002A10[] = dbdan_boss_room_0TLUT_002A10; + + +#endif // DUNGEONS_BDAN_BOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h index 92ef83709..854997c56 100644 --- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h +++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_BDAN_BOSS_ROOM_1_H +#define DUNGEONS_BDAN_BOSS_ROOM_1_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char bdan_boss_room_1TLUT_003AB0[] = dbdan_boss_room static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_0044B8[] = dbdan_boss_room_1Tex_0044B8; #define dbdan_boss_room_1Tex_003CB8 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1Tex_003CB8" -static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_003CB8[] = dbdan_boss_room_1Tex_003CB8; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_003CB8[] = dbdan_boss_room_1Tex_003CB8; + + +#endif // DUNGEONS_BDAN_BOSS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h index c9ea990c7..01827e86a 100644 --- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h +++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef DUNGEONS_BDAN_BOSS_SCENE_H +#define DUNGEONS_BDAN_BOSS_SCENE_H 1 #include "align_asset_macro.h" #define dbdan_boss_sceneCollisionHeader_000E14 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_sceneCollisionHeader_000E14" -static const ALIGN_ASSET(2) char bdan_boss_sceneCollisionHeader_000E14[] = dbdan_boss_sceneCollisionHeader_000E14; \ No newline at end of file +static const ALIGN_ASSET(2) char bdan_boss_sceneCollisionHeader_000E14[] = dbdan_boss_sceneCollisionHeader_000E14; + + +#endif // DUNGEONS_BDAN_BOSS_SCENE_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_0.h b/soh/assets/scenes/dungeons/ddan/ddan_room_0.h index 571df87bc..e475c26d0 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_0.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_0_H +#define DUNGEONS_DDAN_ROOM_0_H 1 #include "align_asset_macro.h" @@ -126,4 +127,7 @@ static const ALIGN_ASSET(2) char ddan_room_0DL_010A88[] = dddan_room_0DL_010A88; static const ALIGN_ASSET(2) char ddan_room_0DL_011050[] = dddan_room_0DL_011050; #define dddan_room_0DL_000580 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_000580" -static const ALIGN_ASSET(2) char ddan_room_0DL_000580[] = dddan_room_0DL_000580; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_0DL_000580[] = dddan_room_0DL_000580; + + +#endif // DUNGEONS_DDAN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_1.h b/soh/assets/scenes/dungeons/ddan/ddan_room_1.h index 24e85073c..56cdae2d3 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_1.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_1_H +#define DUNGEONS_DDAN_ROOM_1_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char ddan_room_1Tex_004F70[] = dddan_room_1Tex_004F7 static const ALIGN_ASSET(2) char ddan_room_1DL_004630[] = dddan_room_1DL_004630; #define dddan_room_1Tex_008F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_008F70" -static const ALIGN_ASSET(2) char ddan_room_1Tex_008F70[] = dddan_room_1Tex_008F70; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_1Tex_008F70[] = dddan_room_1Tex_008F70; + + +#endif // DUNGEONS_DDAN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_10.h b/soh/assets/scenes/dungeons/ddan/ddan_room_10.h index 6e8473e0e..e7cd22c3a 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_10.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_10_H +#define DUNGEONS_DDAN_ROOM_10_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char ddan_room_10Tex_004310[] = dddan_room_10Tex_004 static const ALIGN_ASSET(2) char ddan_room_10Tex_002B10[] = dddan_room_10Tex_002B10; #define dddan_room_10Tex_007310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_007310" -static const ALIGN_ASSET(2) char ddan_room_10Tex_007310[] = dddan_room_10Tex_007310; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_10Tex_007310[] = dddan_room_10Tex_007310; + + +#endif // DUNGEONS_DDAN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_11.h b/soh/assets/scenes/dungeons/ddan/ddan_room_11.h index ddc08878c..2dfed8d44 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_11.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_11_H +#define DUNGEONS_DDAN_ROOM_11_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char ddan_room_11Tex_001C30[] = dddan_room_11Tex_001 static const ALIGN_ASSET(2) char ddan_room_11Tex_001430[] = dddan_room_11Tex_001430; #define dddan_room_11Tex_000C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_000C30" -static const ALIGN_ASSET(2) char ddan_room_11Tex_000C30[] = dddan_room_11Tex_000C30; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_11Tex_000C30[] = dddan_room_11Tex_000C30; + + +#endif // DUNGEONS_DDAN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_12.h b/soh/assets/scenes/dungeons/ddan/ddan_room_12.h index af204da5e..f63f65ec2 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_12.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_12_H +#define DUNGEONS_DDAN_ROOM_12_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ddan_room_12Tex_003B80[] = dddan_room_12Tex_003 static const ALIGN_ASSET(2) char ddan_room_12Tex_004780[] = dddan_room_12Tex_004780; #define dddan_room_12Tex_002F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_002F80" -static const ALIGN_ASSET(2) char ddan_room_12Tex_002F80[] = dddan_room_12Tex_002F80; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_12Tex_002F80[] = dddan_room_12Tex_002F80; + + +#endif // DUNGEONS_DDAN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_13.h b/soh/assets/scenes/dungeons/ddan/ddan_room_13.h index 7c7f03e03..ba9752dcc 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_13.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_13_H +#define DUNGEONS_DDAN_ROOM_13_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ddan_room_13Tex_0020C8[] = dddan_room_13Tex_002 static const ALIGN_ASSET(2) char ddan_room_13Tex_000CC8[] = dddan_room_13Tex_000CC8; #define dddan_room_13Tex_001CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_001CC8" -static const ALIGN_ASSET(2) char ddan_room_13Tex_001CC8[] = dddan_room_13Tex_001CC8; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_13Tex_001CC8[] = dddan_room_13Tex_001CC8; + + +#endif // DUNGEONS_DDAN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_14.h b/soh/assets/scenes/dungeons/ddan/ddan_room_14.h index a6bf7932f..7d37556f9 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_14.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_14_H +#define DUNGEONS_DDAN_ROOM_14_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ddan_room_14Tex_0020C8[] = dddan_room_14Tex_002 static const ALIGN_ASSET(2) char ddan_room_14Tex_0014C8[] = dddan_room_14Tex_0014C8; #define dddan_room_14Tex_001CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_001CC8" -static const ALIGN_ASSET(2) char ddan_room_14Tex_001CC8[] = dddan_room_14Tex_001CC8; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_14Tex_001CC8[] = dddan_room_14Tex_001CC8; + + +#endif // DUNGEONS_DDAN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_15.h b/soh/assets/scenes/dungeons/ddan/ddan_room_15.h index 4f1a5b8be..8b3993eca 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_15.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_15_H +#define DUNGEONS_DDAN_ROOM_15_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ddan_room_15Tex_002528[] = dddan_room_15Tex_002 static const ALIGN_ASSET(2) char ddan_room_15Tex_001528[] = dddan_room_15Tex_001528; #define dddan_room_15Tex_000D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_000D28" -static const ALIGN_ASSET(2) char ddan_room_15Tex_000D28[] = dddan_room_15Tex_000D28; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_15Tex_000D28[] = dddan_room_15Tex_000D28; + + +#endif // DUNGEONS_DDAN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_16.h b/soh/assets/scenes/dungeons/ddan/ddan_room_16.h index 26010b367..f34baa433 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_16.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_16_H +#define DUNGEONS_DDAN_ROOM_16_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char ddan_room_16Tex_003158[] = dddan_room_16Tex_003 static const ALIGN_ASSET(2) char ddan_room_16Tex_002158[] = dddan_room_16Tex_002158; #define dddan_room_16Tex_003958 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003958" -static const ALIGN_ASSET(2) char ddan_room_16Tex_003958[] = dddan_room_16Tex_003958; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_16Tex_003958[] = dddan_room_16Tex_003958; + + +#endif // DUNGEONS_DDAN_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_2.h b/soh/assets/scenes/dungeons/ddan/ddan_room_2.h index 265b96741..2c8a3c2ed 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_2.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_2_H +#define DUNGEONS_DDAN_ROOM_2_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char ddan_room_2DL_0035C8[] = dddan_room_2DL_0035C8; static const ALIGN_ASSET(2) char ddan_room_2DL_006CB0[] = dddan_room_2DL_006CB0; #define dddan_room_2Tex_006EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006EB8" -static const ALIGN_ASSET(2) char ddan_room_2Tex_006EB8[] = dddan_room_2Tex_006EB8; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_2Tex_006EB8[] = dddan_room_2Tex_006EB8; + + +#endif // DUNGEONS_DDAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_3.h b/soh/assets/scenes/dungeons/ddan/ddan_room_3.h index 3c2b97ada..76b5b7bb9 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_3.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_3_H +#define DUNGEONS_DDAN_ROOM_3_H 1 #include "align_asset_macro.h" @@ -78,4 +79,7 @@ static const ALIGN_ASSET(2) char ddan_room_3DL_00D560[] = dddan_room_3DL_00D560; static const ALIGN_ASSET(2) char ddan_room_3Tex_00D668[] = dddan_room_3Tex_00D668; #define dddan_room_3DL_000430 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_000430" -static const ALIGN_ASSET(2) char ddan_room_3DL_000430[] = dddan_room_3DL_000430; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_3DL_000430[] = dddan_room_3DL_000430; + + +#endif // DUNGEONS_DDAN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_4.h b/soh/assets/scenes/dungeons/ddan/ddan_room_4.h index bafd8e339..f8e792c01 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_4.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_4_H +#define DUNGEONS_DDAN_ROOM_4_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ddan_room_4Tex_006D58[] = dddan_room_4Tex_006D5 static const ALIGN_ASSET(2) char ddan_room_4DL_0068C0[] = dddan_room_4DL_0068C0; #define dddan_room_4Tex_008558 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_008558" -static const ALIGN_ASSET(2) char ddan_room_4Tex_008558[] = dddan_room_4Tex_008558; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_4Tex_008558[] = dddan_room_4Tex_008558; + + +#endif // DUNGEONS_DDAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_5.h b/soh/assets/scenes/dungeons/ddan/ddan_room_5.h index 376f1967f..0ff71839f 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_5.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_5_H +#define DUNGEONS_DDAN_ROOM_5_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char ddan_room_5Tex_0046B8[] = dddan_room_5Tex_0046B static const ALIGN_ASSET(2) char ddan_room_5Tex_003AB8[] = dddan_room_5Tex_003AB8; #define dddan_room_5Tex_0056B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0056B8" -static const ALIGN_ASSET(2) char ddan_room_5Tex_0056B8[] = dddan_room_5Tex_0056B8; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_5Tex_0056B8[] = dddan_room_5Tex_0056B8; + + +#endif // DUNGEONS_DDAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_6.h b/soh/assets/scenes/dungeons/ddan/ddan_room_6.h index 3b88aeb91..d4a6a0ede 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_6.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_6_H +#define DUNGEONS_DDAN_ROOM_6_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ddan_room_6Tex_0014A8[] = dddan_room_6Tex_0014A static const ALIGN_ASSET(2) char ddan_room_6Tex_0020A8[] = dddan_room_6Tex_0020A8; #define dddan_room_6Tex_001CA8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_001CA8" -static const ALIGN_ASSET(2) char ddan_room_6Tex_001CA8[] = dddan_room_6Tex_001CA8; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_6Tex_001CA8[] = dddan_room_6Tex_001CA8; + + +#endif // DUNGEONS_DDAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_7.h b/soh/assets/scenes/dungeons/ddan/ddan_room_7.h index fe34da119..034fa7ac1 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_7.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_7_H +#define DUNGEONS_DDAN_ROOM_7_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char ddan_room_7Tex_005EF8[] = dddan_room_7Tex_005EF static const ALIGN_ASSET(2) char ddan_room_7Tex_006EF8[] = dddan_room_7Tex_006EF8; #define dddan_room_7DL_004538 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7DL_004538" -static const ALIGN_ASSET(2) char ddan_room_7DL_004538[] = dddan_room_7DL_004538; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_7DL_004538[] = dddan_room_7DL_004538; + + +#endif // DUNGEONS_DDAN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_8.h b/soh/assets/scenes/dungeons/ddan/ddan_room_8.h index 6248efbb6..6a2cf811e 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_8.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_8_H +#define DUNGEONS_DDAN_ROOM_8_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ddan_room_8Tex_0049A0[] = dddan_room_8Tex_0049A static const ALIGN_ASSET(2) char ddan_room_8Tex_0059A0[] = dddan_room_8Tex_0059A0; #define dddan_room_8Tex_0061A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0061A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0061A0[] = dddan_room_8Tex_0061A0; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_8Tex_0061A0[] = dddan_room_8Tex_0061A0; + + +#endif // DUNGEONS_DDAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_9.h b/soh/assets/scenes/dungeons/ddan/ddan_room_9.h index 2b3b98a19..dee3f237e 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_9.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_ROOM_9_H +#define DUNGEONS_DDAN_ROOM_9_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char ddan_room_9Tex_005D28[] = dddan_room_9Tex_005D2 static const ALIGN_ASSET(2) char ddan_room_9Tex_005128[] = dddan_room_9Tex_005128; #define dddan_room_9Tex_00A928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00A928" -static const ALIGN_ASSET(2) char ddan_room_9Tex_00A928[] = dddan_room_9Tex_00A928; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_room_9Tex_00A928[] = dddan_room_9Tex_00A928; + + +#endif // DUNGEONS_DDAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_scene.h b/soh/assets/scenes/dungeons/ddan/ddan_scene.h index 0a0d838d5..358ec5d21 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_scene.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_SCENE_H +#define DUNGEONS_DDAN_SCENE_H 1 #include "align_asset_macro.h" @@ -39,4 +40,6 @@ static const ALIGN_ASSET(2) char gDcOpeningCs[] = dgDcOpeningCs; static const ALIGN_ASSET(2) char ddan_sceneCollisionHeader_011D40[] = dddan_sceneCollisionHeader_011D40; #define dddan_sceneTLUT_011D70 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneTLUT_011D70" -static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70; + +#endif // DUNGEONS_DDAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h index 0531e32cd..9f60814d0 100644 --- 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,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_BOSS_ROOM_0_H +#define DUNGEONS_DDAN_BOSS_ROOM_0_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003628[] = dddan_boss_room_ 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; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_004628[] = dddan_boss_room_0Tex_004628; + + +#endif // DUNGEONS_DDAN_BOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h index dfaaa07e5..f73a076d6 100644 --- 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,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_BOSS_ROOM_1_H +#define DUNGEONS_DDAN_BOSS_ROOM_1_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0031D8[] = dddan_boss_room_ 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; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_boss_room_1DL_000A50[] = dddan_boss_room_1DL_000A50; + + +#endif // DUNGEONS_DDAN_BOSS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h index 171adff35..285a15c40 100644 --- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h +++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_DDAN_BOSS_SCENE_H +#define DUNGEONS_DDAN_BOSS_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_scene 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; \ No newline at end of file +static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001058[] = dddan_boss_sceneTex_001058; + +#endif // DUNGEONS_DDAN_BOSS_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_0.h b/soh/assets/scenes/dungeons/ganon/ganon_room_0.h index 6dd42da48..06e6b05ac 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_0.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_0_H +#define DUNGEONS_GANON_ROOM_0_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char ganon_room_0Tex_005C68[] = dganon_room_0Tex_005 static const ALIGN_ASSET(2) char ganon_room_0DL_0076C0[] = dganon_room_0DL_0076C0; #define dganon_room_0Tex_0076D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_0076D0" -static const ALIGN_ASSET(2) char ganon_room_0Tex_0076D0[] = dganon_room_0Tex_0076D0; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_0Tex_0076D0[] = dganon_room_0Tex_0076D0; + + +#endif // DUNGEONS_GANON_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_1.h b/soh/assets/scenes/dungeons/ganon/ganon_room_1.h index 728d33bab..b4af253ec 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_1.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_1_H +#define DUNGEONS_GANON_ROOM_1_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005 static const ALIGN_ASSET(2) char ganon_room_1Tex_005370[] = dganon_room_1Tex_005370; #define dganon_room_1Tex_006770 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006770" -static const ALIGN_ASSET(2) char ganon_room_1Tex_006770[] = dganon_room_1Tex_006770; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_1Tex_006770[] = dganon_room_1Tex_006770; + + +#endif // DUNGEONS_GANON_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_2.h b/soh/assets/scenes/dungeons/ganon/ganon_room_2.h index 8c073bc40..d43f70ddb 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_2.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_2_H +#define DUNGEONS_GANON_ROOM_2_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ganon_room_2Tex_0051F0[] = dganon_room_2Tex_005 static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040; #define dganon_room_2Tex_007050 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_007050" -static const ALIGN_ASSET(2) char ganon_room_2Tex_007050[] = dganon_room_2Tex_007050; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_2Tex_007050[] = dganon_room_2Tex_007050; + + +#endif // DUNGEONS_GANON_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_3.h b/soh/assets/scenes/dungeons/ganon/ganon_room_3.h index cef532233..c81614fdf 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_3.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_3_H +#define DUNGEONS_GANON_ROOM_3_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char ganon_room_3Tex_005730[] = dganon_room_3Tex_005 static const ALIGN_ASSET(2) char ganon_room_3Tex_005F30[] = dganon_room_3Tex_005F30; #define dganon_room_3Tex_006730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_006730" -static const ALIGN_ASSET(2) char ganon_room_3Tex_006730[] = dganon_room_3Tex_006730; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_3Tex_006730[] = dganon_room_3Tex_006730; + + +#endif // DUNGEONS_GANON_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_4.h b/soh/assets/scenes/dungeons/ganon/ganon_room_4.h index 2e9148002..f08d2e722 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_4.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_4_H +#define DUNGEONS_GANON_ROOM_4_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ganon_room_4Tex_006A68[] = dganon_room_4Tex_006 static const ALIGN_ASSET(2) char ganon_room_4DL_0088C0[] = dganon_room_4DL_0088C0; #define dganon_room_4Tex_0088D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_0088D0" -static const ALIGN_ASSET(2) char ganon_room_4Tex_0088D0[] = dganon_room_4Tex_0088D0; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_4Tex_0088D0[] = dganon_room_4Tex_0088D0; + + +#endif // DUNGEONS_GANON_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_5.h b/soh/assets/scenes/dungeons/ganon/ganon_room_5.h index d1fe118a9..063b5a746 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_5.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_5_H +#define DUNGEONS_GANON_ROOM_5_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008 static const ALIGN_ASSET(2) char ganon_room_5Tex_006B08[] = dganon_room_5Tex_006B08; #define dganon_room_5Tex_006308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006308" -static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308; + + +#endif // DUNGEONS_GANON_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_6.h b/soh/assets/scenes/dungeons/ganon/ganon_room_6.h index 5a485f038..626ce1890 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_6.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_6_H +#define DUNGEONS_GANON_ROOM_6_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ganon_room_6Tex_008300[] = dganon_room_6Tex_008 static const ALIGN_ASSET(2) char ganon_room_6DL_009388[] = dganon_room_6DL_009388; #define dganon_room_6Tex_009398 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_009398" -static const ALIGN_ASSET(2) char ganon_room_6Tex_009398[] = dganon_room_6Tex_009398; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_6Tex_009398[] = dganon_room_6Tex_009398; + + +#endif // DUNGEONS_GANON_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_7.h b/soh/assets/scenes/dungeons/ganon/ganon_room_7.h index dac4d2c60..522239a0d 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_7.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_7_H +#define DUNGEONS_GANON_ROOM_7_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char ganon_room_7Tex_0071E0[] = dganon_room_7Tex_007 static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88; #define dganon_room_7Tex_009F98 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_009F98" -static const ALIGN_ASSET(2) char ganon_room_7Tex_009F98[] = dganon_room_7Tex_009F98; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_7Tex_009F98[] = dganon_room_7Tex_009F98; + + +#endif // DUNGEONS_GANON_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_8.h b/soh/assets/scenes/dungeons/ganon/ganon_room_8.h index 49f8fe901..40aacf021 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_8.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_8_H +#define DUNGEONS_GANON_ROOM_8_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ganon_room_8Tex_0063E0[] = dganon_room_8Tex_006 static const ALIGN_ASSET(2) char ganon_room_8Tex_005360[] = dganon_room_8Tex_005360; #define dganon_room_8Tex_005FE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005FE0" -static const ALIGN_ASSET(2) char ganon_room_8Tex_005FE0[] = dganon_room_8Tex_005FE0; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_8Tex_005FE0[] = dganon_room_8Tex_005FE0; + + +#endif // DUNGEONS_GANON_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_9.h b/soh/assets/scenes/dungeons/ganon/ganon_room_9.h index c9635b9f9..47cad0daa 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_9.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_ROOM_9_H +#define DUNGEONS_GANON_ROOM_9_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char ganon_room_9Tex_003120[] = dganon_room_9Tex_003 static const ALIGN_ASSET(2) char ganon_room_9Tex_003520[] = dganon_room_9Tex_003520; #define dganon_room_9Tex_003920 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003920" -static const ALIGN_ASSET(2) char ganon_room_9Tex_003920[] = dganon_room_9Tex_003920; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_room_9Tex_003920[] = dganon_room_9Tex_003920; + + +#endif // DUNGEONS_GANON_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_scene.h b/soh/assets/scenes/dungeons/ganon/ganon_scene.h index 4e2007b77..58eff87d2 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_scene.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_SCENE_H +#define DUNGEONS_GANON_SCENE_H 1 #include "align_asset_macro.h" @@ -30,4 +31,6 @@ static const ALIGN_ASSET(2) char ganon_sceneTex_00FFA8[] = dganon_sceneTex_00FFA static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EBE0[] = dganon_sceneTLUT_00EBE0; #define dganon_sceneTLUT_00E9D8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00E9D8" -static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E9D8[] = dganon_sceneTLUT_00E9D8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E9D8[] = dganon_sceneTLUT_00E9D8; + +#endif // DUNGEONS_GANON_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h index 463b93b09..58fc10437 100644 --- a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef DUNGEONS_GANON_BOSS_ROOM_0_H +#define DUNGEONS_GANON_BOSS_ROOM_0_H 1 #include "align_asset_macro.h" #define dganon_boss_room_0DL_005E50 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_room_0DL_005E50" -static const ALIGN_ASSET(2) char ganon_boss_room_0DL_005E50[] = dganon_boss_room_0DL_005E50; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_boss_room_0DL_005E50[] = dganon_boss_room_0DL_005E50; + + +#endif // DUNGEONS_GANON_BOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h index c42c9d854..13d810fbd 100644 --- a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h +++ b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_BOSS_SCENE_H +#define DUNGEONS_GANON_BOSS_SCENE_H 1 #include "align_asset_macro.h" @@ -72,4 +73,6 @@ static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004418[] = dganon_boss_scen static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004018[] = dganon_boss_sceneTex_004018; #define dganon_boss_sceneTex_007418 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_007418" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_007418[] = dganon_boss_sceneTex_007418; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_007418[] = dganon_boss_sceneTex_007418; + +#endif // DUNGEONS_GANON_BOSS_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h index 299f212da..c1927a945 100644 --- a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_DEMO_ROOM_0_H +#define DUNGEONS_GANON_DEMO_ROOM_0_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char ganon_demo_room_0DL_004140[] = dganon_demo_room static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_003D58[] = dganon_demo_room_0Set_000230DL_003D58; #define dganon_demo_room_0Set_000230DL_004140 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0Set_000230DL_004140" -static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_004140[] = dganon_demo_room_0Set_000230DL_004140; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_004140[] = dganon_demo_room_0Set_000230DL_004140; + + +#endif // DUNGEONS_GANON_DEMO_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h index 3346f0149..0044d616d 100644 --- a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h +++ b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_DEMO_SCENE_H +#define DUNGEONS_GANON_DEMO_SCENE_H 1 #include "align_asset_macro.h" @@ -38,4 +39,7 @@ static const ALIGN_ASSET(2) char ganon_demo_sceneTex_001B70[] = dganon_demo_scen #define dganon_demo_sceneTex_006B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_006B70" static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006B70[] = dganon_demo_sceneTex_006B70; -#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0" \ No newline at end of file +#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0" + + +#endif // DUNGEONS_GANON_DEMO_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h b/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h index 6b8adc8bf..5a859ed00 100644 --- a/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_FINAL_ROOM_0_H +#define DUNGEONS_GANON_FINAL_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char ganon_final_room_0DL_00CA40[] = dganon_final_room_0DL_00CA40; #define dganon_final_room_0DL_00CE98 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_room_0DL_00CE98" -static const ALIGN_ASSET(2) char ganon_final_room_0DL_00CE98[] = dganon_final_room_0DL_00CE98; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_final_room_0DL_00CE98[] = dganon_final_room_0DL_00CE98; + + +#endif // DUNGEONS_GANON_FINAL_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h b/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h index 93184b233..efa7738d1 100644 --- a/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h +++ b/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_FINAL_SCENE_H +#define DUNGEONS_GANON_FINAL_SCENE_H 1 #include "align_asset_macro.h" @@ -78,4 +79,6 @@ static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F180[] = dganon_final_sc static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E080[] = dganon_final_sceneTex_00E080; #define dganon_final_sceneTex_011180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_011180" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_011180[] = dganon_final_sceneTex_011180; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_final_sceneTex_011180[] = dganon_final_sceneTex_011180; + +#endif // DUNGEONS_GANON_FINAL_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h index 7ad65ca0a..ca506aa89 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_SONOGO_ROOM_0_H +#define DUNGEONS_GANON_SONOGO_ROOM_0_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007020[] = dganon_sonogo static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005C20[] = dganon_sonogo_room_0Tex_005C20; #define dganon_sonogo_room_0DL_007E70 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0DL_007E70" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_007E70[] = dganon_sonogo_room_0DL_007E70; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_007E70[] = dganon_sonogo_room_0DL_007E70; + + +#endif // DUNGEONS_GANON_SONOGO_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h index 90c42dc79..f4d721082 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_SONOGO_ROOM_1_H +#define DUNGEONS_GANON_SONOGO_ROOM_1_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005D48[] = dganon_sonogo static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004548[] = dganon_sonogo_room_1Tex_004548; #define dganon_sonogo_room_1DL_007BA0 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1DL_007BA0" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_007BA0[] = dganon_sonogo_room_1DL_007BA0; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_007BA0[] = dganon_sonogo_room_1DL_007BA0; + + +#endif // DUNGEONS_GANON_SONOGO_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h index 509cc86d7..584de962e 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_SONOGO_ROOM_2_H +#define DUNGEONS_GANON_SONOGO_ROOM_2_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_008240[] = dganon_sonogo static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006E40[] = dganon_sonogo_room_2Tex_006E40; #define dganon_sonogo_room_2DL_008C90 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2DL_008C90" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_008C90[] = dganon_sonogo_room_2DL_008C90; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_008C90[] = dganon_sonogo_room_2DL_008C90; + + +#endif // DUNGEONS_GANON_SONOGO_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h index 016f52192..77620980e 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_SONOGO_ROOM_3_H +#define DUNGEONS_GANON_SONOGO_ROOM_3_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004E38[] = dganon_sonogo static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004638[] = dganon_sonogo_room_3Tex_004638; #define dganon_sonogo_room_3Tex_003E38 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003E38" -static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003E38[] = dganon_sonogo_room_3Tex_003E38; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003E38[] = dganon_sonogo_room_3Tex_003E38; + + +#endif // DUNGEONS_GANON_SONOGO_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h index a3eb90d30..c56319d02 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_SONOGO_ROOM_4_H +#define DUNGEONS_GANON_SONOGO_ROOM_4_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_007CE8[] = dganon_sonogo static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_006CE8[] = dganon_sonogo_room_4Tex_006CE8; #define dganon_sonogo_room_4Tex_0054A8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054A8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054A8[] = dganon_sonogo_room_4Tex_0054A8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054A8[] = dganon_sonogo_room_4Tex_0054A8; + + +#endif // DUNGEONS_GANON_SONOGO_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h index 9d66715ce..429616fc0 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_SONOGO_SCENE_H +#define DUNGEONS_GANON_SONOGO_SCENE_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006508[] = dganon_sonogo static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_006F10[] = dganon_sonogo_sceneTex_006F10; #define dganon_sonogo_sceneTex_007710 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_007710" -static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007710[] = dganon_sonogo_sceneTex_007710; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007710[] = dganon_sonogo_sceneTex_007710; + +#endif // DUNGEONS_GANON_SONOGO_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h index 7c2d3a968..a6c570778 100644 --- a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_TOU_ROOM_0_H +#define DUNGEONS_GANON_TOU_ROOM_0_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0124F0[] = dganon_tou_room_ static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0084A8[] = dganon_tou_room_0Set_000160DL_0084A8; #define dganon_tou_room_0Set_000160DL_0124B8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0124B8" -static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0124B8[] = dganon_tou_room_0Set_000160DL_0124B8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0124B8[] = dganon_tou_room_0Set_000160DL_0124B8; + + +#endif // DUNGEONS_GANON_TOU_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h index 660402253..0b16597af 100644 --- a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h +++ b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANON_TOU_SCENE_H +#define DUNGEONS_GANON_TOU_SCENE_H 1 #include "align_asset_macro.h" @@ -14,4 +15,7 @@ static const ALIGN_ASSET(2) char ganon_tou_sceneCollisionHeader_002610[] = dgano #define dganon_tou_sceneTex_003280 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneTex_003280" static const ALIGN_ASSET(2) char ganon_tou_sceneTex_003280[] = dganon_tou_sceneTex_003280; -#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610" \ No newline at end of file +#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610" + + +#endif // DUNGEONS_GANON_TOU_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h index 694eaf46c..b1f1e276a 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_0_H +#define DUNGEONS_GANONTIKA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char ganontika_room_0DL_007488[] = dganontika_room_0 static const ALIGN_ASSET(2) char ganontika_room_0DL_0079E8[] = dganontika_room_0DL_0079E8; #define dganontika_room_0DL_007DA0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_007DA0" -static const ALIGN_ASSET(2) char ganontika_room_0DL_007DA0[] = dganontika_room_0DL_007DA0; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_0DL_007DA0[] = dganontika_room_0DL_007DA0; + + +#endif // DUNGEONS_GANONTIKA_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h index 8aa879f59..d1c2ddb40 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_1_H +#define DUNGEONS_GANONTIKA_ROOM_1_H 1 #include "align_asset_macro.h" @@ -192,4 +193,7 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_00CE08[] = dganontika_room_1 static const ALIGN_ASSET(2) char ganontika_room_1DL_00D138[] = dganontika_room_1DL_00D138; #define dganontika_room_1DL_00D560 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_00D560" -static const ALIGN_ASSET(2) char ganontika_room_1DL_00D560[] = dganontika_room_1DL_00D560; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_1DL_00D560[] = dganontika_room_1DL_00D560; + + +#endif // DUNGEONS_GANONTIKA_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h index afa265510..ff09e407c 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_10_H +#define DUNGEONS_GANONTIKA_ROOM_10_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char ganontika_room_10DL_002AD8[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_10DL_0032E8[] = dganontika_room_10DL_0032E8; #define dganontika_room_10DL_0037E8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_0037E8" -static const ALIGN_ASSET(2) char ganontika_room_10DL_0037E8[] = dganontika_room_10DL_0037E8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_10DL_0037E8[] = dganontika_room_10DL_0037E8; + + +#endif // DUNGEONS_GANONTIKA_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h index e9b142529..02df22e39 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_11_H +#define DUNGEONS_GANONTIKA_ROOM_11_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char ganontika_room_11Tex_005950[] = dganontika_room static const ALIGN_ASSET(2) char ganontika_room_11Tex_004150[] = dganontika_room_11Tex_004150; #define dganontika_room_11DL_003F60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_003F60" -static const ALIGN_ASSET(2) char ganontika_room_11DL_003F60[] = dganontika_room_11DL_003F60; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_11DL_003F60[] = dganontika_room_11DL_003F60; + + +#endif // DUNGEONS_GANONTIKA_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h index 8a5f1938f..003441450 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_12_H +#define DUNGEONS_GANONTIKA_ROOM_12_H 1 #include "align_asset_macro.h" @@ -66,4 +67,7 @@ static const ALIGN_ASSET(2) char ganontika_room_12Tex_006160[] = dganontika_room static const ALIGN_ASSET(2) char ganontika_room_12DL_009178[] = dganontika_room_12DL_009178; #define dganontika_room_12Tex_00A270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_00A270" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_00A270[] = dganontika_room_12Tex_00A270; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_12Tex_00A270[] = dganontika_room_12Tex_00A270; + + +#endif // DUNGEONS_GANONTIKA_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h index 1db518034..fa2e49496 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_13_H +#define DUNGEONS_GANONTIKA_ROOM_13_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ganontika_room_13DL_003470[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_13DL_003C80[] = dganontika_room_13DL_003C80; #define dganontika_room_13DL_004170 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_004170" -static const ALIGN_ASSET(2) char ganontika_room_13DL_004170[] = dganontika_room_13DL_004170; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_13DL_004170[] = dganontika_room_13DL_004170; + + +#endif // DUNGEONS_GANONTIKA_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h index 1758382c3..221eace9f 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_14_H +#define DUNGEONS_GANONTIKA_ROOM_14_H 1 #include "align_asset_macro.h" @@ -63,4 +64,7 @@ static const ALIGN_ASSET(2) char ganontika_room_14Tex_004FB8[] = dganontika_room static const ALIGN_ASSET(2) char ganontika_room_14DL_008888[] = dganontika_room_14DL_008888; #define dganontika_room_14Tex_0099C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0099C8" -static const ALIGN_ASSET(2) char ganontika_room_14Tex_0099C8[] = dganontika_room_14Tex_0099C8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_14Tex_0099C8[] = dganontika_room_14Tex_0099C8; + + +#endif // DUNGEONS_GANONTIKA_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h index 6c3dc5c9a..60c463138 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_15_H +#define DUNGEONS_GANONTIKA_ROOM_15_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ganontika_room_15DL_003470[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_15DL_003C80[] = dganontika_room_15DL_003C80; #define dganontika_room_15DL_004170 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_004170" -static const ALIGN_ASSET(2) char ganontika_room_15DL_004170[] = dganontika_room_15DL_004170; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_15DL_004170[] = dganontika_room_15DL_004170; + + +#endif // DUNGEONS_GANONTIKA_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h index 45c065e40..7b0b5e713 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_16_H +#define DUNGEONS_GANONTIKA_ROOM_16_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char ganontika_room_16DL_000E80[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_16DL_001288[] = dganontika_room_16DL_001288; #define dganontika_room_16Tex_002630 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16Tex_002630" -static const ALIGN_ASSET(2) char ganontika_room_16Tex_002630[] = dganontika_room_16Tex_002630; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_16Tex_002630[] = dganontika_room_16Tex_002630; + + +#endif // DUNGEONS_GANONTIKA_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h index adc1298bc..81a2bef39 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_17_H +#define DUNGEONS_GANONTIKA_ROOM_17_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char ganontika_room_17DL_001DE0[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_17DL_002908[] = dganontika_room_17DL_002908; #define dganontika_room_17Tex_006618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_006618" -static const ALIGN_ASSET(2) char ganontika_room_17Tex_006618[] = dganontika_room_17Tex_006618; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_17Tex_006618[] = dganontika_room_17Tex_006618; + + +#endif // DUNGEONS_GANONTIKA_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h index d5cb5fc57..b124eeff2 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_18_H +#define DUNGEONS_GANONTIKA_ROOM_18_H 1 #include "align_asset_macro.h" @@ -72,4 +73,7 @@ static const ALIGN_ASSET(2) char ganontika_room_18DL_004188[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_18DL_000D70[] = dganontika_room_18DL_000D70; #define dganontika_room_18Tex_005380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_005380" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_005380[] = dganontika_room_18Tex_005380; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_18Tex_005380[] = dganontika_room_18Tex_005380; + + +#endif // DUNGEONS_GANONTIKA_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h index caf4496a1..44c804312 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_19_H +#define DUNGEONS_GANONTIKA_ROOM_19_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ganontika_room_19DL_003470[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_19DL_003C80[] = dganontika_room_19DL_003C80; #define dganontika_room_19DL_004170 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_004170" -static const ALIGN_ASSET(2) char ganontika_room_19DL_004170[] = dganontika_room_19DL_004170; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_19DL_004170[] = dganontika_room_19DL_004170; + + +#endif // DUNGEONS_GANONTIKA_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h index 3fbfb5799..5e133520a 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_2_H +#define DUNGEONS_GANONTIKA_ROOM_2_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char ganontika_room_2DL_002AE0[] = dganontika_room_2 static const ALIGN_ASSET(2) char ganontika_room_2Tex_0037D8[] = dganontika_room_2Tex_0037D8; #define dganontika_room_2DL_000F00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_000F00" -static const ALIGN_ASSET(2) char ganontika_room_2DL_000F00[] = dganontika_room_2DL_000F00; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_2DL_000F00[] = dganontika_room_2DL_000F00; + + +#endif // DUNGEONS_GANONTIKA_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h index cf0af584a..ca4315f72 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_3_H +#define DUNGEONS_GANONTIKA_ROOM_3_H 1 #include "align_asset_macro.h" @@ -63,4 +64,7 @@ static const ALIGN_ASSET(2) char ganontika_room_3DL_0028E8[] = dganontika_room_3 static const ALIGN_ASSET(2) char ganontika_room_3DL_002F48[] = dganontika_room_3DL_002F48; #define dganontika_room_3Tex_0076D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0076D8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_0076D8[] = dganontika_room_3Tex_0076D8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_3Tex_0076D8[] = dganontika_room_3Tex_0076D8; + + +#endif // DUNGEONS_GANONTIKA_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h index 5f9e117ef..483128ea0 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_4_H +#define DUNGEONS_GANONTIKA_ROOM_4_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char ganontika_room_4DL_003048[] = dganontika_room_4 static const ALIGN_ASSET(2) char ganontika_room_4DL_0037C8[] = dganontika_room_4DL_0037C8; #define dganontika_room_4DL_003FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_003FD8" -static const ALIGN_ASSET(2) char ganontika_room_4DL_003FD8[] = dganontika_room_4DL_003FD8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_4DL_003FD8[] = dganontika_room_4DL_003FD8; + + +#endif // DUNGEONS_GANONTIKA_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h index 40a8ae3a1..28eebc360 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_5_H +#define DUNGEONS_GANONTIKA_ROOM_5_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char ganontika_room_5Tex_004518[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_5DL_000320[] = dganontika_room_5DL_000320; #define dganontika_room_5Tex_005D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005D18" -static const ALIGN_ASSET(2) char ganontika_room_5Tex_005D18[] = dganontika_room_5Tex_005D18; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_5Tex_005D18[] = dganontika_room_5Tex_005D18; + + +#endif // DUNGEONS_GANONTIKA_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h index 465e86bbe..78207ab18 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_6_H +#define DUNGEONS_GANONTIKA_ROOM_6_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char ganontika_room_6DL_006168[] = dganontika_room_6 static const ALIGN_ASSET(2) char ganontika_room_6DL_0003F0[] = dganontika_room_6DL_0003F0; #define dganontika_room_6DL_0009E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0009E0" -static const ALIGN_ASSET(2) char ganontika_room_6DL_0009E0[] = dganontika_room_6DL_0009E0; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_6DL_0009E0[] = dganontika_room_6DL_0009E0; + + +#endif // DUNGEONS_GANONTIKA_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h index f6eaf48ec..079ee9d6a 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_7_H +#define DUNGEONS_GANONTIKA_ROOM_7_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char ganontika_room_7DL_003048[] = dganontika_room_7 static const ALIGN_ASSET(2) char ganontika_room_7DL_0037C8[] = dganontika_room_7DL_0037C8; #define dganontika_room_7DL_003FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_003FD8" -static const ALIGN_ASSET(2) char ganontika_room_7DL_003FD8[] = dganontika_room_7DL_003FD8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_7DL_003FD8[] = dganontika_room_7DL_003FD8; + + +#endif // DUNGEONS_GANONTIKA_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h index 825ed43c1..48ecf77a4 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_8_H +#define DUNGEONS_GANONTIKA_ROOM_8_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ganontika_room_8Tex_0034B8[] = dganontika_room_ static const ALIGN_ASSET(2) char ganontika_room_8Tex_0054B8[] = dganontika_room_8Tex_0054B8; #define dganontika_room_8Tex_006CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_006CB8" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_006CB8[] = dganontika_room_8Tex_006CB8; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_8Tex_006CB8[] = dganontika_room_8Tex_006CB8; + + +#endif // DUNGEONS_GANONTIKA_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h index 00cfed490..3dc270cf0 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_ROOM_9_H +#define DUNGEONS_GANONTIKA_ROOM_9_H 1 #include "align_asset_macro.h" @@ -63,4 +64,7 @@ static const ALIGN_ASSET(2) char ganontika_room_9DL_0003A0[] = dganontika_room_9 static const ALIGN_ASSET(2) char ganontika_room_9DL_00A750[] = dganontika_room_9DL_00A750; #define dganontika_room_9Tex_00A818 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_00A818" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_00A818[] = dganontika_room_9Tex_00A818; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_room_9Tex_00A818[] = dganontika_room_9Tex_00A818; + + +#endif // DUNGEONS_GANONTIKA_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h b/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h index 8ebe6628c..7eaf3caed 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKA_SCENE_H +#define DUNGEONS_GANONTIKA_SCENE_H 1 #include "align_asset_macro.h" @@ -60,4 +61,6 @@ static const ALIGN_ASSET(2) char ganontika_sceneTex_020B80[] = dganontika_sceneT static const ALIGN_ASSET(2) char ganontika_sceneTex_01F580[] = dganontika_sceneTex_01F580; #define dganontika_sceneTex_01FF80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01FF80" -static const ALIGN_ASSET(2) char ganontika_sceneTex_01FF80[] = dganontika_sceneTex_01FF80; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontika_sceneTex_01FF80[] = dganontika_sceneTex_01FF80; + +#endif // DUNGEONS_GANONTIKA_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h index 832f0510f..da4a8200c 100644 --- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h +++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKASONOGO_ROOM_0_H +#define DUNGEONS_GANONTIKASONOGO_ROOM_0_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00C2D8[] = dganontika static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_016B48[] = dganontikasonogo_room_0DL_016B48; #define dganontikasonogo_room_0Tex_016B78 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_016B78" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_016B78[] = dganontikasonogo_room_0Tex_016B78; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_016B78[] = dganontikasonogo_room_0Tex_016B78; + + +#endif // DUNGEONS_GANONTIKASONOGO_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h index 5aedb322e..6571799a5 100644 --- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h +++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKASONOGO_ROOM_1_H +#define DUNGEONS_GANONTIKASONOGO_ROOM_1_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_008460[] = dganontika static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710; #define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720" -static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_009720[] = dganontikasonogo_room_1Tex_009720; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_009720[] = dganontikasonogo_room_1Tex_009720; + + +#endif // DUNGEONS_GANONTIKASONOGO_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h index e36e74cb7..21f8d1cea 100644 --- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h +++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GANONTIKASONOGO_SCENE_H +#define DUNGEONS_GANONTIKASONOGO_SCENE_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_002B00[] = dganontikasonogo_sceneTex_002B00; #define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00" -static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_003B00[] = dganontikasonogo_sceneTex_003B00; \ No newline at end of file +static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_003B00[] = dganontikasonogo_sceneTex_003B00; + +#endif // DUNGEONS_GANONTIKASONOGO_SCENE_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h index 637ecc7b9..f5d03df17 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GERUDOWAY_ROOM_0_H +#define DUNGEONS_GERUDOWAY_ROOM_0_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char gerudoway_room_0DL_000E70[] = dgerudoway_room_0 static const ALIGN_ASSET(2) char gerudoway_room_0Tex_002FB0[] = dgerudoway_room_0Tex_002FB0; #define dgerudoway_room_0Tex_003FB0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0Tex_003FB0" -static const ALIGN_ASSET(2) char gerudoway_room_0Tex_003FB0[] = dgerudoway_room_0Tex_003FB0; \ No newline at end of file +static const ALIGN_ASSET(2) char gerudoway_room_0Tex_003FB0[] = dgerudoway_room_0Tex_003FB0; + + +#endif // DUNGEONS_GERUDOWAY_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h index ca100b431..6fc0b66fd 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GERUDOWAY_ROOM_1_H +#define DUNGEONS_GERUDOWAY_ROOM_1_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char gerudoway_room_1Tex_006310[] = dgerudoway_room_ static const ALIGN_ASSET(2) char gerudoway_room_1Tex_005B10[] = dgerudoway_room_1Tex_005B10; #define dgerudoway_room_1DL_000B90 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_000B90" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_000B90[] = dgerudoway_room_1DL_000B90; \ No newline at end of file +static const ALIGN_ASSET(2) char gerudoway_room_1DL_000B90[] = dgerudoway_room_1DL_000B90; + + +#endif // DUNGEONS_GERUDOWAY_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h index d6847ac68..e09531528 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GERUDOWAY_ROOM_2_H +#define DUNGEONS_GERUDOWAY_ROOM_2_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char gerudoway_room_2Tex_002298[] = dgerudoway_room_ static const ALIGN_ASSET(2) char gerudoway_room_2Tex_002A98[] = dgerudoway_room_2Tex_002A98; #define dgerudoway_room_2DL_000E80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_000E80" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_000E80[] = dgerudoway_room_2DL_000E80; \ No newline at end of file +static const ALIGN_ASSET(2) char gerudoway_room_2DL_000E80[] = dgerudoway_room_2DL_000E80; + + +#endif // DUNGEONS_GERUDOWAY_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h index e4e931b66..52dbc5537 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GERUDOWAY_ROOM_3_H +#define DUNGEONS_GERUDOWAY_ROOM_3_H 1 #include "align_asset_macro.h" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char gerudoway_room_3DL_004EA8[] = dgerudoway_room_3 static const ALIGN_ASSET(2) char gerudoway_room_3DL_001B70[] = dgerudoway_room_3DL_001B70; #define dgerudoway_room_3DL_003E80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_003E80" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_003E80[] = dgerudoway_room_3DL_003E80; \ No newline at end of file +static const ALIGN_ASSET(2) char gerudoway_room_3DL_003E80[] = dgerudoway_room_3DL_003E80; + + +#endif // DUNGEONS_GERUDOWAY_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h index 5d7b393b8..82e861932 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GERUDOWAY_ROOM_4_H +#define DUNGEONS_GERUDOWAY_ROOM_4_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002828[] = dgerudoway_room_ static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002028[] = dgerudoway_room_4Tex_002028; #define dgerudoway_room_4DL_000D10 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_000D10" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_000D10[] = dgerudoway_room_4DL_000D10; \ No newline at end of file +static const ALIGN_ASSET(2) char gerudoway_room_4DL_000D10[] = dgerudoway_room_4DL_000D10; + + +#endif // DUNGEONS_GERUDOWAY_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h index 4b23049c4..61d5121f8 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GERUDOWAY_ROOM_5_H +#define DUNGEONS_GERUDOWAY_ROOM_5_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char gerudoway_room_5Tex_002FF8[] = dgerudoway_room_ static const ALIGN_ASSET(2) char gerudoway_room_5Tex_0037F8[] = dgerudoway_room_5Tex_0037F8; #define dgerudoway_room_5DL_0014C0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_0014C0" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_0014C0[] = dgerudoway_room_5DL_0014C0; \ No newline at end of file +static const ALIGN_ASSET(2) char gerudoway_room_5DL_0014C0[] = dgerudoway_room_5DL_0014C0; + + +#endif // DUNGEONS_GERUDOWAY_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h index bc0d8358b..8c4fb7e43 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_GERUDOWAY_SCENE_H +#define DUNGEONS_GERUDOWAY_SCENE_H 1 #include "align_asset_macro.h" @@ -36,4 +37,6 @@ static const ALIGN_ASSET(2) char gerudoway_sceneTex_008D20[] = dgerudoway_sceneT static const ALIGN_ASSET(2) char gerudoway_sceneTex_00D120[] = dgerudoway_sceneTex_00D120; #define dgerudoway_sceneTex_00C120 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00C120" -static const ALIGN_ASSET(2) char gerudoway_sceneTex_00C120[] = dgerudoway_sceneTex_00C120; \ No newline at end of file +static const ALIGN_ASSET(2) char gerudoway_sceneTex_00C120[] = dgerudoway_sceneTex_00C120; + +#endif // DUNGEONS_GERUDOWAY_SCENE_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h index 7a6712fd4..7147f7c32 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_0_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_0_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_007678[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_0Set_000100DL_002F20[] = dice_doukutu_room_0Set_000100DL_002F20; #define dice_doukutu_room_0Set_000100DL_007660 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Set_000100DL_007660" -static const ALIGN_ASSET(2) char ice_doukutu_room_0Set_000100DL_007660[] = dice_doukutu_room_0Set_000100DL_007660; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_0Set_000100DL_007660[] = dice_doukutu_room_0Set_000100DL_007660; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h index 679b0e2f2..4a4b3b00c 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_1_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_1_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00BB30[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_1Set_000160DL_0040D8[] = dice_doukutu_room_1Set_000160DL_0040D8; #define dice_doukutu_room_1Set_000160DL_00AB10 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Set_000160DL_00AB10" -static const ALIGN_ASSET(2) char ice_doukutu_room_1Set_000160DL_00AB10[] = dice_doukutu_room_1Set_000160DL_00AB10; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_1Set_000160DL_00AB10[] = dice_doukutu_room_1Set_000160DL_00AB10; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h index db6619c53..71d2a6df2 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_10_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_10_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_10Tex_003BD8[] = dice_doukutu_ static const ALIGN_ASSET(2) char ice_doukutu_room_10Set_000090DL_0019F8[] = dice_doukutu_room_10Set_000090DL_0019F8; #define dice_doukutu_room_10Set_000090DL_003BC8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Set_000090DL_003BC8" -static const ALIGN_ASSET(2) char ice_doukutu_room_10Set_000090DL_003BC8[] = dice_doukutu_room_10Set_000090DL_003BC8; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_10Set_000090DL_003BC8[] = dice_doukutu_room_10Set_000090DL_003BC8; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h index 53216186e..1238986e9 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_11_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_11_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_004848[] = dice_doukutu_ static const ALIGN_ASSET(2) char ice_doukutu_room_11Set_0001B0DL_0028F8[] = dice_doukutu_room_11Set_0001B0DL_0028F8; #define dice_doukutu_room_11Set_0001B0DL_004838 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Set_0001B0DL_004838" -static const ALIGN_ASSET(2) char ice_doukutu_room_11Set_0001B0DL_004838[] = dice_doukutu_room_11Set_0001B0DL_004838; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_11Set_0001B0DL_004838[] = dice_doukutu_room_11Set_0001B0DL_004838; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h index 1445f0ba0..7bc990964 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_2_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_2_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_004AF8[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_2Set_000100DL_001700[] = dice_doukutu_room_2Set_000100DL_001700; #define dice_doukutu_room_2Set_000100DL_003AD8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Set_000100DL_003AD8" -static const ALIGN_ASSET(2) char ice_doukutu_room_2Set_000100DL_003AD8[] = dice_doukutu_room_2Set_000100DL_003AD8; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_2Set_000100DL_003AD8[] = dice_doukutu_room_2Set_000100DL_003AD8; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h index aaa90051e..28ae55028 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_3_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_3_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_006090[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_3Set_0001D0DL_0031D8[] = dice_doukutu_room_3Set_0001D0DL_0031D8; #define dice_doukutu_room_3Set_0001D0DL_005070 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Set_0001D0DL_005070" -static const ALIGN_ASSET(2) char ice_doukutu_room_3Set_0001D0DL_005070[] = dice_doukutu_room_3Set_0001D0DL_005070; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_3Set_0001D0DL_005070[] = dice_doukutu_room_3Set_0001D0DL_005070; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h index 21c0d627a..c9f1badc9 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_4_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_4_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_006650[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_4Set_0000F0DL_0028B8[] = dice_doukutu_room_4Set_0000F0DL_0028B8; #define dice_doukutu_room_4Set_0000F0DL_004638 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Set_0000F0DL_004638" -static const ALIGN_ASSET(2) char ice_doukutu_room_4Set_0000F0DL_004638[] = dice_doukutu_room_4Set_0000F0DL_004638; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_4Set_0000F0DL_004638[] = dice_doukutu_room_4Set_0000F0DL_004638; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h index d1ab60972..f0388b36f 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_5_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_5_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_007878[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_5Set_0001C0DL_004618[] = dice_doukutu_room_5Set_0001C0DL_004618; #define dice_doukutu_room_5Set_0001C0DL_007460 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Set_0001C0DL_007460" -static const ALIGN_ASSET(2) char ice_doukutu_room_5Set_0001C0DL_007460[] = dice_doukutu_room_5Set_0001C0DL_007460; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_5Set_0001C0DL_007460[] = dice_doukutu_room_5Set_0001C0DL_007460; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h index 6770c759b..7f0f897e4 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_6_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_6_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0039B0[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0029B0[] = dice_doukutu_room_6Tex_0029B0; #define dice_doukutu_room_6Set_000110DL_002980 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Set_000110DL_002980" -static const ALIGN_ASSET(2) char ice_doukutu_room_6Set_000110DL_002980[] = dice_doukutu_room_6Set_000110DL_002980; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_6Set_000110DL_002980[] = dice_doukutu_room_6Set_000110DL_002980; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h index 43afba33e..f11032e37 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_7_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_7_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_7Tex_0050E8[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_7Set_0000D0DL_001730[] = dice_doukutu_room_7Set_0000D0DL_001730; #define dice_doukutu_room_7Set_0000D0DL_0040A8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Set_0000D0DL_0040A8" -static const ALIGN_ASSET(2) char ice_doukutu_room_7Set_0000D0DL_0040A8[] = dice_doukutu_room_7Set_0000D0DL_0040A8; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_7Set_0000D0DL_0040A8[] = dice_doukutu_room_7Set_0000D0DL_0040A8; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.h index 0b963c97b..95ffd3905 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_8_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_8_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_8DL_0018F8[] = dice_doukutu_room_8DL_0018F8; #define dice_doukutu_room_8Set_000100DL_0018F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_8Set_000100DL_0018F8" -static const ALIGN_ASSET(2) char ice_doukutu_room_8Set_000100DL_0018F8[] = dice_doukutu_room_8Set_000100DL_0018F8; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_8Set_000100DL_0018F8[] = dice_doukutu_room_8Set_000100DL_0018F8; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h index e0cb0e543..7a106f565 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_ROOM_9_H +#define DUNGEONS_ICE_DOUKUTU_ROOM_9_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_007690[] = dice_doukutu_r static const ALIGN_ASSET(2) char ice_doukutu_room_9Set_0001D0DL_004468[] = dice_doukutu_room_9Set_0001D0DL_004468; #define dice_doukutu_room_9Set_0001D0DL_007680 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Set_0001D0DL_007680" -static const ALIGN_ASSET(2) char ice_doukutu_room_9Set_0001D0DL_007680[] = dice_doukutu_room_9Set_0001D0DL_007680; \ No newline at end of file +static const ALIGN_ASSET(2) char ice_doukutu_room_9Set_0001D0DL_007680[] = dice_doukutu_room_9Set_0001D0DL_007680; + + +#endif // DUNGEONS_ICE_DOUKUTU_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h index 5d36380bd..e012f232e 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_ICE_DOUKUTU_SCENE_H +#define DUNGEONS_ICE_DOUKUTU_SCENE_H 1 #include "align_asset_macro.h" @@ -32,4 +33,7 @@ static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010EC0[] = dice_doukutu_sc #define dice_doukutu_sceneTLUT_00F8A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTLUT_00F8A0" static const ALIGN_ASSET(2) char ice_doukutu_sceneTLUT_00F8A0[] = dice_doukutu_sceneTLUT_00F8A0; -#define dice_doukutu_sceneCollisionHeader_00F668 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneCollisionHeader_00F668" \ No newline at end of file +#define dice_doukutu_sceneCollisionHeader_00F668 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneCollisionHeader_00F668" + + +#endif // DUNGEONS_ICE_DOUKUTU_SCENE_H diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h index 5fc7f89d3..eb4913db8 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINBOSS_ROOM_0_H +#define DUNGEONS_JYASINBOSS_ROOM_0_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char jyasinboss_room_0Set_000080DL_0007B0[] = djyasi static const ALIGN_ASSET(2) char jyasinboss_room_0Set_0000C0DL_0007B0[] = djyasinboss_room_0Set_0000C0DL_0007B0; #define djyasinboss_room_0Set_000100DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Set_000100DL_0007B0" -static const ALIGN_ASSET(2) char jyasinboss_room_0Set_000100DL_0007B0[] = djyasinboss_room_0Set_000100DL_0007B0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinboss_room_0Set_000100DL_0007B0[] = djyasinboss_room_0Set_000100DL_0007B0; + + +#endif // DUNGEONS_JYASINBOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h index 1957c088e..54aa427bf 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINBOSS_ROOM_1_H +#define DUNGEONS_JYASINBOSS_ROOM_1_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char jyasinboss_room_1Set_0001B0DL_002DD0[] = djyasi static const ALIGN_ASSET(2) char jyasinboss_room_1Set_000320DL_002DD0[] = djyasinboss_room_1Set_000320DL_002DD0; #define djyasinboss_room_1Set_000490DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Set_000490DL_002DD0" -static const ALIGN_ASSET(2) char jyasinboss_room_1Set_000490DL_002DD0[] = djyasinboss_room_1Set_000490DL_002DD0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinboss_room_1Set_000490DL_002DD0[] = djyasinboss_room_1Set_000490DL_002DD0; + + +#endif // DUNGEONS_JYASINBOSS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h index b1395affe..3f4dbd064 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINBOSS_ROOM_2_H +#define DUNGEONS_JYASINBOSS_ROOM_2_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char jyasinboss_room_2Set_0000F0DL_0021A0[] = djyasi static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000130DL_0021A0[] = djyasinboss_room_2Set_000130DL_0021A0; #define djyasinboss_room_2Set_000170DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_000170DL_0021A0" -static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000170DL_0021A0[] = djyasinboss_room_2Set_000170DL_0021A0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000170DL_0021A0[] = djyasinboss_room_2Set_000170DL_0021A0; + + +#endif // DUNGEONS_JYASINBOSS_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h index 9a365e392..da3f66804 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINBOSS_ROOM_3_H +#define DUNGEONS_JYASINBOSS_ROOM_3_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char jyasinboss_room_3Set_0000A0DL_003C88[] = djyasi static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000100DL_003C88[] = djyasinboss_room_3Set_000100DL_003C88; #define djyasinboss_room_3Set_000160DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_000160DL_003C88" -static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000160DL_003C88[] = djyasinboss_room_3Set_000160DL_003C88; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000160DL_003C88[] = djyasinboss_room_3Set_000160DL_003C88; + + +#endif // DUNGEONS_JYASINBOSS_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h index 6908a6f31..a7a1c0aca 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINBOSS_SCENE_H +#define DUNGEONS_JYASINBOSS_SCENE_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char jyasinboss_sceneTex_006CF0[] = djyasinboss_scen #define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" -#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" \ No newline at end of file +#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" + + +#endif // DUNGEONS_JYASINBOSS_SCENE_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h index 016ab1982..e00ddd7da 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_0_H +#define DUNGEONS_JYASINZOU_ROOM_0_H 1 #include "align_asset_macro.h" @@ -87,4 +88,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_0DL_001700[] = djyasinzou_room_0 static const ALIGN_ASSET(2) char jyasinzou_room_0DL_0102C0[] = djyasinzou_room_0DL_0102C0; #define djyasinzou_room_0DL_0106F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_0106F0" -static const ALIGN_ASSET(2) char jyasinzou_room_0DL_0106F0[] = djyasinzou_room_0DL_0106F0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_0DL_0106F0[] = djyasinzou_room_0DL_0106F0; + + +#endif // DUNGEONS_JYASINZOU_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h index 6baf3899c..4b62b8fc0 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_1_H +#define DUNGEONS_JYASINZOU_ROOM_1_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0045E8[] = djyasinzou_room_1 static const ALIGN_ASSET(2) char jyasinzou_room_1DL_004D50[] = djyasinzou_room_1DL_004D50; #define djyasinzou_room_1Tex_004F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_004F48" -static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_004F48[] = djyasinzou_room_1Tex_004F48; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_004F48[] = djyasinzou_room_1Tex_004F48; + + +#endif // DUNGEONS_JYASINZOU_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h index 42c77965b..74e3a8898 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_10_H +#define DUNGEONS_JYASINZOU_ROOM_10_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0020C8[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0031A0[] = djyasinzou_room_10Tex_0031A0; #define djyasinzou_room_10Tex_0059A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0059A0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0; + + +#endif // DUNGEONS_JYASINZOU_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h index 1b2233d73..a73341a83 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_11_H +#define DUNGEONS_JYASINZOU_ROOM_11_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_11DL_000E40[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_11DL_000530[] = djyasinzou_room_11DL_000530; #define djyasinzou_room_11Tex_000780 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11Tex_000780" -static const ALIGN_ASSET(2) char jyasinzou_room_11Tex_000780[] = djyasinzou_room_11Tex_000780; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_11Tex_000780[] = djyasinzou_room_11Tex_000780; + + +#endif // DUNGEONS_JYASINZOU_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h index 30ae1fccd..cf4a8b8fe 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_12_H +#define DUNGEONS_JYASINZOU_ROOM_12_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_12Tex_0010D8[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_12DL_000B38[] = djyasinzou_room_12DL_000B38; #define djyasinzou_room_12DL_000F08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12DL_000F08" -static const ALIGN_ASSET(2) char jyasinzou_room_12DL_000F08[] = djyasinzou_room_12DL_000F08; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_12DL_000F08[] = djyasinzou_room_12DL_000F08; + + +#endif // DUNGEONS_JYASINZOU_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h index 1450b0746..276c78539 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_13_H +#define DUNGEONS_JYASINZOU_ROOM_13_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_13DL_002710[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0038A8[] = djyasinzou_room_13Tex_0038A8; #define djyasinzou_room_13Tex_004CA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_004CA8" -static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_004CA8[] = djyasinzou_room_13Tex_004CA8; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_004CA8[] = djyasinzou_room_13Tex_004CA8; + + +#endif // DUNGEONS_JYASINZOU_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h index a57a1e1f1..3c47d67ec 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_14_H +#define DUNGEONS_JYASINZOU_ROOM_14_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0030A0[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001AE0[] = djyasinzou_room_14DL_001AE0; #define djyasinzou_room_14Tex_0034A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0034A0" -static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0; + + +#endif // DUNGEONS_JYASINZOU_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h index 8b22af2c9..65e4639d2 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_15_H +#define DUNGEONS_JYASINZOU_ROOM_15_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_002FE8[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_003FE8[] = djyasinzou_room_15Tex_003FE8; #define djyasinzou_room_15DL_002E90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002E90" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002E90[] = djyasinzou_room_15DL_002E90; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002E90[] = djyasinzou_room_15DL_002E90; + + +#endif // DUNGEONS_JYASINZOU_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h index 311c7fd44..ac610c97f 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_16_H +#define DUNGEONS_JYASINZOU_ROOM_16_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_16DL_002660[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0041B8[] = djyasinzou_room_16Tex_0041B8; #define djyasinzou_room_16Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0051B8" -static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8; + + +#endif // DUNGEONS_JYASINZOU_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h index 52a1e738b..face9bba1 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_17_H +#define DUNGEONS_JYASINZOU_ROOM_17_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_17DL_003258[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_007250[] = djyasinzou_room_17Tex_007250; #define djyasinzou_room_17DL_005D38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_005D38" -static const ALIGN_ASSET(2) char jyasinzou_room_17DL_005D38[] = djyasinzou_room_17DL_005D38; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_17DL_005D38[] = djyasinzou_room_17DL_005D38; + + +#endif // DUNGEONS_JYASINZOU_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h index 602cf267b..eaf4a1192 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_18_H +#define DUNGEONS_JYASINZOU_ROOM_18_H 1 #include "align_asset_macro.h" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_003CF0[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001FA8[] = djyasinzou_room_18DL_001FA8; #define djyasinzou_room_18Tex_0030F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0030F0" -static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0030F0[] = djyasinzou_room_18Tex_0030F0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0030F0[] = djyasinzou_room_18Tex_0030F0; + + +#endif // DUNGEONS_JYASINZOU_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h index 4d5f5d8d1..6e442469b 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_19_H +#define DUNGEONS_JYASINZOU_ROOM_19_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_19DL_002768[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_19DL_0029E8[] = djyasinzou_room_19DL_0029E8; #define djyasinzou_room_19DL_002C68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_002C68" -static const ALIGN_ASSET(2) char jyasinzou_room_19DL_002C68[] = djyasinzou_room_19DL_002C68; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_19DL_002C68[] = djyasinzou_room_19DL_002C68; + + +#endif // DUNGEONS_JYASINZOU_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h index b04e6238e..e93c059d5 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_2_H +#define DUNGEONS_JYASINZOU_ROOM_2_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0023B0[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003FB0[] = djyasinzou_room_2Tex_003FB0; #define djyasinzou_room_2DL_002170 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_002170" -static const ALIGN_ASSET(2) char jyasinzou_room_2DL_002170[] = djyasinzou_room_2DL_002170; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_2DL_002170[] = djyasinzou_room_2DL_002170; + + +#endif // DUNGEONS_JYASINZOU_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h index 2a610ea63..9d6ec0806 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_20_H +#define DUNGEONS_JYASINZOU_ROOM_20_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0059B8[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_20DL_002DF8[] = djyasinzou_room_20DL_002DF8; #define djyasinzou_room_20Tex_0079B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0079B8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8; + + +#endif // DUNGEONS_JYASINZOU_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h index a6768ca49..5fe0e9603 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_21_H +#define DUNGEONS_JYASINZOU_ROOM_21_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_001660[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002E60[] = djyasinzou_room_21Tex_002E60; #define djyasinzou_room_21DL_001520 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_001520" -static const ALIGN_ASSET(2) char jyasinzou_room_21DL_001520[] = djyasinzou_room_21DL_001520; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_21DL_001520[] = djyasinzou_room_21DL_001520; + + +#endif // DUNGEONS_JYASINZOU_ROOM_21_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h index 9b634ab30..fba5c9edc 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_22_H +#define DUNGEONS_JYASINZOU_ROOM_22_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_22DL_000E48[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_001468[] = djyasinzou_room_22Tex_001468; #define djyasinzou_room_22DL_0012C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_0012C8" -static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0012C8[] = djyasinzou_room_22DL_0012C8; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0012C8[] = djyasinzou_room_22DL_0012C8; + + +#endif // DUNGEONS_JYASINZOU_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h index d2c58102e..aa252158c 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_23_H +#define DUNGEONS_JYASINZOU_ROOM_23_H 1 #include "align_asset_macro.h" @@ -72,4 +73,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_23DL_003DE0[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_005438[] = djyasinzou_room_23Tex_005438; #define djyasinzou_room_23DL_004258 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_004258" -static const ALIGN_ASSET(2) char jyasinzou_room_23DL_004258[] = djyasinzou_room_23DL_004258; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_23DL_004258[] = djyasinzou_room_23DL_004258; + + +#endif // DUNGEONS_JYASINZOU_ROOM_23_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h index 5edb3671d..8cfeb6901 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_24_H +#define DUNGEONS_JYASINZOU_ROOM_24_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_002B38[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_24DL_005400[] = djyasinzou_room_24DL_005400; #define djyasinzou_room_24Tex_0054D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_0054D0" -static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0; + + +#endif // DUNGEONS_JYASINZOU_ROOM_24_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h index 2c755eeb8..1c6fcf821 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_25_H +#define DUNGEONS_JYASINZOU_ROOM_25_H 1 #include "align_asset_macro.h" @@ -180,4 +181,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014F98[] = djyasinzou_room static const ALIGN_ASSET(2) char jyasinzou_room_25DL_00B540[] = djyasinzou_room_25DL_00B540; #define djyasinzou_room_25Tex_00BE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BE98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BE98[] = djyasinzou_room_25Tex_00BE98; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BE98[] = djyasinzou_room_25Tex_00BE98; + + +#endif // DUNGEONS_JYASINZOU_ROOM_25_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h index f1c1478c3..9d9f96be5 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_26_H +#define DUNGEONS_JYASINZOU_ROOM_26_H 1 #include "align_asset_macro.h" @@ -99,4 +100,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_006A98[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_003880[] = djyasinzou_room_26DL_003880; #define djyasinzou_room_26DL_00BF50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_00BF50" -static const ALIGN_ASSET(2) char jyasinzou_room_26DL_00BF50[] = djyasinzou_room_26DL_00BF50; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_26DL_00BF50[] = djyasinzou_room_26DL_00BF50; + + +#endif // DUNGEONS_JYASINZOU_ROOM_26_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h index 571376687..071317efe 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_27_H +#define DUNGEONS_JYASINZOU_ROOM_27_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_27DL_003138[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_27DL_004150[] = djyasinzou_room_27DL_004150; #define djyasinzou_room_27Tex_004B10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004B10" -static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004B10[] = djyasinzou_room_27Tex_004B10; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004B10[] = djyasinzou_room_27Tex_004B10; + + +#endif // DUNGEONS_JYASINZOU_ROOM_27_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h index 4c49bc7bd..70b76b61f 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_28_H +#define DUNGEONS_JYASINZOU_ROOM_28_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_28DL_003E18[] = djyasinzou_room_ static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006130[] = djyasinzou_room_28Tex_006130; #define djyasinzou_room_28Tex_005930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005930" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930; + + +#endif // DUNGEONS_JYASINZOU_ROOM_28_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h index 78dbd6919..64354c57e 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_3_H +#define DUNGEONS_JYASINZOU_ROOM_3_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_3DL_000A70[] = djyasinzou_room_3 static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_002BC8[] = djyasinzou_room_3Tex_002BC8; #define djyasinzou_room_3DL_001150 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001150" -static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001150[] = djyasinzou_room_3DL_001150; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001150[] = djyasinzou_room_3DL_001150; + + +#endif // DUNGEONS_JYASINZOU_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h index 0a048117b..36735173e 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_4_H +#define DUNGEONS_JYASINZOU_ROOM_4_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_4DL_002880[] = djyasinzou_room_4 static const ALIGN_ASSET(2) char jyasinzou_room_4DL_007170[] = djyasinzou_room_4DL_007170; #define djyasinzou_room_4DL_0032A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_0032A0" -static const ALIGN_ASSET(2) char jyasinzou_room_4DL_0032A0[] = djyasinzou_room_4DL_0032A0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_4DL_0032A0[] = djyasinzou_room_4DL_0032A0; + + +#endif // DUNGEONS_JYASINZOU_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h index d25a86536..5425cf527 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_5_H +#define DUNGEONS_JYASINZOU_ROOM_5_H 1 #include "align_asset_macro.h" @@ -162,4 +163,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00C638[] = djyasinzou_room_5 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_016730[] = djyasinzou_room_5DL_016730; #define djyasinzou_room_5Tex_017008 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_017008" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008; + + +#endif // DUNGEONS_JYASINZOU_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h index b53a1a69a..36fc78839 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_6_H +#define DUNGEONS_JYASINZOU_ROOM_6_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_6DL_002950[] = djyasinzou_room_6 static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000EB0[] = djyasinzou_room_6DL_000EB0; #define djyasinzou_room_6DL_000908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_000908" -static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000908[] = djyasinzou_room_6DL_000908; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000908[] = djyasinzou_room_6DL_000908; + + +#endif // DUNGEONS_JYASINZOU_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h index 12f4f28bd..2485cf2f5 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_7_H +#define DUNGEONS_JYASINZOU_ROOM_7_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002340[] = djyasinzou_room_7 static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002630[] = djyasinzou_room_7DL_002630; #define djyasinzou_room_7Tex_004D08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004D08" -static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08; + + +#endif // DUNGEONS_JYASINZOU_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h index bba30a43a..508a1b411 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_8_H +#define DUNGEONS_JYASINZOU_ROOM_8_H 1 #include "align_asset_macro.h" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002D70[] = djyasinzou_room_8 static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004250[] = djyasinzou_room_8Tex_004250; #define djyasinzou_room_8DL_007ED0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_007ED0" -static const ALIGN_ASSET(2) char jyasinzou_room_8DL_007ED0[] = djyasinzou_room_8DL_007ED0; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_8DL_007ED0[] = djyasinzou_room_8DL_007ED0; + + +#endif // DUNGEONS_JYASINZOU_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h index 3ef2b145e..fdbd749c8 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_ROOM_9_H +#define DUNGEONS_JYASINZOU_ROOM_9_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char jyasinzou_room_9DL_002768[] = djyasinzou_room_9 static const ALIGN_ASSET(2) char jyasinzou_room_9DL_0029E8[] = djyasinzou_room_9DL_0029E8; #define djyasinzou_room_9DL_002C68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_002C68" -static const ALIGN_ASSET(2) char jyasinzou_room_9DL_002C68[] = djyasinzou_room_9DL_002C68; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_room_9DL_002C68[] = djyasinzou_room_9DL_002C68; + + +#endif // DUNGEONS_JYASINZOU_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h index 7d82db3ea..fa52d8cac 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_JYASINZOU_SCENE_H +#define DUNGEONS_JYASINZOU_SCENE_H 1 #include "align_asset_macro.h" @@ -30,4 +31,6 @@ static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017DE0[] = djyasinzou_scene static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017FE0[] = djyasinzou_sceneTLUT_017FE0; #define djyasinzou_sceneTex_019120 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019120" -static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120; \ No newline at end of file +static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120; + +#endif // DUNGEONS_JYASINZOU_SCENE_H diff --git a/soh/assets/scenes/dungeons/men/men_room_0.h b/soh/assets/scenes/dungeons/men/men_room_0.h index 9487fa1cc..05524589e 100644 --- a/soh/assets/scenes/dungeons/men/men_room_0.h +++ b/soh/assets/scenes/dungeons/men/men_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_0_H +#define DUNGEONS_MEN_ROOM_0_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char men_room_0Tex_00A538[] = dmen_room_0Tex_00A538; static const ALIGN_ASSET(2) char men_room_0DL_007FD8[] = dmen_room_0DL_007FD8; #define dmen_room_0Tex_008938 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008938" -static const ALIGN_ASSET(2) char men_room_0Tex_008938[] = dmen_room_0Tex_008938; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_0Tex_008938[] = dmen_room_0Tex_008938; + + +#endif // DUNGEONS_MEN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/men/men_room_1.h b/soh/assets/scenes/dungeons/men/men_room_1.h index 18bdb2b7c..093fde806 100644 --- a/soh/assets/scenes/dungeons/men/men_room_1.h +++ b/soh/assets/scenes/dungeons/men/men_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_1_H +#define DUNGEONS_MEN_ROOM_1_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char men_room_1Tex_007A70[] = dmen_room_1Tex_007A70; static const ALIGN_ASSET(2) char men_room_1DL_000B70[] = dmen_room_1DL_000B70; #define dmen_room_1Tex_007270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007270" -static const ALIGN_ASSET(2) char men_room_1Tex_007270[] = dmen_room_1Tex_007270; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_1Tex_007270[] = dmen_room_1Tex_007270; + + +#endif // DUNGEONS_MEN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/men/men_room_10.h b/soh/assets/scenes/dungeons/men/men_room_10.h index b5a9d6649..a278ee7c2 100644 --- a/soh/assets/scenes/dungeons/men/men_room_10.h +++ b/soh/assets/scenes/dungeons/men/men_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_10_H +#define DUNGEONS_MEN_ROOM_10_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char men_room_10Tex_003448[] = dmen_room_10Tex_00344 static const ALIGN_ASSET(2) char men_room_10DL_002340[] = dmen_room_10DL_002340; #define dmen_room_10Tex_004448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004448" -static const ALIGN_ASSET(2) char men_room_10Tex_004448[] = dmen_room_10Tex_004448; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_10Tex_004448[] = dmen_room_10Tex_004448; + + +#endif // DUNGEONS_MEN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/men/men_room_2.h b/soh/assets/scenes/dungeons/men/men_room_2.h index 441b67ec0..b8fdadd96 100644 --- a/soh/assets/scenes/dungeons/men/men_room_2.h +++ b/soh/assets/scenes/dungeons/men/men_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_2_H +#define DUNGEONS_MEN_ROOM_2_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char men_room_2DL_002FA0[] = dmen_room_2DL_002FA0; static const ALIGN_ASSET(2) char men_room_2DL_003928[] = dmen_room_2DL_003928; #define dmen_room_2Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_003C48" -static const ALIGN_ASSET(2) char men_room_2Tex_003C48[] = dmen_room_2Tex_003C48; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_2Tex_003C48[] = dmen_room_2Tex_003C48; + + +#endif // DUNGEONS_MEN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/men/men_room_3.h b/soh/assets/scenes/dungeons/men/men_room_3.h index c8ec308f2..d839e5cf4 100644 --- a/soh/assets/scenes/dungeons/men/men_room_3.h +++ b/soh/assets/scenes/dungeons/men/men_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_3_H +#define DUNGEONS_MEN_ROOM_3_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char men_room_3Tex_004850[] = dmen_room_3Tex_004850; static const ALIGN_ASSET(2) char men_room_3DL_002768[] = dmen_room_3DL_002768; #define dmen_room_3DL_0031B8 "__OTR__scenes/nonmq/men_scene/men_room_3DL_0031B8" -static const ALIGN_ASSET(2) char men_room_3DL_0031B8[] = dmen_room_3DL_0031B8; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_3DL_0031B8[] = dmen_room_3DL_0031B8; + + +#endif // DUNGEONS_MEN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/men/men_room_4.h b/soh/assets/scenes/dungeons/men/men_room_4.h index ead0c4629..c59cad6e3 100644 --- a/soh/assets/scenes/dungeons/men/men_room_4.h +++ b/soh/assets/scenes/dungeons/men/men_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_4_H +#define DUNGEONS_MEN_ROOM_4_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char men_room_4DL_002F40[] = dmen_room_4DL_002F40; static const ALIGN_ASSET(2) char men_room_4Tex_0089E0[] = dmen_room_4Tex_0089E0; #define dmen_room_4Tex_0059E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0059E0" -static const ALIGN_ASSET(2) char men_room_4Tex_0059E0[] = dmen_room_4Tex_0059E0; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_4Tex_0059E0[] = dmen_room_4Tex_0059E0; + + +#endif // DUNGEONS_MEN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/men/men_room_5.h b/soh/assets/scenes/dungeons/men/men_room_5.h index 495783e2d..f54f3e7d8 100644 --- a/soh/assets/scenes/dungeons/men/men_room_5.h +++ b/soh/assets/scenes/dungeons/men/men_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_5_H +#define DUNGEONS_MEN_ROOM_5_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char men_room_5Tex_002C18[] = dmen_room_5Tex_002C18; static const ALIGN_ASSET(2) char men_room_5DL_002128[] = dmen_room_5DL_002128; #define dmen_room_5Tex_002418 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002418" -static const ALIGN_ASSET(2) char men_room_5Tex_002418[] = dmen_room_5Tex_002418; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_5Tex_002418[] = dmen_room_5Tex_002418; + + +#endif // DUNGEONS_MEN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/men/men_room_6.h b/soh/assets/scenes/dungeons/men/men_room_6.h index b2d8780ba..bd50f88b8 100644 --- a/soh/assets/scenes/dungeons/men/men_room_6.h +++ b/soh/assets/scenes/dungeons/men/men_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_6_H +#define DUNGEONS_MEN_ROOM_6_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char men_room_6Tex_004778[] = dmen_room_6Tex_004778; static const ALIGN_ASSET(2) char men_room_6DL_003E60[] = dmen_room_6DL_003E60; #define dmen_room_6Tex_005378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005378" -static const ALIGN_ASSET(2) char men_room_6Tex_005378[] = dmen_room_6Tex_005378; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_6Tex_005378[] = dmen_room_6Tex_005378; + + +#endif // DUNGEONS_MEN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/men/men_room_7.h b/soh/assets/scenes/dungeons/men/men_room_7.h index 5b7d8b8e8..7c9fc3602 100644 --- a/soh/assets/scenes/dungeons/men/men_room_7.h +++ b/soh/assets/scenes/dungeons/men/men_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_7_H +#define DUNGEONS_MEN_ROOM_7_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char men_room_7Tex_003AB8[] = dmen_room_7Tex_003AB8; static const ALIGN_ASSET(2) char men_room_7Tex_005AB8[] = dmen_room_7Tex_005AB8; #define dmen_room_7Tex_0036B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0036B8" -static const ALIGN_ASSET(2) char men_room_7Tex_0036B8[] = dmen_room_7Tex_0036B8; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_7Tex_0036B8[] = dmen_room_7Tex_0036B8; + + +#endif // DUNGEONS_MEN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/men/men_room_8.h b/soh/assets/scenes/dungeons/men/men_room_8.h index 7bf3f7d79..115e55fec 100644 --- a/soh/assets/scenes/dungeons/men/men_room_8.h +++ b/soh/assets/scenes/dungeons/men/men_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_8_H +#define DUNGEONS_MEN_ROOM_8_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char men_room_8DL_000EC0[] = dmen_room_8DL_000EC0; static const ALIGN_ASSET(2) char men_room_8Tex_007E30[] = dmen_room_8Tex_007E30; #define dmen_room_8Tex_006D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_006D30" -static const ALIGN_ASSET(2) char men_room_8Tex_006D30[] = dmen_room_8Tex_006D30; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_8Tex_006D30[] = dmen_room_8Tex_006D30; + + +#endif // DUNGEONS_MEN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/men/men_room_9.h b/soh/assets/scenes/dungeons/men/men_room_9.h index 8437f9b74..5252fe02a 100644 --- a/soh/assets/scenes/dungeons/men/men_room_9.h +++ b/soh/assets/scenes/dungeons/men/men_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_ROOM_9_H +#define DUNGEONS_MEN_ROOM_9_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char men_room_9Tex_0026B0[] = dmen_room_9Tex_0026B0; static const ALIGN_ASSET(2) char men_room_9DL_0019C0[] = dmen_room_9DL_0019C0; #define dmen_room_9Tex_001AB0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_001AB0" -static const ALIGN_ASSET(2) char men_room_9Tex_001AB0[] = dmen_room_9Tex_001AB0; \ No newline at end of file +static const ALIGN_ASSET(2) char men_room_9Tex_001AB0[] = dmen_room_9Tex_001AB0; + + +#endif // DUNGEONS_MEN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/men/men_scene.h b/soh/assets/scenes/dungeons/men/men_scene.h index eadc29cdd..bd22d86f3 100644 --- a/soh/assets/scenes/dungeons/men/men_scene.h +++ b/soh/assets/scenes/dungeons/men/men_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MEN_SCENE_H +#define DUNGEONS_MEN_SCENE_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char men_sceneTLUT_00F6C0[] = dmen_sceneTLUT_00F6C0; static const ALIGN_ASSET(2) char men_sceneTex_010CC0[] = dmen_sceneTex_010CC0; #define dmen_sceneTex_0108C0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_0108C0" -static const ALIGN_ASSET(2) char men_sceneTex_0108C0[] = dmen_sceneTex_0108C0; \ No newline at end of file +static const ALIGN_ASSET(2) char men_sceneTex_0108C0[] = dmen_sceneTex_0108C0; + +#endif // DUNGEONS_MEN_SCENE_H diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h index fd40f1887..5afbf3fd6 100644 --- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h +++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MORIBOSSROOM_ROOM_0_H +#define DUNGEONS_MORIBOSSROOM_ROOM_0_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0044B8[] = dmoribossroom static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0040B8[] = dmoribossroom_room_0Tex_0040B8; #define dmoribossroom_room_0Tex_0056B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0056B8" -static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0056B8[] = dmoribossroom_room_0Tex_0056B8; \ No newline at end of file +static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0056B8[] = dmoribossroom_room_0Tex_0056B8; + + +#endif // DUNGEONS_MORIBOSSROOM_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h index 36463ff12..1b6eea9fa 100644 --- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h +++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MORIBOSSROOM_ROOM_1_H +#define DUNGEONS_MORIBOSSROOM_ROOM_1_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00B520[] = dmoribossroom static const ALIGN_ASSET(2) char moribossroom_room_1DL_00D698[] = dmoribossroom_room_1DL_00D698; #define dmoribossroom_room_1Tex_00D6A8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00D6A8" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00D6A8[] = dmoribossroom_room_1Tex_00D6A8; \ No newline at end of file +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00D6A8[] = dmoribossroom_room_1Tex_00D6A8; + + +#endif // DUNGEONS_MORIBOSSROOM_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h index 6f6707a2d..f80bcabd6 100644 --- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h +++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_MORIBOSSROOM_SCENE_H +#define DUNGEONS_MORIBOSSROOM_SCENE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char moribossroom_sceneTex_000CF8[] = dmoribossroom_ static const ALIGN_ASSET(2) char moribossroom_sceneTLUT_000B50[] = dmoribossroom_sceneTLUT_000B50; #define dmoribossroom_sceneTex_0010F8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTex_0010F8" -static const ALIGN_ASSET(2) char moribossroom_sceneTex_0010F8[] = dmoribossroom_sceneTex_0010F8; \ No newline at end of file +static const ALIGN_ASSET(2) char moribossroom_sceneTex_0010F8[] = dmoribossroom_sceneTex_0010F8; + +#endif // DUNGEONS_MORIBOSSROOM_SCENE_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_0.h b/soh/assets/scenes/dungeons/ydan/ydan_room_0.h index 102afe159..dba7964c4 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_0.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_0_H +#define DUNGEONS_YDAN_ROOM_0_H 1 #include "align_asset_macro.h" @@ -87,4 +88,7 @@ static const ALIGN_ASSET(2) char ydan_room_0Tex_00BDC0[] = dydan_room_0Tex_00BDC static const ALIGN_ASSET(2) char ydan_room_0Tex_00ADC0[] = dydan_room_0Tex_00ADC0; #define dydan_room_0DL_011290 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_011290" -static const ALIGN_ASSET(2) char ydan_room_0DL_011290[] = dydan_room_0DL_011290; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_0DL_011290[] = dydan_room_0DL_011290; + + +#endif // DUNGEONS_YDAN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_1.h b/soh/assets/scenes/dungeons/ydan/ydan_room_1.h index c2ceb6947..3e225d8a1 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_1.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_1_H +#define DUNGEONS_YDAN_ROOM_1_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ydan_room_1Tex_002798[] = dydan_room_1Tex_00279 static const ALIGN_ASSET(2) char ydan_room_1DL_003110[] = dydan_room_1DL_003110; #define dydan_room_1Tex_003200 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_003200" -static const ALIGN_ASSET(2) char ydan_room_1Tex_003200[] = dydan_room_1Tex_003200; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_1Tex_003200[] = dydan_room_1Tex_003200; + + +#endif // DUNGEONS_YDAN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_10.h b/soh/assets/scenes/dungeons/ydan/ydan_room_10.h index 77a76e1d5..d73939069 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_10.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_10_H +#define DUNGEONS_YDAN_ROOM_10_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ydan_room_10Tex_0033E0[] = dydan_room_10Tex_003 static const ALIGN_ASSET(2) char ydan_room_10DL_003D20[] = dydan_room_10DL_003D20; #define dydan_room_10Tex_003DF8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10Tex_003DF8" -static const ALIGN_ASSET(2) char ydan_room_10Tex_003DF8[] = dydan_room_10Tex_003DF8; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_10Tex_003DF8[] = dydan_room_10Tex_003DF8; + + +#endif // DUNGEONS_YDAN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_11.h b/soh/assets/scenes/dungeons/ydan/ydan_room_11.h index dadff29b5..5648b2afc 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_11.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_11_H +#define DUNGEONS_YDAN_ROOM_11_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ydan_room_11Tex_003CD8[] = dydan_room_11Tex_003 static const ALIGN_ASSET(2) char ydan_room_11DL_006730[] = dydan_room_11DL_006730; #define dydan_room_11Tex_006968 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_006968" -static const ALIGN_ASSET(2) char ydan_room_11Tex_006968[] = dydan_room_11Tex_006968; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_11Tex_006968[] = dydan_room_11Tex_006968; + + +#endif // DUNGEONS_YDAN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_2.h b/soh/assets/scenes/dungeons/ydan/ydan_room_2.h index acd5aae53..3d7fe0edc 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_2.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_2_H +#define DUNGEONS_YDAN_ROOM_2_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char ydan_room_2Tex_003508[] = dydan_room_2Tex_00350 static const ALIGN_ASSET(2) char ydan_room_2DL_004E50[] = dydan_room_2DL_004E50; #define dydan_room_2Tex_004F28 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_004F28" -static const ALIGN_ASSET(2) char ydan_room_2Tex_004F28[] = dydan_room_2Tex_004F28; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_2Tex_004F28[] = dydan_room_2Tex_004F28; + + +#endif // DUNGEONS_YDAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_3.h b/soh/assets/scenes/dungeons/ydan/ydan_room_3.h index 3642951b0..22d270141 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_3.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_3_H +#define DUNGEONS_YDAN_ROOM_3_H 1 #include "align_asset_macro.h" @@ -96,4 +97,7 @@ static const ALIGN_ASSET(2) char ydan_room_3Tex_00C8C0[] = dydan_room_3Tex_00C8C static const ALIGN_ASSET(2) char ydan_room_3Tex_00C0C0[] = dydan_room_3Tex_00C0C0; #define dydan_room_3Tex_00B0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B0C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00B0C0[] = dydan_room_3Tex_00B0C0; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_3Tex_00B0C0[] = dydan_room_3Tex_00B0C0; + + +#endif // DUNGEONS_YDAN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_4.h b/soh/assets/scenes/dungeons/ydan/ydan_room_4.h index 05866c7ac..fcc583137 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_4.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_4_H +#define DUNGEONS_YDAN_ROOM_4_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ydan_room_4Tex_003120[] = dydan_room_4Tex_00312 static const ALIGN_ASSET(2) char ydan_room_4Tex_001920[] = dydan_room_4Tex_001920; #define dydan_room_4Tex_002120 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_002120" -static const ALIGN_ASSET(2) char ydan_room_4Tex_002120[] = dydan_room_4Tex_002120; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_4Tex_002120[] = dydan_room_4Tex_002120; + + +#endif // DUNGEONS_YDAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_5.h b/soh/assets/scenes/dungeons/ydan/ydan_room_5.h index 36d7dcd53..342e2eb4c 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_5.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_5_H +#define DUNGEONS_YDAN_ROOM_5_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char ydan_room_5Tex_006F88[] = dydan_room_5Tex_006F8 static const ALIGN_ASSET(2) char ydan_room_5Tex_006388[] = dydan_room_5Tex_006388; #define dydan_room_5Tex_007788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007788" -static const ALIGN_ASSET(2) char ydan_room_5Tex_007788[] = dydan_room_5Tex_007788; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_5Tex_007788[] = dydan_room_5Tex_007788; + + +#endif // DUNGEONS_YDAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_6.h b/soh/assets/scenes/dungeons/ydan/ydan_room_6.h index 21a9fe6c3..f88e5f7cb 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_6.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_6_H +#define DUNGEONS_YDAN_ROOM_6_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char ydan_room_6Tex_004700[] = dydan_room_6Tex_00470 static const ALIGN_ASSET(2) char ydan_room_6Tex_002700[] = dydan_room_6Tex_002700; #define dydan_room_6Tex_003F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_003F00" -static const ALIGN_ASSET(2) char ydan_room_6Tex_003F00[] = dydan_room_6Tex_003F00; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_6Tex_003F00[] = dydan_room_6Tex_003F00; + + +#endif // DUNGEONS_YDAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_7.h b/soh/assets/scenes/dungeons/ydan/ydan_room_7.h index a751f9cae..5f127f93d 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_7.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_7_H +#define DUNGEONS_YDAN_ROOM_7_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char ydan_room_7Tex_003C98[] = dydan_room_7Tex_003C9 static const ALIGN_ASSET(2) char ydan_room_7Tex_006898[] = dydan_room_7Tex_006898; #define dydan_room_7Tex_004498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_004498" -static const ALIGN_ASSET(2) char ydan_room_7Tex_004498[] = dydan_room_7Tex_004498; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_7Tex_004498[] = dydan_room_7Tex_004498; + + +#endif // DUNGEONS_YDAN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_8.h b/soh/assets/scenes/dungeons/ydan/ydan_room_8.h index 6c10f0661..6af3f1fbf 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_8.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_8_H +#define DUNGEONS_YDAN_ROOM_8_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char ydan_room_8DL_000760[] = dydan_room_8DL_000760; #define dydan_room_8Tex_000988 "__OTR__scenes/nonmq/ydan_scene/ydan_room_8Tex_000988" -static const ALIGN_ASSET(2) char ydan_room_8Tex_000988[] = dydan_room_8Tex_000988; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_8Tex_000988[] = dydan_room_8Tex_000988; + + +#endif // DUNGEONS_YDAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_9.h b/soh/assets/scenes/dungeons/ydan/ydan_room_9.h index 4e7a6b319..e6cea1c90 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_9.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_ROOM_9_H +#define DUNGEONS_YDAN_ROOM_9_H 1 #include "align_asset_macro.h" @@ -51,4 +52,7 @@ static const ALIGN_ASSET(2) char ydan_room_9Tex_004480[] = dydan_room_9Tex_00448 static const ALIGN_ASSET(2) char ydan_room_9DL_0070E0[] = dydan_room_9DL_0070E0; #define dydan_room_9Tex_008498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_008498" -static const ALIGN_ASSET(2) char ydan_room_9Tex_008498[] = dydan_room_9Tex_008498; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_room_9Tex_008498[] = dydan_room_9Tex_008498; + + +#endif // DUNGEONS_YDAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_scene.h b/soh/assets/scenes/dungeons/ydan/ydan_scene.h index e89ed7b3d..a906e44a0 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_scene.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_SCENE_H +#define DUNGEONS_YDAN_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gYdanTex_00CA18[] = dgYdanTex_00CA18; static const ALIGN_ASSET(2) char ydan_sceneCollisionHeader_00B618[] = dydan_sceneCollisionHeader_00B618; #define dydan_sceneTLUT_00B810 "__OTR__scenes/nonmq/ydan_scene/ydan_sceneTLUT_00B810" -static const ALIGN_ASSET(2) char ydan_sceneTLUT_00B810[] = dydan_sceneTLUT_00B810; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_sceneTLUT_00B810[] = dydan_sceneTLUT_00B810; + +#endif // DUNGEONS_YDAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h index 4b5d7884d..b04378f32 100644 --- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h +++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_BOSS_ROOM_0_H +#define DUNGEONS_YDAN_BOSS_ROOM_0_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005FF0[] = dydan_boss_room_ static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_004BF0[] = dydan_boss_room_0Tex_004BF0; #define dydan_boss_room_0Tex_005BF0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_005BF0" -static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005BF0[] = dydan_boss_room_0Tex_005BF0; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005BF0[] = dydan_boss_room_0Tex_005BF0; + + +#endif // DUNGEONS_YDAN_BOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h index 983b1b6e6..8547b762f 100644 --- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h +++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_BOSS_ROOM_1_H +#define DUNGEONS_YDAN_BOSS_ROOM_1_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_005338[] = dydan_boss_room_ static const ALIGN_ASSET(2) char ydan_boss_room_1DL_005FD8[] = dydan_boss_room_1DL_005FD8; #define dydan_boss_room_1Tex_005FE8 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_005FE8" -static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_005FE8[] = dydan_boss_room_1Tex_005FE8; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_005FE8[] = dydan_boss_room_1Tex_005FE8; + + +#endif // DUNGEONS_YDAN_BOSS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h index 35a760f02..6a3c7ba69 100644 --- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h +++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DUNGEONS_YDAN_BOSS_SCENE_H +#define DUNGEONS_YDAN_BOSS_SCENE_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char ydan_boss_sceneCollisionHeader_000CFC[] = dydan static const ALIGN_ASSET(2) char ydan_boss_sceneTLUT_000D30[] = dydan_boss_sceneTLUT_000D30; #define dydan_boss_sceneTex_000F38 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_sceneTex_000F38" -static const ALIGN_ASSET(2) char ydan_boss_sceneTex_000F38[] = dydan_boss_sceneTex_000F38; \ No newline at end of file +static const ALIGN_ASSET(2) char ydan_boss_sceneTex_000F38[] = dydan_boss_sceneTex_000F38; + +#endif // DUNGEONS_YDAN_BOSS_SCENE_H diff --git a/soh/assets/scenes/indoors/bowling/bowling_room_0.h b/soh/assets/scenes/indoors/bowling/bowling_room_0.h index ec4fda2fd..a82819b68 100644 --- a/soh/assets/scenes/indoors/bowling/bowling_room_0.h +++ b/soh/assets/scenes/indoors/bowling/bowling_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_BOWLING_ROOM_0_H +#define INDOORS_BOWLING_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char bowling_room_0DL_004D90[] = dbowling_room_0DL_004D90; #define dbowling_room_0DL_0061A8 "__OTR__scenes/nonmq/bowling_scene/bowling_room_0DL_0061A8" -static const ALIGN_ASSET(2) char bowling_room_0DL_0061A8[] = dbowling_room_0DL_0061A8; \ No newline at end of file +static const ALIGN_ASSET(2) char bowling_room_0DL_0061A8[] = dbowling_room_0DL_0061A8; + + +#endif // INDOORS_BOWLING_ROOM_0_H diff --git a/soh/assets/scenes/indoors/bowling/bowling_scene.h b/soh/assets/scenes/indoors/bowling/bowling_scene.h index 589a86256..ed0cb984b 100644 --- a/soh/assets/scenes/indoors/bowling/bowling_scene.h +++ b/soh/assets/scenes/indoors/bowling/bowling_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_BOWLING_SCENE_H +#define INDOORS_BOWLING_SCENE_H 1 #include "align_asset_macro.h" @@ -87,4 +88,6 @@ static const ALIGN_ASSET(2) char bowling_sceneTex_004720[] = dbowling_sceneTex_0 static const ALIGN_ASSET(2) char bowling_sceneTex_007120[] = dbowling_sceneTex_007120; #define dbowling_sceneTex_00AD20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00AD20" -static const ALIGN_ASSET(2) char bowling_sceneTex_00AD20[] = dbowling_sceneTex_00AD20; \ No newline at end of file +static const ALIGN_ASSET(2) char bowling_sceneTex_00AD20[] = dbowling_sceneTex_00AD20; + +#endif // INDOORS_BOWLING_SCENE_H diff --git a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h index e093175e2..1d6f2c369 100644 --- a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h +++ b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_DAIYOUSEI_IZUMI_ROOM_0_H +#define INDOORS_DAIYOUSEI_IZUMI_ROOM_0_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_0001E0DL_0038F8[] = d static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_002BB8[] = ddaiyousei_izumi_room_0Set_000260DL_002BB8; #define ddaiyousei_izumi_room_0Set_000260DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_0038F8" -static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_0038F8[] = ddaiyousei_izumi_room_0Set_000260DL_0038F8; \ No newline at end of file +static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_0038F8[] = ddaiyousei_izumi_room_0Set_000260DL_0038F8; + + +#endif // INDOORS_DAIYOUSEI_IZUMI_ROOM_0_H diff --git a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h index 8f264e74e..30ff0b896 100644 --- a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h +++ b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_DAIYOUSEI_IZUMI_SCENE_H +#define INDOORS_DAIYOUSEI_IZUMI_SCENE_H 1 #include "align_asset_macro.h" @@ -8,8 +9,8 @@ static const ALIGN_ASSET(2) char gGreatFairyMagicCs[] = dgGreatFairyMagicCs; #define dgGreatFairyDoubleMagicCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleMagicCs" static const ALIGN_ASSET(2) char gGreatFairyDoubleMagicCs[] = dgGreatFairyDoubleMagicCs; -#define dgGreatFairyDoubleDefenceCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleDefenceCs" -static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenceCs[] = dgGreatFairyDoubleDefenceCs; +#define dgGreatFairyDoubleDefenseCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleDefenseCs" +static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenseCs[] = dgGreatFairyDoubleDefenseCs; #define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" static const ALIGN_ASSET(2) char daiyousei_izumi_sceneCollisionHeader_0043A4[] = ddaiyousei_izumi_sceneCollisionHeader_0043A4; @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_006000[] = ddaiyousei_ #define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" -#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" \ No newline at end of file +#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" + + +#endif // INDOORS_DAIYOUSEI_IZUMI_SCENE_H diff --git a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h index b7f2740ee..74be5a6b5 100644 --- a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h +++ b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAIRAL_NIWA_ROOM_0_H +#define INDOORS_HAIRAL_NIWA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0082C8[] = dhairal_niwa_ro static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0090A8[] = dhairal_niwa_room_0DL_0090A8; #define dhairal_niwa_room_0DL_00A7E0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A7E0" -static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A7E0[] = dhairal_niwa_room_0DL_00A7E0; \ No newline at end of file +static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A7E0[] = dhairal_niwa_room_0DL_00A7E0; + + +#endif // INDOORS_HAIRAL_NIWA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h index e049e6668..8f5aaa3b6 100644 --- a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h +++ b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAIRAL_NIWA_SCENE_H +#define INDOORS_HAIRAL_NIWA_SCENE_H 1 #include "align_asset_macro.h" @@ -69,4 +70,6 @@ static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009B90[] = dhairal_niwa_sc static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005B90[] = dhairal_niwa_sceneTex_005B90; #define dhairal_niwa_sceneTex_003B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_003B90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003B90[] = dhairal_niwa_sceneTex_003B90; \ No newline at end of file +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003B90[] = dhairal_niwa_sceneTex_003B90; + +#endif // INDOORS_HAIRAL_NIWA_SCENE_H diff --git a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h index aa9a5478e..12b7e190c 100644 --- a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h +++ b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAIRAL_NIWA2_ROOM_0_H +#define INDOORS_HAIRAL_NIWA2_ROOM_0_H 1 #include "align_asset_macro.h" @@ -72,4 +73,7 @@ static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_016BF8[] = dhairal_niwa2 static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0163F8[] = dhairal_niwa2_room_0Tex_0163F8; #define dhairal_niwa2_room_0Tex_014BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_014BF8" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8; \ No newline at end of file +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8; + + +#endif // INDOORS_HAIRAL_NIWA2_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h index f8e86453f..46f96ae0d 100644 --- a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h +++ b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_HAIRAL_NIWA2_SCENE_H +#define INDOORS_HAIRAL_NIWA2_SCENE_H 1 #include "align_asset_macro.h" #define dhairal_niwa2_sceneCollisionHeader_002CD8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_sceneCollisionHeader_002CD8" -static const ALIGN_ASSET(2) char hairal_niwa2_sceneCollisionHeader_002CD8[] = dhairal_niwa2_sceneCollisionHeader_002CD8; \ No newline at end of file +static const ALIGN_ASSET(2) char hairal_niwa2_sceneCollisionHeader_002CD8[] = dhairal_niwa2_sceneCollisionHeader_002CD8; + + +#endif // INDOORS_HAIRAL_NIWA2_SCENE_H diff --git a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h index 370aa158f..aaa3313fe 100644 --- a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h +++ b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAIRAL_NIWA_N_ROOM_0_H +#define INDOORS_HAIRAL_NIWA_N_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_002FE8[] = dhairal_niwa_n_room_0DL_002FE8; #define dhairal_niwa_n_room_0DL_003608 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_003608" -static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_003608[] = dhairal_niwa_n_room_0DL_003608; \ No newline at end of file +static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_003608[] = dhairal_niwa_n_room_0DL_003608; + + +#endif // INDOORS_HAIRAL_NIWA_N_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h index 72ead5606..572c26609 100644 --- a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h +++ b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAIRAL_NIWA_N_SCENE_H +#define INDOORS_HAIRAL_NIWA_N_SCENE_H 1 #include "align_asset_macro.h" @@ -42,4 +43,6 @@ static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0028F0[] = dhairal_niwa_ static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0060F0[] = dhairal_niwa_n_sceneTex_0060F0; #define dhairal_niwa_n_sceneTex_0018F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0018F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0018F0[] = dhairal_niwa_n_sceneTex_0018F0; \ No newline at end of file +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0018F0[] = dhairal_niwa_n_sceneTex_0018F0; + +#endif // INDOORS_HAIRAL_NIWA_N_SCENE_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h index 26ad7ee76..a078f2c1e 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_ROOM_0_H +#define INDOORS_HAKASITARELAY_ROOM_0_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_003448[] = dhakasitarel static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_0062A8[] = dhakasitarelay_room_0DL_0062A8; #define dhakasitarelay_room_0Tex_0062B8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_0062B8" -static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_0062B8[] = dhakasitarelay_room_0Tex_0062B8; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_0062B8[] = dhakasitarelay_room_0Tex_0062B8; + + +#endif // INDOORS_HAKASITARELAY_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h index 8e3642b67..8fda0afa6 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_ROOM_1_H +#define INDOORS_HAKASITARELAY_ROOM_1_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005F20[] = dhakasitarel static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005720[] = dhakasitarelay_room_1Tex_005720; #define dhakasitarelay_room_1Tex_006320 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_006320" -static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_006320[] = dhakasitarelay_room_1Tex_006320; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_006320[] = dhakasitarelay_room_1Tex_006320; + + +#endif // INDOORS_HAKASITARELAY_ROOM_1_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h index dac172393..e4e766d67 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_ROOM_2_H +#define INDOORS_HAKASITARELAY_ROOM_2_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_007CA8[] = dhakasitarel static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0074A8[] = dhakasitarelay_room_2Tex_0074A8; #define dhakasitarelay_room_2Tex_0080A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0080A8" -static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0080A8[] = dhakasitarelay_room_2Tex_0080A8; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0080A8[] = dhakasitarelay_room_2Tex_0080A8; + + +#endif // INDOORS_HAKASITARELAY_ROOM_2_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h index 991eebc7b..5b52cffd5 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_ROOM_3_H +#define INDOORS_HAKASITARELAY_ROOM_3_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_007CE0[] = dhakasitarel static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0078E0[] = dhakasitarelay_room_3Tex_0078E0; #define dhakasitarelay_room_3Tex_0070E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0070E0" -static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0070E0[] = dhakasitarelay_room_3Tex_0070E0; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0070E0[] = dhakasitarelay_room_3Tex_0070E0; + + +#endif // INDOORS_HAKASITARELAY_ROOM_3_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h index f1ffcffb9..db978106f 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_ROOM_4_H +#define INDOORS_HAKASITARELAY_ROOM_4_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002080[] = dhakasitarel static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_001E80[] = dhakasitarelay_room_4Tex_001E80; #define dhakasitarelay_room_4Tex_002880 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_002880" -static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002880[] = dhakasitarelay_room_4Tex_002880; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002880[] = dhakasitarelay_room_4Tex_002880; + + +#endif // INDOORS_HAKASITARELAY_ROOM_4_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h index d5b9d4693..748218312 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_ROOM_5_H +#define INDOORS_HAKASITARELAY_ROOM_5_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_001C48[] = dhakasitarel static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_003448[] = dhakasitarelay_room_5Tex_003448; #define dhakasitarelay_room_5Tex_002C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_002C48" -static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002C48[] = dhakasitarelay_room_5Tex_002C48; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002C48[] = dhakasitarelay_room_5Tex_002C48; + + +#endif // INDOORS_HAKASITARELAY_ROOM_5_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h index 6c12089d4..edfae4957 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_ROOM_6_H +#define INDOORS_HAKASITARELAY_ROOM_6_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char hakasitarelay_room_6TLUT_004188[] = dhakasitare static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0041A8[] = dhakasitarelay_room_6Tex_0041A8; #define dhakasitarelay_room_6Tex_004AA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_004AA8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004AA8[] = dhakasitarelay_room_6Tex_004AA8; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004AA8[] = dhakasitarelay_room_6Tex_004AA8; + + +#endif // INDOORS_HAKASITARELAY_ROOM_6_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h index e61badaa0..da196ba5c 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HAKASITARELAY_SCENE_H +#define INDOORS_HAKASITARELAY_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D880[] = dhakasitarela static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00C080[] = dhakasitarelay_sceneTex_00C080; #define dhakasitarelay_sceneTex_00D080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneTex_00D080" -static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D080[] = dhakasitarelay_sceneTex_00D080; \ No newline at end of file +static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D080[] = dhakasitarelay_sceneTex_00D080; + +#endif // INDOORS_HAKASITARELAY_SCENE_H diff --git a/soh/assets/scenes/indoors/hut/hut_room_0.h b/soh/assets/scenes/indoors/hut/hut_room_0.h index 570c10d26..3aaa9aae4 100644 --- a/soh/assets/scenes/indoors/hut/hut_room_0.h +++ b/soh/assets/scenes/indoors/hut/hut_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_HUT_ROOM_0_H +#define INDOORS_HUT_ROOM_0_H 1 #include "align_asset_macro.h" #define dhut_room_0DL_003D58 "__OTR__scenes/nonmq/hut_scene/hut_room_0DL_003D58" -static const ALIGN_ASSET(2) char hut_room_0DL_003D58[] = dhut_room_0DL_003D58; \ No newline at end of file +static const ALIGN_ASSET(2) char hut_room_0DL_003D58[] = dhut_room_0DL_003D58; + + +#endif // INDOORS_HUT_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hut/hut_scene.h b/soh/assets/scenes/indoors/hut/hut_scene.h index 11e9cf5bc..5f767efae 100644 --- a/soh/assets/scenes/indoors/hut/hut_scene.h +++ b/soh/assets/scenes/indoors/hut/hut_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_HUT_SCENE_H +#define INDOORS_HUT_SCENE_H 1 #include "align_asset_macro.h" #define dhut_sceneCollisionHeader_0004DC "__OTR__scenes/nonmq/hut_scene/hut_sceneCollisionHeader_0004DC" -static const ALIGN_ASSET(2) char hut_sceneCollisionHeader_0004DC[] = dhut_sceneCollisionHeader_0004DC; \ No newline at end of file +static const ALIGN_ASSET(2) char hut_sceneCollisionHeader_0004DC[] = dhut_sceneCollisionHeader_0004DC; + + +#endif // INDOORS_HUT_SCENE_H diff --git a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h index 918ea4f80..385754807 100644 --- a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h +++ b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HYLIA_LABO_ROOM_0_H +#define INDOORS_HYLIA_LABO_ROOM_0_H 1 #include "align_asset_macro.h" @@ -63,4 +64,7 @@ static const ALIGN_ASSET(2) char hylia_labo_room_0DL_004A80[] = dhylia_labo_room static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005A38[] = dhylia_labo_room_0DL_005A38; #define dhylia_labo_room_0DL_0040E0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0040E0" -static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0040E0[] = dhylia_labo_room_0DL_0040E0; \ No newline at end of file +static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0040E0[] = dhylia_labo_room_0DL_0040E0; + + +#endif // INDOORS_HYLIA_LABO_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h index 15ce40a4a..a724a2d64 100644 --- a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h +++ b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_HYLIA_LABO_SCENE_H +#define INDOORS_HYLIA_LABO_SCENE_H 1 #include "align_asset_macro.h" @@ -96,4 +97,6 @@ static const ALIGN_ASSET(2) char hylia_labo_sceneTex_004C90[] = dhylia_labo_scen static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010090[] = dhylia_labo_sceneTex_010090; #define dhylia_labo_sceneTex_00E090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00E090" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E090[] = dhylia_labo_sceneTex_00E090; \ No newline at end of file +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E090[] = dhylia_labo_sceneTex_00E090; + +#endif // INDOORS_HYLIA_LABO_SCENE_H diff --git a/soh/assets/scenes/indoors/impa/impa_room_0.h b/soh/assets/scenes/indoors/impa/impa_room_0.h index 3c6f69656..0a522fb7d 100644 --- a/soh/assets/scenes/indoors/impa/impa_room_0.h +++ b/soh/assets/scenes/indoors/impa/impa_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_IMPA_ROOM_0_H +#define INDOORS_IMPA_ROOM_0_H 1 #include "align_asset_macro.h" #define dimpa_room_0DL_001758 "__OTR__scenes/nonmq/impa_scene/impa_room_0DL_001758" -static const ALIGN_ASSET(2) char impa_room_0DL_001758[] = dimpa_room_0DL_001758; \ No newline at end of file +static const ALIGN_ASSET(2) char impa_room_0DL_001758[] = dimpa_room_0DL_001758; + + +#endif // INDOORS_IMPA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/impa/impa_scene.h b/soh/assets/scenes/indoors/impa/impa_scene.h index 77ccd8952..bcc2aea15 100644 --- a/soh/assets/scenes/indoors/impa/impa_scene.h +++ b/soh/assets/scenes/indoors/impa/impa_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_IMPA_SCENE_H +#define INDOORS_IMPA_SCENE_H 1 #include "align_asset_macro.h" #define dimpa_sceneCollisionHeader_000CE0 "__OTR__scenes/nonmq/impa_scene/impa_sceneCollisionHeader_000CE0" -static const ALIGN_ASSET(2) char impa_sceneCollisionHeader_000CE0[] = dimpa_sceneCollisionHeader_000CE0; \ No newline at end of file +static const ALIGN_ASSET(2) char impa_sceneCollisionHeader_000CE0[] = dimpa_sceneCollisionHeader_000CE0; + + +#endif // INDOORS_IMPA_SCENE_H diff --git a/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h b/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h index cf8fa3e64..36e99e7ac 100644 --- a/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h +++ b/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KAKARIKO_ROOM_0_H +#define INDOORS_KAKARIKO_ROOM_0_H 1 #include "align_asset_macro.h" #define dkakariko_room_0DL_005760 "__OTR__scenes/nonmq/kakariko_scene/kakariko_room_0DL_005760" -static const ALIGN_ASSET(2) char kakariko_room_0DL_005760[] = dkakariko_room_0DL_005760; \ No newline at end of file +static const ALIGN_ASSET(2) char kakariko_room_0DL_005760[] = dkakariko_room_0DL_005760; + + +#endif // INDOORS_KAKARIKO_ROOM_0_H diff --git a/soh/assets/scenes/indoors/kakariko/kakariko_scene.h b/soh/assets/scenes/indoors/kakariko/kakariko_scene.h index c747212b5..19727894a 100644 --- a/soh/assets/scenes/indoors/kakariko/kakariko_scene.h +++ b/soh/assets/scenes/indoors/kakariko/kakariko_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KAKARIKO_SCENE_H +#define INDOORS_KAKARIKO_SCENE_H 1 #include "align_asset_macro.h" #define dkakariko_sceneCollisionHeader_000E68 "__OTR__scenes/nonmq/kakariko_scene/kakariko_sceneCollisionHeader_000E68" -static const ALIGN_ASSET(2) char kakariko_sceneCollisionHeader_000E68[] = dkakariko_sceneCollisionHeader_000E68; \ No newline at end of file +static const ALIGN_ASSET(2) char kakariko_sceneCollisionHeader_000E68[] = dkakariko_sceneCollisionHeader_000E68; + + +#endif // INDOORS_KAKARIKO_SCENE_H diff --git a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h index 0f9df6fee..fe67f2766 100644 --- a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h +++ b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_KENJYANOMA_ROOM_0_H +#define INDOORS_KENJYANOMA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000180DL_010CD8[] = dkenjy static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000230DL_001608[] = dkenjyanoma_room_0Set_000230DL_001608; #define dkenjyanoma_room_0Set_000230DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_010CD8" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000230DL_010CD8[] = dkenjyanoma_room_0Set_000230DL_010CD8; \ No newline at end of file +static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000230DL_010CD8[] = dkenjyanoma_room_0Set_000230DL_010CD8; + + +#endif // INDOORS_KENJYANOMA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h index 80f40f618..1132c6f2e 100644 --- a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h +++ b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_KENJYANOMA_SCENE_H +#define INDOORS_KENJYANOMA_SCENE_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char kenjyanoma_sceneCollisionHeader_00359C[] = dken #define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" -#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" \ No newline at end of file +#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" + + +#endif // INDOORS_KENJYANOMA_SCENE_H diff --git a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h index 3609b4c82..764cb901a 100644 --- a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME_ROOM_0_H +#define INDOORS_KOKIRI_HOME_ROOM_0_H 1 #include "align_asset_macro.h" #define dkokiri_home_room_0DL_006398 "__OTR__scenes/nonmq/kokiri_home_scene/kokiri_home_room_0DL_006398" -static const ALIGN_ASSET(2) char kokiri_home_room_0DL_006398[] = dkokiri_home_room_0DL_006398; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home_room_0DL_006398[] = dkokiri_home_room_0DL_006398; + + +#endif // INDOORS_KOKIRI_HOME_ROOM_0_H diff --git a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h index 7fa25151f..faadb2ff9 100644 --- a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME_SCENE_H +#define INDOORS_KOKIRI_HOME_SCENE_H 1 #include "align_asset_macro.h" #define dkokiri_home_sceneCollisionHeader_000C8C "__OTR__scenes/nonmq/kokiri_home_scene/kokiri_home_sceneCollisionHeader_000C8C" -static const ALIGN_ASSET(2) char kokiri_home_sceneCollisionHeader_000C8C[] = dkokiri_home_sceneCollisionHeader_000C8C; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home_sceneCollisionHeader_000C8C[] = dkokiri_home_sceneCollisionHeader_000C8C; + + +#endif // INDOORS_KOKIRI_HOME_SCENE_H diff --git a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h index 27daf7dae..b0a16b9f3 100644 --- a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME3_ROOM_0_H +#define INDOORS_KOKIRI_HOME3_ROOM_0_H 1 #include "align_asset_macro.h" #define dkokiri_home3_room_0DL_036590 "__OTR__scenes/nonmq/kokiri_home3_scene/kokiri_home3_room_0DL_036590" -static const ALIGN_ASSET(2) char kokiri_home3_room_0DL_036590[] = dkokiri_home3_room_0DL_036590; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home3_room_0DL_036590[] = dkokiri_home3_room_0DL_036590; + + +#endif // INDOORS_KOKIRI_HOME3_ROOM_0_H diff --git a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h index 353539859..fa6597995 100644 --- a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME3_SCENE_H +#define INDOORS_KOKIRI_HOME3_SCENE_H 1 #include "align_asset_macro.h" #define dkokiri_home3_sceneCollisionHeader_001774 "__OTR__scenes/nonmq/kokiri_home3_scene/kokiri_home3_sceneCollisionHeader_001774" -static const ALIGN_ASSET(2) char kokiri_home3_sceneCollisionHeader_001774[] = dkokiri_home3_sceneCollisionHeader_001774; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home3_sceneCollisionHeader_001774[] = dkokiri_home3_sceneCollisionHeader_001774; + + +#endif // INDOORS_KOKIRI_HOME3_SCENE_H diff --git a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h index df717eda0..e954d48dc 100644 --- a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME4_ROOM_0_H +#define INDOORS_KOKIRI_HOME4_ROOM_0_H 1 #include "align_asset_macro.h" #define dkokiri_home4_room_0DL_0388B8 "__OTR__scenes/nonmq/kokiri_home4_scene/kokiri_home4_room_0DL_0388B8" -static const ALIGN_ASSET(2) char kokiri_home4_room_0DL_0388B8[] = dkokiri_home4_room_0DL_0388B8; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home4_room_0DL_0388B8[] = dkokiri_home4_room_0DL_0388B8; + + +#endif // INDOORS_KOKIRI_HOME4_ROOM_0_H diff --git a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h index fb9a75f6e..ed244364d 100644 --- a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME4_SCENE_H +#define INDOORS_KOKIRI_HOME4_SCENE_H 1 #include "align_asset_macro.h" #define dkokiri_home4_sceneCollisionHeader_001A84 "__OTR__scenes/nonmq/kokiri_home4_scene/kokiri_home4_sceneCollisionHeader_001A84" -static const ALIGN_ASSET(2) char kokiri_home4_sceneCollisionHeader_001A84[] = dkokiri_home4_sceneCollisionHeader_001A84; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home4_sceneCollisionHeader_001A84[] = dkokiri_home4_sceneCollisionHeader_001A84; + + +#endif // INDOORS_KOKIRI_HOME4_SCENE_H diff --git a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h index f1edb76b4..e5aacdf16 100644 --- a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME5_ROOM_0_H +#define INDOORS_KOKIRI_HOME5_ROOM_0_H 1 #include "align_asset_macro.h" #define dkokiri_home5_room_0DL_030EE8 "__OTR__scenes/nonmq/kokiri_home5_scene/kokiri_home5_room_0DL_030EE8" -static const ALIGN_ASSET(2) char kokiri_home5_room_0DL_030EE8[] = dkokiri_home5_room_0DL_030EE8; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home5_room_0DL_030EE8[] = dkokiri_home5_room_0DL_030EE8; + + +#endif // INDOORS_KOKIRI_HOME5_ROOM_0_H diff --git a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h index 25222a87b..250287b76 100644 --- a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_KOKIRI_HOME5_SCENE_H +#define INDOORS_KOKIRI_HOME5_SCENE_H 1 #include "align_asset_macro.h" #define dkokiri_home5_sceneCollisionHeader_0013DC "__OTR__scenes/nonmq/kokiri_home5_scene/kokiri_home5_sceneCollisionHeader_0013DC" -static const ALIGN_ASSET(2) char kokiri_home5_sceneCollisionHeader_0013DC[] = dkokiri_home5_sceneCollisionHeader_0013DC; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_home5_sceneCollisionHeader_0013DC[] = dkokiri_home5_sceneCollisionHeader_0013DC; + + +#endif // INDOORS_KOKIRI_HOME5_SCENE_H diff --git a/soh/assets/scenes/indoors/labo/labo_room_0.h b/soh/assets/scenes/indoors/labo/labo_room_0.h index 931445d05..e632c604b 100644 --- a/soh/assets/scenes/indoors/labo/labo_room_0.h +++ b/soh/assets/scenes/indoors/labo/labo_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_LABO_ROOM_0_H +#define INDOORS_LABO_ROOM_0_H 1 #include "align_asset_macro.h" #define dlabo_room_0DL_006E50 "__OTR__scenes/nonmq/labo_scene/labo_room_0DL_006E50" -static const ALIGN_ASSET(2) char labo_room_0DL_006E50[] = dlabo_room_0DL_006E50; \ No newline at end of file +static const ALIGN_ASSET(2) char labo_room_0DL_006E50[] = dlabo_room_0DL_006E50; + + +#endif // INDOORS_LABO_ROOM_0_H diff --git a/soh/assets/scenes/indoors/labo/labo_scene.h b/soh/assets/scenes/indoors/labo/labo_scene.h index 39dd372be..f9a048f59 100644 --- a/soh/assets/scenes/indoors/labo/labo_scene.h +++ b/soh/assets/scenes/indoors/labo/labo_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_LABO_SCENE_H +#define INDOORS_LABO_SCENE_H 1 #include "align_asset_macro.h" #define dlabo_sceneCollisionHeader_000EC4 "__OTR__scenes/nonmq/labo_scene/labo_sceneCollisionHeader_000EC4" -static const ALIGN_ASSET(2) char labo_sceneCollisionHeader_000EC4[] = dlabo_sceneCollisionHeader_000EC4; \ No newline at end of file +static const ALIGN_ASSET(2) char labo_sceneCollisionHeader_000EC4[] = dlabo_sceneCollisionHeader_000EC4; + + +#endif // INDOORS_LABO_SCENE_H diff --git a/soh/assets/scenes/indoors/link_home/link_home_room_0.h b/soh/assets/scenes/indoors/link_home/link_home_room_0.h index ef0bb46c6..084b00855 100644 --- a/soh/assets/scenes/indoors/link_home/link_home_room_0.h +++ b/soh/assets/scenes/indoors/link_home/link_home_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_LINK_HOME_ROOM_0_H +#define INDOORS_LINK_HOME_ROOM_0_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char link_home_room_0DL_0023A8[] = dlink_home_room_0 static const ALIGN_ASSET(2) char link_home_room_0Set_002400DL_0023A8[] = dlink_home_room_0Set_002400DL_0023A8; #define dlink_home_room_0Set_002440DL_0023A8 "__OTR__scenes/nonmq/link_home_scene/link_home_room_0Set_002440DL_0023A8" -static const ALIGN_ASSET(2) char link_home_room_0Set_002440DL_0023A8[] = dlink_home_room_0Set_002440DL_0023A8; \ No newline at end of file +static const ALIGN_ASSET(2) char link_home_room_0Set_002440DL_0023A8[] = dlink_home_room_0Set_002440DL_0023A8; + + +#endif // INDOORS_LINK_HOME_ROOM_0_H diff --git a/soh/assets/scenes/indoors/link_home/link_home_scene.h b/soh/assets/scenes/indoors/link_home/link_home_scene.h index 3c51fa267..d66349aa0 100644 --- a/soh/assets/scenes/indoors/link_home/link_home_scene.h +++ b/soh/assets/scenes/indoors/link_home/link_home_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_LINK_HOME_SCENE_H +#define INDOORS_LINK_HOME_SCENE_H 1 #include "align_asset_macro.h" @@ -7,4 +8,7 @@ static const ALIGN_ASSET(2) char link_home_sceneCollisionHeader_000E4C[] = dlink #define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C" -#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C" \ No newline at end of file +#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C" + + +#endif // INDOORS_LINK_HOME_SCENE_H diff --git a/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h b/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h index 49769647c..8fbc38d42 100644 --- a/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h +++ b/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_MAHOUYA_ROOM_0_H +#define INDOORS_MAHOUYA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char mahouya_room_0DL_006548[] = dmahouya_room_0DL_006548; #define dmahouya_room_0DL_006A78 "__OTR__scenes/nonmq/mahouya_scene/mahouya_room_0DL_006A78" -static const ALIGN_ASSET(2) char mahouya_room_0DL_006A78[] = dmahouya_room_0DL_006A78; \ No newline at end of file +static const ALIGN_ASSET(2) char mahouya_room_0DL_006A78[] = dmahouya_room_0DL_006A78; + + +#endif // INDOORS_MAHOUYA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/mahouya/mahouya_scene.h b/soh/assets/scenes/indoors/mahouya/mahouya_scene.h index e82132302..0e558bcfd 100644 --- a/soh/assets/scenes/indoors/mahouya/mahouya_scene.h +++ b/soh/assets/scenes/indoors/mahouya/mahouya_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_MAHOUYA_SCENE_H +#define INDOORS_MAHOUYA_SCENE_H 1 #include "align_asset_macro.h" @@ -42,4 +43,6 @@ static const ALIGN_ASSET(2) char mahouya_sceneTex_003A20[] = dmahouya_sceneTex_0 static const ALIGN_ASSET(2) char mahouya_sceneTex_002A20[] = dmahouya_sceneTex_002A20; #define dmahouya_sceneTex_008A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_008A20" -static const ALIGN_ASSET(2) char mahouya_sceneTex_008A20[] = dmahouya_sceneTex_008A20; \ No newline at end of file +static const ALIGN_ASSET(2) char mahouya_sceneTex_008A20[] = dmahouya_sceneTex_008A20; + +#endif // INDOORS_MAHOUYA_SCENE_H diff --git a/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h b/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h index 3555bb18e..7d95fae4d 100644 --- a/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h +++ b/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_MALON_STABLE_ROOM_0_H +#define INDOORS_MALON_STABLE_ROOM_0_H 1 #include "align_asset_macro.h" #define dmalon_stable_room_0DL_008A00 "__OTR__scenes/nonmq/malon_stable_scene/malon_stable_room_0DL_008A00" -static const ALIGN_ASSET(2) char malon_stable_room_0DL_008A00[] = dmalon_stable_room_0DL_008A00; \ No newline at end of file +static const ALIGN_ASSET(2) char malon_stable_room_0DL_008A00[] = dmalon_stable_room_0DL_008A00; + + +#endif // INDOORS_MALON_STABLE_ROOM_0_H diff --git a/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h b/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h index 9ae03f25c..c8006d866 100644 --- a/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h +++ b/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_MALON_STABLE_SCENE_H +#define INDOORS_MALON_STABLE_SCENE_H 1 #include "align_asset_macro.h" #define dmalon_stable_sceneCollisionHeader_000644 "__OTR__scenes/nonmq/malon_stable_scene/malon_stable_sceneCollisionHeader_000644" -static const ALIGN_ASSET(2) char malon_stable_sceneCollisionHeader_000644[] = dmalon_stable_sceneCollisionHeader_000644; \ No newline at end of file +static const ALIGN_ASSET(2) char malon_stable_sceneCollisionHeader_000644[] = dmalon_stable_sceneCollisionHeader_000644; + + +#endif // INDOORS_MALON_STABLE_SCENE_H diff --git a/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h b/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h index c1aed1885..d532f22de 100644 --- a/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h +++ b/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_MIHARIGOYA_ROOM_0_H +#define INDOORS_MIHARIGOYA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000E60[] = dmihar static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000660[] = dmiharigoya_room_0Set_000470DL_000660; #define dmiharigoya_room_0Set_000470DL_002C60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002C60" -static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002C60[] = dmiharigoya_room_0Set_000470DL_002C60; \ No newline at end of file +static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002C60[] = dmiharigoya_room_0Set_000470DL_002C60; + + +#endif // INDOORS_MIHARIGOYA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h b/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h index f23e977ca..f5c92c71e 100644 --- a/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h +++ b/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_MIHARIGOYA_SCENE_H +#define INDOORS_MIHARIGOYA_SCENE_H 1 #include "align_asset_macro.h" @@ -59,4 +60,7 @@ static const ALIGN_ASSET(2) char miharigoya_sceneTex_000C50[] = dmiharigoya_scen #define dmiharigoya_sceneTex_00BD50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_00BD50" static const ALIGN_ASSET(2) char miharigoya_sceneTex_00BD50[] = dmiharigoya_sceneTex_00BD50; -#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28" \ No newline at end of file +#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28" + + +#endif // INDOORS_MIHARIGOYA_SCENE_H diff --git a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h index 3edbfb0cb..7e371da85 100644 --- a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h +++ b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_NAKANIWA_ROOM_0_H +#define INDOORS_NAKANIWA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -117,4 +118,7 @@ static const ALIGN_ASSET(2) char nakaniwa_room_0Set_0001B0DL_014E98[] = dnakaniw static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000240DL_007178[] = dnakaniwa_room_0Set_000240DL_007178; #define dnakaniwa_room_0Set_000240DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000240DL_014E98" -static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000240DL_014E98[] = dnakaniwa_room_0Set_000240DL_014E98; \ No newline at end of file +static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000240DL_014E98[] = dnakaniwa_room_0Set_000240DL_014E98; + + +#endif // INDOORS_NAKANIWA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h index 123004dbf..c5884e2a6 100644 --- a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h +++ b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_NAKANIWA_SCENE_H +#define INDOORS_NAKANIWA_SCENE_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char nakaniwa_sceneCollisionHeader_001BC8[] = dnakan #define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" -#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" \ No newline at end of file +#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" + + +#endif // INDOORS_NAKANIWA_SCENE_H diff --git a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h index 8c287c712..71a9cc181 100644 --- a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h +++ b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_SYATEKIJYOU_ROOM_0_H +#define INDOORS_SYATEKIJYOU_ROOM_0_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000F0DL_0076D8[] = dsyat static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0001A0DL_006548[] = dsyatekijyou_room_0Set_0001A0DL_006548; #define dsyatekijyou_room_0Set_0001A0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_0076D8" -static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0001A0DL_0076D8[] = dsyatekijyou_room_0Set_0001A0DL_0076D8; \ No newline at end of file +static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0001A0DL_0076D8[] = dsyatekijyou_room_0Set_0001A0DL_0076D8; + + +#endif // INDOORS_SYATEKIJYOU_ROOM_0_H diff --git a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h index 7231bdb3e..212daef49 100644 --- a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h +++ b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_SYATEKIJYOU_SCENE_H +#define INDOORS_SYATEKIJYOU_SCENE_H 1 #include "align_asset_macro.h" @@ -75,4 +76,7 @@ static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003740[] = dsyatekijyou_sc #define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" -#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" \ No newline at end of file +#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" + + +#endif // INDOORS_SYATEKIJYOU_SCENE_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h index ccc14fe9d..22aef3938 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_ROOM_0_H +#define INDOORS_TAKARAYA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char takaraya_room_0Tex_0063E0[] = dtakaraya_room_0T static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0; #define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0095C0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_0095C0[] = dtakaraya_room_0Tex_0095C0; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_room_0Tex_0095C0[] = dtakaraya_room_0Tex_0095C0; + + +#endif // INDOORS_TAKARAYA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h index 060ff5ab5..b66f0c5eb 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_ROOM_1_H +#define INDOORS_TAKARAYA_ROOM_1_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char takaraya_room_1DL_0017D0[] = dtakaraya_room_1DL_0017D0; #define dtakaraya_room_1Tex_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_1Tex_0017F8" -static const ALIGN_ASSET(2) char takaraya_room_1Tex_0017F8[] = dtakaraya_room_1Tex_0017F8; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_room_1Tex_0017F8[] = dtakaraya_room_1Tex_0017F8; + + +#endif // INDOORS_TAKARAYA_ROOM_1_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h index 924053894..74f70e05b 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_ROOM_2_H +#define INDOORS_TAKARAYA_ROOM_2_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char takaraya_room_2DL_001800[] = dtakaraya_room_2DL_001800; #define dtakaraya_room_2Tex_001828 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_2Tex_001828" -static const ALIGN_ASSET(2) char takaraya_room_2Tex_001828[] = dtakaraya_room_2Tex_001828; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_room_2Tex_001828[] = dtakaraya_room_2Tex_001828; + + +#endif // INDOORS_TAKARAYA_ROOM_2_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h index 40aa1ef19..edd0d0246 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_ROOM_3_H +#define INDOORS_TAKARAYA_ROOM_3_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char takaraya_room_3DL_0017F0[] = dtakaraya_room_3DL static const ALIGN_ASSET(2) char takaraya_room_3Tex_002018[] = dtakaraya_room_3Tex_002018; #define dtakaraya_room_3Tex_001818 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3Tex_001818" -static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818; + + +#endif // INDOORS_TAKARAYA_ROOM_3_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h index 705696054..4052ba32b 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_ROOM_4_H +#define INDOORS_TAKARAYA_ROOM_4_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char takaraya_room_4Tex_002020[] = dtakaraya_room_4T static const ALIGN_ASSET(2) char takaraya_room_4Tex_002820[] = dtakaraya_room_4Tex_002820; #define dtakaraya_room_4Tex_001820 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_001820" -static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820; + + +#endif // INDOORS_TAKARAYA_ROOM_4_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h index b0695a0d0..15edb2d8e 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_ROOM_5_H +#define INDOORS_TAKARAYA_ROOM_5_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char takaraya_room_5Tex_001FF8[] = dtakaraya_room_5T static const ALIGN_ASSET(2) char takaraya_room_5Tex_0017F8[] = dtakaraya_room_5Tex_0017F8; #define dtakaraya_room_5Tex_0027F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_0027F8" -static const ALIGN_ASSET(2) char takaraya_room_5Tex_0027F8[] = dtakaraya_room_5Tex_0027F8; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_room_5Tex_0027F8[] = dtakaraya_room_5Tex_0027F8; + + +#endif // INDOORS_TAKARAYA_ROOM_5_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h index d66b6ab80..c15d626e8 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_ROOM_6_H +#define INDOORS_TAKARAYA_ROOM_6_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6T static const ALIGN_ASSET(2) char takaraya_room_6Tex_0012F8[] = dtakaraya_room_6Tex_0012F8; #define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_001AF8" -static const ALIGN_ASSET(2) char takaraya_room_6Tex_001AF8[] = dtakaraya_room_6Tex_001AF8; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_room_6Tex_001AF8[] = dtakaraya_room_6Tex_001AF8; + + +#endif // INDOORS_TAKARAYA_ROOM_6_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_scene.h b/soh/assets/scenes/indoors/takaraya/takaraya_scene.h index 43e963c41..2296cf713 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_scene.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TAKARAYA_SCENE_H +#define INDOORS_TAKARAYA_SCENE_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char takaraya_sceneTex_0051B0[] = dtakaraya_sceneTex static const ALIGN_ASSET(2) char takaraya_sceneTex_0069B0[] = dtakaraya_sceneTex_0069B0; #define dtakaraya_sceneTex_0061B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0061B0" -static const ALIGN_ASSET(2) char takaraya_sceneTex_0061B0[] = dtakaraya_sceneTex_0061B0; \ No newline at end of file +static const ALIGN_ASSET(2) char takaraya_sceneTex_0061B0[] = dtakaraya_sceneTex_0061B0; + +#endif // INDOORS_TAKARAYA_SCENE_H diff --git a/soh/assets/scenes/indoors/tent/tent_room_0.h b/soh/assets/scenes/indoors/tent/tent_room_0.h index d48bba9a5..675c41a39 100644 --- a/soh/assets/scenes/indoors/tent/tent_room_0.h +++ b/soh/assets/scenes/indoors/tent/tent_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_TENT_ROOM_0_H +#define INDOORS_TENT_ROOM_0_H 1 #include "align_asset_macro.h" #define dtent_room_0DL_00DE30 "__OTR__scenes/nonmq/tent_scene/tent_room_0DL_00DE30" -static const ALIGN_ASSET(2) char tent_room_0DL_00DE30[] = dtent_room_0DL_00DE30; \ No newline at end of file +static const ALIGN_ASSET(2) char tent_room_0DL_00DE30[] = dtent_room_0DL_00DE30; + + +#endif // INDOORS_TENT_ROOM_0_H diff --git a/soh/assets/scenes/indoors/tent/tent_scene.h b/soh/assets/scenes/indoors/tent/tent_scene.h index 06b796296..2a01636e4 100644 --- a/soh/assets/scenes/indoors/tent/tent_scene.h +++ b/soh/assets/scenes/indoors/tent/tent_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef INDOORS_TENT_SCENE_H +#define INDOORS_TENT_SCENE_H 1 #include "align_asset_macro.h" #define dtent_sceneCollisionHeader_00064C "__OTR__scenes/nonmq/tent_scene/tent_sceneCollisionHeader_00064C" -static const ALIGN_ASSET(2) char tent_sceneCollisionHeader_00064C[] = dtent_sceneCollisionHeader_00064C; \ No newline at end of file +static const ALIGN_ASSET(2) char tent_sceneCollisionHeader_00064C[] = dtent_sceneCollisionHeader_00064C; + + +#endif // INDOORS_TENT_SCENE_H diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h index 21ef5e507..d2ac5f07f 100644 --- a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h +++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TOKINOMA_ROOM_0_H +#define INDOORS_TOKINOMA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -90,4 +91,7 @@ static const ALIGN_ASSET(2) char tokinoma_room_0Set_000610DL_008128[] = dtokinom static const ALIGN_ASSET(2) char tokinoma_room_0Set_000690DL_008128[] = dtokinoma_room_0Set_000690DL_008128; #define dtokinoma_room_0Set_000270DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000270DL_008128" -static const ALIGN_ASSET(2) char tokinoma_room_0Set_000270DL_008128[] = dtokinoma_room_0Set_000270DL_008128; \ No newline at end of file +static const ALIGN_ASSET(2) char tokinoma_room_0Set_000270DL_008128[] = dtokinoma_room_0Set_000270DL_008128; + + +#endif // INDOORS_TOKINOMA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h index 81ee20fc2..929172206 100644 --- a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h +++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TOKINOMA_ROOM_1_H +#define INDOORS_TOKINOMA_ROOM_1_H 1 #include "align_asset_macro.h" @@ -90,4 +91,7 @@ static const ALIGN_ASSET(2) char tokinoma_room_1Set_000890DL_006470[] = dtokinom static const ALIGN_ASSET(2) char tokinoma_room_1Set_0002B0DL_0053E0[] = dtokinoma_room_1Set_0002B0DL_0053E0; #define dtokinoma_room_1Set_0002B0DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0002B0DL_006470" -static const ALIGN_ASSET(2) char tokinoma_room_1Set_0002B0DL_006470[] = dtokinoma_room_1Set_0002B0DL_006470; \ No newline at end of file +static const ALIGN_ASSET(2) char tokinoma_room_1Set_0002B0DL_006470[] = dtokinoma_room_1Set_0002B0DL_006470; + + +#endif // INDOORS_TOKINOMA_ROOM_1_H diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h index 10cdd46ae..7408f61f9 100644 --- a/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h +++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_TOKINOMA_SCENE_H +#define INDOORS_TOKINOMA_SCENE_H 1 #include "align_asset_macro.h" @@ -61,4 +62,7 @@ static const ALIGN_ASSET(2) char tokinoma_sceneTex_0117A0[] = dtokinoma_sceneTex #define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" \ No newline at end of file +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" + + +#endif // INDOORS_TOKINOMA_SCENE_H diff --git a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h index 18c5d3dec..baa936861 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h +++ b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_YOUSEI_IZUMI_TATE_ROOM_0_H +#define INDOORS_YOUSEI_IZUMI_TATE_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_002C10[] = dyousei_izumi_tate_room_0DL_002C10; #define dyousei_izumi_tate_room_0DL_003FB0 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_003FB0" -static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_003FB0[] = dyousei_izumi_tate_room_0DL_003FB0; \ No newline at end of file +static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_003FB0[] = dyousei_izumi_tate_room_0DL_003FB0; + + +#endif // INDOORS_YOUSEI_IZUMI_TATE_ROOM_0_H diff --git a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h index de01420dd..547f8d436 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h +++ b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_YOUSEI_IZUMI_TATE_SCENE_H +#define INDOORS_YOUSEI_IZUMI_TATE_SCENE_H 1 #include "align_asset_macro.h" @@ -33,4 +34,6 @@ static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007010[] = dyousei_i static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_003810[] = dyousei_izumi_tate_sceneTex_003810; #define dyousei_izumi_tate_sceneTex_002010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002010" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002010[] = dyousei_izumi_tate_sceneTex_002010; \ No newline at end of file +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002010[] = dyousei_izumi_tate_sceneTex_002010; + +#endif // INDOORS_YOUSEI_IZUMI_TATE_SCENE_H diff --git a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h index f17deac07..20d3a8a22 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h +++ b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_YOUSEI_IZUMI_YOKO_ROOM_0_H +#define INDOORS_YOUSEI_IZUMI_YOKO_ROOM_0_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000170DL_003FF8[] = static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_002B88[] = dyousei_izumi_yoko_room_0Set_000210DL_002B88; #define dyousei_izumi_yoko_room_0Set_000210DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_003FF8" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000210DL_003FF8; \ No newline at end of file +static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000210DL_003FF8; + + +#endif // INDOORS_YOUSEI_IZUMI_YOKO_ROOM_0_H diff --git a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h index 61fbcb0a0..f18210e14 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h +++ b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INDOORS_YOUSEI_IZUMI_YOKO_SCENE_H +#define INDOORS_YOUSEI_IZUMI_YOKO_SCENE_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0055A0[] = dyousei_i #define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" -#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" \ No newline at end of file +#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" + + +#endif // INDOORS_YOUSEI_IZUMI_YOKO_SCENE_H diff --git a/soh/assets/scenes/misc/enrui/enrui_room_0.h b/soh/assets/scenes/misc/enrui/enrui_room_0.h index ad81468bb..b34bbecaa 100644 --- a/soh/assets/scenes/misc/enrui/enrui_room_0.h +++ b/soh/assets/scenes/misc/enrui/enrui_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_ENRUI_ROOM_0_H +#define MISC_ENRUI_ROOM_0_H 1 #include "align_asset_macro.h" #define denrui_room_0DL_000338 "__OTR__scenes/nonmq/enrui_scene/enrui_room_0DL_000338" -static const ALIGN_ASSET(2) char enrui_room_0DL_000338[] = denrui_room_0DL_000338; \ No newline at end of file +static const ALIGN_ASSET(2) char enrui_room_0DL_000338[] = denrui_room_0DL_000338; + + +#endif // MISC_ENRUI_ROOM_0_H diff --git a/soh/assets/scenes/misc/enrui/enrui_scene.h b/soh/assets/scenes/misc/enrui/enrui_scene.h index 31bab49dd..ed6ac652f 100644 --- a/soh/assets/scenes/misc/enrui/enrui_scene.h +++ b/soh/assets/scenes/misc/enrui/enrui_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_ENRUI_SCENE_H +#define MISC_ENRUI_SCENE_H 1 #include "align_asset_macro.h" #define denrui_sceneCollisionHeader_0003B4 "__OTR__scenes/nonmq/enrui_scene/enrui_sceneCollisionHeader_0003B4" -static const ALIGN_ASSET(2) char enrui_sceneCollisionHeader_0003B4[] = denrui_sceneCollisionHeader_0003B4; \ No newline at end of file +static const ALIGN_ASSET(2) char enrui_sceneCollisionHeader_0003B4[] = denrui_sceneCollisionHeader_0003B4; + + +#endif // MISC_ENRUI_SCENE_H diff --git a/soh/assets/scenes/misc/entra_n/entra_n_room_0.h b/soh/assets/scenes/misc/entra_n/entra_n_room_0.h index 35911b8eb..8646b3cd9 100644 --- a/soh/assets/scenes/misc/entra_n/entra_n_room_0.h +++ b/soh/assets/scenes/misc/entra_n/entra_n_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_ENTRA_N_ROOM_0_H +#define MISC_ENTRA_N_ROOM_0_H 1 #include "align_asset_macro.h" #define dentra_n_room_0DL_000348 "__OTR__scenes/nonmq/entra_n_scene/entra_n_room_0DL_000348" -static const ALIGN_ASSET(2) char entra_n_room_0DL_000348[] = dentra_n_room_0DL_000348; \ No newline at end of file +static const ALIGN_ASSET(2) char entra_n_room_0DL_000348[] = dentra_n_room_0DL_000348; + + +#endif // MISC_ENTRA_N_ROOM_0_H diff --git a/soh/assets/scenes/misc/entra_n/entra_n_scene.h b/soh/assets/scenes/misc/entra_n/entra_n_scene.h index d4989c045..611784121 100644 --- a/soh/assets/scenes/misc/entra_n/entra_n_scene.h +++ b/soh/assets/scenes/misc/entra_n/entra_n_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_ENTRA_N_SCENE_H +#define MISC_ENTRA_N_SCENE_H 1 #include "align_asset_macro.h" #define dentra_n_sceneCollisionHeader_0003F8 "__OTR__scenes/nonmq/entra_n_scene/entra_n_sceneCollisionHeader_0003F8" -static const ALIGN_ASSET(2) char entra_n_sceneCollisionHeader_0003F8[] = dentra_n_sceneCollisionHeader_0003F8; \ No newline at end of file +static const ALIGN_ASSET(2) char entra_n_sceneCollisionHeader_0003F8[] = dentra_n_sceneCollisionHeader_0003F8; + + +#endif // MISC_ENTRA_N_SCENE_H diff --git a/soh/assets/scenes/misc/hakaana/hakaana_room_0.h b/soh/assets/scenes/misc/hakaana/hakaana_room_0.h index 723c65c48..8dcb6c1a8 100644 --- a/soh/assets/scenes/misc/hakaana/hakaana_room_0.h +++ b/soh/assets/scenes/misc/hakaana/hakaana_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HAKAANA_ROOM_0_H +#define MISC_HAKAANA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char hakaana_room_0Tex_003258[] = dhakaana_room_0Tex static const ALIGN_ASSET(2) char hakaana_room_0DL_0068B8[] = dhakaana_room_0DL_0068B8; #define dhakaana_room_0Tex_0068C8 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_0068C8" -static const ALIGN_ASSET(2) char hakaana_room_0Tex_0068C8[] = dhakaana_room_0Tex_0068C8; \ No newline at end of file +static const ALIGN_ASSET(2) char hakaana_room_0Tex_0068C8[] = dhakaana_room_0Tex_0068C8; + + +#endif // MISC_HAKAANA_ROOM_0_H diff --git a/soh/assets/scenes/misc/hakaana/hakaana_scene.h b/soh/assets/scenes/misc/hakaana/hakaana_scene.h index 3ddc21fa8..3bd09805b 100644 --- a/soh/assets/scenes/misc/hakaana/hakaana_scene.h +++ b/soh/assets/scenes/misc/hakaana/hakaana_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_HAKAANA_SCENE_H +#define MISC_HAKAANA_SCENE_H 1 #include "align_asset_macro.h" #define dhakaana_sceneCollisionHeader_000A60 "__OTR__scenes/nonmq/hakaana_scene/hakaana_sceneCollisionHeader_000A60" -static const ALIGN_ASSET(2) char hakaana_sceneCollisionHeader_000A60[] = dhakaana_sceneCollisionHeader_000A60; \ No newline at end of file +static const ALIGN_ASSET(2) char hakaana_sceneCollisionHeader_000A60[] = dhakaana_sceneCollisionHeader_000A60; + + +#endif // MISC_HAKAANA_SCENE_H diff --git a/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h b/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h index 49607893a..ad9347b0f 100644 --- a/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h +++ b/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HAKAANA2_ROOM_0_H +#define MISC_HAKAANA2_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char hakaana2_room_0DL_005DD8[] = dhakaana2_room_0DL_005DD8; #define dhakaana2_room_0DL_0067F8 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_room_0DL_0067F8" -static const ALIGN_ASSET(2) char hakaana2_room_0DL_0067F8[] = dhakaana2_room_0DL_0067F8; \ No newline at end of file +static const ALIGN_ASSET(2) char hakaana2_room_0DL_0067F8[] = dhakaana2_room_0DL_0067F8; + + +#endif // MISC_HAKAANA2_ROOM_0_H diff --git a/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h b/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h index 793b37f3d..8edaef403 100644 --- a/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h +++ b/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HAKAANA2_SCENE_H +#define MISC_HAKAANA2_SCENE_H 1 #include "align_asset_macro.h" @@ -57,4 +58,6 @@ static const ALIGN_ASSET(2) char hakaana2_sceneTex_00B890[] = dhakaana2_sceneTex static const ALIGN_ASSET(2) char hakaana2_sceneTex_006890[] = dhakaana2_sceneTex_006890; #define dhakaana2_sceneTex_008090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_008090" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_008090[] = dhakaana2_sceneTex_008090; \ No newline at end of file +static const ALIGN_ASSET(2) char hakaana2_sceneTex_008090[] = dhakaana2_sceneTex_008090; + +#endif // MISC_HAKAANA2_SCENE_H diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h index 6ef9c6f1e..c254c0e65 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HAKAANA_OUKE_ROOM_0_H +#define MISC_HAKAANA_OUKE_ROOM_0_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_000130DL_007FD8[] = dhak static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_0001B0DL_004F00[] = dhakaana_ouke_room_0Set_0001B0DL_004F00; #define dhakaana_ouke_room_0Set_0001B0DL_007FD8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_007FD8" -static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_0001B0DL_007FD8[] = dhakaana_ouke_room_0Set_0001B0DL_007FD8; \ No newline at end of file +static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_0001B0DL_007FD8[] = dhakaana_ouke_room_0Set_0001B0DL_007FD8; + + +#endif // MISC_HAKAANA_OUKE_ROOM_0_H diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h index e991d0461..6a02b4a89 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HAKAANA_OUKE_ROOM_1_H +#define MISC_HAKAANA_OUKE_ROOM_1_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_0000C0DL_003FF0[] = dhak static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_000100DL_001FA0[] = dhakaana_ouke_room_1Set_000100DL_001FA0; #define dhakaana_ouke_room_1Set_000100DL_003FF0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_003FF0" -static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_000100DL_003FF0[] = dhakaana_ouke_room_1Set_000100DL_003FF0; \ No newline at end of file +static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_000100DL_003FF0[] = dhakaana_ouke_room_1Set_000100DL_003FF0; + + +#endif // MISC_HAKAANA_OUKE_ROOM_1_H diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h index 1a671aea3..73f461be5 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HAKAANA_OUKE_ROOM_2_H +#define MISC_HAKAANA_OUKE_ROOM_2_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_0000C0DL_0050F8[] = dhak static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_000140DL_002738[] = dhakaana_ouke_room_2Set_000140DL_002738; #define dhakaana_ouke_room_2Set_000140DL_0050F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_0050F8" -static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_000140DL_0050F8[] = dhakaana_ouke_room_2Set_000140DL_0050F8; \ No newline at end of file +static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_000140DL_0050F8[] = dhakaana_ouke_room_2Set_000140DL_0050F8; + + +#endif // MISC_HAKAANA_OUKE_ROOM_2_H diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h index 96c431695..5c791a6c0 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HAKAANA_OUKE_SCENE_H +#define MISC_HAKAANA_OUKE_SCENE_H 1 #include "align_asset_macro.h" @@ -28,4 +29,7 @@ static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_002AE0[] = dhakaana_ouke_ #define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" -#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" \ No newline at end of file +#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" + + +#endif // MISC_HAKAANA_OUKE_SCENE_H diff --git a/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h b/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h index 8f82a898b..a0ccc89c3 100644 --- a/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h +++ b/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HIRAL_DEMO_ROOM_0_H +#define MISC_HIRAL_DEMO_ROOM_0_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0004C0DL_000630[] = dhiral static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000530DL_000630[] = dhiral_demo_room_0Set_000530DL_000630; #define dhiral_demo_room_0Set_0005D0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0005D0DL_000630" -static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0005D0DL_000630[] = dhiral_demo_room_0Set_0005D0DL_000630; \ No newline at end of file +static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0005D0DL_000630[] = dhiral_demo_room_0Set_0005D0DL_000630; + + +#endif // MISC_HIRAL_DEMO_ROOM_0_H diff --git a/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h b/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h index e840befa8..3c10c20bc 100644 --- a/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h +++ b/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_HIRAL_DEMO_SCENE_H +#define MISC_HIRAL_DEMO_SCENE_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char hiral_demo_sceneCollisionHeader_003548[] = dhir #define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" \ No newline at end of file +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" + + +#endif // MISC_HIRAL_DEMO_SCENE_H diff --git a/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h b/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h index e8ff242e5..5fcf29417 100644 --- a/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h +++ b/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_KAKARIKO3_ROOM_0_H +#define MISC_KAKARIKO3_ROOM_0_H 1 #include "align_asset_macro.h" #define dkakariko3_room_0DL_004D20 "__OTR__scenes/nonmq/kakariko3_scene/kakariko3_room_0DL_004D20" -static const ALIGN_ASSET(2) char kakariko3_room_0DL_004D20[] = dkakariko3_room_0DL_004D20; \ No newline at end of file +static const ALIGN_ASSET(2) char kakariko3_room_0DL_004D20[] = dkakariko3_room_0DL_004D20; + + +#endif // MISC_KAKARIKO3_ROOM_0_H diff --git a/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h b/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h index 0ba16c026..9a8f07f3c 100644 --- a/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h +++ b/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_KAKARIKO3_SCENE_H +#define MISC_KAKARIKO3_SCENE_H 1 #include "align_asset_macro.h" #define dkakariko3_sceneCollisionHeader_000808 "__OTR__scenes/nonmq/kakariko3_scene/kakariko3_sceneCollisionHeader_000808" -static const ALIGN_ASSET(2) char kakariko3_sceneCollisionHeader_000808[] = dkakariko3_sceneCollisionHeader_000808; \ No newline at end of file +static const ALIGN_ASSET(2) char kakariko3_sceneCollisionHeader_000808[] = dkakariko3_sceneCollisionHeader_000808; + + +#endif // MISC_KAKARIKO3_SCENE_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h index 7a28c6dc4..8a867b685 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_0_H +#define MISC_KAKUSIANA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_0Tex_006AA0[] = dkakusiana_room_ static const ALIGN_ASSET(2) char kakusiana_room_0DL_001600[] = dkakusiana_room_0DL_001600; #define dkakusiana_room_0DL_0013B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0013B8" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_0013B8[] = dkakusiana_room_0DL_0013B8; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_0DL_0013B8[] = dkakusiana_room_0DL_0013B8; + + +#endif // MISC_KAKUSIANA_ROOM_0_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h index 00cf6b808..e6fedee9f 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_1_H +#define MISC_KAKUSIANA_ROOM_1_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_1DL_001938[] = dkakusiana_room_1 static const ALIGN_ASSET(2) char kakusiana_room_1DL_0045E8[] = dkakusiana_room_1DL_0045E8; #define dkakusiana_room_1DL_000BE8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_000BE8" -static const ALIGN_ASSET(2) char kakusiana_room_1DL_000BE8[] = dkakusiana_room_1DL_000BE8; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_1DL_000BE8[] = dkakusiana_room_1DL_000BE8; + + +#endif // MISC_KAKUSIANA_ROOM_1_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h index 95c8ff450..7aa366fa9 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_10_H +#define MISC_KAKUSIANA_ROOM_10_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_10Tex_001FE0[] = dkakusiana_room static const ALIGN_ASSET(2) char kakusiana_room_10DL_000700[] = dkakusiana_room_10DL_000700; #define dkakusiana_room_10Tex_002BE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_002BE0" -static const ALIGN_ASSET(2) char kakusiana_room_10Tex_002BE0[] = dkakusiana_room_10Tex_002BE0; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_10Tex_002BE0[] = dkakusiana_room_10Tex_002BE0; + + +#endif // MISC_KAKUSIANA_ROOM_10_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h index 86ffafff6..dee4a680e 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_11_H +#define MISC_KAKUSIANA_ROOM_11_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_11DL_001068[] = dkakusiana_room_ static const ALIGN_ASSET(2) char kakusiana_room_11Tex_004048[] = dkakusiana_room_11Tex_004048; #define dkakusiana_room_11Tex_003048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_003048" -static const ALIGN_ASSET(2) char kakusiana_room_11Tex_003048[] = dkakusiana_room_11Tex_003048; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_11Tex_003048[] = dkakusiana_room_11Tex_003048; + + +#endif // MISC_KAKUSIANA_ROOM_11_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h index 0b9b977bc..c69ea90bd 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_12_H +#define MISC_KAKUSIANA_ROOM_12_H 1 #include "align_asset_macro.h" @@ -48,4 +49,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_12DL_000BA8[] = dkakusiana_room_ static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0037F0[] = dkakusiana_room_12Tex_0037F0; #define dkakusiana_room_12Tex_0027F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0027F0" -static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0; + + +#endif // MISC_KAKUSIANA_ROOM_12_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h index d22935fee..780ac7437 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_13_H +#define MISC_KAKUSIANA_ROOM_13_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_13DL_0006F0[] = dkakusiana_room_ static const ALIGN_ASSET(2) char kakusiana_room_13DL_0017B8[] = dkakusiana_room_13DL_0017B8; #define dkakusiana_room_13Tex_002950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_002950" -static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950; + + +#endif // MISC_KAKUSIANA_ROOM_13_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h index a06ca151a..f03a320f5 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_2_H +#define MISC_KAKUSIANA_ROOM_2_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_2DL_002818[] = dkakusiana_room_2 static const ALIGN_ASSET(2) char kakusiana_room_2DL_000A20[] = dkakusiana_room_2DL_000A20; #define dkakusiana_room_2Tex_001448 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2Tex_001448" -static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448; + + +#endif // MISC_KAKUSIANA_ROOM_2_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h index 0cd01ad4b..4ce489cb3 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_3_H +#define MISC_KAKUSIANA_ROOM_3_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_3DL_003D80[] = dkakusiana_room_3 static const ALIGN_ASSET(2) char kakusiana_room_3DL_000AF0[] = dkakusiana_room_3DL_000AF0; #define dkakusiana_room_3Tex_001818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_001818" -static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818; + + +#endif // MISC_KAKUSIANA_ROOM_3_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h index f3cbe568b..914535494 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_4_H +#define MISC_KAKUSIANA_ROOM_4_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_4Tex_002138[] = dkakusiana_room_ static const ALIGN_ASSET(2) char kakusiana_room_4DL_001F10[] = dkakusiana_room_4DL_001F10; #define dkakusiana_room_4Tex_003138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_003138" -static const ALIGN_ASSET(2) char kakusiana_room_4Tex_003138[] = dkakusiana_room_4Tex_003138; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_4Tex_003138[] = dkakusiana_room_4Tex_003138; + + +#endif // MISC_KAKUSIANA_ROOM_4_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h index f587ca453..74961eeef 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_5_H +#define MISC_KAKUSIANA_ROOM_5_H 1 #include "align_asset_macro.h" @@ -33,4 +34,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_5DL_000CD8[] = dkakusiana_room_5 static const ALIGN_ASSET(2) char kakusiana_room_5DL_0007D0[] = dkakusiana_room_5DL_0007D0; #define dkakusiana_room_5Tex_002888 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5Tex_002888" -static const ALIGN_ASSET(2) char kakusiana_room_5Tex_002888[] = dkakusiana_room_5Tex_002888; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_5Tex_002888[] = dkakusiana_room_5Tex_002888; + + +#endif // MISC_KAKUSIANA_ROOM_5_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h index 89b93d1ce..100b9f7a9 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_6_H +#define MISC_KAKUSIANA_ROOM_6_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_6DL_000F48[] = dkakusiana_room_6 static const ALIGN_ASSET(2) char kakusiana_room_6DL_0006B0[] = dkakusiana_room_6DL_0006B0; #define dkakusiana_room_6Tex_0022E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_0022E0" -static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0; + + +#endif // MISC_KAKUSIANA_ROOM_6_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h index 404b40b58..2f7ad9f56 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_7_H +#define MISC_KAKUSIANA_ROOM_7_H 1 #include "align_asset_macro.h" @@ -36,4 +37,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002960[] = dkakusiana_room_ static const ALIGN_ASSET(2) char kakusiana_room_7DL_001B88[] = dkakusiana_room_7DL_001B88; #define dkakusiana_room_7Tex_001D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_001D60" -static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60; + + +#endif // MISC_KAKUSIANA_ROOM_7_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h index 6af327318..14325312f 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_8_H +#define MISC_KAKUSIANA_ROOM_8_H 1 #include "align_asset_macro.h" @@ -27,4 +28,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_8DL_001048[] = dkakusiana_room_8 static const ALIGN_ASSET(2) char kakusiana_room_8DL_000B20[] = dkakusiana_room_8DL_000B20; #define dkakusiana_room_8Tex_0019C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8Tex_0019C0" -static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0; + + +#endif // MISC_KAKUSIANA_ROOM_8_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h index 0911984af..088fd8dfa 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_ROOM_9_H +#define MISC_KAKUSIANA_ROOM_9_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char kakusiana_room_9DL_000F80[] = dkakusiana_room_9 static const ALIGN_ASSET(2) char kakusiana_room_9DL_0006E0[] = dkakusiana_room_9DL_0006E0; #define dkakusiana_room_9Tex_002340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_002340" -static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340; + + +#endif // MISC_KAKUSIANA_ROOM_9_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h b/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h index bc673d8e8..2f6012fb8 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KAKUSIANA_SCENE_H +#define MISC_KAKUSIANA_SCENE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char kakusiana_sceneTex_00C020[] = dkakusiana_sceneT static const ALIGN_ASSET(2) char kakusiana_sceneTex_00B820[] = dkakusiana_sceneTex_00B820; #define dkakusiana_sceneTex_00D020 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00D020" -static const ALIGN_ASSET(2) char kakusiana_sceneTex_00D020[] = dkakusiana_sceneTex_00D020; \ No newline at end of file +static const ALIGN_ASSET(2) char kakusiana_sceneTex_00D020[] = dkakusiana_sceneTex_00D020; + +#endif // MISC_KAKUSIANA_SCENE_H diff --git a/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h b/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h index 44f150958..cbe5c6663 100644 --- a/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h +++ b/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_KINSUTA_ROOM_0_H +#define MISC_KINSUTA_ROOM_0_H 1 #include "align_asset_macro.h" @@ -69,4 +70,7 @@ static const ALIGN_ASSET(2) char kinsuta_room_0DL_002FD8[] = dkinsuta_room_0DL_0 static const ALIGN_ASSET(2) char kinsuta_room_0Tex_007910[] = dkinsuta_room_0Tex_007910; #define dkinsuta_room_0DL_001F78 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_001F78" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_001F78[] = dkinsuta_room_0DL_001F78; \ No newline at end of file +static const ALIGN_ASSET(2) char kinsuta_room_0DL_001F78[] = dkinsuta_room_0DL_001F78; + + +#endif // MISC_KINSUTA_ROOM_0_H diff --git a/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h b/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h index cc5b3f5d6..bbdca758c 100644 --- a/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h +++ b/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_KINSUTA_SCENE_H +#define MISC_KINSUTA_SCENE_H 1 #include "align_asset_macro.h" #define dkinsuta_sceneCollisionHeader_0015E4 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_sceneCollisionHeader_0015E4" -static const ALIGN_ASSET(2) char kinsuta_sceneCollisionHeader_0015E4[] = dkinsuta_sceneCollisionHeader_0015E4; \ No newline at end of file +static const ALIGN_ASSET(2) char kinsuta_sceneCollisionHeader_0015E4[] = dkinsuta_sceneCollisionHeader_0015E4; + + +#endif // MISC_KINSUTA_SCENE_H diff --git a/soh/assets/scenes/misc/market_alley/market_alley_room_0.h b/soh/assets/scenes/misc/market_alley/market_alley_room_0.h index 5be9e6032..4ba06910d 100644 --- a/soh/assets/scenes/misc/market_alley/market_alley_room_0.h +++ b/soh/assets/scenes/misc/market_alley/market_alley_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_ALLEY_ROOM_0_H +#define MISC_MARKET_ALLEY_ROOM_0_H 1 #include "align_asset_macro.h" #define dmarket_alley_room_0DL_075688 "__OTR__scenes/nonmq/market_alley_scene/market_alley_room_0DL_075688" -static const ALIGN_ASSET(2) char market_alley_room_0DL_075688[] = dmarket_alley_room_0DL_075688; \ No newline at end of file +static const ALIGN_ASSET(2) char market_alley_room_0DL_075688[] = dmarket_alley_room_0DL_075688; + + +#endif // MISC_MARKET_ALLEY_ROOM_0_H diff --git a/soh/assets/scenes/misc/market_alley/market_alley_scene.h b/soh/assets/scenes/misc/market_alley/market_alley_scene.h index 4fce3de20..161022752 100644 --- a/soh/assets/scenes/misc/market_alley/market_alley_scene.h +++ b/soh/assets/scenes/misc/market_alley/market_alley_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_ALLEY_SCENE_H +#define MISC_MARKET_ALLEY_SCENE_H 1 #include "align_asset_macro.h" #define dmarket_alley_sceneCollisionHeader_001218 "__OTR__scenes/nonmq/market_alley_scene/market_alley_sceneCollisionHeader_001218" -static const ALIGN_ASSET(2) char market_alley_sceneCollisionHeader_001218[] = dmarket_alley_sceneCollisionHeader_001218; \ No newline at end of file +static const ALIGN_ASSET(2) char market_alley_sceneCollisionHeader_001218[] = dmarket_alley_sceneCollisionHeader_001218; + + +#endif // MISC_MARKET_ALLEY_SCENE_H diff --git a/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h b/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h index 523f039dd..00e40edfb 100644 --- a/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h +++ b/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_MARKET_ALLEY_N_ROOM_0_H +#define MISC_MARKET_ALLEY_N_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char market_alley_n_room_0DL_075678[] = dmarket_alley_n_room_0DL_075678; #define dmarket_alley_n_room_0DL_0756E0 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_room_0DL_0756E0" -static const ALIGN_ASSET(2) char market_alley_n_room_0DL_0756E0[] = dmarket_alley_n_room_0DL_0756E0; \ No newline at end of file +static const ALIGN_ASSET(2) char market_alley_n_room_0DL_0756E0[] = dmarket_alley_n_room_0DL_0756E0; + + +#endif // MISC_MARKET_ALLEY_N_ROOM_0_H diff --git a/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h b/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h index dcad1e5b4..9970570aa 100644 --- a/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h +++ b/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_ALLEY_N_SCENE_H +#define MISC_MARKET_ALLEY_N_SCENE_H 1 #include "align_asset_macro.h" #define dmarket_alley_n_sceneCollisionHeader_0012C0 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_sceneCollisionHeader_0012C0" -static const ALIGN_ASSET(2) char market_alley_n_sceneCollisionHeader_0012C0[] = dmarket_alley_n_sceneCollisionHeader_0012C0; \ No newline at end of file +static const ALIGN_ASSET(2) char market_alley_n_sceneCollisionHeader_0012C0[] = dmarket_alley_n_sceneCollisionHeader_0012C0; + + +#endif // MISC_MARKET_ALLEY_N_SCENE_H diff --git a/soh/assets/scenes/misc/market_day/market_day_room_0.h b/soh/assets/scenes/misc/market_day/market_day_room_0.h index 80d2aa0b1..e14f8afc5 100644 --- a/soh/assets/scenes/misc/market_day/market_day_room_0.h +++ b/soh/assets/scenes/misc/market_day/market_day_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_DAY_ROOM_0_H +#define MISC_MARKET_DAY_ROOM_0_H 1 #include "align_asset_macro.h" #define dmarket_day_room_0DL_0057D8 "__OTR__scenes/nonmq/market_day_scene/market_day_room_0DL_0057D8" -static const ALIGN_ASSET(2) char market_day_room_0DL_0057D8[] = dmarket_day_room_0DL_0057D8; \ No newline at end of file +static const ALIGN_ASSET(2) char market_day_room_0DL_0057D8[] = dmarket_day_room_0DL_0057D8; + + +#endif // MISC_MARKET_DAY_ROOM_0_H diff --git a/soh/assets/scenes/misc/market_day/market_day_scene.h b/soh/assets/scenes/misc/market_day/market_day_scene.h index d9bd23a63..8ffdbc87a 100644 --- a/soh/assets/scenes/misc/market_day/market_day_scene.h +++ b/soh/assets/scenes/misc/market_day/market_day_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_DAY_SCENE_H +#define MISC_MARKET_DAY_SCENE_H 1 #include "align_asset_macro.h" #define dmarket_day_sceneCollisionHeader_002640 "__OTR__scenes/nonmq/market_day_scene/market_day_sceneCollisionHeader_002640" -static const ALIGN_ASSET(2) char market_day_sceneCollisionHeader_002640[] = dmarket_day_sceneCollisionHeader_002640; \ No newline at end of file +static const ALIGN_ASSET(2) char market_day_sceneCollisionHeader_002640[] = dmarket_day_sceneCollisionHeader_002640; + + +#endif // MISC_MARKET_DAY_SCENE_H diff --git a/soh/assets/scenes/misc/market_night/market_night_room_0.h b/soh/assets/scenes/misc/market_night/market_night_room_0.h index 5c5492ea3..e43f72027 100644 --- a/soh/assets/scenes/misc/market_night/market_night_room_0.h +++ b/soh/assets/scenes/misc/market_night/market_night_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_NIGHT_ROOM_0_H +#define MISC_MARKET_NIGHT_ROOM_0_H 1 #include "align_asset_macro.h" #define dmarket_night_room_0DL_005708 "__OTR__scenes/nonmq/market_night_scene/market_night_room_0DL_005708" -static const ALIGN_ASSET(2) char market_night_room_0DL_005708[] = dmarket_night_room_0DL_005708; \ No newline at end of file +static const ALIGN_ASSET(2) char market_night_room_0DL_005708[] = dmarket_night_room_0DL_005708; + + +#endif // MISC_MARKET_NIGHT_ROOM_0_H diff --git a/soh/assets/scenes/misc/market_night/market_night_scene.h b/soh/assets/scenes/misc/market_night/market_night_scene.h index d35189134..6ad9157a7 100644 --- a/soh/assets/scenes/misc/market_night/market_night_scene.h +++ b/soh/assets/scenes/misc/market_night/market_night_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_NIGHT_SCENE_H +#define MISC_MARKET_NIGHT_SCENE_H 1 #include "align_asset_macro.h" #define dmarket_night_sceneCollisionHeader_0025F8 "__OTR__scenes/nonmq/market_night_scene/market_night_sceneCollisionHeader_0025F8" -static const ALIGN_ASSET(2) char market_night_sceneCollisionHeader_0025F8[] = dmarket_night_sceneCollisionHeader_0025F8; \ No newline at end of file +static const ALIGN_ASSET(2) char market_night_sceneCollisionHeader_0025F8[] = dmarket_night_sceneCollisionHeader_0025F8; + + +#endif // MISC_MARKET_NIGHT_SCENE_H diff --git a/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h b/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h index 742ad08bc..0ba874a26 100644 --- a/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h +++ b/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_RUINS_ROOM_0_H +#define MISC_MARKET_RUINS_ROOM_0_H 1 #include "align_asset_macro.h" #define dmarket_ruins_room_0DL_0027B0 "__OTR__scenes/nonmq/market_ruins_scene/market_ruins_room_0DL_0027B0" -static const ALIGN_ASSET(2) char market_ruins_room_0DL_0027B0[] = dmarket_ruins_room_0DL_0027B0; \ No newline at end of file +static const ALIGN_ASSET(2) char market_ruins_room_0DL_0027B0[] = dmarket_ruins_room_0DL_0027B0; + + +#endif // MISC_MARKET_RUINS_ROOM_0_H diff --git a/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h b/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h index b31ffada8..0d475a584 100644 --- a/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h +++ b/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_MARKET_RUINS_SCENE_H +#define MISC_MARKET_RUINS_SCENE_H 1 #include "align_asset_macro.h" #define dmarket_ruins_sceneCollisionHeader_0015F8 "__OTR__scenes/nonmq/market_ruins_scene/market_ruins_sceneCollisionHeader_0015F8" -static const ALIGN_ASSET(2) char market_ruins_sceneCollisionHeader_0015F8[] = dmarket_ruins_sceneCollisionHeader_0015F8; \ No newline at end of file +static const ALIGN_ASSET(2) char market_ruins_sceneCollisionHeader_0015F8[] = dmarket_ruins_sceneCollisionHeader_0015F8; + + +#endif // MISC_MARKET_RUINS_SCENE_H diff --git a/soh/assets/scenes/misc/shrine/shrine_room_0.h b/soh/assets/scenes/misc/shrine/shrine_room_0.h index 00992e9c5..fd3ca932b 100644 --- a/soh/assets/scenes/misc/shrine/shrine_room_0.h +++ b/soh/assets/scenes/misc/shrine/shrine_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_SHRINE_ROOM_0_H +#define MISC_SHRINE_ROOM_0_H 1 #include "align_asset_macro.h" #define dshrine_room_0DL_007AE0 "__OTR__scenes/nonmq/shrine_scene/shrine_room_0DL_007AE0" -static const ALIGN_ASSET(2) char shrine_room_0DL_007AE0[] = dshrine_room_0DL_007AE0; \ No newline at end of file +static const ALIGN_ASSET(2) char shrine_room_0DL_007AE0[] = dshrine_room_0DL_007AE0; + + +#endif // MISC_SHRINE_ROOM_0_H diff --git a/soh/assets/scenes/misc/shrine/shrine_scene.h b/soh/assets/scenes/misc/shrine/shrine_scene.h index 846da28e8..bd9dc02d4 100644 --- a/soh/assets/scenes/misc/shrine/shrine_scene.h +++ b/soh/assets/scenes/misc/shrine/shrine_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_SHRINE_SCENE_H +#define MISC_SHRINE_SCENE_H 1 #include "align_asset_macro.h" #define dshrine_sceneCollisionHeader_0014AC "__OTR__scenes/nonmq/shrine_scene/shrine_sceneCollisionHeader_0014AC" -static const ALIGN_ASSET(2) char shrine_sceneCollisionHeader_0014AC[] = dshrine_sceneCollisionHeader_0014AC; \ No newline at end of file +static const ALIGN_ASSET(2) char shrine_sceneCollisionHeader_0014AC[] = dshrine_sceneCollisionHeader_0014AC; + + +#endif // MISC_SHRINE_SCENE_H diff --git a/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h b/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h index 80c3807ea..e0503d5f5 100644 --- a/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h +++ b/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_SHRINE_N_ROOM_0_H +#define MISC_SHRINE_N_ROOM_0_H 1 #include "align_asset_macro.h" #define dshrine_n_room_0DL_007B00 "__OTR__scenes/nonmq/shrine_n_scene/shrine_n_room_0DL_007B00" -static const ALIGN_ASSET(2) char shrine_n_room_0DL_007B00[] = dshrine_n_room_0DL_007B00; \ No newline at end of file +static const ALIGN_ASSET(2) char shrine_n_room_0DL_007B00[] = dshrine_n_room_0DL_007B00; + + +#endif // MISC_SHRINE_N_ROOM_0_H diff --git a/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h b/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h index f7b36ca0a..d7fd0dd1e 100644 --- a/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h +++ b/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_SHRINE_N_SCENE_H +#define MISC_SHRINE_N_SCENE_H 1 #include "align_asset_macro.h" #define dshrine_n_sceneCollisionHeader_0014D4 "__OTR__scenes/nonmq/shrine_n_scene/shrine_n_sceneCollisionHeader_0014D4" -static const ALIGN_ASSET(2) char shrine_n_sceneCollisionHeader_0014D4[] = dshrine_n_sceneCollisionHeader_0014D4; \ No newline at end of file +static const ALIGN_ASSET(2) char shrine_n_sceneCollisionHeader_0014D4[] = dshrine_n_sceneCollisionHeader_0014D4; + + +#endif // MISC_SHRINE_N_SCENE_H diff --git a/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h b/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h index aeb2f4b91..c70d0d3b2 100644 --- a/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h +++ b/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_SHRINE_R_ROOM_0_H +#define MISC_SHRINE_R_ROOM_0_H 1 #include "align_asset_macro.h" #define dshrine_r_room_0DL_007AE0 "__OTR__scenes/nonmq/shrine_r_scene/shrine_r_room_0DL_007AE0" -static const ALIGN_ASSET(2) char shrine_r_room_0DL_007AE0[] = dshrine_r_room_0DL_007AE0; \ No newline at end of file +static const ALIGN_ASSET(2) char shrine_r_room_0DL_007AE0[] = dshrine_r_room_0DL_007AE0; + + +#endif // MISC_SHRINE_R_ROOM_0_H diff --git a/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h b/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h index 7a40723c5..70faee9ee 100644 --- a/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h +++ b/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef MISC_SHRINE_R_SCENE_H +#define MISC_SHRINE_R_SCENE_H 1 #include "align_asset_macro.h" #define dshrine_r_sceneCollisionHeader_00145C "__OTR__scenes/nonmq/shrine_r_scene/shrine_r_sceneCollisionHeader_00145C" -static const ALIGN_ASSET(2) char shrine_r_sceneCollisionHeader_00145C[] = dshrine_r_sceneCollisionHeader_00145C; \ No newline at end of file +static const ALIGN_ASSET(2) char shrine_r_sceneCollisionHeader_00145C[] = dshrine_r_sceneCollisionHeader_00145C; + + +#endif // MISC_SHRINE_R_SCENE_H diff --git a/soh/assets/scenes/misc/turibori/turibori_room_0.h b/soh/assets/scenes/misc/turibori/turibori_room_0.h index ceb8ad781..d9e764478 100644 --- a/soh/assets/scenes/misc/turibori/turibori_room_0.h +++ b/soh/assets/scenes/misc/turibori/turibori_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_TURIBORI_ROOM_0_H +#define MISC_TURIBORI_ROOM_0_H 1 #include "align_asset_macro.h" @@ -6,4 +7,7 @@ static const ALIGN_ASSET(2) char turibori_room_0DL_0056F8[] = dturibori_room_0DL_0056F8; #define dturibori_room_0DL_006740 "__OTR__scenes/nonmq/turibori_scene/turibori_room_0DL_006740" -static const ALIGN_ASSET(2) char turibori_room_0DL_006740[] = dturibori_room_0DL_006740; \ No newline at end of file +static const ALIGN_ASSET(2) char turibori_room_0DL_006740[] = dturibori_room_0DL_006740; + + +#endif // MISC_TURIBORI_ROOM_0_H diff --git a/soh/assets/scenes/misc/turibori/turibori_scene.h b/soh/assets/scenes/misc/turibori/turibori_scene.h index dec04205e..156ed9c2f 100644 --- a/soh/assets/scenes/misc/turibori/turibori_scene.h +++ b/soh/assets/scenes/misc/turibori/turibori_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MISC_TURIBORI_SCENE_H +#define MISC_TURIBORI_SCENE_H 1 #include "align_asset_macro.h" @@ -84,4 +85,6 @@ static const ALIGN_ASSET(2) char turibori_sceneTex_0091E0[] = dturibori_sceneTex static const ALIGN_ASSET(2) char turibori_sceneTex_0092E0[] = dturibori_sceneTex_0092E0; #define dturibori_sceneTex_00E4E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00E4E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00E4E0[] = dturibori_sceneTex_00E4E0; \ No newline at end of file +static const ALIGN_ASSET(2) char turibori_sceneTex_00E4E0[] = dturibori_sceneTex_00E4E0; + +#endif // MISC_TURIBORI_SCENE_H diff --git a/soh/assets/scenes/overworld/entra/entra_room_0.h b/soh/assets/scenes/overworld/entra/entra_room_0.h index 837bfd396..257d35e86 100644 --- a/soh/assets/scenes/overworld/entra/entra_room_0.h +++ b/soh/assets/scenes/overworld/entra/entra_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef OVERWORLD_ENTRA_ROOM_0_H +#define OVERWORLD_ENTRA_ROOM_0_H 1 #include "align_asset_macro.h" #define dentra_room_0DL_000348 "__OTR__scenes/nonmq/entra_scene/entra_room_0DL_000348" -static const ALIGN_ASSET(2) char entra_room_0DL_000348[] = dentra_room_0DL_000348; \ No newline at end of file +static const ALIGN_ASSET(2) char entra_room_0DL_000348[] = dentra_room_0DL_000348; + + +#endif // OVERWORLD_ENTRA_ROOM_0_H diff --git a/soh/assets/scenes/overworld/entra/entra_scene.h b/soh/assets/scenes/overworld/entra/entra_scene.h index edfc81bd3..7ebc1f8ed 100644 --- a/soh/assets/scenes/overworld/entra/entra_scene.h +++ b/soh/assets/scenes/overworld/entra/entra_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef OVERWORLD_ENTRA_SCENE_H +#define OVERWORLD_ENTRA_SCENE_H 1 #include "align_asset_macro.h" #define dentra_sceneCollisionHeader_0003B4 "__OTR__scenes/nonmq/entra_scene/entra_sceneCollisionHeader_0003B4" -static const ALIGN_ASSET(2) char entra_sceneCollisionHeader_0003B4[] = dentra_sceneCollisionHeader_0003B4; \ No newline at end of file +static const ALIGN_ASSET(2) char entra_sceneCollisionHeader_0003B4[] = dentra_sceneCollisionHeader_0003B4; + + +#endif // OVERWORLD_ENTRA_SCENE_H diff --git a/soh/assets/scenes/overworld/souko/souko_room_0.h b/soh/assets/scenes/overworld/souko/souko_room_0.h index 2b70a4c09..252d0c920 100644 --- a/soh/assets/scenes/overworld/souko/souko_room_0.h +++ b/soh/assets/scenes/overworld/souko/souko_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SOUKO_ROOM_0_H +#define OVERWORLD_SOUKO_ROOM_0_H 1 #include "align_asset_macro.h" @@ -57,4 +58,7 @@ static const ALIGN_ASSET(2) char souko_room_0Tex_0080F8[] = dsouko_room_0Tex_008 static const ALIGN_ASSET(2) char souko_room_0Tex_0078F8[] = dsouko_room_0Tex_0078F8; #define dsouko_room_0DL_000C58 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_000C58" -static const ALIGN_ASSET(2) char souko_room_0DL_000C58[] = dsouko_room_0DL_000C58; \ No newline at end of file +static const ALIGN_ASSET(2) char souko_room_0DL_000C58[] = dsouko_room_0DL_000C58; + + +#endif // OVERWORLD_SOUKO_ROOM_0_H diff --git a/soh/assets/scenes/overworld/souko/souko_room_1.h b/soh/assets/scenes/overworld/souko/souko_room_1.h index 5ba1d7b33..8ac7d1eba 100644 --- a/soh/assets/scenes/overworld/souko/souko_room_1.h +++ b/soh/assets/scenes/overworld/souko/souko_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SOUKO_ROOM_1_H +#define OVERWORLD_SOUKO_ROOM_1_H 1 #include "align_asset_macro.h" @@ -72,4 +73,7 @@ static const ALIGN_ASSET(2) char souko_room_1Tex_007D18[] = dsouko_room_1Tex_007 static const ALIGN_ASSET(2) char souko_room_1Tex_007518[] = dsouko_room_1Tex_007518; #define dsouko_room_1DL_000FB8 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_000FB8" -static const ALIGN_ASSET(2) char souko_room_1DL_000FB8[] = dsouko_room_1DL_000FB8; \ No newline at end of file +static const ALIGN_ASSET(2) char souko_room_1DL_000FB8[] = dsouko_room_1DL_000FB8; + + +#endif // OVERWORLD_SOUKO_ROOM_1_H diff --git a/soh/assets/scenes/overworld/souko/souko_room_2.h b/soh/assets/scenes/overworld/souko/souko_room_2.h index 659d01950..5c33d1ea9 100644 --- a/soh/assets/scenes/overworld/souko/souko_room_2.h +++ b/soh/assets/scenes/overworld/souko/souko_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SOUKO_ROOM_2_H +#define OVERWORLD_SOUKO_ROOM_2_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char souko_room_2DL_0002B0[] = dsouko_room_2DL_0002B static const ALIGN_ASSET(2) char souko_room_2DL_0015E0[] = dsouko_room_2DL_0015E0; #define dsouko_room_2DL_000EF8 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_000EF8" -static const ALIGN_ASSET(2) char souko_room_2DL_000EF8[] = dsouko_room_2DL_000EF8; \ No newline at end of file +static const ALIGN_ASSET(2) char souko_room_2DL_000EF8[] = dsouko_room_2DL_000EF8; + + +#endif // OVERWORLD_SOUKO_ROOM_2_H diff --git a/soh/assets/scenes/overworld/souko/souko_scene.h b/soh/assets/scenes/overworld/souko/souko_scene.h index 8440632c4..8dfad318a 100644 --- a/soh/assets/scenes/overworld/souko/souko_scene.h +++ b/soh/assets/scenes/overworld/souko/souko_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SOUKO_SCENE_H +#define OVERWORLD_SOUKO_SCENE_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char souko_sceneTex_004C10[] = dsouko_sceneTex_004C1 static const ALIGN_ASSET(2) char souko_sceneTex_004410[] = dsouko_sceneTex_004410; #define dsouko_sceneTex_005410 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_005410" -static const ALIGN_ASSET(2) char souko_sceneTex_005410[] = dsouko_sceneTex_005410; \ No newline at end of file +static const ALIGN_ASSET(2) char souko_sceneTex_005410[] = dsouko_sceneTex_005410; + +#endif // OVERWORLD_SOUKO_SCENE_H diff --git a/soh/assets/scenes/overworld/spot00/spot00_room_0.h b/soh/assets/scenes/overworld/spot00/spot00_room_0.h index 71d02997c..619c13111 100644 --- a/soh/assets/scenes/overworld/spot00/spot00_room_0.h +++ b/soh/assets/scenes/overworld/spot00/spot00_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT00_ROOM_0_H +#define OVERWORLD_SPOT00_ROOM_0_H 1 #include "align_asset_macro.h" @@ -1335,4 +1336,7 @@ static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00E328[] = dspot00_ro static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0112B8[] = dspot00_room_0Set_001CF0DL_0112B8; #define dspot00_room_0Set_001CF0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0121D0" -static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0121D0[] = dspot00_room_0Set_001CF0DL_0121D0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0121D0[] = dspot00_room_0Set_001CF0DL_0121D0; + + +#endif // OVERWORLD_SPOT00_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot00/spot00_scene.h b/soh/assets/scenes/overworld/spot00/spot00_scene.h index 65fd92671..406a18176 100644 --- a/soh/assets/scenes/overworld/spot00/spot00_scene.h +++ b/soh/assets/scenes/overworld/spot00/spot00_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT00_SCENE_H +#define OVERWORLD_SPOT00_SCENE_H 1 #include "align_asset_macro.h" @@ -202,4 +203,7 @@ static const ALIGN_ASSET(2) char spot00_sceneTex_026998[] = dspot00_sceneTex_026 #define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" \ No newline at end of file +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" + + +#endif // OVERWORLD_SPOT00_SCENE_H diff --git a/soh/assets/scenes/overworld/spot01/spot01_room_0.h b/soh/assets/scenes/overworld/spot01/spot01_room_0.h index 5f9791701..bc0e45593 100644 --- a/soh/assets/scenes/overworld/spot01/spot01_room_0.h +++ b/soh/assets/scenes/overworld/spot01/spot01_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT01_ROOM_0_H +#define OVERWORLD_SPOT01_ROOM_0_H 1 #include "align_asset_macro.h" @@ -543,4 +544,7 @@ static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_009A70[] = dspot01_ro static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_005680[] = dspot01_room_0Set_001630DL_005680; #define dspot01_room_0Set_001630DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0063A0" -static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0063A0[] = dspot01_room_0Set_001630DL_0063A0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0063A0[] = dspot01_room_0Set_001630DL_0063A0; + + +#endif // OVERWORLD_SPOT01_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot01/spot01_scene.h b/soh/assets/scenes/overworld/spot01/spot01_scene.h index 752c6a5df..cb85b2f94 100644 --- a/soh/assets/scenes/overworld/spot01/spot01_scene.h +++ b/soh/assets/scenes/overworld/spot01/spot01_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT01_SCENE_H +#define OVERWORLD_SPOT01_SCENE_H 1 #include "align_asset_macro.h" @@ -142,4 +143,7 @@ static const ALIGN_ASSET(2) char spot01_sceneTex_00B250[] = dspot01_sceneTex_00B #define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" \ No newline at end of file +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" + + +#endif // OVERWORLD_SPOT01_SCENE_H diff --git a/soh/assets/scenes/overworld/spot02/spot02_room_0.h b/soh/assets/scenes/overworld/spot02/spot02_room_0.h index 827f0332c..138c85057 100644 --- a/soh/assets/scenes/overworld/spot02/spot02_room_0.h +++ b/soh/assets/scenes/overworld/spot02/spot02_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT02_ROOM_0_H +#define OVERWORLD_SPOT02_ROOM_0_H 1 #include "align_asset_macro.h" @@ -165,4 +166,7 @@ static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_002030[] = dspot02_ro static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_000AB0[] = dspot02_room_0Set_000900DL_000AB0; #define dspot02_room_0Set_000900DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001170" -static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001170[] = dspot02_room_0Set_000900DL_001170; \ No newline at end of file +static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001170[] = dspot02_room_0Set_000900DL_001170; + + +#endif // OVERWORLD_SPOT02_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot02/spot02_room_1.h b/soh/assets/scenes/overworld/spot02/spot02_room_1.h index 5cc992284..76f7763cf 100644 --- a/soh/assets/scenes/overworld/spot02/spot02_room_1.h +++ b/soh/assets/scenes/overworld/spot02/spot02_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT02_ROOM_1_H +#define OVERWORLD_SPOT02_ROOM_1_H 1 #include "align_asset_macro.h" @@ -522,4 +523,7 @@ static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_005730[] = dspot02_ro static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_006C48[] = dspot02_room_1Set_001260DL_006C48; #define dspot02_room_1Set_001260DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_007990" -static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007990[] = dspot02_room_1Set_001260DL_007990; \ No newline at end of file +static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007990[] = dspot02_room_1Set_001260DL_007990; + + +#endif // OVERWORLD_SPOT02_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot02/spot02_scene.h b/soh/assets/scenes/overworld/spot02/spot02_scene.h index b1b64227d..47ce5c69a 100644 --- a/soh/assets/scenes/overworld/spot02/spot02_scene.h +++ b/soh/assets/scenes/overworld/spot02/spot02_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT02_SCENE_H +#define OVERWORLD_SPOT02_SCENE_H 1 #include "align_asset_macro.h" @@ -55,4 +56,7 @@ static const ALIGN_ASSET(2) char spot02_sceneTex_00B880[] = dspot02_sceneTex_00B #define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" -#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" \ No newline at end of file +#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" + + +#endif // OVERWORLD_SPOT02_SCENE_H diff --git a/soh/assets/scenes/overworld/spot03/spot03_room_0.h b/soh/assets/scenes/overworld/spot03/spot03_room_0.h index 4e4097ac3..e8d8bd6db 100644 --- a/soh/assets/scenes/overworld/spot03/spot03_room_0.h +++ b/soh/assets/scenes/overworld/spot03/spot03_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT03_ROOM_0_H +#define OVERWORLD_SPOT03_ROOM_0_H 1 #include "align_asset_macro.h" @@ -105,4 +106,7 @@ static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_008B88[] = dspot03_ro static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_009330[] = dspot03_room_0Set_000580DL_009330; #define dspot03_room_0Set_000580DL_00CEB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_00CEB0" -static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_00CEB0[] = dspot03_room_0Set_000580DL_00CEB0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_00CEB0[] = dspot03_room_0Set_000580DL_00CEB0; + + +#endif // OVERWORLD_SPOT03_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot03/spot03_room_1.h b/soh/assets/scenes/overworld/spot03/spot03_room_1.h index 3cb2b0072..4d5a1cfe8 100644 --- a/soh/assets/scenes/overworld/spot03/spot03_room_1.h +++ b/soh/assets/scenes/overworld/spot03/spot03_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT03_ROOM_1_H +#define OVERWORLD_SPOT03_ROOM_1_H 1 #include "align_asset_macro.h" @@ -84,4 +85,7 @@ static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_0047C0[] = dspot03_ro static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_004C88[] = dspot03_room_1Set_0001E0DL_004C88; #define dspot03_room_1Set_0001E0DL_007210 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_007210" -static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_007210[] = dspot03_room_1Set_0001E0DL_007210; \ No newline at end of file +static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_007210[] = dspot03_room_1Set_0001E0DL_007210; + + +#endif // OVERWORLD_SPOT03_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot03/spot03_scene.h b/soh/assets/scenes/overworld/spot03/spot03_scene.h index 8df9de90c..477894324 100644 --- a/soh/assets/scenes/overworld/spot03/spot03_scene.h +++ b/soh/assets/scenes/overworld/spot03/spot03_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT03_SCENE_H +#define OVERWORLD_SPOT03_SCENE_H 1 #include "align_asset_macro.h" @@ -47,4 +48,7 @@ static const ALIGN_ASSET(2) char spot03_sceneTex_007558[] = dspot03_sceneTex_007 #define dspot03_sceneTex_008D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_008D58" static const ALIGN_ASSET(2) char spot03_sceneTex_008D58[] = dspot03_sceneTex_008D58; -#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneCollisionHeader_006580" \ No newline at end of file +#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneCollisionHeader_006580" + + +#endif // OVERWORLD_SPOT03_SCENE_H diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_0.h b/soh/assets/scenes/overworld/spot04/spot04_room_0.h index 7b1c837f7..a457f0932 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_room_0.h +++ b/soh/assets/scenes/overworld/spot04/spot04_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT04_ROOM_0_H +#define OVERWORLD_SPOT04_ROOM_0_H 1 #include "align_asset_macro.h" @@ -936,4 +937,7 @@ static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_009740[] = dspot04_ro static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00A808[] = dspot04_room_0Set_001240DL_00A808; #define dspot04_room_0Set_001240DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_0055C0" -static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0055C0[] = dspot04_room_0Set_001240DL_0055C0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0055C0[] = dspot04_room_0Set_001240DL_0055C0; + + +#endif // OVERWORLD_SPOT04_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_1.h b/soh/assets/scenes/overworld/spot04/spot04_room_1.h index cb6eca324..098b2c293 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_room_1.h +++ b/soh/assets/scenes/overworld/spot04/spot04_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT04_ROOM_1_H +#define OVERWORLD_SPOT04_ROOM_1_H 1 #include "align_asset_macro.h" @@ -216,4 +217,7 @@ static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_004D48[] = dspot04_ro static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_004218[] = dspot04_room_1Set_000900DL_004218; #define dspot04_room_1Set_000900DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_007A90" -static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_007A90[] = dspot04_room_1Set_000900DL_007A90; \ No newline at end of file +static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_007A90[] = dspot04_room_1Set_000900DL_007A90; + + +#endif // OVERWORLD_SPOT04_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_2.h b/soh/assets/scenes/overworld/spot04/spot04_room_2.h index dfe126e43..e7f76b047 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_room_2.h +++ b/soh/assets/scenes/overworld/spot04/spot04_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT04_ROOM_2_H +#define OVERWORLD_SPOT04_ROOM_2_H 1 #include "align_asset_macro.h" @@ -339,4 +340,7 @@ static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002AD0[] = dspot04_ro static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_001EC0[] = dspot04_room_2Set_0003E0DL_001EC0; #define dspot04_room_2Set_0003E0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_002338" -static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002338[] = dspot04_room_2Set_0003E0DL_002338; \ No newline at end of file +static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002338[] = dspot04_room_2Set_0003E0DL_002338; + + +#endif // OVERWORLD_SPOT04_ROOM_2_H diff --git a/soh/assets/scenes/overworld/spot04/spot04_scene.h b/soh/assets/scenes/overworld/spot04/spot04_scene.h index 6ca7c8cab..80cea7dca 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_scene.h +++ b/soh/assets/scenes/overworld/spot04/spot04_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT04_SCENE_H +#define OVERWORLD_SPOT04_SCENE_H 1 #include "align_asset_macro.h" @@ -54,4 +55,7 @@ static const ALIGN_ASSET(2) char spot04_sceneTex_00FA18[] = dspot04_sceneTex_00F #define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" \ No newline at end of file +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" + + +#endif // OVERWORLD_SPOT04_SCENE_H diff --git a/soh/assets/scenes/overworld/spot05/spot05_room_0.h b/soh/assets/scenes/overworld/spot05/spot05_room_0.h index 27ea469cf..4e1415ed2 100644 --- a/soh/assets/scenes/overworld/spot05/spot05_room_0.h +++ b/soh/assets/scenes/overworld/spot05/spot05_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT05_ROOM_0_H +#define OVERWORLD_SPOT05_ROOM_0_H 1 #include "align_asset_macro.h" @@ -222,4 +223,7 @@ static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_007620[] = dspot05_ro static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_006EC8[] = dspot05_room_0Set_0005D0DL_006EC8; #define dspot05_room_0Set_0005D0DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009DF0" -static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009DF0[] = dspot05_room_0Set_0005D0DL_009DF0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009DF0[] = dspot05_room_0Set_0005D0DL_009DF0; + + +#endif // OVERWORLD_SPOT05_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot05/spot05_scene.h b/soh/assets/scenes/overworld/spot05/spot05_scene.h index bf79f8bcd..b0aa7b0cf 100644 --- a/soh/assets/scenes/overworld/spot05/spot05_scene.h +++ b/soh/assets/scenes/overworld/spot05/spot05_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT05_SCENE_H +#define OVERWORLD_SPOT05_SCENE_H 1 #include "align_asset_macro.h" @@ -96,4 +97,7 @@ static const ALIGN_ASSET(2) char spot05_sceneTex_010360[] = dspot05_sceneTex_010 #define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C" -#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C" \ No newline at end of file +#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C" + + +#endif // OVERWORLD_SPOT05_SCENE_H diff --git a/soh/assets/scenes/overworld/spot06/spot06_room_0.h b/soh/assets/scenes/overworld/spot06/spot06_room_0.h index 0d0c0c135..a77e30617 100644 --- a/soh/assets/scenes/overworld/spot06/spot06_room_0.h +++ b/soh/assets/scenes/overworld/spot06/spot06_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT06_ROOM_0_H +#define OVERWORLD_SPOT06_ROOM_0_H 1 #include "align_asset_macro.h" @@ -222,4 +223,7 @@ static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_00A148[] = dspot06_ro static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_009510[] = dspot06_room_0Set_000920DL_009510; #define dspot06_room_0Set_000920DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_00A550" -static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_00A550[] = dspot06_room_0Set_000920DL_00A550; \ No newline at end of file +static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_00A550[] = dspot06_room_0Set_000920DL_00A550; + + +#endif // OVERWORLD_SPOT06_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot06/spot06_scene.h b/soh/assets/scenes/overworld/spot06/spot06_scene.h index a9caeb6ed..66ed29664 100644 --- a/soh/assets/scenes/overworld/spot06/spot06_scene.h +++ b/soh/assets/scenes/overworld/spot06/spot06_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT06_SCENE_H +#define OVERWORLD_SPOT06_SCENE_H 1 #include "align_asset_macro.h" @@ -147,4 +148,7 @@ static const ALIGN_ASSET(2) char spot06_sceneTex_00BAB8[] = dspot06_sceneTex_00B #define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC" -#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC" \ No newline at end of file +#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC" + + +#endif // OVERWORLD_SPOT06_SCENE_H diff --git a/soh/assets/scenes/overworld/spot07/spot07_room_0.h b/soh/assets/scenes/overworld/spot07/spot07_room_0.h index 78538c8e4..4e7dbb8c3 100644 --- a/soh/assets/scenes/overworld/spot07/spot07_room_0.h +++ b/soh/assets/scenes/overworld/spot07/spot07_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT07_ROOM_0_H +#define OVERWORLD_SPOT07_ROOM_0_H 1 #include "align_asset_macro.h" @@ -126,4 +127,7 @@ static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_006010[] = dspot07_ro static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_000838[] = dspot07_room_0Set_000300DL_000838; #define dspot07_room_0Set_000300DL_003EA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_003EA8" -static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_003EA8[] = dspot07_room_0Set_000300DL_003EA8; \ No newline at end of file +static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_003EA8[] = dspot07_room_0Set_000300DL_003EA8; + + +#endif // OVERWORLD_SPOT07_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot07/spot07_room_1.h b/soh/assets/scenes/overworld/spot07/spot07_room_1.h index e591d3129..a0b7fcb20 100644 --- a/soh/assets/scenes/overworld/spot07/spot07_room_1.h +++ b/soh/assets/scenes/overworld/spot07/spot07_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT07_ROOM_1_H +#define OVERWORLD_SPOT07_ROOM_1_H 1 #include "align_asset_macro.h" @@ -234,4 +235,7 @@ static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005798[] = dspot07_ro static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0012C0[] = dspot07_room_1Set_0004C0DL_0012C0; #define dspot07_room_1Set_0004C0DL_007488 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_007488" -static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_007488[] = dspot07_room_1Set_0004C0DL_007488; \ No newline at end of file +static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_007488[] = dspot07_room_1Set_0004C0DL_007488; + + +#endif // OVERWORLD_SPOT07_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot07/spot07_scene.h b/soh/assets/scenes/overworld/spot07/spot07_scene.h index 11c07bf0a..a7bdc1f78 100644 --- a/soh/assets/scenes/overworld/spot07/spot07_scene.h +++ b/soh/assets/scenes/overworld/spot07/spot07_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT07_SCENE_H +#define OVERWORLD_SPOT07_SCENE_H 1 #include "align_asset_macro.h" @@ -67,4 +68,7 @@ static const ALIGN_ASSET(2) char spot07_sceneTex_005B98[] = dspot07_sceneTex_005 #define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824" -#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824" \ No newline at end of file +#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824" + + +#endif // OVERWORLD_SPOT07_SCENE_H diff --git a/soh/assets/scenes/overworld/spot08/spot08_room_0.h b/soh/assets/scenes/overworld/spot08/spot08_room_0.h index 8464cc01d..aaec4510f 100644 --- a/soh/assets/scenes/overworld/spot08/spot08_room_0.h +++ b/soh/assets/scenes/overworld/spot08/spot08_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT08_ROOM_0_H +#define OVERWORLD_SPOT08_ROOM_0_H 1 #include "align_asset_macro.h" @@ -378,4 +379,7 @@ static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007FE8[] = dspot08_ro static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0048B0[] = dspot08_room_0Set_000AD0DL_0048B0; #define dspot08_room_0Set_000AD0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0069C0" -static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0069C0[] = dspot08_room_0Set_000AD0DL_0069C0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0069C0[] = dspot08_room_0Set_000AD0DL_0069C0; + + +#endif // OVERWORLD_SPOT08_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot08/spot08_scene.h b/soh/assets/scenes/overworld/spot08/spot08_scene.h index f5d17dbfd..76f13d7b8 100644 --- a/soh/assets/scenes/overworld/spot08/spot08_scene.h +++ b/soh/assets/scenes/overworld/spot08/spot08_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT08_SCENE_H +#define OVERWORLD_SPOT08_SCENE_H 1 #include "align_asset_macro.h" @@ -97,4 +98,7 @@ static const ALIGN_ASSET(2) char spot08_sceneTex_0071A0[] = dspot08_sceneTex_007 #define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" -#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" \ No newline at end of file +#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" + + +#endif // OVERWORLD_SPOT08_SCENE_H diff --git a/soh/assets/scenes/overworld/spot09/spot09_room_0.h b/soh/assets/scenes/overworld/spot09/spot09_room_0.h index b8e240fc2..2671659b5 100644 --- a/soh/assets/scenes/overworld/spot09/spot09_room_0.h +++ b/soh/assets/scenes/overworld/spot09/spot09_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT09_ROOM_0_H +#define OVERWORLD_SPOT09_ROOM_0_H 1 #include "align_asset_macro.h" @@ -486,4 +487,7 @@ static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005128[] = dspot09_ro static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005598[] = dspot09_room_0Set_000A80DL_005598; #define dspot09_room_0Set_000A80DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005A08" -static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005A08[] = dspot09_room_0Set_000A80DL_005A08; \ No newline at end of file +static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005A08[] = dspot09_room_0Set_000A80DL_005A08; + + +#endif // OVERWORLD_SPOT09_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot09/spot09_scene.h b/soh/assets/scenes/overworld/spot09/spot09_scene.h index cf0e0debc..faf5e298a 100644 --- a/soh/assets/scenes/overworld/spot09/spot09_scene.h +++ b/soh/assets/scenes/overworld/spot09/spot09_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT09_SCENE_H +#define OVERWORLD_SPOT09_SCENE_H 1 #include "align_asset_macro.h" @@ -83,4 +84,7 @@ static const ALIGN_ASSET(2) char spot09_sceneTex_003460[] = dspot09_sceneTex_003 #define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" -#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" \ No newline at end of file +#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" + + +#endif // OVERWORLD_SPOT09_SCENE_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_0.h b/soh/assets/scenes/overworld/spot10/spot10_room_0.h index 3607cb74f..7a299efbc 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_0.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_0_H +#define OVERWORLD_SPOT10_ROOM_0_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char spot10_room_0DL_0025B0[] = dspot10_room_0DL_002 static const ALIGN_ASSET(2) char spot10_room_0Set_0000B0DL_0025B0[] = dspot10_room_0Set_0000B0DL_0025B0; #define dspot10_room_0Set_000130DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0Set_000130DL_0025B0" -static const ALIGN_ASSET(2) char spot10_room_0Set_000130DL_0025B0[] = dspot10_room_0Set_000130DL_0025B0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_0Set_000130DL_0025B0[] = dspot10_room_0Set_000130DL_0025B0; + + +#endif // OVERWORLD_SPOT10_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_1.h b/soh/assets/scenes/overworld/spot10/spot10_room_1.h index ce2fc3597..9f507333f 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_1.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_1_H +#define OVERWORLD_SPOT10_ROOM_1_H 1 #include "align_asset_macro.h" @@ -45,4 +46,7 @@ static const ALIGN_ASSET(2) char spot10_room_1Set_000110DL_007C18[] = dspot10_ro static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_003B48[] = dspot10_room_1Set_0001A0DL_003B48; #define dspot10_room_1Set_0001A0DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_0001A0DL_007C18" -static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_007C18[] = dspot10_room_1Set_0001A0DL_007C18; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_007C18[] = dspot10_room_1Set_0001A0DL_007C18; + + +#endif // OVERWORLD_SPOT10_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_2.h b/soh/assets/scenes/overworld/spot10/spot10_room_2.h index 84384e78d..3ccc4dd3d 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_2.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_2_H +#define OVERWORLD_SPOT10_ROOM_2_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char spot10_room_2Tex_0033E8[] = dspot10_room_2Tex_0 static const ALIGN_ASSET(2) char spot10_room_2Set_000110DL_0023B0[] = dspot10_room_2Set_000110DL_0023B0; #define dspot10_room_2Set_0001F0DL_0023B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Set_0001F0DL_0023B0" -static const ALIGN_ASSET(2) char spot10_room_2Set_0001F0DL_0023B0[] = dspot10_room_2Set_0001F0DL_0023B0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_2Set_0001F0DL_0023B0[] = dspot10_room_2Set_0001F0DL_0023B0; + + +#endif // OVERWORLD_SPOT10_ROOM_2_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_3.h b/soh/assets/scenes/overworld/spot10/spot10_room_3.h index 14787644b..b21990ad1 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_3.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_3_H +#define OVERWORLD_SPOT10_ROOM_3_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char spot10_room_3Set_000150DL_005298[] = dspot10_ro static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_0028C0[] = dspot10_room_3Set_000210DL_0028C0; #define dspot10_room_3Set_000210DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000210DL_005298" -static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_005298[] = dspot10_room_3Set_000210DL_005298; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_005298[] = dspot10_room_3Set_000210DL_005298; + + +#endif // OVERWORLD_SPOT10_ROOM_3_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_4.h b/soh/assets/scenes/overworld/spot10/spot10_room_4.h index ff377fa1a..75bebd799 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_4.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_4_H +#define OVERWORLD_SPOT10_ROOM_4_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char spot10_room_4DL_002490[] = dspot10_room_4DL_002 static const ALIGN_ASSET(2) char spot10_room_4Set_0000B0DL_002490[] = dspot10_room_4Set_0000B0DL_002490; #define dspot10_room_4Set_000130DL_002490 "__OTR__scenes/nonmq/spot10_scene/spot10_room_4Set_000130DL_002490" -static const ALIGN_ASSET(2) char spot10_room_4Set_000130DL_002490[] = dspot10_room_4Set_000130DL_002490; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_4Set_000130DL_002490[] = dspot10_room_4Set_000130DL_002490; + + +#endif // OVERWORLD_SPOT10_ROOM_4_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_5.h b/soh/assets/scenes/overworld/spot10/spot10_room_5.h index 9067f6b4c..8095b0b86 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_5.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_5_H +#define OVERWORLD_SPOT10_ROOM_5_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char spot10_room_5Tex_0037F0[] = dspot10_room_5Tex_0 static const ALIGN_ASSET(2) char spot10_room_5Set_0000E0DL_003780[] = dspot10_room_5Set_0000E0DL_003780; #define dspot10_room_5Set_000180DL_003780 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Set_000180DL_003780" -static const ALIGN_ASSET(2) char spot10_room_5Set_000180DL_003780[] = dspot10_room_5Set_000180DL_003780; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_5Set_000180DL_003780[] = dspot10_room_5Set_000180DL_003780; + + +#endif // OVERWORLD_SPOT10_ROOM_5_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_6.h b/soh/assets/scenes/overworld/spot10/spot10_room_6.h index e6b3d543f..ff6ea589a 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_6.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_6_H +#define OVERWORLD_SPOT10_ROOM_6_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char spot10_room_6Tex_0032E8[] = dspot10_room_6Tex_0 static const ALIGN_ASSET(2) char spot10_room_6Set_000100DL_0022B8[] = dspot10_room_6Set_000100DL_0022B8; #define dspot10_room_6Set_000190DL_0022B8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Set_000190DL_0022B8" -static const ALIGN_ASSET(2) char spot10_room_6Set_000190DL_0022B8[] = dspot10_room_6Set_000190DL_0022B8; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_6Set_000190DL_0022B8[] = dspot10_room_6Set_000190DL_0022B8; + + +#endif // OVERWORLD_SPOT10_ROOM_6_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_7.h b/soh/assets/scenes/overworld/spot10/spot10_room_7.h index f027004e4..1d9bbf375 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_7.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_7_H +#define OVERWORLD_SPOT10_ROOM_7_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char spot10_room_7DL_002588[] = dspot10_room_7DL_002 static const ALIGN_ASSET(2) char spot10_room_7Set_0000F0DL_002588[] = dspot10_room_7Set_0000F0DL_002588; #define dspot10_room_7Set_0001B0DL_002588 "__OTR__scenes/nonmq/spot10_scene/spot10_room_7Set_0001B0DL_002588" -static const ALIGN_ASSET(2) char spot10_room_7Set_0001B0DL_002588[] = dspot10_room_7Set_0001B0DL_002588; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_7Set_0001B0DL_002588[] = dspot10_room_7Set_0001B0DL_002588; + + +#endif // OVERWORLD_SPOT10_ROOM_7_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_8.h b/soh/assets/scenes/overworld/spot10/spot10_room_8.h index 214006897..656132ca2 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_8.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_8_H +#define OVERWORLD_SPOT10_ROOM_8_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char spot10_room_8DL_002630[] = dspot10_room_8DL_002 static const ALIGN_ASSET(2) char spot10_room_8Set_000120DL_002630[] = dspot10_room_8Set_000120DL_002630; #define dspot10_room_8Set_000200DL_002630 "__OTR__scenes/nonmq/spot10_scene/spot10_room_8Set_000200DL_002630" -static const ALIGN_ASSET(2) char spot10_room_8Set_000200DL_002630[] = dspot10_room_8Set_000200DL_002630; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_8Set_000200DL_002630[] = dspot10_room_8Set_000200DL_002630; + + +#endif // OVERWORLD_SPOT10_ROOM_8_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_9.h b/soh/assets/scenes/overworld/spot10/spot10_room_9.h index e66adddae..5eebcd9e4 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_9.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_ROOM_9_H +#define OVERWORLD_SPOT10_ROOM_9_H 1 #include "align_asset_macro.h" @@ -30,4 +31,7 @@ static const ALIGN_ASSET(2) char spot10_room_9Set_0000B0DL_0033C0[] = dspot10_ro static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_001EC0[] = dspot10_room_9Set_000140DL_001EC0; #define dspot10_room_9Set_000140DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_000140DL_0033C0" -static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_0033C0[] = dspot10_room_9Set_000140DL_0033C0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_0033C0[] = dspot10_room_9Set_000140DL_0033C0; + + +#endif // OVERWORLD_SPOT10_ROOM_9_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_scene.h b/soh/assets/scenes/overworld/spot10/spot10_scene.h index 3eb042356..7b964f396 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_scene.h +++ b/soh/assets/scenes/overworld/spot10/spot10_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT10_SCENE_H +#define OVERWORLD_SPOT10_SCENE_H 1 #include "align_asset_macro.h" @@ -31,4 +32,7 @@ static const ALIGN_ASSET(2) char spot10_sceneTex_00D230[] = dspot10_sceneTex_00D #define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98" -#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98" \ No newline at end of file +#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98" + + +#endif // OVERWORLD_SPOT10_SCENE_H diff --git a/soh/assets/scenes/overworld/spot11/spot11_room_0.h b/soh/assets/scenes/overworld/spot11/spot11_room_0.h index 22c1090d6..cbaea5212 100644 --- a/soh/assets/scenes/overworld/spot11/spot11_room_0.h +++ b/soh/assets/scenes/overworld/spot11/spot11_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT11_ROOM_0_H +#define OVERWORLD_SPOT11_ROOM_0_H 1 #include "align_asset_macro.h" @@ -228,4 +229,7 @@ static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001578[] = dspot11_ro static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00B5B0[] = dspot11_room_0Set_0007F0DL_00B5B0; #define dspot11_room_0Set_0007F0DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_001138" -static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001138[] = dspot11_room_0Set_0007F0DL_001138; \ No newline at end of file +static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001138[] = dspot11_room_0Set_0007F0DL_001138; + + +#endif // OVERWORLD_SPOT11_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot11/spot11_scene.h b/soh/assets/scenes/overworld/spot11/spot11_scene.h index 51d627922..35d42b9f6 100644 --- a/soh/assets/scenes/overworld/spot11/spot11_scene.h +++ b/soh/assets/scenes/overworld/spot11/spot11_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT11_SCENE_H +#define OVERWORLD_SPOT11_SCENE_H 1 #include "align_asset_macro.h" @@ -108,4 +109,7 @@ static const ALIGN_ASSET(2) char spot11_sceneTex_00DCA0[] = dspot11_sceneTex_00D #define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4" -#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4" \ No newline at end of file +#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4" + + +#endif // OVERWORLD_SPOT11_SCENE_H diff --git a/soh/assets/scenes/overworld/spot12/spot12_room_0.h b/soh/assets/scenes/overworld/spot12/spot12_room_0.h index 46318f7cd..056e1178f 100644 --- a/soh/assets/scenes/overworld/spot12/spot12_room_0.h +++ b/soh/assets/scenes/overworld/spot12/spot12_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT12_ROOM_0_H +#define OVERWORLD_SPOT12_ROOM_0_H 1 #include "align_asset_macro.h" @@ -426,4 +427,7 @@ static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0088C8[] = dspot12_ro static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00FC80[] = dspot12_room_0Set_0008C0DL_00FC80; #define dspot12_room_0Set_0008C0DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_007640" -static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_007640[] = dspot12_room_0Set_0008C0DL_007640; \ No newline at end of file +static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_007640[] = dspot12_room_0Set_0008C0DL_007640; + + +#endif // OVERWORLD_SPOT12_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot12/spot12_room_1.h b/soh/assets/scenes/overworld/spot12/spot12_room_1.h index 1dea4bc26..d6f478f38 100644 --- a/soh/assets/scenes/overworld/spot12/spot12_room_1.h +++ b/soh/assets/scenes/overworld/spot12/spot12_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT12_ROOM_1_H +#define OVERWORLD_SPOT12_ROOM_1_H 1 #include "align_asset_macro.h" @@ -207,4 +208,7 @@ static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_00AF80[] = dspot12_ro static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_001E58[] = dspot12_room_1Set_0007F0DL_001E58; #define dspot12_room_1Set_0007F0DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_002A60" -static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_002A60[] = dspot12_room_1Set_0007F0DL_002A60; \ No newline at end of file +static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_002A60[] = dspot12_room_1Set_0007F0DL_002A60; + + +#endif // OVERWORLD_SPOT12_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot12/spot12_scene.h b/soh/assets/scenes/overworld/spot12/spot12_scene.h index c2f15b365..f08278485 100644 --- a/soh/assets/scenes/overworld/spot12/spot12_scene.h +++ b/soh/assets/scenes/overworld/spot12/spot12_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT12_SCENE_H +#define OVERWORLD_SPOT12_SCENE_H 1 #include "align_asset_macro.h" @@ -61,4 +62,7 @@ static const ALIGN_ASSET(2) char spot12_sceneTex_008678[] = dspot12_sceneTex_008 #define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" -#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" \ No newline at end of file +#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" + + +#endif // OVERWORLD_SPOT12_SCENE_H diff --git a/soh/assets/scenes/overworld/spot13/spot13_room_0.h b/soh/assets/scenes/overworld/spot13/spot13_room_0.h index 114605493..95d567382 100644 --- a/soh/assets/scenes/overworld/spot13/spot13_room_0.h +++ b/soh/assets/scenes/overworld/spot13/spot13_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef OVERWORLD_SPOT13_ROOM_0_H +#define OVERWORLD_SPOT13_ROOM_0_H 1 #include "align_asset_macro.h" #define dspot13_room_0DL_0008F8 "__OTR__scenes/nonmq/spot13_scene/spot13_room_0DL_0008F8" -static const ALIGN_ASSET(2) char spot13_room_0DL_0008F8[] = dspot13_room_0DL_0008F8; \ No newline at end of file +static const ALIGN_ASSET(2) char spot13_room_0DL_0008F8[] = dspot13_room_0DL_0008F8; + + +#endif // OVERWORLD_SPOT13_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot13/spot13_room_1.h b/soh/assets/scenes/overworld/spot13/spot13_room_1.h index d8d2e928f..59bd37305 100644 --- a/soh/assets/scenes/overworld/spot13/spot13_room_1.h +++ b/soh/assets/scenes/overworld/spot13/spot13_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT13_ROOM_1_H +#define OVERWORLD_SPOT13_ROOM_1_H 1 #include "align_asset_macro.h" @@ -81,4 +82,7 @@ static const ALIGN_ASSET(2) char spot13_room_1DL_011E28[] = dspot13_room_1DL_011 static const ALIGN_ASSET(2) char spot13_room_1Tex_012240[] = dspot13_room_1Tex_012240; #define dspot13_room_1Tex_011E40 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_011E40" -static const ALIGN_ASSET(2) char spot13_room_1Tex_011E40[] = dspot13_room_1Tex_011E40; \ No newline at end of file +static const ALIGN_ASSET(2) char spot13_room_1Tex_011E40[] = dspot13_room_1Tex_011E40; + + +#endif // OVERWORLD_SPOT13_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot13/spot13_scene.h b/soh/assets/scenes/overworld/spot13/spot13_scene.h index f2518d28a..a4e7eb89e 100644 --- a/soh/assets/scenes/overworld/spot13/spot13_scene.h +++ b/soh/assets/scenes/overworld/spot13/spot13_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT13_SCENE_H +#define OVERWORLD_SPOT13_SCENE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char spot13_sceneTex_004E30[] = dspot13_sceneTex_004 static const ALIGN_ASSET(2) char spot13_sceneTex_003E30[] = dspot13_sceneTex_003E30; #define dspot13_sceneTex_003A30 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneTex_003A30" -static const ALIGN_ASSET(2) char spot13_sceneTex_003A30[] = dspot13_sceneTex_003A30; \ No newline at end of file +static const ALIGN_ASSET(2) char spot13_sceneTex_003A30[] = dspot13_sceneTex_003A30; + +#endif // OVERWORLD_SPOT13_SCENE_H diff --git a/soh/assets/scenes/overworld/spot15/spot15_room_0.h b/soh/assets/scenes/overworld/spot15/spot15_room_0.h index 2c1a91715..a0fc18ce3 100644 --- a/soh/assets/scenes/overworld/spot15/spot15_room_0.h +++ b/soh/assets/scenes/overworld/spot15/spot15_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT15_ROOM_0_H +#define OVERWORLD_SPOT15_ROOM_0_H 1 #include "align_asset_macro.h" @@ -111,4 +112,7 @@ static const ALIGN_ASSET(2) char spot15_room_0DL_00BBC0[] = dspot15_room_0DL_00B static const ALIGN_ASSET(2) char spot15_room_0DL_00B628[] = dspot15_room_0DL_00B628; #define dspot15_room_0DL_0041F0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0041F0" -static const ALIGN_ASSET(2) char spot15_room_0DL_0041F0[] = dspot15_room_0DL_0041F0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot15_room_0DL_0041F0[] = dspot15_room_0DL_0041F0; + + +#endif // OVERWORLD_SPOT15_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot15/spot15_scene.h b/soh/assets/scenes/overworld/spot15/spot15_scene.h index cbfa29a88..73e3adc62 100644 --- a/soh/assets/scenes/overworld/spot15/spot15_scene.h +++ b/soh/assets/scenes/overworld/spot15/spot15_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT15_SCENE_H +#define OVERWORLD_SPOT15_SCENE_H 1 #include "align_asset_macro.h" @@ -135,4 +136,6 @@ static const ALIGN_ASSET(2) char spot15_sceneTex_009600[] = dspot15_sceneTex_009 static const ALIGN_ASSET(2) char spot15_sceneTex_004C00[] = dspot15_sceneTex_004C00; #define dspot15_sceneTex_016800 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_016800" -static const ALIGN_ASSET(2) char spot15_sceneTex_016800[] = dspot15_sceneTex_016800; \ No newline at end of file +static const ALIGN_ASSET(2) char spot15_sceneTex_016800[] = dspot15_sceneTex_016800; + +#endif // OVERWORLD_SPOT15_SCENE_H diff --git a/soh/assets/scenes/overworld/spot16/spot16_room_0.h b/soh/assets/scenes/overworld/spot16/spot16_room_0.h index d0b51d82e..7103cc719 100644 --- a/soh/assets/scenes/overworld/spot16/spot16_room_0.h +++ b/soh/assets/scenes/overworld/spot16/spot16_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT16_ROOM_0_H +#define OVERWORLD_SPOT16_ROOM_0_H 1 #include "align_asset_macro.h" @@ -276,4 +277,7 @@ static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00ABC8[] = dspot16_ro static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_0066D0[] = dspot16_room_0Set_000C00DL_0066D0; #define dspot16_room_0Set_000C00DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_007C78" -static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_007C78[] = dspot16_room_0Set_000C00DL_007C78; \ No newline at end of file +static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_007C78[] = dspot16_room_0Set_000C00DL_007C78; + + +#endif // OVERWORLD_SPOT16_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot16/spot16_scene.h b/soh/assets/scenes/overworld/spot16/spot16_scene.h index 9ec3c71e8..d288da992 100644 --- a/soh/assets/scenes/overworld/spot16/spot16_scene.h +++ b/soh/assets/scenes/overworld/spot16/spot16_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT16_SCENE_H +#define OVERWORLD_SPOT16_SCENE_H 1 #include "align_asset_macro.h" @@ -132,4 +133,7 @@ static const ALIGN_ASSET(2) char spot16_sceneTex_013998[] = dspot16_sceneTex_013 #define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" \ No newline at end of file +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" + + +#endif // OVERWORLD_SPOT16_SCENE_H diff --git a/soh/assets/scenes/overworld/spot17/spot17_room_0.h b/soh/assets/scenes/overworld/spot17/spot17_room_0.h index 877a0b8b6..f6fb5cec7 100644 --- a/soh/assets/scenes/overworld/spot17/spot17_room_0.h +++ b/soh/assets/scenes/overworld/spot17/spot17_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT17_ROOM_0_H +#define OVERWORLD_SPOT17_ROOM_0_H 1 #include "align_asset_macro.h" @@ -60,4 +61,7 @@ static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_001110[] = dspot17_ro static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_0027C8[] = dspot17_room_0Set_000170DL_0027C8; #define dspot17_room_0Set_000170DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_003480" -static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_003480[] = dspot17_room_0Set_000170DL_003480; \ No newline at end of file +static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_003480[] = dspot17_room_0Set_000170DL_003480; + + +#endif // OVERWORLD_SPOT17_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot17/spot17_room_1.h b/soh/assets/scenes/overworld/spot17/spot17_room_1.h index 7b98a65fe..b47c62986 100644 --- a/soh/assets/scenes/overworld/spot17/spot17_room_1.h +++ b/soh/assets/scenes/overworld/spot17/spot17_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT17_ROOM_1_H +#define OVERWORLD_SPOT17_ROOM_1_H 1 #include "align_asset_macro.h" @@ -372,4 +373,7 @@ static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_008F98[] = dspot17_ro static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_009AA0[] = dspot17_room_1Set_000940DL_009AA0; #define dspot17_room_1Set_000940DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_004AC8" -static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_004AC8[] = dspot17_room_1Set_000940DL_004AC8; \ No newline at end of file +static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_004AC8[] = dspot17_room_1Set_000940DL_004AC8; + + +#endif // OVERWORLD_SPOT17_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot17/spot17_scene.h b/soh/assets/scenes/overworld/spot17/spot17_scene.h index 0429910ce..24f2ff86d 100644 --- a/soh/assets/scenes/overworld/spot17/spot17_scene.h +++ b/soh/assets/scenes/overworld/spot17/spot17_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT17_SCENE_H +#define OVERWORLD_SPOT17_SCENE_H 1 #include "align_asset_macro.h" @@ -78,4 +79,7 @@ static const ALIGN_ASSET(2) char spot17_sceneTex_00C6D8[] = dspot17_sceneTex_00C #define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4" -#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4" \ No newline at end of file +#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4" + + +#endif // OVERWORLD_SPOT17_SCENE_H diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_0.h b/soh/assets/scenes/overworld/spot18/spot18_room_0.h index b86782686..ed7ece37b 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_0.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT18_ROOM_0_H +#define OVERWORLD_SPOT18_ROOM_0_H 1 #include "align_asset_macro.h" @@ -102,4 +103,7 @@ static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_003238[] = dspot18_ro static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_00DC80[] = dspot18_room_0Set_000D10DL_00DC80; #define dspot18_room_0Set_000D10DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000D10DL_0013E0" -static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_0013E0[] = dspot18_room_0Set_000D10DL_0013E0; \ No newline at end of file +static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_0013E0[] = dspot18_room_0Set_000D10DL_0013E0; + + +#endif // OVERWORLD_SPOT18_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_1.h b/soh/assets/scenes/overworld/spot18/spot18_room_1.h index a2222c807..fad61da7e 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_1.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT18_ROOM_1_H +#define OVERWORLD_SPOT18_ROOM_1_H 1 #include "align_asset_macro.h" @@ -111,4 +112,7 @@ static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_0007D0[] = dspot18_ro static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001398[] = dspot18_room_1Set_000300DL_001398; #define dspot18_room_1Set_000300DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_002660" -static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_002660[] = dspot18_room_1Set_000300DL_002660; \ No newline at end of file +static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_002660[] = dspot18_room_1Set_000300DL_002660; + + +#endif // OVERWORLD_SPOT18_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_2.h b/soh/assets/scenes/overworld/spot18/spot18_room_2.h index d678e24e7..71a11385d 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_2.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT18_ROOM_2_H +#define OVERWORLD_SPOT18_ROOM_2_H 1 #include "align_asset_macro.h" @@ -177,4 +178,7 @@ static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_00CBC0[] = dspot18_ro static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_0019D0[] = dspot18_room_2Set_0002E0DL_0019D0; #define dspot18_room_2Set_0002E0DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_000E30" -static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_000E30[] = dspot18_room_2Set_0002E0DL_000E30; \ No newline at end of file +static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_000E30[] = dspot18_room_2Set_0002E0DL_000E30; + + +#endif // OVERWORLD_SPOT18_ROOM_2_H diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_3.h b/soh/assets/scenes/overworld/spot18/spot18_room_3.h index c4f77e12e..dd22bb742 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_3.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT18_ROOM_3_H +#define OVERWORLD_SPOT18_ROOM_3_H 1 #include "align_asset_macro.h" @@ -261,4 +262,7 @@ static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_002230[] = dspot18_ro static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_008218[] = dspot18_room_3Set_000800DL_008218; #define dspot18_room_3Set_000800DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018BF8" -static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018BF8[] = dspot18_room_3Set_000800DL_018BF8; \ No newline at end of file +static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018BF8[] = dspot18_room_3Set_000800DL_018BF8; + + +#endif // OVERWORLD_SPOT18_ROOM_3_H diff --git a/soh/assets/scenes/overworld/spot18/spot18_scene.h b/soh/assets/scenes/overworld/spot18/spot18_scene.h index 7e6de44f2..f078c9d7f 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_scene.h +++ b/soh/assets/scenes/overworld/spot18/spot18_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT18_SCENE_H +#define OVERWORLD_SPOT18_SCENE_H 1 #include "align_asset_macro.h" @@ -42,4 +43,7 @@ static const ALIGN_ASSET(2) char spot18_sceneTex_009848[] = dspot18_sceneTex_009 #define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC" -#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC" \ No newline at end of file +#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC" + + +#endif // OVERWORLD_SPOT18_SCENE_H diff --git a/soh/assets/scenes/overworld/spot20/spot20_room_0.h b/soh/assets/scenes/overworld/spot20/spot20_room_0.h index 0bb45dad0..d75adc694 100644 --- a/soh/assets/scenes/overworld/spot20/spot20_room_0.h +++ b/soh/assets/scenes/overworld/spot20/spot20_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT20_ROOM_0_H +#define OVERWORLD_SPOT20_ROOM_0_H 1 #include "align_asset_macro.h" @@ -474,4 +475,7 @@ static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_002730[] = dspot20_ro static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0062D0[] = dspot20_room_0Set_0013A0DL_0062D0; #define dspot20_room_0Set_0013A0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_002C00" -static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_002C00[] = dspot20_room_0Set_0013A0DL_002C00; \ No newline at end of file +static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_002C00[] = dspot20_room_0Set_0013A0DL_002C00; + + +#endif // OVERWORLD_SPOT20_ROOM_0_H diff --git a/soh/assets/scenes/overworld/spot20/spot20_scene.h b/soh/assets/scenes/overworld/spot20/spot20_scene.h index b9035e90f..2434fd180 100644 --- a/soh/assets/scenes/overworld/spot20/spot20_scene.h +++ b/soh/assets/scenes/overworld/spot20/spot20_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OVERWORLD_SPOT20_SCENE_H +#define OVERWORLD_SPOT20_SCENE_H 1 #include "align_asset_macro.h" @@ -100,4 +101,7 @@ static const ALIGN_ASSET(2) char spot20_sceneTex_010E20[] = dspot20_sceneTex_010 #define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" \ No newline at end of file +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" + + +#endif // OVERWORLD_SPOT20_SCENE_H diff --git a/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h b/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h index 798d7c662..1bf183c70 100644 --- a/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h +++ b/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_ALLEY_SHOP_ROOM_0_H +#define SHOPS_ALLEY_SHOP_ROOM_0_H 1 #include "align_asset_macro.h" #define dalley_shop_room_0DL_0013E0 "__OTR__scenes/nonmq/alley_shop_scene/alley_shop_room_0DL_0013E0" -static const ALIGN_ASSET(2) char alley_shop_room_0DL_0013E0[] = dalley_shop_room_0DL_0013E0; \ No newline at end of file +static const ALIGN_ASSET(2) char alley_shop_room_0DL_0013E0[] = dalley_shop_room_0DL_0013E0; + + +#endif // SHOPS_ALLEY_SHOP_ROOM_0_H diff --git a/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h b/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h index afe1639ff..fa0feb5c0 100644 --- a/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h +++ b/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_ALLEY_SHOP_SCENE_H +#define SHOPS_ALLEY_SHOP_SCENE_H 1 #include "align_asset_macro.h" #define dalley_shop_sceneCollisionHeader_000584 "__OTR__scenes/nonmq/alley_shop_scene/alley_shop_sceneCollisionHeader_000584" -static const ALIGN_ASSET(2) char alley_shop_sceneCollisionHeader_000584[] = dalley_shop_sceneCollisionHeader_000584; \ No newline at end of file +static const ALIGN_ASSET(2) char alley_shop_sceneCollisionHeader_000584[] = dalley_shop_sceneCollisionHeader_000584; + + +#endif // SHOPS_ALLEY_SHOP_SCENE_H diff --git a/soh/assets/scenes/shops/drag/drag_room_0.h b/soh/assets/scenes/shops/drag/drag_room_0.h index 8dc5824b8..ee173eca0 100644 --- a/soh/assets/scenes/shops/drag/drag_room_0.h +++ b/soh/assets/scenes/shops/drag/drag_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_DRAG_ROOM_0_H +#define SHOPS_DRAG_ROOM_0_H 1 #include "align_asset_macro.h" #define ddrag_room_0DL_006618 "__OTR__scenes/nonmq/drag_scene/drag_room_0DL_006618" -static const ALIGN_ASSET(2) char drag_room_0DL_006618[] = ddrag_room_0DL_006618; \ No newline at end of file +static const ALIGN_ASSET(2) char drag_room_0DL_006618[] = ddrag_room_0DL_006618; + + +#endif // SHOPS_DRAG_ROOM_0_H diff --git a/soh/assets/scenes/shops/drag/drag_scene.h b/soh/assets/scenes/shops/drag/drag_scene.h index 3c43c558c..c42054d50 100644 --- a/soh/assets/scenes/shops/drag/drag_scene.h +++ b/soh/assets/scenes/shops/drag/drag_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_DRAG_SCENE_H +#define SHOPS_DRAG_SCENE_H 1 #include "align_asset_macro.h" #define ddrag_sceneCollisionHeader_0003C0 "__OTR__scenes/nonmq/drag_scene/drag_sceneCollisionHeader_0003C0" -static const ALIGN_ASSET(2) char drag_sceneCollisionHeader_0003C0[] = ddrag_sceneCollisionHeader_0003C0; \ No newline at end of file +static const ALIGN_ASSET(2) char drag_sceneCollisionHeader_0003C0[] = ddrag_sceneCollisionHeader_0003C0; + + +#endif // SHOPS_DRAG_SCENE_H diff --git a/soh/assets/scenes/shops/face_shop/face_shop_room_0.h b/soh/assets/scenes/shops/face_shop/face_shop_room_0.h index c07ad05a5..ea0d792b4 100644 --- a/soh/assets/scenes/shops/face_shop/face_shop_room_0.h +++ b/soh/assets/scenes/shops/face_shop/face_shop_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_FACE_SHOP_ROOM_0_H +#define SHOPS_FACE_SHOP_ROOM_0_H 1 #include "align_asset_macro.h" #define dface_shop_room_0DL_008E08 "__OTR__scenes/nonmq/face_shop_scene/face_shop_room_0DL_008E08" -static const ALIGN_ASSET(2) char face_shop_room_0DL_008E08[] = dface_shop_room_0DL_008E08; \ No newline at end of file +static const ALIGN_ASSET(2) char face_shop_room_0DL_008E08[] = dface_shop_room_0DL_008E08; + + +#endif // SHOPS_FACE_SHOP_ROOM_0_H diff --git a/soh/assets/scenes/shops/face_shop/face_shop_scene.h b/soh/assets/scenes/shops/face_shop/face_shop_scene.h index 6f24f14b7..386a1a2ff 100644 --- a/soh/assets/scenes/shops/face_shop/face_shop_scene.h +++ b/soh/assets/scenes/shops/face_shop/face_shop_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_FACE_SHOP_SCENE_H +#define SHOPS_FACE_SHOP_SCENE_H 1 #include "align_asset_macro.h" #define dface_shop_sceneCollisionHeader_000338 "__OTR__scenes/nonmq/face_shop_scene/face_shop_sceneCollisionHeader_000338" -static const ALIGN_ASSET(2) char face_shop_sceneCollisionHeader_000338[] = dface_shop_sceneCollisionHeader_000338; \ No newline at end of file +static const ALIGN_ASSET(2) char face_shop_sceneCollisionHeader_000338[] = dface_shop_sceneCollisionHeader_000338; + + +#endif // SHOPS_FACE_SHOP_SCENE_H diff --git a/soh/assets/scenes/shops/golon/golon_room_0.h b/soh/assets/scenes/shops/golon/golon_room_0.h index 6cfdd1d24..b4f6c001d 100644 --- a/soh/assets/scenes/shops/golon/golon_room_0.h +++ b/soh/assets/scenes/shops/golon/golon_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_GOLON_ROOM_0_H +#define SHOPS_GOLON_ROOM_0_H 1 #include "align_asset_macro.h" #define dgolon_room_0DL_0009B0 "__OTR__scenes/nonmq/golon_scene/golon_room_0DL_0009B0" -static const ALIGN_ASSET(2) char golon_room_0DL_0009B0[] = dgolon_room_0DL_0009B0; \ No newline at end of file +static const ALIGN_ASSET(2) char golon_room_0DL_0009B0[] = dgolon_room_0DL_0009B0; + + +#endif // SHOPS_GOLON_ROOM_0_H diff --git a/soh/assets/scenes/shops/golon/golon_scene.h b/soh/assets/scenes/shops/golon/golon_scene.h index 5a3e24091..aba348670 100644 --- a/soh/assets/scenes/shops/golon/golon_scene.h +++ b/soh/assets/scenes/shops/golon/golon_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_GOLON_SCENE_H +#define SHOPS_GOLON_SCENE_H 1 #include "align_asset_macro.h" #define dgolon_sceneCollisionHeader_000368 "__OTR__scenes/nonmq/golon_scene/golon_sceneCollisionHeader_000368" -static const ALIGN_ASSET(2) char golon_sceneCollisionHeader_000368[] = dgolon_sceneCollisionHeader_000368; \ No newline at end of file +static const ALIGN_ASSET(2) char golon_sceneCollisionHeader_000368[] = dgolon_sceneCollisionHeader_000368; + + +#endif // SHOPS_GOLON_SCENE_H diff --git a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h index c3ae420bb..dc8424b78 100644 --- a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h +++ b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_KOKIRI_SHOP_ROOM_0_H +#define SHOPS_KOKIRI_SHOP_ROOM_0_H 1 #include "align_asset_macro.h" #define dkokiri_shop_room_0DL_00B428 "__OTR__scenes/nonmq/kokiri_shop_scene/kokiri_shop_room_0DL_00B428" -static const ALIGN_ASSET(2) char kokiri_shop_room_0DL_00B428[] = dkokiri_shop_room_0DL_00B428; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_shop_room_0DL_00B428[] = dkokiri_shop_room_0DL_00B428; + + +#endif // SHOPS_KOKIRI_SHOP_ROOM_0_H diff --git a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h index fb86be02f..adfa7c8ba 100644 --- a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h +++ b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_KOKIRI_SHOP_SCENE_H +#define SHOPS_KOKIRI_SHOP_SCENE_H 1 #include "align_asset_macro.h" #define dkokiri_shop_sceneCollisionHeader_000950 "__OTR__scenes/nonmq/kokiri_shop_scene/kokiri_shop_sceneCollisionHeader_000950" -static const ALIGN_ASSET(2) char kokiri_shop_sceneCollisionHeader_000950[] = dkokiri_shop_sceneCollisionHeader_000950; \ No newline at end of file +static const ALIGN_ASSET(2) char kokiri_shop_sceneCollisionHeader_000950[] = dkokiri_shop_sceneCollisionHeader_000950; + + +#endif // SHOPS_KOKIRI_SHOP_SCENE_H diff --git a/soh/assets/scenes/shops/night_shop/night_shop_room_0.h b/soh/assets/scenes/shops/night_shop/night_shop_room_0.h index 1aa0374f4..ea97e50a7 100644 --- a/soh/assets/scenes/shops/night_shop/night_shop_room_0.h +++ b/soh/assets/scenes/shops/night_shop/night_shop_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_NIGHT_SHOP_ROOM_0_H +#define SHOPS_NIGHT_SHOP_ROOM_0_H 1 #include "align_asset_macro.h" #define dnight_shop_room_0DL_003100 "__OTR__scenes/nonmq/night_shop_scene/night_shop_room_0DL_003100" -static const ALIGN_ASSET(2) char night_shop_room_0DL_003100[] = dnight_shop_room_0DL_003100; \ No newline at end of file +static const ALIGN_ASSET(2) char night_shop_room_0DL_003100[] = dnight_shop_room_0DL_003100; + + +#endif // SHOPS_NIGHT_SHOP_ROOM_0_H diff --git a/soh/assets/scenes/shops/night_shop/night_shop_scene.h b/soh/assets/scenes/shops/night_shop/night_shop_scene.h index f1df6ce6f..3b5307dee 100644 --- a/soh/assets/scenes/shops/night_shop/night_shop_scene.h +++ b/soh/assets/scenes/shops/night_shop/night_shop_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_NIGHT_SHOP_SCENE_H +#define SHOPS_NIGHT_SHOP_SCENE_H 1 #include "align_asset_macro.h" #define dnight_shop_sceneCollisionHeader_000644 "__OTR__scenes/nonmq/night_shop_scene/night_shop_sceneCollisionHeader_000644" -static const ALIGN_ASSET(2) char night_shop_sceneCollisionHeader_000644[] = dnight_shop_sceneCollisionHeader_000644; \ No newline at end of file +static const ALIGN_ASSET(2) char night_shop_sceneCollisionHeader_000644[] = dnight_shop_sceneCollisionHeader_000644; + + +#endif // SHOPS_NIGHT_SHOP_SCENE_H diff --git a/soh/assets/scenes/shops/shop1/shop1_room_0.h b/soh/assets/scenes/shops/shop1/shop1_room_0.h index 3b3b0e261..1d0a99e90 100644 --- a/soh/assets/scenes/shops/shop1/shop1_room_0.h +++ b/soh/assets/scenes/shops/shop1/shop1_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_SHOP1_ROOM_0_H +#define SHOPS_SHOP1_ROOM_0_H 1 #include "align_asset_macro.h" #define dshop1_room_0DL_003F18 "__OTR__scenes/nonmq/shop1_scene/shop1_room_0DL_003F18" -static const ALIGN_ASSET(2) char shop1_room_0DL_003F18[] = dshop1_room_0DL_003F18; \ No newline at end of file +static const ALIGN_ASSET(2) char shop1_room_0DL_003F18[] = dshop1_room_0DL_003F18; + + +#endif // SHOPS_SHOP1_ROOM_0_H diff --git a/soh/assets/scenes/shops/shop1/shop1_scene.h b/soh/assets/scenes/shops/shop1/shop1_scene.h index 8fc45d1f9..d67f59784 100644 --- a/soh/assets/scenes/shops/shop1/shop1_scene.h +++ b/soh/assets/scenes/shops/shop1/shop1_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_SHOP1_SCENE_H +#define SHOPS_SHOP1_SCENE_H 1 #include "align_asset_macro.h" #define dshop1_sceneCollisionHeader_0002B8 "__OTR__scenes/nonmq/shop1_scene/shop1_sceneCollisionHeader_0002B8" -static const ALIGN_ASSET(2) char shop1_sceneCollisionHeader_0002B8[] = dshop1_sceneCollisionHeader_0002B8; \ No newline at end of file +static const ALIGN_ASSET(2) char shop1_sceneCollisionHeader_0002B8[] = dshop1_sceneCollisionHeader_0002B8; + + +#endif // SHOPS_SHOP1_SCENE_H diff --git a/soh/assets/scenes/shops/zoora/zoora_room_0.h b/soh/assets/scenes/shops/zoora/zoora_room_0.h index 5ada3db86..7c7ba04e8 100644 --- a/soh/assets/scenes/shops/zoora/zoora_room_0.h +++ b/soh/assets/scenes/shops/zoora/zoora_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_ZOORA_ROOM_0_H +#define SHOPS_ZOORA_ROOM_0_H 1 #include "align_asset_macro.h" #define dzoora_room_0DL_0009C0 "__OTR__scenes/nonmq/zoora_scene/zoora_room_0DL_0009C0" -static const ALIGN_ASSET(2) char zoora_room_0DL_0009C0[] = dzoora_room_0DL_0009C0; \ No newline at end of file +static const ALIGN_ASSET(2) char zoora_room_0DL_0009C0[] = dzoora_room_0DL_0009C0; + + +#endif // SHOPS_ZOORA_ROOM_0_H diff --git a/soh/assets/scenes/shops/zoora/zoora_scene.h b/soh/assets/scenes/shops/zoora/zoora_scene.h index 9f576d075..1cea04bc1 100644 --- a/soh/assets/scenes/shops/zoora/zoora_scene.h +++ b/soh/assets/scenes/shops/zoora/zoora_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef SHOPS_ZOORA_SCENE_H +#define SHOPS_ZOORA_SCENE_H 1 #include "align_asset_macro.h" #define dzoora_sceneCollisionHeader_000360 "__OTR__scenes/nonmq/zoora_scene/zoora_sceneCollisionHeader_000360" -static const ALIGN_ASSET(2) char zoora_sceneCollisionHeader_000360[] = dzoora_sceneCollisionHeader_000360; \ No newline at end of file +static const ALIGN_ASSET(2) char zoora_sceneCollisionHeader_000360[] = dzoora_sceneCollisionHeader_000360; + + +#endif // SHOPS_ZOORA_SCENE_H diff --git a/soh/assets/scenes/test_levels/besitu/besitu_room_0.h b/soh/assets/scenes/test_levels/besitu/besitu_room_0.h index 2d5f00f12..2afdbb7da 100644 --- a/soh/assets/scenes/test_levels/besitu/besitu_room_0.h +++ b/soh/assets/scenes/test_levels/besitu/besitu_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_BESITU_ROOM_0_H +#define TEST_LEVELS_BESITU_ROOM_0_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char besitu_room_0Tex_0034D8[] = dbesitu_room_0Tex_0 static const ALIGN_ASSET(2) char besitu_room_0Tex_0044D8[] = dbesitu_room_0Tex_0044D8; #define dbesitu_room_0Tex_002CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_002CD8" -static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8; \ No newline at end of file +static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8; + + +#endif // TEST_LEVELS_BESITU_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/besitu/besitu_scene.h b/soh/assets/scenes/test_levels/besitu/besitu_scene.h index 1d840a01f..55964d264 100644 --- a/soh/assets/scenes/test_levels/besitu/besitu_scene.h +++ b/soh/assets/scenes/test_levels/besitu/besitu_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_BESITU_SCENE_H +#define TEST_LEVELS_BESITU_SCENE_H 1 #include "align_asset_macro.h" #define dbesitu_sceneCollisionHeader_000478 "__OTR__scenes/nonmq/besitu_scene/besitu_sceneCollisionHeader_000478" -static const ALIGN_ASSET(2) char besitu_sceneCollisionHeader_000478[] = dbesitu_sceneCollisionHeader_000478; \ No newline at end of file +static const ALIGN_ASSET(2) char besitu_sceneCollisionHeader_000478[] = dbesitu_sceneCollisionHeader_000478; + + +#endif // TEST_LEVELS_BESITU_SCENE_H diff --git a/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h b/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h index 3ede3cfee..5cbe9ea1c 100644 --- a/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h +++ b/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_DEPTH_TEST_ROOM_0_H +#define TEST_LEVELS_DEPTH_TEST_ROOM_0_H 1 #include "align_asset_macro.h" #define ddepth_test_room_0DL_0004A0 "__OTR__scenes/nonmq/depth_test_scene/depth_test_room_0DL_0004A0" -static const ALIGN_ASSET(2) char depth_test_room_0DL_0004A0[] = ddepth_test_room_0DL_0004A0; \ No newline at end of file +static const ALIGN_ASSET(2) char depth_test_room_0DL_0004A0[] = ddepth_test_room_0DL_0004A0; + + +#endif // TEST_LEVELS_DEPTH_TEST_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h b/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h index dc0a62737..507a79455 100644 --- a/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h +++ b/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_DEPTH_TEST_SCENE_H +#define TEST_LEVELS_DEPTH_TEST_SCENE_H 1 #include "align_asset_macro.h" #define ddepth_test_sceneCollisionHeader_0002D4 "__OTR__scenes/nonmq/depth_test_scene/depth_test_sceneCollisionHeader_0002D4" -static const ALIGN_ASSET(2) char depth_test_sceneCollisionHeader_0002D4[] = ddepth_test_sceneCollisionHeader_0002D4; \ No newline at end of file +static const ALIGN_ASSET(2) char depth_test_sceneCollisionHeader_0002D4[] = ddepth_test_sceneCollisionHeader_0002D4; + + +#endif // TEST_LEVELS_DEPTH_TEST_SCENE_H diff --git a/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h b/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h index 2d78fa14e..fac20a13e 100644 --- a/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h +++ b/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_SASATEST_ROOM_0_H +#define TEST_LEVELS_SASATEST_ROOM_0_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char sasatest_room_0Set_000310DL_001580[] = dsasates static const ALIGN_ASSET(2) char sasatest_room_0Set_0001C0DL_001580[] = dsasatest_room_0Set_0001C0DL_001580; #define dsasatest_room_0Set_000270DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0Set_000270DL_001580" -static const ALIGN_ASSET(2) char sasatest_room_0Set_000270DL_001580[] = dsasatest_room_0Set_000270DL_001580; \ No newline at end of file +static const ALIGN_ASSET(2) char sasatest_room_0Set_000270DL_001580[] = dsasatest_room_0Set_000270DL_001580; + + +#endif // TEST_LEVELS_SASATEST_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h b/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h index 9a07ea37b..648614986 100644 --- a/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h +++ b/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_SASATEST_SCENE_H +#define TEST_LEVELS_SASATEST_SCENE_H 1 #include "align_asset_macro.h" @@ -9,4 +10,7 @@ static const ALIGN_ASSET(2) char sasatest_sceneCollisionHeader_002838[] = dsasat #define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838" -#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838" \ No newline at end of file +#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838" + + +#endif // TEST_LEVELS_SASATEST_SCENE_H diff --git a/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h b/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h index 840cb8197..42788f6c7 100644 --- a/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h +++ b/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_SUTARU_ROOM_0_H +#define TEST_LEVELS_SUTARU_ROOM_0_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char sutaru_room_0Tex_0042F0[] = dsutaru_room_0Tex_0 static const ALIGN_ASSET(2) char sutaru_room_0Tex_0052F0[] = dsutaru_room_0Tex_0052F0; #define dsutaru_room_0Tex_0062F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0062F0" -static const ALIGN_ASSET(2) char sutaru_room_0Tex_0062F0[] = dsutaru_room_0Tex_0062F0; \ No newline at end of file +static const ALIGN_ASSET(2) char sutaru_room_0Tex_0062F0[] = dsutaru_room_0Tex_0062F0; + + +#endif // TEST_LEVELS_SUTARU_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h b/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h index 627e94bbe..115c20517 100644 --- a/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h +++ b/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_SUTARU_SCENE_H +#define TEST_LEVELS_SUTARU_SCENE_H 1 #include "align_asset_macro.h" #define dsutaru_sceneCollisionHeader_000B78 "__OTR__scenes/nonmq/sutaru_scene/sutaru_sceneCollisionHeader_000B78" -static const ALIGN_ASSET(2) char sutaru_sceneCollisionHeader_000B78[] = dsutaru_sceneCollisionHeader_000B78; \ No newline at end of file +static const ALIGN_ASSET(2) char sutaru_sceneCollisionHeader_000B78[] = dsutaru_sceneCollisionHeader_000B78; + + +#endif // TEST_LEVELS_SUTARU_SCENE_H diff --git a/soh/assets/scenes/test_levels/syotes/syotes_room_0.h b/soh/assets/scenes/test_levels/syotes/syotes_room_0.h index c0d92e9bf..daa4c7b91 100644 --- a/soh/assets/scenes/test_levels/syotes/syotes_room_0.h +++ b/soh/assets/scenes/test_levels/syotes/syotes_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_SYOTES_ROOM_0_H +#define TEST_LEVELS_SYOTES_ROOM_0_H 1 #include "align_asset_macro.h" @@ -39,4 +40,7 @@ static const ALIGN_ASSET(2) char syotes_room_0Tex_0051E8[] = dsyotes_room_0Tex_0 static const ALIGN_ASSET(2) char syotes_room_0DL_00BF70[] = dsyotes_room_0DL_00BF70; #define dsyotes_room_0Tex_00BF80 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_00BF80" -static const ALIGN_ASSET(2) char syotes_room_0Tex_00BF80[] = dsyotes_room_0Tex_00BF80; \ No newline at end of file +static const ALIGN_ASSET(2) char syotes_room_0Tex_00BF80[] = dsyotes_room_0Tex_00BF80; + + +#endif // TEST_LEVELS_SYOTES_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/syotes/syotes_scene.h b/soh/assets/scenes/test_levels/syotes/syotes_scene.h index d7a047444..62b5bfa0b 100644 --- a/soh/assets/scenes/test_levels/syotes/syotes_scene.h +++ b/soh/assets/scenes/test_levels/syotes/syotes_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_SYOTES_SCENE_H +#define TEST_LEVELS_SYOTES_SCENE_H 1 #include "align_asset_macro.h" #define dsyotes_sceneCollisionHeader_001BD4 "__OTR__scenes/nonmq/syotes_scene/syotes_sceneCollisionHeader_001BD4" -static const ALIGN_ASSET(2) char syotes_sceneCollisionHeader_001BD4[] = dsyotes_sceneCollisionHeader_001BD4; \ No newline at end of file +static const ALIGN_ASSET(2) char syotes_sceneCollisionHeader_001BD4[] = dsyotes_sceneCollisionHeader_001BD4; + + +#endif // TEST_LEVELS_SYOTES_SCENE_H diff --git a/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h b/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h index a58aaebd9..3c908c82a 100644 --- a/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h +++ b/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_SYOTES2_ROOM_0_H +#define TEST_LEVELS_SYOTES2_ROOM_0_H 1 #include "align_asset_macro.h" @@ -24,4 +25,7 @@ static const ALIGN_ASSET(2) char syotes2_room_0Tex_0066F8[] = dsyotes2_room_0Tex static const ALIGN_ASSET(2) char syotes2_room_0Tex_0046F8[] = dsyotes2_room_0Tex_0046F8; #define dsyotes2_room_0Tex_007EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_007EF8" -static const ALIGN_ASSET(2) char syotes2_room_0Tex_007EF8[] = dsyotes2_room_0Tex_007EF8; \ No newline at end of file +static const ALIGN_ASSET(2) char syotes2_room_0Tex_007EF8[] = dsyotes2_room_0Tex_007EF8; + + +#endif // TEST_LEVELS_SYOTES2_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h b/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h index b212419ca..99da67035 100644 --- a/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h +++ b/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_SYOTES2_SCENE_H +#define TEST_LEVELS_SYOTES2_SCENE_H 1 #include "align_asset_macro.h" #define dsyotes2_sceneCollisionHeader_002478 "__OTR__scenes/nonmq/syotes2_scene/syotes2_sceneCollisionHeader_002478" -static const ALIGN_ASSET(2) char syotes2_sceneCollisionHeader_002478[] = dsyotes2_sceneCollisionHeader_002478; \ No newline at end of file +static const ALIGN_ASSET(2) char syotes2_sceneCollisionHeader_002478[] = dsyotes2_sceneCollisionHeader_002478; + + +#endif // TEST_LEVELS_SYOTES2_SCENE_H diff --git a/soh/assets/scenes/test_levels/test01/test01_room_0.h b/soh/assets/scenes/test_levels/test01/test01_room_0.h index a03c5d526..14eeda7a2 100644 --- a/soh/assets/scenes/test_levels/test01/test01_room_0.h +++ b/soh/assets/scenes/test_levels/test01/test01_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_TEST01_ROOM_0_H +#define TEST_LEVELS_TEST01_ROOM_0_H 1 #include "align_asset_macro.h" @@ -21,4 +22,7 @@ static const ALIGN_ASSET(2) char test01_room_0Tex_006490[] = dtest01_room_0Tex_0 static const ALIGN_ASSET(2) char test01_room_0DL_0090D8[] = dtest01_room_0DL_0090D8; #define dtest01_room_0Tex_0090E8 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_0090E8" -static const ALIGN_ASSET(2) char test01_room_0Tex_0090E8[] = dtest01_room_0Tex_0090E8; \ No newline at end of file +static const ALIGN_ASSET(2) char test01_room_0Tex_0090E8[] = dtest01_room_0Tex_0090E8; + + +#endif // TEST_LEVELS_TEST01_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/test01/test01_scene.h b/soh/assets/scenes/test_levels/test01/test01_scene.h index d56b864ae..a194ec16d 100644 --- a/soh/assets/scenes/test_levels/test01/test01_scene.h +++ b/soh/assets/scenes/test_levels/test01/test01_scene.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_TEST01_SCENE_H +#define TEST_LEVELS_TEST01_SCENE_H 1 #include "align_asset_macro.h" #define dtest01_sceneCollisionHeader_003DEC "__OTR__scenes/nonmq/test01_scene/test01_sceneCollisionHeader_003DEC" -static const ALIGN_ASSET(2) char test01_sceneCollisionHeader_003DEC[] = dtest01_sceneCollisionHeader_003DEC; \ No newline at end of file +static const ALIGN_ASSET(2) char test01_sceneCollisionHeader_003DEC[] = dtest01_sceneCollisionHeader_003DEC; + + +#endif // TEST_LEVELS_TEST01_SCENE_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_0.h b/soh/assets/scenes/test_levels/testroom/testroom_room_0.h index 01a7621f2..4854ac076 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_0.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_TESTROOM_ROOM_0_H +#define TEST_LEVELS_TESTROOM_ROOM_0_H 1 #include "align_asset_macro.h" @@ -18,4 +19,7 @@ static const ALIGN_ASSET(2) char testroom_room_0Tex_002600[] = dtestroom_room_0T static const ALIGN_ASSET(2) char testroom_room_0Tex_002E00[] = dtestroom_room_0Tex_002E00; #define dtestroom_room_0Tex_003E00 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_003E00" -static const ALIGN_ASSET(2) char testroom_room_0Tex_003E00[] = dtestroom_room_0Tex_003E00; \ No newline at end of file +static const ALIGN_ASSET(2) char testroom_room_0Tex_003E00[] = dtestroom_room_0Tex_003E00; + + +#endif // TEST_LEVELS_TESTROOM_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_1.h b/soh/assets/scenes/test_levels/testroom/testroom_room_1.h index 533377fdc..94efd01c2 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_1.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_TESTROOM_ROOM_1_H +#define TEST_LEVELS_TESTROOM_ROOM_1_H 1 #include "align_asset_macro.h" @@ -12,4 +13,7 @@ static const ALIGN_ASSET(2) char testroom_room_1Tex_000BE8[] = dtestroom_room_1T static const ALIGN_ASSET(2) char testroom_room_1Tex_0013E8[] = dtestroom_room_1Tex_0013E8; #define dtestroom_room_1Tex_001BE8 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1Tex_001BE8" -static const ALIGN_ASSET(2) char testroom_room_1Tex_001BE8[] = dtestroom_room_1Tex_001BE8; \ No newline at end of file +static const ALIGN_ASSET(2) char testroom_room_1Tex_001BE8[] = dtestroom_room_1Tex_001BE8; + + +#endif // TEST_LEVELS_TESTROOM_ROOM_1_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_2.h b/soh/assets/scenes/test_levels/testroom/testroom_room_2.h index 66c138ca0..22874c780 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_2.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_TESTROOM_ROOM_2_H +#define TEST_LEVELS_TESTROOM_ROOM_2_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char testroom_room_2TLUT_001A58[] = dtestroom_room_2 static const ALIGN_ASSET(2) char testroom_room_2Tex_002278[] = dtestroom_room_2Tex_002278; #define dtestroom_room_2Tex_002A78 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_002A78" -static const ALIGN_ASSET(2) char testroom_room_2Tex_002A78[] = dtestroom_room_2Tex_002A78; \ No newline at end of file +static const ALIGN_ASSET(2) char testroom_room_2Tex_002A78[] = dtestroom_room_2Tex_002A78; + + +#endif // TEST_LEVELS_TESTROOM_ROOM_2_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_3.h b/soh/assets/scenes/test_levels/testroom/testroom_room_3.h index 68a8cbadc..13f748780 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_3.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_TESTROOM_ROOM_3_H +#define TEST_LEVELS_TESTROOM_ROOM_3_H 1 #include "align_asset_macro.h" @@ -15,4 +16,7 @@ static const ALIGN_ASSET(2) char testroom_room_3Tex_001218[] = dtestroom_room_3T static const ALIGN_ASSET(2) char testroom_room_3Tex_002218[] = dtestroom_room_3Tex_002218; #define dtestroom_room_3Tex_003218 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_003218" -static const ALIGN_ASSET(2) char testroom_room_3Tex_003218[] = dtestroom_room_3Tex_003218; \ No newline at end of file +static const ALIGN_ASSET(2) char testroom_room_3Tex_003218[] = dtestroom_room_3Tex_003218; + + +#endif // TEST_LEVELS_TESTROOM_ROOM_3_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_4.h b/soh/assets/scenes/test_levels/testroom/testroom_room_4.h index 3fd2e36cf..55eb7df18 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_4.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_4.h @@ -1,6 +1,10 @@ -#pragma once +#ifndef TEST_LEVELS_TESTROOM_ROOM_4_H +#define TEST_LEVELS_TESTROOM_ROOM_4_H 1 #include "align_asset_macro.h" #define dtestroom_room_4DL_0001F0 "__OTR__scenes/nonmq/testroom_scene/testroom_room_4DL_0001F0" -static const ALIGN_ASSET(2) char testroom_room_4DL_0001F0[] = dtestroom_room_4DL_0001F0; \ No newline at end of file +static const ALIGN_ASSET(2) char testroom_room_4DL_0001F0[] = dtestroom_room_4DL_0001F0; + + +#endif // TEST_LEVELS_TESTROOM_ROOM_4_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_scene.h b/soh/assets/scenes/test_levels/testroom/testroom_scene.h index c771d59f5..4ef8caafd 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_scene.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_scene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEST_LEVELS_TESTROOM_SCENE_H +#define TEST_LEVELS_TESTROOM_SCENE_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char testroom_sceneTex_002200[] = dtestroom_sceneTex static const ALIGN_ASSET(2) char testroom_sceneTex_002A00[] = dtestroom_sceneTex_002A00; #define dtestroom_sceneTex_003A00 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneTex_003A00" -static const ALIGN_ASSET(2) char testroom_sceneTex_003A00[] = dtestroom_sceneTex_003A00; \ No newline at end of file +static const ALIGN_ASSET(2) char testroom_sceneTex_003A00[] = dtestroom_sceneTex_003A00; + +#endif // TEST_LEVELS_TESTROOM_SCENE_H diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 667a9ff1a..b1feac469 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -44,6 +44,10 @@ static const ALIGN_ASSET(2) char gTitleRandomizerSubtitleTex[] = dgTitleRandomiz #define dgTitleBossRushSubtitleTex "__OTR__objects/object_mag/gTitleBossRushSubtitleTex" static const ALIGN_ASSET(2) char gTitleBossRushSubtitleTex[] = dgTitleBossRushSubtitleTex; +// overlays +#define dgOptionsDividerChangeLangVtx "__OTR__overlays/ovl_file_choose/gOptionsDividerChangeLangVtx" +static const ALIGN_ASSET(2) char gOptionsDividerChangeLangVtx[] = dgOptionsDividerChangeLangVtx; + // textures #define dgDPad "__OTR__textures/parameter_static/gDPad" static const ALIGN_ASSET(2) char gDPadTex[] = dgDPad; @@ -78,5 +82,23 @@ static const ALIGN_ASSET(2) char gFileSelBossRushSettingsGERText[] = dgFileSelBo #define dgFileSelRANDButtonTex "__OTR__textures/title_static/gFileSelRANDButtonTex" static const ALIGN_ASSET(2) char gFileSelRANDButtonTex[] = dgFileSelRANDButtonTex; +#define dgFileSelLangEnglishENGTex "__OTR__textures/title_static/gFileSelLangEnglishENGTex" +static const ALIGN_ASSET(2) char gFileSelLangEnglishENGTex[] = dgFileSelLangEnglishENGTex; + +#define dgFileSelLangDeutschGERTex "__OTR__textures/title_static/gFileSelLangDeutschGERTex" +static const ALIGN_ASSET(2) char gFileSelLangDeutschGERTex[] = dgFileSelLangDeutschGERTex; + +#define dgFileSelLangFrancaisFRATex "__OTR__textures/title_static/gFileSelLangFrancaisFRATex" +static const ALIGN_ASSET(2) char gFileSelLangFrancaisFRATex[] = dgFileSelLangFrancaisFRATex; + +#define dgFileSelLanguageENGTex "__OTR__textures/title_static/gFileSelLanguageENGTex" +static const ALIGN_ASSET(2) char gFileSelLanguageENGTex[] = dgFileSelLanguageENGTex; + +#define dgFileSelLanguageFRATex "__OTR__textures/title_static/gFileSelLanguageFRATex" +static const ALIGN_ASSET(2) char gFileSelLanguageFRATex[] = dgFileSelLanguageFRATex; + +#define dgFileSelLanguageGERTex "__OTR__textures/title_static/gFileSelLanguageGERTex" +static const ALIGN_ASSET(2) char gFileSelLanguageGERTex[] = dgFileSelLanguageGERTex; + #define dgEmptyTexture "__OTR__textures/virtual/gEmptyTexture" static const ALIGN_ASSET(2) char gEmptyTexture[] = dgEmptyTexture; diff --git a/soh/assets/textures/backgrounds/vr_ALVR_pal_static.h b/soh/assets/textures/backgrounds/vr_ALVR_pal_static.h index 0bb5132c2..2eb8ff840 100644 --- a/soh/assets/textures/backgrounds/vr_ALVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_ALVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_ALVR_PAL_STATIC_H +#define TEXTURES_VR_ALVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gMarketPotionShopBgTLUT[] = dgMarketPotionShopBgTLUT; #define dgMarketPotionShopBg2TLUT "__OTR__textures/vr_ALVR_pal_static/gMarketPotionShopBg2TLUT" -static const ALIGN_ASSET(2) char gMarketPotionShopBg2TLUT[] = dgMarketPotionShopBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketPotionShopBg2TLUT[] = dgMarketPotionShopBg2TLUT; + +#endif // TEXTURES_VR_ALVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_ALVR_static.h b/soh/assets/textures/backgrounds/vr_ALVR_static.h index 4263dddcd..4fa7e9fa5 100644 --- a/soh/assets/textures/backgrounds/vr_ALVR_static.h +++ b/soh/assets/textures/backgrounds/vr_ALVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_ALVR_STATIC_H +#define TEXTURES_VR_ALVR_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gMarketPotionShopBgTex[] = dgMarketPotionShopBgTex; #define dgMarketPotionShop2BgTex "__OTR__textures/vr_ALVR_static/gMarketPotionShop2BgTex" -static const ALIGN_ASSET(2) char gMarketPotionShop2BgTex[] = dgMarketPotionShop2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketPotionShop2BgTex[] = dgMarketPotionShop2BgTex; + +#endif // TEXTURES_VR_ALVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_DGVR_pal_static.h b/soh/assets/textures/backgrounds/vr_DGVR_pal_static.h index 62d2edada..1446ee708 100644 --- a/soh/assets/textures/backgrounds/vr_DGVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_DGVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_DGVR_PAL_STATIC_H +#define TEXTURES_VR_DGVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gKakPotionShopBgTLUT[] = dgKakPotionShopBgTLUT; #define dgKakPotionShopBg2TLUT "__OTR__textures/vr_DGVR_pal_static/gKakPotionShopBg2TLUT" -static const ALIGN_ASSET(2) char gKakPotionShopBg2TLUT[] = dgKakPotionShopBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gKakPotionShopBg2TLUT[] = dgKakPotionShopBg2TLUT; + +#endif // TEXTURES_VR_DGVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_DGVR_static.h b/soh/assets/textures/backgrounds/vr_DGVR_static.h index 99093826e..fd43e8e8c 100644 --- a/soh/assets/textures/backgrounds/vr_DGVR_static.h +++ b/soh/assets/textures/backgrounds/vr_DGVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_DGVR_STATIC_H +#define TEXTURES_VR_DGVR_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gKakPotionShopBgTex[] = dgKakPotionShopBgTex; #define dgKakPotionShop2BgTex "__OTR__textures/vr_DGVR_static/gKakPotionShop2BgTex" -static const ALIGN_ASSET(2) char gKakPotionShop2BgTex[] = dgKakPotionShop2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKakPotionShop2BgTex[] = dgKakPotionShop2BgTex; + +#endif // TEXTURES_VR_DGVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_FCVR_pal_static.h b/soh/assets/textures/backgrounds/vr_FCVR_pal_static.h index 9b396c4f8..1409e69b5 100644 --- a/soh/assets/textures/backgrounds/vr_FCVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_FCVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_FCVR_PAL_STATIC_H +#define TEXTURES_VR_FCVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gMaskShopBgTLUT[] = dgMaskShopBgTLUT; #define dgMaskShopBg2TLUT "__OTR__textures/vr_FCVR_pal_static/gMaskShopBg2TLUT" -static const ALIGN_ASSET(2) char gMaskShopBg2TLUT[] = dgMaskShopBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gMaskShopBg2TLUT[] = dgMaskShopBg2TLUT; + +#endif // TEXTURES_VR_FCVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_FCVR_static.h b/soh/assets/textures/backgrounds/vr_FCVR_static.h index 149824b24..d1fadd68d 100644 --- a/soh/assets/textures/backgrounds/vr_FCVR_static.h +++ b/soh/assets/textures/backgrounds/vr_FCVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_FCVR_STATIC_H +#define TEXTURES_VR_FCVR_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gMaskShopBgTex[] = dgMaskShopBgTex; #define dgMaskShop2BgTex "__OTR__textures/vr_FCVR_static/gMaskShop2BgTex" -static const ALIGN_ASSET(2) char gMaskShop2BgTex[] = dgMaskShop2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMaskShop2BgTex[] = dgMaskShop2BgTex; + +#endif // TEXTURES_VR_FCVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_GLVR_pal_static.h b/soh/assets/textures/backgrounds/vr_GLVR_pal_static.h index 94dd43eae..ed2592fe6 100644 --- a/soh/assets/textures/backgrounds/vr_GLVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_GLVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_GLVR_PAL_STATIC_H +#define TEXTURES_VR_GLVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGoronShopBgTLUT[] = dgGoronShopBgTLUT; #define dgGoronShopBg2TLUT "__OTR__textures/vr_GLVR_pal_static/gGoronShopBg2TLUT" -static const ALIGN_ASSET(2) char gGoronShopBg2TLUT[] = dgGoronShopBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoronShopBg2TLUT[] = dgGoronShopBg2TLUT; + +#endif // TEXTURES_VR_GLVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_GLVR_static.h b/soh/assets/textures/backgrounds/vr_GLVR_static.h index 0a80a1b10..4b3ccc8e2 100644 --- a/soh/assets/textures/backgrounds/vr_GLVR_static.h +++ b/soh/assets/textures/backgrounds/vr_GLVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_GLVR_STATIC_H +#define TEXTURES_VR_GLVR_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gGoronShopBgTex[] = dgGoronShopBgTex; #define dgGoronShop2BgTex "__OTR__textures/vr_GLVR_static/gGoronShop2BgTex" -static const ALIGN_ASSET(2) char gGoronShop2BgTex[] = dgGoronShop2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoronShop2BgTex[] = dgGoronShop2BgTex; + +#endif // TEXTURES_VR_GLVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_IPVR_pal_static.h b/soh/assets/textures/backgrounds/vr_IPVR_pal_static.h index e9327175b..de15c08b6 100644 --- a/soh/assets/textures/backgrounds/vr_IPVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_IPVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_IPVR_PAL_STATIC_H +#define TEXTURES_VR_IPVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gRichardsHouseBg2TLUT[] = dgRichardsHouseBg2TLU static const ALIGN_ASSET(2) char gRichardsHouseBg3TLUT[] = dgRichardsHouseBg3TLUT; #define dgRichardsHouseBg4TLUT "__OTR__textures/vr_IPVR_pal_static/gRichardsHouseBg4TLUT" -static const ALIGN_ASSET(2) char gRichardsHouseBg4TLUT[] = dgRichardsHouseBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gRichardsHouseBg4TLUT[] = dgRichardsHouseBg4TLUT; + +#endif // TEXTURES_VR_IPVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_IPVR_static.h b/soh/assets/textures/backgrounds/vr_IPVR_static.h index 789994592..4118f5586 100644 --- a/soh/assets/textures/backgrounds/vr_IPVR_static.h +++ b/soh/assets/textures/backgrounds/vr_IPVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_IPVR_STATIC_H +#define TEXTURES_VR_IPVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gRichardsHouse2BgTex[] = dgRichardsHouse2BgTex; static const ALIGN_ASSET(2) char gRichardsHouse3BgTex[] = dgRichardsHouse3BgTex; #define dgRichardsHouse4BgTex "__OTR__textures/vr_IPVR_static/gRichardsHouse4BgTex" -static const ALIGN_ASSET(2) char gRichardsHouse4BgTex[] = dgRichardsHouse4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gRichardsHouse4BgTex[] = dgRichardsHouse4BgTex; + +#endif // TEXTURES_VR_IPVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_K3VR_pal_static.h b/soh/assets/textures/backgrounds/vr_K3VR_pal_static.h index 4c79fec8d..c8b58b716 100644 --- a/soh/assets/textures/backgrounds/vr_K3VR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_K3VR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_K3VR_PAL_STATIC_H +#define TEXTURES_VR_K3VR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gHouseOfTwinsBgTLUT[] = dgHouseOfTwinsBgTLUT; static const ALIGN_ASSET(2) char gHouseOfTwinsBg2TLUT[] = dgHouseOfTwinsBg2TLUT; #define dgHouseOfTwinsBg3TLUT "__OTR__textures/vr_K3VR_pal_static/gHouseOfTwinsBg3TLUT" -static const ALIGN_ASSET(2) char gHouseOfTwinsBg3TLUT[] = dgHouseOfTwinsBg3TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gHouseOfTwinsBg3TLUT[] = dgHouseOfTwinsBg3TLUT; + +#endif // TEXTURES_VR_K3VR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_K3VR_static.h b/soh/assets/textures/backgrounds/vr_K3VR_static.h index 9a192ee0f..73c098d90 100644 --- a/soh/assets/textures/backgrounds/vr_K3VR_static.h +++ b/soh/assets/textures/backgrounds/vr_K3VR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_K3VR_STATIC_H +#define TEXTURES_VR_K3VR_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gHouseOfTwinsBgTex[] = dgHouseOfTwinsBgTex; static const ALIGN_ASSET(2) char gHouseOfTwins2BgTex[] = dgHouseOfTwins2BgTex; #define dgHouseOfTwins3BgTex "__OTR__textures/vr_K3VR_static/gHouseOfTwins3BgTex" -static const ALIGN_ASSET(2) char gHouseOfTwins3BgTex[] = dgHouseOfTwins3BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHouseOfTwins3BgTex[] = dgHouseOfTwins3BgTex; + +#endif // TEXTURES_VR_K3VR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_K4VR_pal_static.h b/soh/assets/textures/backgrounds/vr_K4VR_pal_static.h index bfe5be5a1..8e83042b7 100644 --- a/soh/assets/textures/backgrounds/vr_K4VR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_K4VR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_K4VR_PAL_STATIC_H +#define TEXTURES_VR_K4VR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gMidosHouseBgTLUT[] = dgMidosHouseBgTLUT; static const ALIGN_ASSET(2) char gMidosHouseBg2TLUT[] = dgMidosHouseBg2TLUT; #define dgMidosHouseBg3TLUT "__OTR__textures/vr_K4VR_pal_static/gMidosHouseBg3TLUT" -static const ALIGN_ASSET(2) char gMidosHouseBg3TLUT[] = dgMidosHouseBg3TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gMidosHouseBg3TLUT[] = dgMidosHouseBg3TLUT; + +#endif // TEXTURES_VR_K4VR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_K4VR_static.h b/soh/assets/textures/backgrounds/vr_K4VR_static.h index 63cebc44b..42e4cde85 100644 --- a/soh/assets/textures/backgrounds/vr_K4VR_static.h +++ b/soh/assets/textures/backgrounds/vr_K4VR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_K4VR_STATIC_H +#define TEXTURES_VR_K4VR_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gMidosHouseBgTex[] = dgMidosHouseBgTex; static const ALIGN_ASSET(2) char gMidosHouse2BgTex[] = dgMidosHouse2BgTex; #define dgMidosHouse3BgTex "__OTR__textures/vr_K4VR_static/gMidosHouse3BgTex" -static const ALIGN_ASSET(2) char gMidosHouse3BgTex[] = dgMidosHouse3BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMidosHouse3BgTex[] = dgMidosHouse3BgTex; + +#endif // TEXTURES_VR_K4VR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_K5VR_pal_static.h b/soh/assets/textures/backgrounds/vr_K5VR_pal_static.h index d4b0ad416..61e7c0e14 100644 --- a/soh/assets/textures/backgrounds/vr_K5VR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_K5VR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_K5VR_PAL_STATIC_H +#define TEXTURES_VR_K5VR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gSariasHouseBgTLUT[] = dgSariasHouseBgTLUT; static const ALIGN_ASSET(2) char gSariasHouseBg2TLUT[] = dgSariasHouseBg2TLUT; #define dgSariasHouseBg3TLUT "__OTR__textures/vr_K5VR_pal_static/gSariasHouseBg3TLUT" -static const ALIGN_ASSET(2) char gSariasHouseBg3TLUT[] = dgSariasHouseBg3TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gSariasHouseBg3TLUT[] = dgSariasHouseBg3TLUT; + +#endif // TEXTURES_VR_K5VR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_K5VR_static.h b/soh/assets/textures/backgrounds/vr_K5VR_static.h index 92553200a..2ba942837 100644 --- a/soh/assets/textures/backgrounds/vr_K5VR_static.h +++ b/soh/assets/textures/backgrounds/vr_K5VR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_K5VR_STATIC_H +#define TEXTURES_VR_K5VR_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gSariasHouseBgTex[] = dgSariasHouseBgTex; static const ALIGN_ASSET(2) char gSariasHouse2BgTex[] = dgSariasHouse2BgTex; #define dgSariasHouse3BgTex "__OTR__textures/vr_K5VR_static/gSariasHouse3BgTex" -static const ALIGN_ASSET(2) char gSariasHouse3BgTex[] = dgSariasHouse3BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSariasHouse3BgTex[] = dgSariasHouse3BgTex; + +#endif // TEXTURES_VR_K5VR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KHVR_pal_static.h b/soh/assets/textures/backgrounds/vr_KHVR_pal_static.h index 5f7891db3..bd9d7e3a2 100644 --- a/soh/assets/textures/backgrounds/vr_KHVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_KHVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KHVR_PAL_STATIC_H +#define TEXTURES_VR_KHVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gKnowItAllBrosHouseBg2TLUT[] = dgKnowItAllBrosH static const ALIGN_ASSET(2) char gKnowItAllBrosHouseBg3TLUT[] = dgKnowItAllBrosHouseBg3TLUT; #define dgKnowItAllBrosHouseBg4TLUT "__OTR__textures/vr_KHVR_pal_static/gKnowItAllBrosHouseBg4TLUT" -static const ALIGN_ASSET(2) char gKnowItAllBrosHouseBg4TLUT[] = dgKnowItAllBrosHouseBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gKnowItAllBrosHouseBg4TLUT[] = dgKnowItAllBrosHouseBg4TLUT; + +#endif // TEXTURES_VR_KHVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KHVR_static.h b/soh/assets/textures/backgrounds/vr_KHVR_static.h index 92e48a1d0..d14f03ff4 100644 --- a/soh/assets/textures/backgrounds/vr_KHVR_static.h +++ b/soh/assets/textures/backgrounds/vr_KHVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KHVR_STATIC_H +#define TEXTURES_VR_KHVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gKnowItAllBrosHouse2BgTex[] = dgKnowItAllBrosHo static const ALIGN_ASSET(2) char gKnowItAllBrosHouse3BgTex[] = dgKnowItAllBrosHouse3BgTex; #define dgKnowItAllBrosHouse4BgTex "__OTR__textures/vr_KHVR_static/gKnowItAllBrosHouse4BgTex" -static const ALIGN_ASSET(2) char gKnowItAllBrosHouse4BgTex[] = dgKnowItAllBrosHouse4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKnowItAllBrosHouse4BgTex[] = dgKnowItAllBrosHouse4BgTex; + +#endif // TEXTURES_VR_KHVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KKRVR_pal_static.h b/soh/assets/textures/backgrounds/vr_KKRVR_pal_static.h index e49e11123..6d503cce1 100644 --- a/soh/assets/textures/backgrounds/vr_KKRVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_KKRVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KKRVR_PAL_STATIC_H +#define TEXTURES_VR_KKRVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gCarpentersHouseBg2TLUT[] = dgCarpentersHouseBg static const ALIGN_ASSET(2) char gCarpentersHouseBg3TLUT[] = dgCarpentersHouseBg3TLUT; #define dgCarpentersHouseBg4TLUT "__OTR__textures/vr_KKRVR_pal_static/gCarpentersHouseBg4TLUT" -static const ALIGN_ASSET(2) char gCarpentersHouseBg4TLUT[] = dgCarpentersHouseBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gCarpentersHouseBg4TLUT[] = dgCarpentersHouseBg4TLUT; + +#endif // TEXTURES_VR_KKRVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KKRVR_static.h b/soh/assets/textures/backgrounds/vr_KKRVR_static.h index e328bba6d..4d93a1eaa 100644 --- a/soh/assets/textures/backgrounds/vr_KKRVR_static.h +++ b/soh/assets/textures/backgrounds/vr_KKRVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KKRVR_STATIC_H +#define TEXTURES_VR_KKRVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gCarpentersHouse2BgTex[] = dgCarpentersHouse2Bg static const ALIGN_ASSET(2) char gCarpentersHouse3BgTex[] = dgCarpentersHouse3BgTex; #define dgCarpentersHouse4BgTex "__OTR__textures/vr_KKRVR_static/gCarpentersHouse4BgTex" -static const ALIGN_ASSET(2) char gCarpentersHouse4BgTex[] = dgCarpentersHouse4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCarpentersHouse4BgTex[] = dgCarpentersHouse4BgTex; + +#endif // TEXTURES_VR_KKRVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KR3VR_pal_static.h b/soh/assets/textures/backgrounds/vr_KR3VR_pal_static.h index af8b6ad06..4a1592cf4 100644 --- a/soh/assets/textures/backgrounds/vr_KR3VR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_KR3VR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KR3VR_PAL_STATIC_H +#define TEXTURES_VR_KR3VR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBackAlleyHouseBgTLUT[] = dgBackAlleyHouseBgTLU static const ALIGN_ASSET(2) char gBackAlleyHouseBg2TLUT[] = dgBackAlleyHouseBg2TLUT; #define dgBackAlleyHouseBg3TLUT "__OTR__textures/vr_KR3VR_pal_static/gBackAlleyHouseBg3TLUT" -static const ALIGN_ASSET(2) char gBackAlleyHouseBg3TLUT[] = dgBackAlleyHouseBg3TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gBackAlleyHouseBg3TLUT[] = dgBackAlleyHouseBg3TLUT; + +#endif // TEXTURES_VR_KR3VR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KR3VR_static.h b/soh/assets/textures/backgrounds/vr_KR3VR_static.h index 709767d94..fd61105cd 100644 --- a/soh/assets/textures/backgrounds/vr_KR3VR_static.h +++ b/soh/assets/textures/backgrounds/vr_KR3VR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KR3VR_STATIC_H +#define TEXTURES_VR_KR3VR_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBackAlleyHouseBgTex[] = dgBackAlleyHouseBgTex; static const ALIGN_ASSET(2) char gBackAlleyHouse2BgTex[] = dgBackAlleyHouse2BgTex; #define dgBackAlleyHouse3BgTex "__OTR__textures/vr_KR3VR_static/gBackAlleyHouse3BgTex" -static const ALIGN_ASSET(2) char gBackAlleyHouse3BgTex[] = dgBackAlleyHouse3BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBackAlleyHouse3BgTex[] = dgBackAlleyHouse3BgTex; + +#endif // TEXTURES_VR_KR3VR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KSVR_pal_static.h b/soh/assets/textures/backgrounds/vr_KSVR_pal_static.h index 0f9dfe5b8..1ec222eca 100644 --- a/soh/assets/textures/backgrounds/vr_KSVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_KSVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KSVR_PAL_STATIC_H +#define TEXTURES_VR_KSVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gKokiriShopBgTLUT[] = dgKokiriShopBgTLUT; #define dgKokiriShopBg2TLUT "__OTR__textures/vr_KSVR_pal_static/gKokiriShopBg2TLUT" -static const ALIGN_ASSET(2) char gKokiriShopBg2TLUT[] = dgKokiriShopBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gKokiriShopBg2TLUT[] = dgKokiriShopBg2TLUT; + +#endif // TEXTURES_VR_KSVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_KSVR_static.h b/soh/assets/textures/backgrounds/vr_KSVR_static.h index 70c9b3491..b3ff5ec10 100644 --- a/soh/assets/textures/backgrounds/vr_KSVR_static.h +++ b/soh/assets/textures/backgrounds/vr_KSVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_KSVR_STATIC_H +#define TEXTURES_VR_KSVR_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gKokiriShopBgTex[] = dgKokiriShopBgTex; #define dgKokiriShop2BgTex "__OTR__textures/vr_KSVR_static/gKokiriShop2BgTex" -static const ALIGN_ASSET(2) char gKokiriShop2BgTex[] = dgKokiriShop2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKokiriShop2BgTex[] = dgKokiriShop2BgTex; + +#endif // TEXTURES_VR_KSVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_LBVR_pal_static.h b/soh/assets/textures/backgrounds/vr_LBVR_pal_static.h index b2e45053c..34b47aece 100644 --- a/soh/assets/textures/backgrounds/vr_LBVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_LBVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_LBVR_PAL_STATIC_H +#define TEXTURES_VR_LBVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gCowHouseBg2TLUT[] = dgCowHouseBg2TLUT; static const ALIGN_ASSET(2) char gCowHouseBg3TLUT[] = dgCowHouseBg3TLUT; #define dgCowHouseBg4TLUT "__OTR__textures/vr_LBVR_pal_static/gCowHouseBg4TLUT" -static const ALIGN_ASSET(2) char gCowHouseBg4TLUT[] = dgCowHouseBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gCowHouseBg4TLUT[] = dgCowHouseBg4TLUT; + +#endif // TEXTURES_VR_LBVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_LBVR_static.h b/soh/assets/textures/backgrounds/vr_LBVR_static.h index c5643c57e..52d087c82 100644 --- a/soh/assets/textures/backgrounds/vr_LBVR_static.h +++ b/soh/assets/textures/backgrounds/vr_LBVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_LBVR_STATIC_H +#define TEXTURES_VR_LBVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gCowHouse2BgTex[] = dgCowHouse2BgTex; static const ALIGN_ASSET(2) char gCowHouse3BgTex[] = dgCowHouse3BgTex; #define dgCowHouse4BgTex "__OTR__textures/vr_LBVR_static/gCowHouse4BgTex" -static const ALIGN_ASSET(2) char gCowHouse4BgTex[] = dgCowHouse4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCowHouse4BgTex[] = dgCowHouse4BgTex; + +#endif // TEXTURES_VR_LBVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_LHVR_pal_static.h b/soh/assets/textures/backgrounds/vr_LHVR_pal_static.h index 0e07a37b2..2b47bafd6 100644 --- a/soh/assets/textures/backgrounds/vr_LHVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_LHVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_LHVR_PAL_STATIC_H +#define TEXTURES_VR_LHVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gLinksHouseBg2TLUT[] = dgLinksHouseBg2TLUT; static const ALIGN_ASSET(2) char gLinksHouseBg3TLUT[] = dgLinksHouseBg3TLUT; #define dgLinksHouseBg4TLUT "__OTR__textures/vr_LHVR_pal_static/gLinksHouseBg4TLUT" -static const ALIGN_ASSET(2) char gLinksHouseBg4TLUT[] = dgLinksHouseBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gLinksHouseBg4TLUT[] = dgLinksHouseBg4TLUT; + +#endif // TEXTURES_VR_LHVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_LHVR_static.h b/soh/assets/textures/backgrounds/vr_LHVR_static.h index 2f576fae2..407b0c886 100644 --- a/soh/assets/textures/backgrounds/vr_LHVR_static.h +++ b/soh/assets/textures/backgrounds/vr_LHVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_LHVR_STATIC_H +#define TEXTURES_VR_LHVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gLinksHouse2BgTex[] = dgLinksHouse2BgTex; static const ALIGN_ASSET(2) char gLinksHouse3BgTex[] = dgLinksHouse3BgTex; #define dgLinksHouse4BgTex "__OTR__textures/vr_LHVR_static/gLinksHouse4BgTex" -static const ALIGN_ASSET(2) char gLinksHouse4BgTex[] = dgLinksHouse4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLinksHouse4BgTex[] = dgLinksHouse4BgTex; + +#endif // TEXTURES_VR_LHVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_MDVR_pal_static.h b/soh/assets/textures/backgrounds/vr_MDVR_pal_static.h index fa65a7bd8..e78c1d78c 100644 --- a/soh/assets/textures/backgrounds/vr_MDVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_MDVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_MDVR_PAL_STATIC_H +#define TEXTURES_VR_MDVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gMarketDayBg2TLUT[] = dgMarketDayBg2TLUT; static const ALIGN_ASSET(2) char gMarketDayBg3TLUT[] = dgMarketDayBg3TLUT; #define dgMarketDayBg4TLUT "__OTR__textures/vr_MDVR_pal_static/gMarketDayBg4TLUT" -static const ALIGN_ASSET(2) char gMarketDayBg4TLUT[] = dgMarketDayBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketDayBg4TLUT[] = dgMarketDayBg4TLUT; + +#endif // TEXTURES_VR_MDVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_MDVR_static.h b/soh/assets/textures/backgrounds/vr_MDVR_static.h index e8a5431ae..af6b7f25d 100644 --- a/soh/assets/textures/backgrounds/vr_MDVR_static.h +++ b/soh/assets/textures/backgrounds/vr_MDVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_MDVR_STATIC_H +#define TEXTURES_VR_MDVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gMarketDay2BgTex[] = dgMarketDay2BgTex; static const ALIGN_ASSET(2) char gMarketDay3BgTex[] = dgMarketDay3BgTex; #define dgMarketDay4BgTex "__OTR__textures/vr_MDVR_static/gMarketDay4BgTex" -static const ALIGN_ASSET(2) char gMarketDay4BgTex[] = dgMarketDay4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketDay4BgTex[] = dgMarketDay4BgTex; + +#endif // TEXTURES_VR_MDVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_MLVR_pal_static.h b/soh/assets/textures/backgrounds/vr_MLVR_pal_static.h index 4a4d8a43e..efe8591b5 100644 --- a/soh/assets/textures/backgrounds/vr_MLVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_MLVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_MLVR_PAL_STATIC_H +#define TEXTURES_VR_MLVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gStableBg2TLUT[] = dgStableBg2TLUT; static const ALIGN_ASSET(2) char gStableBg3TLUT[] = dgStableBg3TLUT; #define dgStableBg4TLUT "__OTR__textures/vr_MLVR_pal_static/gStableBg4TLUT" -static const ALIGN_ASSET(2) char gStableBg4TLUT[] = dgStableBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gStableBg4TLUT[] = dgStableBg4TLUT; + +#endif // TEXTURES_VR_MLVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_MLVR_static.h b/soh/assets/textures/backgrounds/vr_MLVR_static.h index 2e401c749..24dea7442 100644 --- a/soh/assets/textures/backgrounds/vr_MLVR_static.h +++ b/soh/assets/textures/backgrounds/vr_MLVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_MLVR_STATIC_H +#define TEXTURES_VR_MLVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gStable2BgTex[] = dgStable2BgTex; static const ALIGN_ASSET(2) char gStable3BgTex[] = dgStable3BgTex; #define dgStable4BgTex "__OTR__textures/vr_MLVR_static/gStable4BgTex" -static const ALIGN_ASSET(2) char gStable4BgTex[] = dgStable4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gStable4BgTex[] = dgStable4BgTex; + +#endif // TEXTURES_VR_MLVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_MNVR_pal_static.h b/soh/assets/textures/backgrounds/vr_MNVR_pal_static.h index 297b5fa35..1d5f06e39 100644 --- a/soh/assets/textures/backgrounds/vr_MNVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_MNVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_MNVR_PAL_STATIC_H +#define TEXTURES_VR_MNVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gMarketNightBg2TLUT[] = dgMarketNightBg2TLUT; static const ALIGN_ASSET(2) char gMarketNightBg3TLUT[] = dgMarketNightBg3TLUT; #define dgMarketNightBg4TLUT "__OTR__textures/vr_MNVR_pal_static/gMarketNightBg4TLUT" -static const ALIGN_ASSET(2) char gMarketNightBg4TLUT[] = dgMarketNightBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketNightBg4TLUT[] = dgMarketNightBg4TLUT; + +#endif // TEXTURES_VR_MNVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_MNVR_static.h b/soh/assets/textures/backgrounds/vr_MNVR_static.h index aabf8345c..82b9ad383 100644 --- a/soh/assets/textures/backgrounds/vr_MNVR_static.h +++ b/soh/assets/textures/backgrounds/vr_MNVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_MNVR_STATIC_H +#define TEXTURES_VR_MNVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gMarketNight2BgTex[] = dgMarketNight2BgTex; static const ALIGN_ASSET(2) char gMarketNight3BgTex[] = dgMarketNight3BgTex; #define dgMarketNight4BgTex "__OTR__textures/vr_MNVR_static/gMarketNight4BgTex" -static const ALIGN_ASSET(2) char gMarketNight4BgTex[] = dgMarketNight4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketNight4BgTex[] = dgMarketNight4BgTex; + +#endif // TEXTURES_VR_MNVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_NSVR_pal_static.h b/soh/assets/textures/backgrounds/vr_NSVR_pal_static.h index ba9217949..7339cc8c1 100644 --- a/soh/assets/textures/backgrounds/vr_NSVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_NSVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_NSVR_PAL_STATIC_H +#define TEXTURES_VR_NSVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gBombchuShopBgTLUT[] = dgBombchuShopBgTLUT; #define dgBombchuShopBg2TLUT "__OTR__textures/vr_NSVR_pal_static/gBombchuShopBg2TLUT" -static const ALIGN_ASSET(2) char gBombchuShopBg2TLUT[] = dgBombchuShopBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gBombchuShopBg2TLUT[] = dgBombchuShopBg2TLUT; + +#endif // TEXTURES_VR_NSVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_NSVR_static.h b/soh/assets/textures/backgrounds/vr_NSVR_static.h index 601ba7660..af68a05f5 100644 --- a/soh/assets/textures/backgrounds/vr_NSVR_static.h +++ b/soh/assets/textures/backgrounds/vr_NSVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_NSVR_STATIC_H +#define TEXTURES_VR_NSVR_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gBombchuShopBgTex[] = dgBombchuShopBgTex; #define dgBombchuShop2BgTex "__OTR__textures/vr_NSVR_static/gBombchuShop2BgTex" -static const ALIGN_ASSET(2) char gBombchuShop2BgTex[] = dgBombchuShop2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBombchuShop2BgTex[] = dgBombchuShop2BgTex; + +#endif // TEXTURES_VR_NSVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_RUVR_pal_static.h b/soh/assets/textures/backgrounds/vr_RUVR_pal_static.h index a989bbbb7..c4eb52d47 100644 --- a/soh/assets/textures/backgrounds/vr_RUVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_RUVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_RUVR_PAL_STATIC_H +#define TEXTURES_VR_RUVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gMarketRuinsBg2TLUT[] = dgMarketRuinsBg2TLUT; static const ALIGN_ASSET(2) char gMarketRuinsBg3TLUT[] = dgMarketRuinsBg3TLUT; #define dgMarketRuinsBg4TLUT "__OTR__textures/vr_RUVR_pal_static/gMarketRuinsBg4TLUT" -static const ALIGN_ASSET(2) char gMarketRuinsBg4TLUT[] = dgMarketRuinsBg4TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketRuinsBg4TLUT[] = dgMarketRuinsBg4TLUT; + +#endif // TEXTURES_VR_RUVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_RUVR_static.h b/soh/assets/textures/backgrounds/vr_RUVR_static.h index 349f39eab..414db8e6f 100644 --- a/soh/assets/textures/backgrounds/vr_RUVR_static.h +++ b/soh/assets/textures/backgrounds/vr_RUVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_RUVR_STATIC_H +#define TEXTURES_VR_RUVR_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char gMarketRuins2BgTex[] = dgMarketRuins2BgTex; static const ALIGN_ASSET(2) char gMarketRuins3BgTex[] = dgMarketRuins3BgTex; #define dgMarketRuins4BgTex "__OTR__textures/vr_RUVR_static/gMarketRuins4BgTex" -static const ALIGN_ASSET(2) char gMarketRuins4BgTex[] = dgMarketRuins4BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketRuins4BgTex[] = dgMarketRuins4BgTex; + +#endif // TEXTURES_VR_RUVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_SP1a_pal_static.h b/soh/assets/textures/backgrounds/vr_SP1a_pal_static.h index 6ea699a61..5a7f6f376 100644 --- a/soh/assets/textures/backgrounds/vr_SP1a_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_SP1a_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_SP1A_PAL_STATIC_H +#define TEXTURES_VR_SP1A_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gBazaarBgTLUT[] = dgBazaarBgTLUT; #define dgBazaarBg2TLUT "__OTR__textures/vr_SP1a_pal_static/gBazaarBg2TLUT" -static const ALIGN_ASSET(2) char gBazaarBg2TLUT[] = dgBazaarBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gBazaarBg2TLUT[] = dgBazaarBg2TLUT; + +#endif // TEXTURES_VR_SP1A_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_SP1a_static.h b/soh/assets/textures/backgrounds/vr_SP1a_static.h index 0906d39d3..74d5c2b96 100644 --- a/soh/assets/textures/backgrounds/vr_SP1a_static.h +++ b/soh/assets/textures/backgrounds/vr_SP1a_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_SP1A_STATIC_H +#define TEXTURES_VR_SP1A_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gBazaarBgTex[] = dgBazaarBgTex; #define dgBazaar2BgTex "__OTR__textures/vr_SP1a_static/gBazaar2BgTex" -static const ALIGN_ASSET(2) char gBazaar2BgTex[] = dgBazaar2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBazaar2BgTex[] = dgBazaar2BgTex; + +#endif // TEXTURES_VR_SP1A_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_TTVR_pal_static.h b/soh/assets/textures/backgrounds/vr_TTVR_pal_static.h index 91526ccf3..5ebf53f4b 100644 --- a/soh/assets/textures/backgrounds/vr_TTVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_TTVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_TTVR_PAL_STATIC_H +#define TEXTURES_VR_TTVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gCarpentersTentBgTLUT[] = dgCarpentersTentBgTLU static const ALIGN_ASSET(2) char gCarpentersTentBg2TLUT[] = dgCarpentersTentBg2TLUT; #define dgCarpentersTentBg3TLUT "__OTR__textures/vr_TTVR_pal_static/gCarpentersTentBg3TLUT" -static const ALIGN_ASSET(2) char gCarpentersTentBg3TLUT[] = dgCarpentersTentBg3TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gCarpentersTentBg3TLUT[] = dgCarpentersTentBg3TLUT; + +#endif // TEXTURES_VR_TTVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_TTVR_static.h b/soh/assets/textures/backgrounds/vr_TTVR_static.h index 50a90e814..bbd78a20d 100644 --- a/soh/assets/textures/backgrounds/vr_TTVR_static.h +++ b/soh/assets/textures/backgrounds/vr_TTVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_TTVR_STATIC_H +#define TEXTURES_VR_TTVR_STATIC_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gCarpentersTentBgTex[] = dgCarpentersTentBgTex; static const ALIGN_ASSET(2) char gCarpentersTent2BgTex[] = dgCarpentersTent2BgTex; #define dgCarpentersTent3BgTex "__OTR__textures/vr_TTVR_static/gCarpentersTent3BgTex" -static const ALIGN_ASSET(2) char gCarpentersTent3BgTex[] = dgCarpentersTent3BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCarpentersTent3BgTex[] = dgCarpentersTent3BgTex; + +#endif // TEXTURES_VR_TTVR_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_ZRVR_pal_static.h b/soh/assets/textures/backgrounds/vr_ZRVR_pal_static.h index 97eace20a..4dddc2b74 100644 --- a/soh/assets/textures/backgrounds/vr_ZRVR_pal_static.h +++ b/soh/assets/textures/backgrounds/vr_ZRVR_pal_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_ZRVR_PAL_STATIC_H +#define TEXTURES_VR_ZRVR_PAL_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gZoraShopBgTLUT[] = dgZoraShopBgTLUT; #define dgZoraShopBg2TLUT "__OTR__textures/vr_ZRVR_pal_static/gZoraShopBg2TLUT" -static const ALIGN_ASSET(2) char gZoraShopBg2TLUT[] = dgZoraShopBg2TLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gZoraShopBg2TLUT[] = dgZoraShopBg2TLUT; + +#endif // TEXTURES_VR_ZRVR_PAL_STATIC_H diff --git a/soh/assets/textures/backgrounds/vr_ZRVR_static.h b/soh/assets/textures/backgrounds/vr_ZRVR_static.h index 2c57f9ab4..d685be970 100644 --- a/soh/assets/textures/backgrounds/vr_ZRVR_static.h +++ b/soh/assets/textures/backgrounds/vr_ZRVR_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_ZRVR_STATIC_H +#define TEXTURES_VR_ZRVR_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gZoraShopBgTex[] = dgZoraShopBgTex; #define dgZoraShop2BgTex "__OTR__textures/vr_ZRVR_static/gZoraShop2BgTex" -static const ALIGN_ASSET(2) char gZoraShop2BgTex[] = dgZoraShop2BgTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gZoraShop2BgTex[] = dgZoraShop2BgTex; + +#endif // TEXTURES_VR_ZRVR_STATIC_H diff --git a/soh/assets/textures/boss_title_cards/object_bv.h b/soh/assets/textures/boss_title_cards/object_bv.h index fcf117dc1..60a4d3074 100644 --- a/soh/assets/textures/boss_title_cards/object_bv.h +++ b/soh/assets/textures/boss_title_cards/object_bv.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_BV_H +#define TEXTURES_OBJECT_BV_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBarinadeTitleCardENGTex[] = dgBarinadeTitleCar static const ALIGN_ASSET(2) char gBarinadeTitleCardGERTex[] = dgBarinadeTitleCardGERTex; #define dgBarinadeTitleCardFRATex "__OTR__textures/object_bv/gBarinadeTitleCardFRATex" -static const ALIGN_ASSET(2) char gBarinadeTitleCardFRATex[] = dgBarinadeTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBarinadeTitleCardFRATex[] = dgBarinadeTitleCardFRATex; + +#endif // TEXTURES_OBJECT_BV_H diff --git a/soh/assets/textures/boss_title_cards/object_fd.h b/soh/assets/textures/boss_title_cards/object_fd.h index af5dcef4b..56d765a86 100644 --- a/soh/assets/textures/boss_title_cards/object_fd.h +++ b/soh/assets/textures/boss_title_cards/object_fd.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_FD_H +#define TEXTURES_OBJECT_FD_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardENGTex[] = dgVolvagiaBoss static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardGERTex[] = dgVolvagiaBossTitleCardGERTex; #define dgVolvagiaBossTitleCardFRATex "__OTR__textures/object_fd/gVolvagiaBossTitleCardFRATex" -static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardFRATex[] = dgVolvagiaBossTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardFRATex[] = dgVolvagiaBossTitleCardFRATex; + +#endif // TEXTURES_OBJECT_FD_H diff --git a/soh/assets/textures/boss_title_cards/object_fhg.h b/soh/assets/textures/boss_title_cards/object_fhg.h index 3ff7e31d5..68d09d083 100644 --- a/soh/assets/textures/boss_title_cards/object_fhg.h +++ b/soh/assets/textures/boss_title_cards/object_fhg.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_FHG_H +#define TEXTURES_OBJECT_FHG_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gPhantomGanonTitleCardENGTex[] = dgPhantomGanon static const ALIGN_ASSET(2) char gPhantomGanonTitleCardGERTex[] = dgPhantomGanonTitleCardGERTex; #define dgPhantomGanonTitleCardFRATex "__OTR__textures/object_fhg/gPhantomGanonTitleCardFRATex" -static const ALIGN_ASSET(2) char gPhantomGanonTitleCardFRATex[] = dgPhantomGanonTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gPhantomGanonTitleCardFRATex[] = dgPhantomGanonTitleCardFRATex; + +#endif // TEXTURES_OBJECT_FHG_H diff --git a/soh/assets/textures/boss_title_cards/object_ganon.h b/soh/assets/textures/boss_title_cards/object_ganon.h index 55ee44622..0b855ac80 100644 --- a/soh/assets/textures/boss_title_cards/object_ganon.h +++ b/soh/assets/textures/boss_title_cards/object_ganon.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_GANON_H +#define TEXTURES_OBJECT_GANON_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGanondorfTitleCardENGTex[] = dgGanondorfTitleC static const ALIGN_ASSET(2) char gGanondorfTitleCardGERTex[] = dgGanondorfTitleCardGERTex; #define dgGanondorfTitleCardFRATex "__OTR__textures/object_ganon/gGanondorfTitleCardFRATex" -static const ALIGN_ASSET(2) char gGanondorfTitleCardFRATex[] = dgGanondorfTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanondorfTitleCardFRATex[] = dgGanondorfTitleCardFRATex; + +#endif // TEXTURES_OBJECT_GANON_H diff --git a/soh/assets/textures/boss_title_cards/object_ganon2.h b/soh/assets/textures/boss_title_cards/object_ganon2.h index 2b9a7277f..d9eb76cc1 100644 --- a/soh/assets/textures/boss_title_cards/object_ganon2.h +++ b/soh/assets/textures/boss_title_cards/object_ganon2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_GANON2_H +#define TEXTURES_OBJECT_GANON2_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGanonTitleCardENGTex[] = dgGanonTitleCardENGTe static const ALIGN_ASSET(2) char gGanonTitleCardGERTex[] = dgGanonTitleCardGERTex; #define dgGanonTitleCardFRATex "__OTR__textures/object_ganon2/gGanonTitleCardFRATex" -static const ALIGN_ASSET(2) char gGanonTitleCardFRATex[] = dgGanonTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanonTitleCardFRATex[] = dgGanonTitleCardFRATex; + +#endif // TEXTURES_OBJECT_GANON2_H diff --git a/soh/assets/textures/boss_title_cards/object_goma.h b/soh/assets/textures/boss_title_cards/object_goma.h index b4aa348a5..96243178b 100644 --- a/soh/assets/textures/boss_title_cards/object_goma.h +++ b/soh/assets/textures/boss_title_cards/object_goma.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_GOMA_H +#define TEXTURES_OBJECT_GOMA_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGohmaTitleCardENGTex[] = dgGohmaTitleCardENGTe static const ALIGN_ASSET(2) char gGohmaTitleCardGERTex[] = dgGohmaTitleCardGERTex; #define dgGohmaTitleCardFRATex "__OTR__textures/object_goma/gGohmaTitleCardFRATex" -static const ALIGN_ASSET(2) char gGohmaTitleCardFRATex[] = dgGohmaTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGohmaTitleCardFRATex[] = dgGohmaTitleCardFRATex; + +#endif // TEXTURES_OBJECT_GOMA_H diff --git a/soh/assets/textures/boss_title_cards/object_kingdodongo.h b/soh/assets/textures/boss_title_cards/object_kingdodongo.h index f911f3467..d03784a28 100644 --- a/soh/assets/textures/boss_title_cards/object_kingdodongo.h +++ b/soh/assets/textures/boss_title_cards/object_kingdodongo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_KINGDODONGO_H +#define TEXTURES_OBJECT_KINGDODONGO_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gKingDodongoTitleCardENGTex[] = dgKingDodongoTi static const ALIGN_ASSET(2) char gKingDodongoTitleCardGERTex[] = dgKingDodongoTitleCardGERTex; #define dgKingDodongoTitleCardFRATex "__OTR__textures/object_kingdodongo/gKingDodongoTitleCardFRATex" -static const ALIGN_ASSET(2) char gKingDodongoTitleCardFRATex[] = dgKingDodongoTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKingDodongoTitleCardFRATex[] = dgKingDodongoTitleCardFRATex; + +#endif // TEXTURES_OBJECT_KINGDODONGO_H diff --git a/soh/assets/textures/boss_title_cards/object_mo.h b/soh/assets/textures/boss_title_cards/object_mo.h index acd0da7d8..1d2d1489a 100644 --- a/soh/assets/textures/boss_title_cards/object_mo.h +++ b/soh/assets/textures/boss_title_cards/object_mo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_MO_H +#define TEXTURES_OBJECT_MO_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gMorphaTitleCardENGTex[] = dgMorphaTitleCardENG static const ALIGN_ASSET(2) char gMorphaTitleCardGERTex[] = dgMorphaTitleCardGERTex; #define dgMorphaTitleCardFRATex "__OTR__textures/object_mo/gMorphaTitleCardFRATex" -static const ALIGN_ASSET(2) char gMorphaTitleCardFRATex[] = dgMorphaTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMorphaTitleCardFRATex[] = dgMorphaTitleCardFRATex; + +#endif // TEXTURES_OBJECT_MO_H diff --git a/soh/assets/textures/boss_title_cards/object_sst.h b/soh/assets/textures/boss_title_cards/object_sst.h index ad6b3e03f..f98670567 100644 --- a/soh/assets/textures/boss_title_cards/object_sst.h +++ b/soh/assets/textures/boss_title_cards/object_sst.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_SST_H +#define TEXTURES_OBJECT_SST_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBongoTitleCardENGTex[] = dgBongoTitleCardENGTe static const ALIGN_ASSET(2) char gBongoTitleCardGERTex[] = dgBongoTitleCardGERTex; #define dgBongoTitleCardFRATex "__OTR__textures/object_sst/gBongoTitleCardFRATex" -static const ALIGN_ASSET(2) char gBongoTitleCardFRATex[] = dgBongoTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBongoTitleCardFRATex[] = dgBongoTitleCardFRATex; + +#endif // TEXTURES_OBJECT_SST_H diff --git a/soh/assets/textures/boss_title_cards/object_tw.h b/soh/assets/textures/boss_title_cards/object_tw.h index 39c070141..d3a4b22fc 100644 --- a/soh/assets/textures/boss_title_cards/object_tw.h +++ b/soh/assets/textures/boss_title_cards/object_tw.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_OBJECT_TW_H +#define TEXTURES_OBJECT_TW_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gTwinrovaTitleCardENGTex[] = dgTwinrovaTitleCar static const ALIGN_ASSET(2) char gTwinrovaTitleCardGERTex[] = dgTwinrovaTitleCardGERTex; #define dgTwinrovaTitleCardFRATex "__OTR__textures/object_tw/gTwinrovaTitleCardFRATex" -static const ALIGN_ASSET(2) char gTwinrovaTitleCardFRATex[] = dgTwinrovaTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gTwinrovaTitleCardFRATex[] = dgTwinrovaTitleCardFRATex; + +#endif // TEXTURES_OBJECT_TW_H diff --git a/soh/assets/textures/do_action_static/do_action_static.h b/soh/assets/textures/do_action_static/do_action_static.h index 49b9b3ca9..9b721d711 100644 --- a/soh/assets/textures/do_action_static/do_action_static.h +++ b/soh/assets/textures/do_action_static/do_action_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_DO_ACTION_STATIC_H +#define TEXTURES_DO_ACTION_STATIC_H 1 #include "align_asset_macro.h" @@ -261,4 +262,6 @@ static const ALIGN_ASSET(2) char gNum6DoActionFRATex[] = dgNum6DoActionFRATex; static const ALIGN_ASSET(2) char gNum7DoActionFRATex[] = dgNum7DoActionFRATex; #define dgNum8DoActionFRATex "__OTR__textures/do_action_static/gNum8DoActionFRATex" -static const ALIGN_ASSET(2) char gNum8DoActionFRATex[] = dgNum8DoActionFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gNum8DoActionFRATex[] = dgNum8DoActionFRATex; + +#endif // TEXTURES_DO_ACTION_STATIC_H diff --git a/soh/assets/textures/icon_item_24_static/icon_item_24_static.h b/soh/assets/textures/icon_item_24_static/icon_item_24_static.h index 5636bd3ea..7ae545eee 100644 --- a/soh/assets/textures/icon_item_24_static/icon_item_24_static.h +++ b/soh/assets/textures/icon_item_24_static/icon_item_24_static.h @@ -1,63 +1,66 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_24_STATIC_H +#define TEXTURES_ICON_ITEM_24_STATIC_H 1 #include "align_asset_macro.h" -#define dgForestMedallionIconTex "__OTR__textures/icon_item_24_static/gForestMedallionIconTex" -static const ALIGN_ASSET(2) char gForestMedallionIconTex[] = dgForestMedallionIconTex; +#define dgQuestIconMedallionForestTex "__OTR__textures/icon_item_24_static/gQuestIconMedallionForestTex" +static const ALIGN_ASSET(2) char gQuestIconMedallionForestTex[] = dgQuestIconMedallionForestTex; -#define dgFireMedallionIconTex "__OTR__textures/icon_item_24_static/gFireMedallionIconTex" -static const ALIGN_ASSET(2) char gFireMedallionIconTex[] = dgFireMedallionIconTex; +#define dgQuestIconMedallionFireTex "__OTR__textures/icon_item_24_static/gQuestIconMedallionFireTex" +static const ALIGN_ASSET(2) char gQuestIconMedallionFireTex[] = dgQuestIconMedallionFireTex; -#define dgWaterMedallionIconTex "__OTR__textures/icon_item_24_static/gWaterMedallionIconTex" -static const ALIGN_ASSET(2) char gWaterMedallionIconTex[] = dgWaterMedallionIconTex; +#define dgQuestIconMedallionWaterTex "__OTR__textures/icon_item_24_static/gQuestIconMedallionWaterTex" +static const ALIGN_ASSET(2) char gQuestIconMedallionWaterTex[] = dgQuestIconMedallionWaterTex; -#define dgSpiritMedallionIconTex "__OTR__textures/icon_item_24_static/gSpiritMedallionIconTex" -static const ALIGN_ASSET(2) char gSpiritMedallionIconTex[] = dgSpiritMedallionIconTex; +#define dgQuestIconMedallionSpiritTex "__OTR__textures/icon_item_24_static/gQuestIconMedallionSpiritTex" +static const ALIGN_ASSET(2) char gQuestIconMedallionSpiritTex[] = dgQuestIconMedallionSpiritTex; -#define dgShadowMedallionIconTex "__OTR__textures/icon_item_24_static/gShadowMedallionIconTex" -static const ALIGN_ASSET(2) char gShadowMedallionIconTex[] = dgShadowMedallionIconTex; +#define dgQuestIconMedallionShadowTex "__OTR__textures/icon_item_24_static/gQuestIconMedallionShadowTex" +static const ALIGN_ASSET(2) char gQuestIconMedallionShadowTex[] = dgQuestIconMedallionShadowTex; -#define dgLightMedallionIconTex "__OTR__textures/icon_item_24_static/gLightMedallionIconTex" -static const ALIGN_ASSET(2) char gLightMedallionIconTex[] = dgLightMedallionIconTex; +#define dgQuestIconMedallionLightTex "__OTR__textures/icon_item_24_static/gQuestIconMedallionLightTex" +static const ALIGN_ASSET(2) char gQuestIconMedallionLightTex[] = dgQuestIconMedallionLightTex; -#define dgKokiriEmeraldIconTex "__OTR__textures/icon_item_24_static/gKokiriEmeraldIconTex" -static const ALIGN_ASSET(2) char gKokiriEmeraldIconTex[] = dgKokiriEmeraldIconTex; +#define dgQuestIconKokiriEmeraldTex "__OTR__textures/icon_item_24_static/gQuestIconKokiriEmeraldTex" +static const ALIGN_ASSET(2) char gQuestIconKokiriEmeraldTex[] = dgQuestIconKokiriEmeraldTex; -#define dgGoronRubyIconTex "__OTR__textures/icon_item_24_static/gGoronRubyIconTex" -static const ALIGN_ASSET(2) char gGoronRubyIconTex[] = dgGoronRubyIconTex; +#define dgQuestIconGoronRubyTex "__OTR__textures/icon_item_24_static/gQuestIconGoronRubyTex" +static const ALIGN_ASSET(2) char gQuestIconGoronRubyTex[] = dgQuestIconGoronRubyTex; -#define dgZoraSapphireIconTex "__OTR__textures/icon_item_24_static/gZoraSapphireIconTex" -static const ALIGN_ASSET(2) char gZoraSapphireIconTex[] = dgZoraSapphireIconTex; +#define dgQuestIconZoraSapphireTex "__OTR__textures/icon_item_24_static/gQuestIconZoraSapphireTex" +static const ALIGN_ASSET(2) char gQuestIconZoraSapphireTex[] = dgQuestIconZoraSapphireTex; -#define dgStoneOfAgonyIconTex "__OTR__textures/icon_item_24_static/gStoneOfAgonyIconTex" -static const ALIGN_ASSET(2) char gStoneOfAgonyIconTex[] = dgStoneOfAgonyIconTex; +#define dgQuestIconStoneOfAgonyTex "__OTR__textures/icon_item_24_static/gQuestIconStoneOfAgonyTex" +static const ALIGN_ASSET(2) char gQuestIconStoneOfAgonyTex[] = dgQuestIconStoneOfAgonyTex; -#define dgGerudosCardIconTex "__OTR__textures/icon_item_24_static/gGerudosCardIconTex" -static const ALIGN_ASSET(2) char gGerudosCardIconTex[] = dgGerudosCardIconTex; +#define dgQuestIconGerudosCardTex "__OTR__textures/icon_item_24_static/gQuestIconGerudosCardTex" +static const ALIGN_ASSET(2) char gQuestIconGerudosCardTex[] = dgQuestIconGerudosCardTex; -#define dgGoldSkulltulaIconTex "__OTR__textures/icon_item_24_static/gGoldSkulltulaIconTex" -static const ALIGN_ASSET(2) char gGoldSkulltulaIconTex[] = dgGoldSkulltulaIconTex; +#define dgQuestIconGoldSkulltulaTex "__OTR__textures/icon_item_24_static/gQuestIconGoldSkulltulaTex" +static const ALIGN_ASSET(2) char gQuestIconGoldSkulltulaTex[] = dgQuestIconGoldSkulltulaTex; -#define dgHeartContainerIconTex "__OTR__textures/icon_item_24_static/gHeartContainerIconTex" -static const ALIGN_ASSET(2) char gHeartContainerIconTex[] = dgHeartContainerIconTex; +#define dgQuestIconHeartContainerTex "__OTR__textures/icon_item_24_static/gQuestIconHeartContainerTex" +static const ALIGN_ASSET(2) char gQuestIconHeartContainerTex[] = dgQuestIconHeartContainerTex; -#define dgUnusedPieceOfHeartIconTex "__OTR__textures/icon_item_24_static/gUnusedPieceOfHeartIconTex" -static const ALIGN_ASSET(2) char gUnusedPieceOfHeartIconTex[] = dgUnusedPieceOfHeartIconTex; +#define dgQuestIconHeartPieceTex "__OTR__textures/icon_item_24_static/gQuestIconHeartPieceTex" +static const ALIGN_ASSET(2) char gQuestIconHeartPieceTex[] = dgQuestIconHeartPieceTex; -#define dgBossKeyIconTex "__OTR__textures/icon_item_24_static/gBossKeyIconTex" -static const ALIGN_ASSET(2) char gBossKeyIconTex[] = dgBossKeyIconTex; +#define dgQuestIconDungeonBossKeyTex "__OTR__textures/icon_item_24_static/gQuestIconDungeonBossKeyTex" +static const ALIGN_ASSET(2) char gQuestIconDungeonBossKeyTex[] = dgQuestIconDungeonBossKeyTex; -#define dgCompassIconTex "__OTR__textures/icon_item_24_static/gCompassIconTex" -static const ALIGN_ASSET(2) char gCompassIconTex[] = dgCompassIconTex; +#define dgQuestIconDungeonCompassTex "__OTR__textures/icon_item_24_static/gQuestIconDungeonCompassTex" +static const ALIGN_ASSET(2) char gQuestIconDungeonCompassTex[] = dgQuestIconDungeonCompassTex; -#define dgDungeonMapIconTex "__OTR__textures/icon_item_24_static/gDungeonMapIconTex" -static const ALIGN_ASSET(2) char gDungeonMapIconTex[] = dgDungeonMapIconTex; +#define dgQuestIconDungeonMapTex "__OTR__textures/icon_item_24_static/gQuestIconDungeonMapTex" +static const ALIGN_ASSET(2) char gQuestIconDungeonMapTex[] = dgQuestIconDungeonMapTex; -#define dgSmallKeyIconTex "__OTR__textures/icon_item_24_static/gSmallKeyIconTex" -static const ALIGN_ASSET(2) char gSmallKeyIconTex[] = dgSmallKeyIconTex; +#define dgQuestIconSmallKeyTex "__OTR__textures/icon_item_24_static/gQuestIconSmallKeyTex" +static const ALIGN_ASSET(2) char gQuestIconSmallKeyTex[] = dgQuestIconSmallKeyTex; -#define dgSmallMagicJarIconTex "__OTR__textures/icon_item_24_static/gSmallMagicJarIconTex" -static const ALIGN_ASSET(2) char gSmallMagicJarIconTex[] = dgSmallMagicJarIconTex; +#define dgQuestIconMagicJarSmallTex "__OTR__textures/icon_item_24_static/gQuestIconMagicJarSmallTex" +static const ALIGN_ASSET(2) char gQuestIconMagicJarSmallTex[] = dgQuestIconMagicJarSmallTex; -#define dgBigMagicJarIconTex "__OTR__textures/icon_item_24_static/gBigMagicJarIconTex" -static const ALIGN_ASSET(2) char gBigMagicJarIconTex[] = dgBigMagicJarIconTex; \ No newline at end of file +#define dgQuestIconMagicJarBigTex "__OTR__textures/icon_item_24_static/gQuestIconMagicJarBigTex" +static const ALIGN_ASSET(2) char gQuestIconMagicJarBigTex[] = dgQuestIconMagicJarBigTex; + +#endif // TEXTURES_ICON_ITEM_24_STATIC_H diff --git a/soh/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.h b/soh/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.h index 8a559452d..4644d05e0 100644 --- a/soh/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.h +++ b/soh/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_DUNGEON_STATIC_H +#define TEXTURES_ICON_ITEM_DUNGEON_STATIC_H 1 #include "align_asset_macro.h" @@ -57,4 +58,6 @@ static const ALIGN_ASSET(2) char gDungeonMapB8ButtonTex[] = dgDungeonMapB8Button static const ALIGN_ASSET(2) char gDungeonMapLinkHeadTex[] = dgDungeonMapLinkHeadTex; #define dgDungeonMapSkullTex "__OTR__textures/icon_item_dungeon_static/gDungeonMapSkullTex" -static const ALIGN_ASSET(2) char gDungeonMapSkullTex[] = dgDungeonMapSkullTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDungeonMapSkullTex[] = dgDungeonMapSkullTex; + +#endif // TEXTURES_ICON_ITEM_DUNGEON_STATIC_H diff --git a/soh/assets/textures/icon_item_field_static/icon_item_field_static.h b/soh/assets/textures/icon_item_field_static/icon_item_field_static.h index 0061e66e1..c1409986c 100644 --- a/soh/assets/textures/icon_item_field_static/icon_item_field_static.h +++ b/soh/assets/textures/icon_item_field_static/icon_item_field_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_FIELD_STATIC_H +#define TEXTURES_ICON_ITEM_FIELD_STATIC_H 1 #include "align_asset_macro.h" @@ -84,4 +85,6 @@ static const ALIGN_ASSET(2) char gWorldMapCloud14Tex[] = dgWorldMapCloud14Tex; static const ALIGN_ASSET(2) char gWorldMapCloud15Tex[] = dgWorldMapCloud15Tex; #define dgWorldMapCloud16Tex "__OTR__textures/icon_item_field_static/gWorldMapCloud16Tex" -static const ALIGN_ASSET(2) char gWorldMapCloud16Tex[] = dgWorldMapCloud16Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gWorldMapCloud16Tex[] = dgWorldMapCloud16Tex; + +#endif // TEXTURES_ICON_ITEM_FIELD_STATIC_H diff --git a/soh/assets/textures/icon_item_fra_static/icon_item_fra_static.h b/soh/assets/textures/icon_item_fra_static/icon_item_fra_static.h index c0149d5e2..90e8f8e03 100644 --- a/soh/assets/textures/icon_item_fra_static/icon_item_fra_static.h +++ b/soh/assets/textures/icon_item_fra_static/icon_item_fra_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_FRA_STATIC_H +#define TEXTURES_ICON_ITEM_FRA_STATIC_H 1 #include "align_asset_macro.h" @@ -99,4 +100,6 @@ static const ALIGN_ASSET(2) char gPauseSave00FRATex[] = dgPauseSave00FRATex; static const ALIGN_ASSET(2) char gPauseSave10FRATex[] = dgPauseSave10FRATex; #define dgPauseSave20FRATex "__OTR__textures/icon_item_fra_static/gPauseSave20FRATex" -static const ALIGN_ASSET(2) char gPauseSave20FRATex[] = dgPauseSave20FRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gPauseSave20FRATex[] = dgPauseSave20FRATex; + +#endif // TEXTURES_ICON_ITEM_FRA_STATIC_H diff --git a/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h b/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h index 12f7def2e..2afcd8987 100644 --- a/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h +++ b/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_GAMEOVER_STATIC_H +#define TEXTURES_ICON_ITEM_GAMEOVER_STATIC_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gContinuePlayingENGTex[] = dgContinuePlayingENG static const ALIGN_ASSET(2) char gContinuePlayingGERTex[] = dgContinuePlayingGERTex; #define dgContinuePlayingFRATex "__OTR__textures/icon_item_gameover_static/gContinuePlayingFRATex" -static const ALIGN_ASSET(2) char gContinuePlayingFRATex[] = dgContinuePlayingFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gContinuePlayingFRATex[] = dgContinuePlayingFRATex; + +#endif // TEXTURES_ICON_ITEM_GAMEOVER_STATIC_H diff --git a/soh/assets/textures/icon_item_ger_static/icon_item_ger_static.h b/soh/assets/textures/icon_item_ger_static/icon_item_ger_static.h index 1867dc9b6..9e51c546e 100644 --- a/soh/assets/textures/icon_item_ger_static/icon_item_ger_static.h +++ b/soh/assets/textures/icon_item_ger_static/icon_item_ger_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_GER_STATIC_H +#define TEXTURES_ICON_ITEM_GER_STATIC_H 1 #include "align_asset_macro.h" @@ -96,4 +97,6 @@ static const ALIGN_ASSET(2) char gPauseQuestStatus10GERTex[] = dgPauseQuestStatu static const ALIGN_ASSET(2) char gPauseSave10GERTex[] = dgPauseSave10GERTex; #define dgPauseSave20GERTex "__OTR__textures/icon_item_ger_static/gPauseSave20GERTex" -static const ALIGN_ASSET(2) char gPauseSave20GERTex[] = dgPauseSave20GERTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gPauseSave20GERTex[] = dgPauseSave20GERTex; + +#endif // TEXTURES_ICON_ITEM_GER_STATIC_H diff --git a/soh/assets/textures/icon_item_nes_static/icon_item_nes_static.h b/soh/assets/textures/icon_item_nes_static/icon_item_nes_static.h index 8181fa62d..182bb96f7 100644 --- a/soh/assets/textures/icon_item_nes_static/icon_item_nes_static.h +++ b/soh/assets/textures/icon_item_nes_static/icon_item_nes_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_NES_STATIC_H +#define TEXTURES_ICON_ITEM_NES_STATIC_H 1 #include "align_asset_macro.h" @@ -93,4 +94,6 @@ static const ALIGN_ASSET(2) char gPauseQuestStatus10ENGTex[] = dgPauseQuestStatu static const ALIGN_ASSET(2) char gPauseQuestStatus20ENGTex[] = dgPauseQuestStatus20ENGTex; #define dgPauseSave10ENGTex "__OTR__textures/icon_item_nes_static/gPauseSave10ENGTex" -static const ALIGN_ASSET(2) char gPauseSave10ENGTex[] = dgPauseSave10ENGTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gPauseSave10ENGTex[] = dgPauseSave10ENGTex; + +#endif // TEXTURES_ICON_ITEM_NES_STATIC_H diff --git a/soh/assets/textures/icon_item_static/icon_item_static.h b/soh/assets/textures/icon_item_static/icon_item_static.h index cc167e393..c32305859 100644 --- a/soh/assets/textures/icon_item_static/icon_item_static.h +++ b/soh/assets/textures/icon_item_static/icon_item_static.h @@ -1,276 +1,277 @@ -#pragma once +#ifndef TEXTURES_ICON_ITEM_STATIC_H +#define TEXTURES_ICON_ITEM_STATIC_H 1 #include "align_asset_macro.h" -#define dgDekuStickIconTex "__OTR__textures/icon_item_static/gDekuStickIconTex" -static const ALIGN_ASSET(2) char gDekuStickIconTex[] = dgDekuStickIconTex; +#define dgItemIconDekuStickTex "__OTR__textures/icon_item_static/gItemIconDekuStickTex" +static const ALIGN_ASSET(2) char gItemIconDekuStickTex[] = dgItemIconDekuStickTex; -#define dgDekuNutIconTex "__OTR__textures/icon_item_static/gDekuNutIconTex" -static const ALIGN_ASSET(2) char gDekuNutIconTex[] = dgDekuNutIconTex; +#define dgItemIconDekuNutTex "__OTR__textures/icon_item_static/gItemIconDekuNutTex" +static const ALIGN_ASSET(2) char gItemIconDekuNutTex[] = dgItemIconDekuNutTex; -#define dgBombIconTex "__OTR__textures/icon_item_static/gBombIconTex" -static const ALIGN_ASSET(2) char gBombIconTex[] = dgBombIconTex; +#define dgItemIconBombTex "__OTR__textures/icon_item_static/gItemIconBombTex" +static const ALIGN_ASSET(2) char gItemIconBombTex[] = dgItemIconBombTex; -#define dgFairyBowIconTex "__OTR__textures/icon_item_static/gFairyBowIconTex" -static const ALIGN_ASSET(2) char gFairyBowIconTex[] = dgFairyBowIconTex; +#define dgItemIconBowTex "__OTR__textures/icon_item_static/gItemIconBowTex" +static const ALIGN_ASSET(2) char gItemIconBowTex[] = dgItemIconBowTex; -#define dgFireArrowIconTex "__OTR__textures/icon_item_static/gFireArrowIconTex" -static const ALIGN_ASSET(2) char gFireArrowIconTex[] = dgFireArrowIconTex; +#define dgItemIconArrowFireTex "__OTR__textures/icon_item_static/gItemIconArrowFireTex" +static const ALIGN_ASSET(2) char gItemIconArrowFireTex[] = dgItemIconArrowFireTex; -#define dgDinsFireIconTex "__OTR__textures/icon_item_static/gDinsFireIconTex" -static const ALIGN_ASSET(2) char gDinsFireIconTex[] = dgDinsFireIconTex; +#define dgItemIconDinsFireTex "__OTR__textures/icon_item_static/gItemIconDinsFireTex" +static const ALIGN_ASSET(2) char gItemIconDinsFireTex[] = dgItemIconDinsFireTex; -#define dgFairySlingshotIconTex "__OTR__textures/icon_item_static/gFairySlingshotIconTex" -static const ALIGN_ASSET(2) char gFairySlingshotIconTex[] = dgFairySlingshotIconTex; +#define dgItemIconSlingshotTex "__OTR__textures/icon_item_static/gItemIconSlingshotTex" +static const ALIGN_ASSET(2) char gItemIconSlingshotTex[] = dgItemIconSlingshotTex; -#define dgFairyOcarinaIconTex "__OTR__textures/icon_item_static/gFairyOcarinaIconTex" -static const ALIGN_ASSET(2) char gFairyOcarinaIconTex[] = dgFairyOcarinaIconTex; +#define dgItemIconOcarinaFairyTex "__OTR__textures/icon_item_static/gItemIconOcarinaFairyTex" +static const ALIGN_ASSET(2) char gItemIconOcarinaFairyTex[] = dgItemIconOcarinaFairyTex; -#define dgOcarinaofTimeIconTex "__OTR__textures/icon_item_static/gOcarinaofTimeIconTex" -static const ALIGN_ASSET(2) char gOcarinaofTimeIconTex[] = dgOcarinaofTimeIconTex; +#define dgItemIconOcarinaOfTimeTex "__OTR__textures/icon_item_static/gItemIconOcarinaOfTimeTex" +static const ALIGN_ASSET(2) char gItemIconOcarinaOfTimeTex[] = dgItemIconOcarinaOfTimeTex; -#define dgBombchuIconTex "__OTR__textures/icon_item_static/gBombchuIconTex" -static const ALIGN_ASSET(2) char gBombchuIconTex[] = dgBombchuIconTex; +#define dgItemIconBombchuTex "__OTR__textures/icon_item_static/gItemIconBombchuTex" +static const ALIGN_ASSET(2) char gItemIconBombchuTex[] = dgItemIconBombchuTex; -#define dgHookshotIconTex "__OTR__textures/icon_item_static/gHookshotIconTex" -static const ALIGN_ASSET(2) char gHookshotIconTex[] = dgHookshotIconTex; +#define dgItemIconHookshotTex "__OTR__textures/icon_item_static/gItemIconHookshotTex" +static const ALIGN_ASSET(2) char gItemIconHookshotTex[] = dgItemIconHookshotTex; -#define dgLongshotIconTex "__OTR__textures/icon_item_static/gLongshotIconTex" -static const ALIGN_ASSET(2) char gLongshotIconTex[] = dgLongshotIconTex; +#define dgItemIconLongshotTex "__OTR__textures/icon_item_static/gItemIconLongshotTex" +static const ALIGN_ASSET(2) char gItemIconLongshotTex[] = dgItemIconLongshotTex; -#define dgIceArrowIconTex "__OTR__textures/icon_item_static/gIceArrowIconTex" -static const ALIGN_ASSET(2) char gIceArrowIconTex[] = dgIceArrowIconTex; +#define dgItemIconArrowIceTex "__OTR__textures/icon_item_static/gItemIconArrowIceTex" +static const ALIGN_ASSET(2) char gItemIconArrowIceTex[] = dgItemIconArrowIceTex; -#define dgFaroresWindIconTex "__OTR__textures/icon_item_static/gFaroresWindIconTex" -static const ALIGN_ASSET(2) char gFaroresWindIconTex[] = dgFaroresWindIconTex; +#define dgItemIconFaroresWindTex "__OTR__textures/icon_item_static/gItemIconFaroresWindTex" +static const ALIGN_ASSET(2) char gItemIconFaroresWindTex[] = dgItemIconFaroresWindTex; -#define dgBoomerangIconTex "__OTR__textures/icon_item_static/gBoomerangIconTex" -static const ALIGN_ASSET(2) char gBoomerangIconTex[] = dgBoomerangIconTex; +#define dgItemIconBoomerangTex "__OTR__textures/icon_item_static/gItemIconBoomerangTex" +static const ALIGN_ASSET(2) char gItemIconBoomerangTex[] = dgItemIconBoomerangTex; -#define dgLensofTruthIconTex "__OTR__textures/icon_item_static/gLensofTruthIconTex" -static const ALIGN_ASSET(2) char gLensofTruthIconTex[] = dgLensofTruthIconTex; +#define dgItemIconLensOfTruthTex "__OTR__textures/icon_item_static/gItemIconLensOfTruthTex" +static const ALIGN_ASSET(2) char gItemIconLensOfTruthTex[] = dgItemIconLensOfTruthTex; -#define dgMagicBeansIconTex "__OTR__textures/icon_item_static/gMagicBeansIconTex" -static const ALIGN_ASSET(2) char gMagicBeansIconTex[] = dgMagicBeansIconTex; +#define dgItemIconMagicBeanTex "__OTR__textures/icon_item_static/gItemIconMagicBeanTex" +static const ALIGN_ASSET(2) char gItemIconMagicBeanTex[] = dgItemIconMagicBeanTex; -#define dgMegatonHammerIconTex "__OTR__textures/icon_item_static/gMegatonHammerIconTex" -static const ALIGN_ASSET(2) char gMegatonHammerIconTex[] = dgMegatonHammerIconTex; +#define dgItemIconHammerTex "__OTR__textures/icon_item_static/gItemIconHammerTex" +static const ALIGN_ASSET(2) char gItemIconHammerTex[] = dgItemIconHammerTex; -#define dgLightArrowIconTex "__OTR__textures/icon_item_static/gLightArrowIconTex" -static const ALIGN_ASSET(2) char gLightArrowIconTex[] = dgLightArrowIconTex; +#define dgItemIconArrowLightTex "__OTR__textures/icon_item_static/gItemIconArrowLightTex" +static const ALIGN_ASSET(2) char gItemIconArrowLightTex[] = dgItemIconArrowLightTex; -#define dgNayrusLoveIconTex "__OTR__textures/icon_item_static/gNayrusLoveIconTex" -static const ALIGN_ASSET(2) char gNayrusLoveIconTex[] = dgNayrusLoveIconTex; +#define dgItemIconNayrusLoveTex "__OTR__textures/icon_item_static/gItemIconNayrusLoveTex" +static const ALIGN_ASSET(2) char gItemIconNayrusLoveTex[] = dgItemIconNayrusLoveTex; -#define dgEmptyBottleIconTex "__OTR__textures/icon_item_static/gEmptyBottleIconTex" -static const ALIGN_ASSET(2) char gEmptyBottleIconTex[] = dgEmptyBottleIconTex; +#define dgItemIconBottleEmptyTex "__OTR__textures/icon_item_static/gItemIconBottleEmptyTex" +static const ALIGN_ASSET(2) char gItemIconBottleEmptyTex[] = dgItemIconBottleEmptyTex; -#define dgRedPotionIconTex "__OTR__textures/icon_item_static/gRedPotionIconTex" -static const ALIGN_ASSET(2) char gRedPotionIconTex[] = dgRedPotionIconTex; +#define dgItemIconBottlePotionRedTex "__OTR__textures/icon_item_static/gItemIconBottlePotionRedTex" +static const ALIGN_ASSET(2) char gItemIconBottlePotionRedTex[] = dgItemIconBottlePotionRedTex; -#define dgGreenPotionIconTex "__OTR__textures/icon_item_static/gGreenPotionIconTex" -static const ALIGN_ASSET(2) char gGreenPotionIconTex[] = dgGreenPotionIconTex; +#define dgItemIconBottlePotionGreenTex "__OTR__textures/icon_item_static/gItemIconBottlePotionGreenTex" +static const ALIGN_ASSET(2) char gItemIconBottlePotionGreenTex[] = dgItemIconBottlePotionGreenTex; -#define dgBluePotionIconTex "__OTR__textures/icon_item_static/gBluePotionIconTex" -static const ALIGN_ASSET(2) char gBluePotionIconTex[] = dgBluePotionIconTex; +#define dgItemIconBottlePotionBlueTex "__OTR__textures/icon_item_static/gItemIconBottlePotionBlueTex" +static const ALIGN_ASSET(2) char gItemIconBottlePotionBlueTex[] = dgItemIconBottlePotionBlueTex; -#define dgBottledFairyIconTex "__OTR__textures/icon_item_static/gBottledFairyIconTex" -static const ALIGN_ASSET(2) char gBottledFairyIconTex[] = dgBottledFairyIconTex; +#define dgItemIconBottleFairyTex "__OTR__textures/icon_item_static/gItemIconBottleFairyTex" +static const ALIGN_ASSET(2) char gItemIconBottleFairyTex[] = dgItemIconBottleFairyTex; -#define dgFishIconTex "__OTR__textures/icon_item_static/gFishIconTex" -static const ALIGN_ASSET(2) char gFishIconTex[] = dgFishIconTex; +#define dgItemIconBottleFishTex "__OTR__textures/icon_item_static/gItemIconBottleFishTex" +static const ALIGN_ASSET(2) char gItemIconBottleFishTex[] = dgItemIconBottleFishTex; -#define dgMilkFullIconTex "__OTR__textures/icon_item_static/gMilkFullIconTex" -static const ALIGN_ASSET(2) char gMilkFullIconTex[] = dgMilkFullIconTex; +#define dgItemIconBottleMilkFullTex "__OTR__textures/icon_item_static/gItemIconBottleMilkFullTex" +static const ALIGN_ASSET(2) char gItemIconBottleMilkFullTex[] = dgItemIconBottleMilkFullTex; -#define dgRutosLetterIconTex "__OTR__textures/icon_item_static/gRutosLetterIconTex" -static const ALIGN_ASSET(2) char gRutosLetterIconTex[] = dgRutosLetterIconTex; +#define dgItemIconBottleRutosLetterTex "__OTR__textures/icon_item_static/gItemIconBottleRutosLetterTex" +static const ALIGN_ASSET(2) char gItemIconBottleRutosLetterTex[] = dgItemIconBottleRutosLetterTex; -#define dgBlueFireIconTex "__OTR__textures/icon_item_static/gBlueFireIconTex" -static const ALIGN_ASSET(2) char gBlueFireIconTex[] = dgBlueFireIconTex; +#define dgItemIconBottleBlueFireTex "__OTR__textures/icon_item_static/gItemIconBottleBlueFireTex" +static const ALIGN_ASSET(2) char gItemIconBottleBlueFireTex[] = dgItemIconBottleBlueFireTex; -#define dgBugIconTex "__OTR__textures/icon_item_static/gBugIconTex" -static const ALIGN_ASSET(2) char gBugIconTex[] = dgBugIconTex; +#define dgItemIconBottleBugTex "__OTR__textures/icon_item_static/gItemIconBottleBugTex" +static const ALIGN_ASSET(2) char gItemIconBottleBugTex[] = dgItemIconBottleBugTex; -#define dgBigPoeIconTex "__OTR__textures/icon_item_static/gBigPoeIconTex" -static const ALIGN_ASSET(2) char gBigPoeIconTex[] = dgBigPoeIconTex; +#define dgItemIconBottleBigPoeTex "__OTR__textures/icon_item_static/gItemIconBottleBigPoeTex" +static const ALIGN_ASSET(2) char gItemIconBottleBigPoeTex[] = dgItemIconBottleBigPoeTex; -#define dgMilkhalfIconTex "__OTR__textures/icon_item_static/gMilkhalfIconTex" -static const ALIGN_ASSET(2) char gMilkhalfIconTex[] = dgMilkhalfIconTex; +#define dgItemIconBottleMilkHalfTex "__OTR__textures/icon_item_static/gItemIconBottleMilkHalfTex" +static const ALIGN_ASSET(2) char gItemIconBottleMilkHalfTex[] = dgItemIconBottleMilkHalfTex; -#define dgPoeIconTex "__OTR__textures/icon_item_static/gPoeIconTex" -static const ALIGN_ASSET(2) char gPoeIconTex[] = dgPoeIconTex; +#define dgItemIconBottlePoeTex "__OTR__textures/icon_item_static/gItemIconBottlePoeTex" +static const ALIGN_ASSET(2) char gItemIconBottlePoeTex[] = dgItemIconBottlePoeTex; -#define dgWeirdEggIconTex "__OTR__textures/icon_item_static/gWeirdEggIconTex" -static const ALIGN_ASSET(2) char gWeirdEggIconTex[] = dgWeirdEggIconTex; +#define dgItemIconWeirdEggTex "__OTR__textures/icon_item_static/gItemIconWeirdEggTex" +static const ALIGN_ASSET(2) char gItemIconWeirdEggTex[] = dgItemIconWeirdEggTex; -#define dgCuccoIconTex "__OTR__textures/icon_item_static/gCuccoIconTex" -static const ALIGN_ASSET(2) char gCuccoIconTex[] = dgCuccoIconTex; +#define dgItemIconChickenTex "__OTR__textures/icon_item_static/gItemIconChickenTex" +static const ALIGN_ASSET(2) char gItemIconChickenTex[] = dgItemIconChickenTex; -#define dgZeldasLetterIconTex "__OTR__textures/icon_item_static/gZeldasLetterIconTex" -static const ALIGN_ASSET(2) char gZeldasLetterIconTex[] = dgZeldasLetterIconTex; +#define dgItemIconZeldasLetterTex "__OTR__textures/icon_item_static/gItemIconZeldasLetterTex" +static const ALIGN_ASSET(2) char gItemIconZeldasLetterTex[] = dgItemIconZeldasLetterTex; -#define dgKeatonMaskIconTex "__OTR__textures/icon_item_static/gKeatonMaskIconTex" -static const ALIGN_ASSET(2) char gKeatonMaskIconTex[] = dgKeatonMaskIconTex; +#define dgItemIconMaskKeatonTex "__OTR__textures/icon_item_static/gItemIconMaskKeatonTex" +static const ALIGN_ASSET(2) char gItemIconMaskKeatonTex[] = dgItemIconMaskKeatonTex; -#define dgSkullMaskIconTex "__OTR__textures/icon_item_static/gSkullMaskIconTex" -static const ALIGN_ASSET(2) char gSkullMaskIconTex[] = dgSkullMaskIconTex; +#define dgItemIconMaskSkullTex "__OTR__textures/icon_item_static/gItemIconMaskSkullTex" +static const ALIGN_ASSET(2) char gItemIconMaskSkullTex[] = dgItemIconMaskSkullTex; -#define dgSpookyMaskIconTex "__OTR__textures/icon_item_static/gSpookyMaskIconTex" -static const ALIGN_ASSET(2) char gSpookyMaskIconTex[] = dgSpookyMaskIconTex; +#define dgItemIconMaskSpookyTex "__OTR__textures/icon_item_static/gItemIconMaskSpookyTex" +static const ALIGN_ASSET(2) char gItemIconMaskSpookyTex[] = dgItemIconMaskSpookyTex; -#define dgBunnyHoodIconTex "__OTR__textures/icon_item_static/gBunnyHoodIconTex" -static const ALIGN_ASSET(2) char gBunnyHoodIconTex[] = dgBunnyHoodIconTex; +#define dgItemIconMaskBunnyHoodTex "__OTR__textures/icon_item_static/gItemIconMaskBunnyHoodTex" +static const ALIGN_ASSET(2) char gItemIconMaskBunnyHoodTex[] = dgItemIconMaskBunnyHoodTex; -#define dgGoronMaskIconTex "__OTR__textures/icon_item_static/gGoronMaskIconTex" -static const ALIGN_ASSET(2) char gGoronMaskIconTex[] = dgGoronMaskIconTex; +#define dgItemIconMaskGoronTex "__OTR__textures/icon_item_static/gItemIconMaskGoronTex" +static const ALIGN_ASSET(2) char gItemIconMaskGoronTex[] = dgItemIconMaskGoronTex; -#define dgZoraMaskIconTex "__OTR__textures/icon_item_static/gZoraMaskIconTex" -static const ALIGN_ASSET(2) char gZoraMaskIconTex[] = dgZoraMaskIconTex; +#define dgItemIconMaskZoraTex "__OTR__textures/icon_item_static/gItemIconMaskZoraTex" +static const ALIGN_ASSET(2) char gItemIconMaskZoraTex[] = dgItemIconMaskZoraTex; -#define dgGerudoMaskIconTex "__OTR__textures/icon_item_static/gGerudoMaskIconTex" -static const ALIGN_ASSET(2) char gGerudoMaskIconTex[] = dgGerudoMaskIconTex; +#define dgItemIconMaskGerudoTex "__OTR__textures/icon_item_static/gItemIconMaskGerudoTex" +static const ALIGN_ASSET(2) char gItemIconMaskGerudoTex[] = dgItemIconMaskGerudoTex; -#define dgMaskofTruthIconTex "__OTR__textures/icon_item_static/gMaskofTruthIconTex" -static const ALIGN_ASSET(2) char gMaskofTruthIconTex[] = dgMaskofTruthIconTex; +#define dgItemIconMaskTruthTex "__OTR__textures/icon_item_static/gItemIconMaskTruthTex" +static const ALIGN_ASSET(2) char gItemIconMaskTruthTex[] = dgItemIconMaskTruthTex; -#define dgSoldOutIconTex "__OTR__textures/icon_item_static/gSoldOutIconTex" -static const ALIGN_ASSET(2) char gSoldOutIconTex[] = dgSoldOutIconTex; +#define dgItemIconSoldOutTex "__OTR__textures/icon_item_static/gItemIconSoldOutTex" +static const ALIGN_ASSET(2) char gItemIconSoldOutTex[] = dgItemIconSoldOutTex; -#define dgPocketEggIconTex "__OTR__textures/icon_item_static/gPocketEggIconTex" -static const ALIGN_ASSET(2) char gPocketEggIconTex[] = dgPocketEggIconTex; +#define dgItemIconPocketEggTex "__OTR__textures/icon_item_static/gItemIconPocketEggTex" +static const ALIGN_ASSET(2) char gItemIconPocketEggTex[] = dgItemIconPocketEggTex; -#define dgPocketCuccoIconTex "__OTR__textures/icon_item_static/gPocketCuccoIconTex" -static const ALIGN_ASSET(2) char gPocketCuccoIconTex[] = dgPocketCuccoIconTex; +#define dgItemIconPocketCuccoTex "__OTR__textures/icon_item_static/gItemIconPocketCuccoTex" +static const ALIGN_ASSET(2) char gItemIconPocketCuccoTex[] = dgItemIconPocketCuccoTex; -#define dgCojiroIconTex "__OTR__textures/icon_item_static/gCojiroIconTex" -static const ALIGN_ASSET(2) char gCojiroIconTex[] = dgCojiroIconTex; +#define dgItemIconCojiroTex "__OTR__textures/icon_item_static/gItemIconCojiroTex" +static const ALIGN_ASSET(2) char gItemIconCojiroTex[] = dgItemIconCojiroTex; -#define dgOddMushroomIconTex "__OTR__textures/icon_item_static/gOddMushroomIconTex" -static const ALIGN_ASSET(2) char gOddMushroomIconTex[] = dgOddMushroomIconTex; +#define dgItemIconOddMushroomTex "__OTR__textures/icon_item_static/gItemIconOddMushroomTex" +static const ALIGN_ASSET(2) char gItemIconOddMushroomTex[] = dgItemIconOddMushroomTex; -#define dgOddPotionIconTex "__OTR__textures/icon_item_static/gOddPotionIconTex" -static const ALIGN_ASSET(2) char gOddPotionIconTex[] = dgOddPotionIconTex; +#define dgItemIconOddPotionTex "__OTR__textures/icon_item_static/gItemIconOddPotionTex" +static const ALIGN_ASSET(2) char gItemIconOddPotionTex[] = dgItemIconOddPotionTex; -#define dgPoachersSawIconTex "__OTR__textures/icon_item_static/gPoachersSawIconTex" -static const ALIGN_ASSET(2) char gPoachersSawIconTex[] = dgPoachersSawIconTex; +#define dgItemIconPoachersSawTex "__OTR__textures/icon_item_static/gItemIconPoachersSawTex" +static const ALIGN_ASSET(2) char gItemIconPoachersSawTex[] = dgItemIconPoachersSawTex; -#define dgBrokenBiggoronSwordIconTex "__OTR__textures/icon_item_static/gBrokenBiggoronSwordIconTex" -static const ALIGN_ASSET(2) char gBrokenBiggoronSwordIconTex[] = dgBrokenBiggoronSwordIconTex; +#define dgItemIconBrokenGoronsSwordTex "__OTR__textures/icon_item_static/gItemIconBrokenGoronsSwordTex" +static const ALIGN_ASSET(2) char gItemIconBrokenGoronsSwordTex[] = dgItemIconBrokenGoronsSwordTex; -#define dgPrescriptionIconTex "__OTR__textures/icon_item_static/gPrescriptionIconTex" -static const ALIGN_ASSET(2) char gPrescriptionIconTex[] = dgPrescriptionIconTex; +#define dgItemIconPrescriptionTex "__OTR__textures/icon_item_static/gItemIconPrescriptionTex" +static const ALIGN_ASSET(2) char gItemIconPrescriptionTex[] = dgItemIconPrescriptionTex; -#define dgEyeBallFrogIconTex "__OTR__textures/icon_item_static/gEyeBallFrogIconTex" -static const ALIGN_ASSET(2) char gEyeBallFrogIconTex[] = dgEyeBallFrogIconTex; +#define dgItemIconEyeballFrogTex "__OTR__textures/icon_item_static/gItemIconEyeballFrogTex" +static const ALIGN_ASSET(2) char gItemIconEyeballFrogTex[] = dgItemIconEyeballFrogTex; -#define dgEyeDropsIconTex "__OTR__textures/icon_item_static/gEyeDropsIconTex" -static const ALIGN_ASSET(2) char gEyeDropsIconTex[] = dgEyeDropsIconTex; +#define dgItemIconEyeDropsTex "__OTR__textures/icon_item_static/gItemIconEyeDropsTex" +static const ALIGN_ASSET(2) char gItemIconEyeDropsTex[] = dgItemIconEyeDropsTex; -#define dgClaimCheckIconTex "__OTR__textures/icon_item_static/gClaimCheckIconTex" -static const ALIGN_ASSET(2) char gClaimCheckIconTex[] = dgClaimCheckIconTex; +#define dgItemIconClaimCheckTex "__OTR__textures/icon_item_static/gItemIconClaimCheckTex" +static const ALIGN_ASSET(2) char gItemIconClaimCheckTex[] = dgItemIconClaimCheckTex; -#define dgFairyBowFireIconTex "__OTR__textures/icon_item_static/gFairyBowFireIconTex" -static const ALIGN_ASSET(2) char gFairyBowFireIconTex[] = dgFairyBowFireIconTex; +#define dgItemIconBowFireTex "__OTR__textures/icon_item_static/gItemIconBowFireTex" +static const ALIGN_ASSET(2) char gItemIconBowFireTex[] = dgItemIconBowFireTex; -#define dgFairyBowIceIconTex "__OTR__textures/icon_item_static/gFairyBowIceIconTex" -static const ALIGN_ASSET(2) char gFairyBowIceIconTex[] = dgFairyBowIceIconTex; +#define dgItemIconBowIceTex "__OTR__textures/icon_item_static/gItemIconBowIceTex" +static const ALIGN_ASSET(2) char gItemIconBowIceTex[] = dgItemIconBowIceTex; -#define dgFairyBowLightIconTex "__OTR__textures/icon_item_static/gFairyBowLightIconTex" -static const ALIGN_ASSET(2) char gFairyBowLightIconTex[] = dgFairyBowLightIconTex; +#define dgItemIconBowLightTex "__OTR__textures/icon_item_static/gItemIconBowLightTex" +static const ALIGN_ASSET(2) char gItemIconBowLightTex[] = dgItemIconBowLightTex; -#define dgKokiriSwordIconTex "__OTR__textures/icon_item_static/gKokiriSwordIconTex" -static const ALIGN_ASSET(2) char gKokiriSwordIconTex[] = dgKokiriSwordIconTex; +#define dgItemIconSwordKokiriTex "__OTR__textures/icon_item_static/gItemIconSwordKokiriTex" +static const ALIGN_ASSET(2) char gItemIconSwordKokiriTex[] = dgItemIconSwordKokiriTex; -#define dgMasterSwordIconTex "__OTR__textures/icon_item_static/gMasterSwordIconTex" -static const ALIGN_ASSET(2) char gMasterSwordIconTex[] = dgMasterSwordIconTex; +#define dgItemIconSwordMasterTex "__OTR__textures/icon_item_static/gItemIconSwordMasterTex" +static const ALIGN_ASSET(2) char gItemIconSwordMasterTex[] = dgItemIconSwordMasterTex; -#define dgBiggoronSwordIconTex "__OTR__textures/icon_item_static/gBiggoronSwordIconTex" -static const ALIGN_ASSET(2) char gBiggoronSwordIconTex[] = dgBiggoronSwordIconTex; +#define dgItemIconSwordBiggoronTex "__OTR__textures/icon_item_static/gItemIconSwordBiggoronTex" +static const ALIGN_ASSET(2) char gItemIconSwordBiggoronTex[] = dgItemIconSwordBiggoronTex; -#define dgDekuShieldIconTex "__OTR__textures/icon_item_static/gDekuShieldIconTex" -static const ALIGN_ASSET(2) char gDekuShieldIconTex[] = dgDekuShieldIconTex; +#define dgItemIconShieldDekuTex "__OTR__textures/icon_item_static/gItemIconShieldDekuTex" +static const ALIGN_ASSET(2) char gItemIconShieldDekuTex[] = dgItemIconShieldDekuTex; -#define dgHylianShieldIconTex "__OTR__textures/icon_item_static/gHylianShieldIconTex" -static const ALIGN_ASSET(2) char gHylianShieldIconTex[] = dgHylianShieldIconTex; +#define dgItemIconShieldHylianTex "__OTR__textures/icon_item_static/gItemIconShieldHylianTex" +static const ALIGN_ASSET(2) char gItemIconShieldHylianTex[] = dgItemIconShieldHylianTex; -#define dgMirrorShieldIconTex "__OTR__textures/icon_item_static/gMirrorShieldIconTex" -static const ALIGN_ASSET(2) char gMirrorShieldIconTex[] = dgMirrorShieldIconTex; +#define dgItemIconShieldMirrorTex "__OTR__textures/icon_item_static/gItemIconShieldMirrorTex" +static const ALIGN_ASSET(2) char gItemIconShieldMirrorTex[] = dgItemIconShieldMirrorTex; -#define dgKokiriTunicIconTex "__OTR__textures/icon_item_static/gKokiriTunicIconTex" -static const ALIGN_ASSET(2) char gKokiriTunicIconTex[] = dgKokiriTunicIconTex; +#define dgItemIconTunicKokiriTex "__OTR__textures/icon_item_static/gItemIconTunicKokiriTex" +static const ALIGN_ASSET(2) char gItemIconTunicKokiriTex[] = dgItemIconTunicKokiriTex; -#define dgGoronTunicIconTex "__OTR__textures/icon_item_static/gGoronTunicIconTex" -static const ALIGN_ASSET(2) char gGoronTunicIconTex[] = dgGoronTunicIconTex; +#define dgItemIconTunicGoronTex "__OTR__textures/icon_item_static/gItemIconTunicGoronTex" +static const ALIGN_ASSET(2) char gItemIconTunicGoronTex[] = dgItemIconTunicGoronTex; -#define dgZoraTunicIconTex "__OTR__textures/icon_item_static/gZoraTunicIconTex" -static const ALIGN_ASSET(2) char gZoraTunicIconTex[] = dgZoraTunicIconTex; +#define dgItemIconTunicZoraTex "__OTR__textures/icon_item_static/gItemIconTunicZoraTex" +static const ALIGN_ASSET(2) char gItemIconTunicZoraTex[] = dgItemIconTunicZoraTex; -#define dgKokiriBootsIconTex "__OTR__textures/icon_item_static/gKokiriBootsIconTex" -static const ALIGN_ASSET(2) char gKokiriBootsIconTex[] = dgKokiriBootsIconTex; +#define dgItemIconBootsKokiriTex "__OTR__textures/icon_item_static/gItemIconBootsKokiriTex" +static const ALIGN_ASSET(2) char gItemIconBootsKokiriTex[] = dgItemIconBootsKokiriTex; -#define dgIronBootsIconTex "__OTR__textures/icon_item_static/gIronBootsIconTex" -static const ALIGN_ASSET(2) char gIronBootsIconTex[] = dgIronBootsIconTex; +#define dgItemIconBootsIronTex "__OTR__textures/icon_item_static/gItemIconBootsIronTex" +static const ALIGN_ASSET(2) char gItemIconBootsIronTex[] = dgItemIconBootsIronTex; -#define dgHoverBootsIconTex "__OTR__textures/icon_item_static/gHoverBootsIconTex" -static const ALIGN_ASSET(2) char gHoverBootsIconTex[] = dgHoverBootsIconTex; +#define dgItemIconBootsHoverTex "__OTR__textures/icon_item_static/gItemIconBootsHoverTex" +static const ALIGN_ASSET(2) char gItemIconBootsHoverTex[] = dgItemIconBootsHoverTex; -#define dgBulletBag30IconTex "__OTR__textures/icon_item_static/gBulletBag30IconTex" -static const ALIGN_ASSET(2) char gBulletBag30IconTex[] = dgBulletBag30IconTex; +#define dgItemIconBulletBag30Tex "__OTR__textures/icon_item_static/gItemIconBulletBag30Tex" +static const ALIGN_ASSET(2) char gItemIconBulletBag30Tex[] = dgItemIconBulletBag30Tex; -#define dgBulletBag40IconTex "__OTR__textures/icon_item_static/gBulletBag40IconTex" -static const ALIGN_ASSET(2) char gBulletBag40IconTex[] = dgBulletBag40IconTex; +#define dgItemIconBulletBag40Tex "__OTR__textures/icon_item_static/gItemIconBulletBag40Tex" +static const ALIGN_ASSET(2) char gItemIconBulletBag40Tex[] = dgItemIconBulletBag40Tex; -#define dgBulletBag50IconTex "__OTR__textures/icon_item_static/gBulletBag50IconTex" -static const ALIGN_ASSET(2) char gBulletBag50IconTex[] = dgBulletBag50IconTex; +#define dgItemIconBulletBag50Tex "__OTR__textures/icon_item_static/gItemIconBulletBag50Tex" +static const ALIGN_ASSET(2) char gItemIconBulletBag50Tex[] = dgItemIconBulletBag50Tex; -#define dgQuiver30IconTex "__OTR__textures/icon_item_static/gQuiver30IconTex" -static const ALIGN_ASSET(2) char gQuiver30IconTex[] = dgQuiver30IconTex; +#define dgItemIconQuiver30Tex "__OTR__textures/icon_item_static/gItemIconQuiver30Tex" +static const ALIGN_ASSET(2) char gItemIconQuiver30Tex[] = dgItemIconQuiver30Tex; -#define dgQuiver40IconTex "__OTR__textures/icon_item_static/gQuiver40IconTex" -static const ALIGN_ASSET(2) char gQuiver40IconTex[] = dgQuiver40IconTex; +#define dgItemIconQuiver40Tex "__OTR__textures/icon_item_static/gItemIconQuiver40Tex" +static const ALIGN_ASSET(2) char gItemIconQuiver40Tex[] = dgItemIconQuiver40Tex; -#define dgQuiver50IconTex "__OTR__textures/icon_item_static/gQuiver50IconTex" -static const ALIGN_ASSET(2) char gQuiver50IconTex[] = dgQuiver50IconTex; +#define dgItemIconQuiver50Tex "__OTR__textures/icon_item_static/gItemIconQuiver50Tex" +static const ALIGN_ASSET(2) char gItemIconQuiver50Tex[] = dgItemIconQuiver50Tex; -#define dgBombBag20IconTex "__OTR__textures/icon_item_static/gBombBag20IconTex" -static const ALIGN_ASSET(2) char gBombBag20IconTex[] = dgBombBag20IconTex; +#define dgItemIconBombBag20Tex "__OTR__textures/icon_item_static/gItemIconBombBag20Tex" +static const ALIGN_ASSET(2) char gItemIconBombBag20Tex[] = dgItemIconBombBag20Tex; -#define dgBombBag30IconTex "__OTR__textures/icon_item_static/gBombBag30IconTex" -static const ALIGN_ASSET(2) char gBombBag30IconTex[] = dgBombBag30IconTex; +#define dgItemIconBombBag30Tex "__OTR__textures/icon_item_static/gItemIconBombBag30Tex" +static const ALIGN_ASSET(2) char gItemIconBombBag30Tex[] = dgItemIconBombBag30Tex; -#define dgBombBag40IconTex "__OTR__textures/icon_item_static/gBombBag40IconTex" -static const ALIGN_ASSET(2) char gBombBag40IconTex[] = dgBombBag40IconTex; +#define dgItemIconBombBag40Tex "__OTR__textures/icon_item_static/gItemIconBombBag40Tex" +static const ALIGN_ASSET(2) char gItemIconBombBag40Tex[] = dgItemIconBombBag40Tex; -#define dgGoronsBraceletIconTex "__OTR__textures/icon_item_static/gGoronsBraceletIconTex" -static const ALIGN_ASSET(2) char gGoronsBraceletIconTex[] = dgGoronsBraceletIconTex; +#define dgItemIconGoronsBraceletTex "__OTR__textures/icon_item_static/gItemIconGoronsBraceletTex" +static const ALIGN_ASSET(2) char gItemIconGoronsBraceletTex[] = dgItemIconGoronsBraceletTex; -#define dgSilverGauntletsIconTex "__OTR__textures/icon_item_static/gSilverGauntletsIconTex" -static const ALIGN_ASSET(2) char gSilverGauntletsIconTex[] = dgSilverGauntletsIconTex; +#define dgItemIconSilverGauntletsTex "__OTR__textures/icon_item_static/gItemIconSilverGauntletsTex" +static const ALIGN_ASSET(2) char gItemIconSilverGauntletsTex[] = dgItemIconSilverGauntletsTex; -#define dgGoldenGauntletsIconTex "__OTR__textures/icon_item_static/gGoldenGauntletsIconTex" -static const ALIGN_ASSET(2) char gGoldenGauntletsIconTex[] = dgGoldenGauntletsIconTex; +#define dgItemIconGoldenGauntletsTex "__OTR__textures/icon_item_static/gItemIconGoldenGauntletsTex" +static const ALIGN_ASSET(2) char gItemIconGoldenGauntletsTex[] = dgItemIconGoldenGauntletsTex; -#define dgSilverScaleIconTex "__OTR__textures/icon_item_static/gSilverScaleIconTex" -static const ALIGN_ASSET(2) char gSilverScaleIconTex[] = dgSilverScaleIconTex; +#define dgItemIconScaleSilverTex "__OTR__textures/icon_item_static/gItemIconScaleSilverTex" +static const ALIGN_ASSET(2) char gItemIconScaleSilverTex[] = dgItemIconScaleSilverTex; -#define dgGoldenScaleIconTex "__OTR__textures/icon_item_static/gGoldenScaleIconTex" -static const ALIGN_ASSET(2) char gGoldenScaleIconTex[] = dgGoldenScaleIconTex; +#define dgItemIconScaleGoldenTex "__OTR__textures/icon_item_static/gItemIconScaleGoldenTex" +static const ALIGN_ASSET(2) char gItemIconScaleGoldenTex[] = dgItemIconScaleGoldenTex; -#define dgBrokenGiantsKnifeIconTex "__OTR__textures/icon_item_static/gBrokenGiantsKnifeIconTex" -static const ALIGN_ASSET(2) char gBrokenGiantsKnifeIconTex[] = dgBrokenGiantsKnifeIconTex; +#define dgItemIconBrokenGiantsKnifeTex "__OTR__textures/icon_item_static/gItemIconBrokenGiantsKnifeTex" +static const ALIGN_ASSET(2) char gItemIconBrokenGiantsKnifeTex[] = dgItemIconBrokenGiantsKnifeTex; -#define dgAdultsWalletIconTex "__OTR__textures/icon_item_static/gAdultsWalletIconTex" -static const ALIGN_ASSET(2) char gAdultsWalletIconTex[] = dgAdultsWalletIconTex; +#define dgItemIconAdultsWalletTex "__OTR__textures/icon_item_static/gItemIconAdultsWalletTex" +static const ALIGN_ASSET(2) char gItemIconAdultsWalletTex[] = dgItemIconAdultsWalletTex; -#define dgGiantsWalletIconTex "__OTR__textures/icon_item_static/gGiantsWalletIconTex" -static const ALIGN_ASSET(2) char gGiantsWalletIconTex[] = dgGiantsWalletIconTex; +#define dgItemIconGiantsWalletTex "__OTR__textures/icon_item_static/gItemIconGiantsWalletTex" +static const ALIGN_ASSET(2) char gItemIconGiantsWalletTex[] = dgItemIconGiantsWalletTex; -#define dgDekuSeedsIconTex "__OTR__textures/icon_item_static/gDekuSeedsIconTex" -static const ALIGN_ASSET(2) char gDekuSeedsIconTex[] = dgDekuSeedsIconTex; +#define dgItemIconDekuSeedsTex "__OTR__textures/icon_item_static/gItemIconDekuSeedsTex" +static const ALIGN_ASSET(2) char gItemIconDekuSeedsTex[] = dgItemIconDekuSeedsTex; -#define dgFishingPoleIconTex "__OTR__textures/icon_item_static/gFishingPoleIconTex" -static const ALIGN_ASSET(2) char gFishingPoleIconTex[] = dgFishingPoleIconTex; +#define dgItemIconFishingPoleTex "__OTR__textures/icon_item_static/gItemIconFishingPoleTex" +static const ALIGN_ASSET(2) char gItemIconFishingPoleTex[] = dgItemIconFishingPoleTex; #define dgHeartPieceIcon1Tex "__OTR__textures/icon_item_static/gHeartPieceIcon1Tex" static const ALIGN_ASSET(2) char gHeartPieceIcon1Tex[] = dgHeartPieceIcon1Tex; @@ -558,4 +559,6 @@ static const ALIGN_ASSET(2) char gBButtonIconDL[] = dgBButtonIconDL; static const ALIGN_ASSET(2) char gPromptCursorLeftDL[] = dgPromptCursorLeftDL; #define dgPromptCursorRightDL "__OTR__textures/icon_item_static/gPromptCursorRightDL" -static const ALIGN_ASSET(2) char gPromptCursorRightDL[] = dgPromptCursorRightDL; \ No newline at end of file +static const ALIGN_ASSET(2) char gPromptCursorRightDL[] = dgPromptCursorRightDL; + +#endif // TEXTURES_ICON_ITEM_STATIC_H diff --git a/soh/assets/textures/item_name_static/item_name_static.h b/soh/assets/textures/item_name_static/item_name_static.h index a7a771226..86af0cab0 100644 --- a/soh/assets/textures/item_name_static/item_name_static.h +++ b/soh/assets/textures/item_name_static/item_name_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_ITEM_NAME_STATIC_H +#define TEXTURES_ITEM_NAME_STATIC_H 1 #include "align_asset_macro.h" @@ -1107,4 +1108,6 @@ static const ALIGN_ASSET(2) char gUnusedBossKeyItemName20JPNTex[] = dgUnusedBoss static const ALIGN_ASSET(2) char gUnusedBossKeyItemName21JPNTex[] = dgUnusedBossKeyItemName21JPNTex; #define dgBiggoronsSwordItemNameFRATex "__OTR__textures/item_name_static/gBiggoronsSwordItemNameFRATex" -static const ALIGN_ASSET(2) char gBiggoronsSwordItemNameFRATex[] = dgBiggoronsSwordItemNameFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBiggoronsSwordItemNameFRATex[] = dgBiggoronsSwordItemNameFRATex; + +#endif // TEXTURES_ITEM_NAME_STATIC_H diff --git a/soh/assets/textures/map_48x85_static/map_48x85_static.h b/soh/assets/textures/map_48x85_static/map_48x85_static.h index 4e817d49f..1b8607887 100644 --- a/soh/assets/textures/map_48x85_static/map_48x85_static.h +++ b/soh/assets/textures/map_48x85_static/map_48x85_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_MAP_48X85_STATIC_H +#define TEXTURES_MAP_48X85_STATIC_H 1 #include "align_asset_macro.h" @@ -204,4 +205,6 @@ static const ALIGN_ASSET(2) char gBottomOfTheWellPauseScreenMapBasement3RightTex static const ALIGN_ASSET(2) char gIceCavernPauseScreenMapFloor1LeftTex[] = dgIceCavernPauseScreenMapFloor1LeftTex; #define dgIceCavernPauseScreenMapFloor1RightTex "__OTR__textures/map_48x85_static/gIceCavernPauseScreenMapFloor1RightTex" -static const ALIGN_ASSET(2) char gIceCavernPauseScreenMapFloor1RightTex[] = dgIceCavernPauseScreenMapFloor1RightTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gIceCavernPauseScreenMapFloor1RightTex[] = dgIceCavernPauseScreenMapFloor1RightTex; + +#endif // TEXTURES_MAP_48X85_STATIC_H diff --git a/soh/assets/textures/map_grand_static/map_grand_static.h b/soh/assets/textures/map_grand_static/map_grand_static.h index e2921cada..b90c07634 100644 --- a/soh/assets/textures/map_grand_static/map_grand_static.h +++ b/soh/assets/textures/map_grand_static/map_grand_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_MAP_GRAND_STATIC_H +#define TEXTURES_MAP_GRAND_STATIC_H 1 #include "align_asset_macro.h" @@ -72,4 +73,6 @@ static const ALIGN_ASSET(2) char gDrainedLakeHyliaMinimapTex[] = dgDrainedLakeHy static const ALIGN_ASSET(2) char gGerudoValleyWithBrokenBridgeMinimapTex[] = dgGerudoValleyWithBrokenBridgeMinimapTex; #define dgGerudosFortressMinimapTex "__OTR__textures/map_grand_static/gGerudosFortressMinimapTex" -static const ALIGN_ASSET(2) char gGerudosFortressMinimapTex[] = dgGerudosFortressMinimapTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGerudosFortressMinimapTex[] = dgGerudosFortressMinimapTex; + +#endif // TEXTURES_MAP_GRAND_STATIC_H diff --git a/soh/assets/textures/map_i_static/map_i_static.h b/soh/assets/textures/map_i_static/map_i_static.h index cf6631830..ce7e28fe4 100644 --- a/soh/assets/textures/map_i_static/map_i_static.h +++ b/soh/assets/textures/map_i_static/map_i_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_MAP_I_STATIC_H +#define TEXTURES_MAP_I_STATIC_H 1 #include "align_asset_macro.h" @@ -717,4 +718,6 @@ static const ALIGN_ASSET(2) char gIceCavernRoom9MinimapTex[] = dgIceCavernRoom9M static const ALIGN_ASSET(2) char gIceCavernRoom10MinimapTex[] = dgIceCavernRoom10MinimapTex; #define dgIceCavernRoom11MinimapTex "__OTR__textures/map_i_static/gIceCavernRoom11MinimapTex" -static const ALIGN_ASSET(2) char gIceCavernRoom11MinimapTex[] = dgIceCavernRoom11MinimapTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gIceCavernRoom11MinimapTex[] = dgIceCavernRoom11MinimapTex; + +#endif // TEXTURES_MAP_I_STATIC_H diff --git a/soh/assets/textures/map_name_static/map_name_static.h b/soh/assets/textures/map_name_static/map_name_static.h index 1eb05a2a2..dcec5afcb 100644 --- a/soh/assets/textures/map_name_static/map_name_static.h +++ b/soh/assets/textures/map_name_static/map_name_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_MAP_NAME_STATIC_H +#define TEXTURES_MAP_NAME_STATIC_H 1 #include "align_asset_macro.h" @@ -306,4 +307,6 @@ static const ALIGN_ASSET(2) char gLonLonRanchPositionNameFRATex[] = dgLonLonRanc static const ALIGN_ASSET(2) char gQuestionMarkPositionNameFRATex[] = dgQuestionMarkPositionNameFRATex; #define dgGanonsCastlePositionNameFRATex "__OTR__textures/map_name_static/gGanonsCastlePositionNameFRATex" -static const ALIGN_ASSET(2) char gGanonsCastlePositionNameFRATex[] = dgGanonsCastlePositionNameFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanonsCastlePositionNameFRATex[] = dgGanonsCastlePositionNameFRATex; + +#endif // TEXTURES_MAP_NAME_STATIC_H diff --git a/soh/assets/textures/message_static/message_static.h b/soh/assets/textures/message_static/message_static.h index 0f8034768..e35ecfb28 100644 --- a/soh/assets/textures/message_static/message_static.h +++ b/soh/assets/textures/message_static/message_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_MESSAGE_STATIC_H +#define TEXTURES_MESSAGE_STATIC_H 1 #include "align_asset_macro.h" @@ -21,4 +22,6 @@ static const ALIGN_ASSET(2) char gMessageContinueTriangleTex[] = dgMessageContin static const ALIGN_ASSET(2) char gMessageEndSquareTex[] = dgMessageEndSquareTex; #define dgMessageArrowTex "__OTR__textures/message_static/gMessageArrowTex" -static const ALIGN_ASSET(2) char gMessageArrowTex[] = dgMessageArrowTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMessageArrowTex[] = dgMessageArrowTex; + +#endif // TEXTURES_MESSAGE_STATIC_H diff --git a/soh/assets/textures/message_texture_static/message_texture_static.h b/soh/assets/textures/message_texture_static/message_texture_static.h index 43f2a54b5..2808db825 100644 --- a/soh/assets/textures/message_texture_static/message_texture_static.h +++ b/soh/assets/textures/message_texture_static/message_texture_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_MESSAGE_TEXTURE_STATIC_H +#define TEXTURES_MESSAGE_TEXTURE_STATIC_H 1 #include "align_asset_macro.h" @@ -6,4 +7,6 @@ static const ALIGN_ASSET(2) char gRedMessageXLeftTex[] = dgRedMessageXLeftTex; #define dgRedMessageXRightTex "__OTR__textures/message_texture_static/gRedMessageXRightTex" -static const ALIGN_ASSET(2) char gRedMessageXRightTex[] = dgRedMessageXRightTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gRedMessageXRightTex[] = dgRedMessageXRightTex; + +#endif // TEXTURES_MESSAGE_TEXTURE_STATIC_H diff --git a/soh/assets/textures/nes_font_static/nes_font_static.h b/soh/assets/textures/nes_font_static/nes_font_static.h index 04b285f08..1f8ff8162 100644 --- a/soh/assets/textures/nes_font_static/nes_font_static.h +++ b/soh/assets/textures/nes_font_static/nes_font_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_NES_FONT_STATIC_H +#define TEXTURES_NES_FONT_STATIC_H 1 #include "align_asset_macro.h" @@ -420,4 +421,6 @@ static const ALIGN_ASSET(2) char gMsgCharA9ZTargetSignTex[] = dgMsgCharA9ZTarget static const ALIGN_ASSET(2) char gMsgCharAAControlStickTex[] = dgMsgCharAAControlStickTex; #define dgMsgCharABControlPadTex "__OTR__textures/nes_font_static/gMsgCharABControlPadTex" -static const ALIGN_ASSET(2) char gMsgCharABControlPadTex[] = dgMsgCharABControlPadTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMsgCharABControlPadTex[] = dgMsgCharABControlPadTex; + +#endif // TEXTURES_NES_FONT_STATIC_H diff --git a/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h b/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h index 8b3ad0816..978b0cd13 100644 --- a/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h +++ b/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_NINTENDO_ROGO_STATIC_H +#define TEXTURES_NINTENDO_ROGO_STATIC_H 1 #include "align_asset_macro.h" @@ -12,4 +13,6 @@ static const ALIGN_ASSET(2) char nintendo_rogo_static_Tex_001800[] = dnintendo_r static const ALIGN_ASSET(2) char gNintendo64LogoDL[] = dgNintendo64LogoDL; #define dnintendo_rogo_staticTex_0029C0 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_staticTex_0029C0" -static const ALIGN_ASSET(2) char nintendo_rogo_staticTex_0029C0[] = dnintendo_rogo_staticTex_0029C0; \ No newline at end of file +static const ALIGN_ASSET(2) char nintendo_rogo_staticTex_0029C0[] = dnintendo_rogo_staticTex_0029C0; + +#endif // TEXTURES_NINTENDO_ROGO_STATIC_H diff --git a/soh/assets/textures/parameter_static/parameter_static.h b/soh/assets/textures/parameter_static/parameter_static.h index c825f03a0..c7be020a5 100644 --- a/soh/assets/textures/parameter_static/parameter_static.h +++ b/soh/assets/textures/parameter_static/parameter_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_PARAMETER_STATIC_H +#define TEXTURES_PARAMETER_STATIC_H 1 #include "align_asset_macro.h" @@ -71,20 +72,20 @@ static const ALIGN_ASSET(2) char gArcheryScoreIconTex[] = dgArcheryScoreIconTex; #define dgMapBossIconTex "__OTR__textures/parameter_static/gMapBossIconTex" static const ALIGN_ASSET(2) char gMapBossIconTex[] = dgMapBossIconTex; -#define dgOcarinaATex "__OTR__textures/parameter_static/gOcarinaATex" -static const ALIGN_ASSET(2) char gOcarinaATex[] = dgOcarinaATex; +#define dgOcarinaBtnIconATex "__OTR__textures/parameter_static/gOcarinaBtnIconATex" +static const ALIGN_ASSET(2) char gOcarinaBtnIconATex[] = dgOcarinaBtnIconATex; -#define dgOcarinaCDownTex "__OTR__textures/parameter_static/gOcarinaCDownTex" -static const ALIGN_ASSET(2) char gOcarinaCDownTex[] = dgOcarinaCDownTex; +#define dgOcarinaBtnIconCDownTex "__OTR__textures/parameter_static/gOcarinaBtnIconCDownTex" +static const ALIGN_ASSET(2) char gOcarinaBtnIconCDownTex[] = dgOcarinaBtnIconCDownTex; -#define dgOcarinaCRightTex "__OTR__textures/parameter_static/gOcarinaCRightTex" -static const ALIGN_ASSET(2) char gOcarinaCRightTex[] = dgOcarinaCRightTex; +#define dgOcarinaBtnIconCRightTex "__OTR__textures/parameter_static/gOcarinaBtnIconCRightTex" +static const ALIGN_ASSET(2) char gOcarinaBtnIconCRightTex[] = dgOcarinaBtnIconCRightTex; -#define dgOcarinaCLeftTex "__OTR__textures/parameter_static/gOcarinaCLeftTex" -static const ALIGN_ASSET(2) char gOcarinaCLeftTex[] = dgOcarinaCLeftTex; +#define dgOcarinaBtnIconCLeftTex "__OTR__textures/parameter_static/gOcarinaBtnIconCLeftTex" +static const ALIGN_ASSET(2) char gOcarinaBtnIconCLeftTex[] = dgOcarinaBtnIconCLeftTex; -#define dgOcarinaCUpTex "__OTR__textures/parameter_static/gOcarinaCUpTex" -static const ALIGN_ASSET(2) char gOcarinaCUpTex[] = dgOcarinaCUpTex; +#define dgOcarinaBtnIconCUpTex "__OTR__textures/parameter_static/gOcarinaBtnIconCUpTex" +static const ALIGN_ASSET(2) char gOcarinaBtnIconCUpTex[] = dgOcarinaBtnIconCUpTex; #define dgOcarinaTrebleClefTex "__OTR__textures/parameter_static/gOcarinaTrebleClefTex" static const ALIGN_ASSET(2) char gOcarinaTrebleClefTex[] = dgOcarinaTrebleClefTex; @@ -168,4 +169,6 @@ static const ALIGN_ASSET(2) char gMagicMeterEndTex[] = dgMagicMeterEndTex; static const ALIGN_ASSET(2) char gMagicMeterMidTex[] = dgMagicMeterMidTex; #define dgMagicMeterFillTex "__OTR__textures/parameter_static/gMagicMeterFillTex" -static const ALIGN_ASSET(2) char gMagicMeterFillTex[] = dgMagicMeterFillTex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMagicMeterFillTex[] = dgMagicMeterFillTex; + +#endif // TEXTURES_PARAMETER_STATIC_H diff --git a/soh/assets/textures/place_title_cards/g_pn_01.h b/soh/assets/textures/place_title_cards/g_pn_01.h index 6c05796d0..b8ad5c8c1 100644 --- a/soh/assets/textures/place_title_cards/g_pn_01.h +++ b/soh/assets/textures/place_title_cards/g_pn_01.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_01_H +#define TEXTURES_G_PN_01_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gForestTempleTitleCardENGTex[] = dgForestTemple static const ALIGN_ASSET(2) char gForestTempleTitleCardGERTex[] = dgForestTempleTitleCardGERTex; #define dgForestTempleTitleCardFRATex "__OTR__textures/g_pn_01/gForestTempleTitleCardFRATex" -static const ALIGN_ASSET(2) char gForestTempleTitleCardFRATex[] = dgForestTempleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gForestTempleTitleCardFRATex[] = dgForestTempleTitleCardFRATex; + +#endif // TEXTURES_G_PN_01_H diff --git a/soh/assets/textures/place_title_cards/g_pn_02.h b/soh/assets/textures/place_title_cards/g_pn_02.h index 87d4d061f..8644b9061 100644 --- a/soh/assets/textures/place_title_cards/g_pn_02.h +++ b/soh/assets/textures/place_title_cards/g_pn_02.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_02_H +#define TEXTURES_G_PN_02_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gShadowTempleTitleCardENGTex[] = dgShadowTemple static const ALIGN_ASSET(2) char gShadowTempleTitleCardGERTex[] = dgShadowTempleTitleCardGERTex; #define dgShadowTempleTitleCardFRATex "__OTR__textures/g_pn_02/gShadowTempleTitleCardFRATex" -static const ALIGN_ASSET(2) char gShadowTempleTitleCardFRATex[] = dgShadowTempleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gShadowTempleTitleCardFRATex[] = dgShadowTempleTitleCardFRATex; + +#endif // TEXTURES_G_PN_02_H diff --git a/soh/assets/textures/place_title_cards/g_pn_03.h b/soh/assets/textures/place_title_cards/g_pn_03.h index 8e9f39ada..da783eeb5 100644 --- a/soh/assets/textures/place_title_cards/g_pn_03.h +++ b/soh/assets/textures/place_title_cards/g_pn_03.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_03_H +#define TEXTURES_G_PN_03_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gFireTempleTitleCardENGTex[] = dgFireTempleTitl static const ALIGN_ASSET(2) char gFireTempleTitleCardGERTex[] = dgFireTempleTitleCardGERTex; #define dgFireTempleTitleCardFRATex "__OTR__textures/g_pn_03/gFireTempleTitleCardFRATex" -static const ALIGN_ASSET(2) char gFireTempleTitleCardFRATex[] = dgFireTempleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gFireTempleTitleCardFRATex[] = dgFireTempleTitleCardFRATex; + +#endif // TEXTURES_G_PN_03_H diff --git a/soh/assets/textures/place_title_cards/g_pn_04.h b/soh/assets/textures/place_title_cards/g_pn_04.h index f5652b8ed..4e96b8fd9 100644 --- a/soh/assets/textures/place_title_cards/g_pn_04.h +++ b/soh/assets/textures/place_title_cards/g_pn_04.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_04_H +#define TEXTURES_G_PN_04_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gWaterTempleTitleCardENGTex[] = dgWaterTempleTi static const ALIGN_ASSET(2) char gWaterTempleTitleCardGERTex[] = dgWaterTempleTitleCardGERTex; #define dgWaterTempleTitleCardFRATex "__OTR__textures/g_pn_04/gWaterTempleTitleCardFRATex" -static const ALIGN_ASSET(2) char gWaterTempleTitleCardFRATex[] = dgWaterTempleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gWaterTempleTitleCardFRATex[] = dgWaterTempleTitleCardFRATex; + +#endif // TEXTURES_G_PN_04_H diff --git a/soh/assets/textures/place_title_cards/g_pn_05.h b/soh/assets/textures/place_title_cards/g_pn_05.h index a4e7d31b1..e9e4a8dc7 100644 --- a/soh/assets/textures/place_title_cards/g_pn_05.h +++ b/soh/assets/textures/place_title_cards/g_pn_05.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_05_H +#define TEXTURES_G_PN_05_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gSpiritTempleTitleCardENGTex[] = dgSpiritTemple static const ALIGN_ASSET(2) char gSpiritTempleTitleCardGERTex[] = dgSpiritTempleTitleCardGERTex; #define dgSpiritTempleTitleCardFRATex "__OTR__textures/g_pn_05/gSpiritTempleTitleCardFRATex" -static const ALIGN_ASSET(2) char gSpiritTempleTitleCardFRATex[] = dgSpiritTempleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSpiritTempleTitleCardFRATex[] = dgSpiritTempleTitleCardFRATex; + +#endif // TEXTURES_G_PN_05_H diff --git a/soh/assets/textures/place_title_cards/g_pn_06.h b/soh/assets/textures/place_title_cards/g_pn_06.h index 68155125f..3bb37b7f2 100644 --- a/soh/assets/textures/place_title_cards/g_pn_06.h +++ b/soh/assets/textures/place_title_cards/g_pn_06.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_06_H +#define TEXTURES_G_PN_06_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gDekuTreeTitleCardENGTex[] = dgDekuTreeTitleCar static const ALIGN_ASSET(2) char gDekuTreeTitleCardGERTex[] = dgDekuTreeTitleCardGERTex; #define dgDekuTreeTitleCardFRATex "__OTR__textures/g_pn_06/gDekuTreeTitleCardFRATex" -static const ALIGN_ASSET(2) char gDekuTreeTitleCardFRATex[] = dgDekuTreeTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDekuTreeTitleCardFRATex[] = dgDekuTreeTitleCardFRATex; + +#endif // TEXTURES_G_PN_06_H diff --git a/soh/assets/textures/place_title_cards/g_pn_07.h b/soh/assets/textures/place_title_cards/g_pn_07.h index 70fdf6c51..83707850d 100644 --- a/soh/assets/textures/place_title_cards/g_pn_07.h +++ b/soh/assets/textures/place_title_cards/g_pn_07.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_07_H +#define TEXTURES_G_PN_07_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gJabuJabuTitleCardENGTex[] = dgJabuJabuTitleCar static const ALIGN_ASSET(2) char gJabuJabuTitleCardGERTex[] = dgJabuJabuTitleCardGERTex; #define dgJabuJabuTitleCardFRATex "__OTR__textures/g_pn_07/gJabuJabuTitleCardFRATex" -static const ALIGN_ASSET(2) char gJabuJabuTitleCardFRATex[] = dgJabuJabuTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gJabuJabuTitleCardFRATex[] = dgJabuJabuTitleCardFRATex; + +#endif // TEXTURES_G_PN_07_H diff --git a/soh/assets/textures/place_title_cards/g_pn_08.h b/soh/assets/textures/place_title_cards/g_pn_08.h index b649c3f1a..cbad62d9e 100644 --- a/soh/assets/textures/place_title_cards/g_pn_08.h +++ b/soh/assets/textures/place_title_cards/g_pn_08.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_08_H +#define TEXTURES_G_PN_08_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gDodongosCavernTitleCardENGTex[] = dgDodongosCa static const ALIGN_ASSET(2) char gDodongosCavernTitleCardGERTex[] = dgDodongosCavernTitleCardGERTex; #define dgDodongosCavernTitleCardFRATex "__OTR__textures/g_pn_08/gDodongosCavernTitleCardFRATex" -static const ALIGN_ASSET(2) char gDodongosCavernTitleCardFRATex[] = dgDodongosCavernTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDodongosCavernTitleCardFRATex[] = dgDodongosCavernTitleCardFRATex; + +#endif // TEXTURES_G_PN_08_H diff --git a/soh/assets/textures/place_title_cards/g_pn_09.h b/soh/assets/textures/place_title_cards/g_pn_09.h index b166b6b14..d9e897662 100644 --- a/soh/assets/textures/place_title_cards/g_pn_09.h +++ b/soh/assets/textures/place_title_cards/g_pn_09.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_09_H +#define TEXTURES_G_PN_09_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gInsideGanonsCastleTitleCardENGTex[] = dgInside static const ALIGN_ASSET(2) char gInsideGanonsCastleTitleCardGERTex[] = dgInsideGanonsCastleTitleCardGERTex; #define dgInsideGanonsCastleTitleCardFRATex "__OTR__textures/g_pn_09/gInsideGanonsCastleTitleCardFRATex" -static const ALIGN_ASSET(2) char gInsideGanonsCastleTitleCardFRATex[] = dgInsideGanonsCastleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gInsideGanonsCastleTitleCardFRATex[] = dgInsideGanonsCastleTitleCardFRATex; + +#endif // TEXTURES_G_PN_09_H diff --git a/soh/assets/textures/place_title_cards/g_pn_10.h b/soh/assets/textures/place_title_cards/g_pn_10.h index 077104377..f82384b57 100644 --- a/soh/assets/textures/place_title_cards/g_pn_10.h +++ b/soh/assets/textures/place_title_cards/g_pn_10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_10_H +#define TEXTURES_G_PN_10_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gIceCavernTitleCardENGTex[] = dgIceCavernTitleC static const ALIGN_ASSET(2) char gIceCavernTitleCardGERTex[] = dgIceCavernTitleCardGERTex; #define dgIceCavernTitleCardFRATex "__OTR__textures/g_pn_10/gIceCavernTitleCardFRATex" -static const ALIGN_ASSET(2) char gIceCavernTitleCardFRATex[] = dgIceCavernTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gIceCavernTitleCardFRATex[] = dgIceCavernTitleCardFRATex; + +#endif // TEXTURES_G_PN_10_H diff --git a/soh/assets/textures/place_title_cards/g_pn_11.h b/soh/assets/textures/place_title_cards/g_pn_11.h index 2bc0021e7..49effb265 100644 --- a/soh/assets/textures/place_title_cards/g_pn_11.h +++ b/soh/assets/textures/place_title_cards/g_pn_11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_11_H +#define TEXTURES_G_PN_11_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGERudoTrainingGroundTitleCardENGTex[] = dgGERu static const ALIGN_ASSET(2) char gGERudoTrainingGroundTitleCardGERTex[] = dgGERudoTrainingGroundTitleCardGERTex; #define dgGERudoTrainingGroundTitleCardFRATex "__OTR__textures/g_pn_11/gGERudoTrainingGroundTitleCardFRATex" -static const ALIGN_ASSET(2) char gGERudoTrainingGroundTitleCardFRATex[] = dgGERudoTrainingGroundTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGERudoTrainingGroundTitleCardFRATex[] = dgGERudoTrainingGroundTitleCardFRATex; + +#endif // TEXTURES_G_PN_11_H diff --git a/soh/assets/textures/place_title_cards/g_pn_12.h b/soh/assets/textures/place_title_cards/g_pn_12.h index 93bae4cad..7b89829b3 100644 --- a/soh/assets/textures/place_title_cards/g_pn_12.h +++ b/soh/assets/textures/place_title_cards/g_pn_12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_12_H +#define TEXTURES_G_PN_12_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gCastleCourtyardTitleCardENGTex[] = dgCastleCou static const ALIGN_ASSET(2) char gCastleCourtyardTitleCardGERTex[] = dgCastleCourtyardTitleCardGERTex; #define dgCastleCourtyardTitleCardFRATex "__OTR__textures/g_pn_12/gCastleCourtyardTitleCardFRATex" -static const ALIGN_ASSET(2) char gCastleCourtyardTitleCardFRATex[] = dgCastleCourtyardTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gCastleCourtyardTitleCardFRATex[] = dgCastleCourtyardTitleCardFRATex; + +#endif // TEXTURES_G_PN_12_H diff --git a/soh/assets/textures/place_title_cards/g_pn_13.h b/soh/assets/textures/place_title_cards/g_pn_13.h index 428154db0..2dcdffb3c 100644 --- a/soh/assets/textures/place_title_cards/g_pn_13.h +++ b/soh/assets/textures/place_title_cards/g_pn_13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_13_H +#define TEXTURES_G_PN_13_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGreatFairysFountainTitleCardENGTex[] = dgGreat static const ALIGN_ASSET(2) char gGreatFairysFountainTitleCardGERTex[] = dgGreatFairysFountainTitleCardGERTex; #define dgGreatFairysFountainTitleCardFRATex "__OTR__textures/g_pn_13/gGreatFairysFountainTitleCardFRATex" -static const ALIGN_ASSET(2) char gGreatFairysFountainTitleCardFRATex[] = dgGreatFairysFountainTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGreatFairysFountainTitleCardFRATex[] = dgGreatFairysFountainTitleCardFRATex; + +#endif // TEXTURES_G_PN_13_H diff --git a/soh/assets/textures/place_title_cards/g_pn_14.h b/soh/assets/textures/place_title_cards/g_pn_14.h index b8f7392ee..6154ce378 100644 --- a/soh/assets/textures/place_title_cards/g_pn_14.h +++ b/soh/assets/textures/place_title_cards/g_pn_14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_14_H +#define TEXTURES_G_PN_14_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gChamberOfTheSagesTitleCardENGTex[] = dgChamber static const ALIGN_ASSET(2) char gChamberOfTheSagesTitleCardGERTex[] = dgChamberOfTheSagesTitleCardGERTex; #define dgChamberOfTheSagesTitleCardFRATex "__OTR__textures/g_pn_14/gChamberOfTheSagesTitleCardFRATex" -static const ALIGN_ASSET(2) char gChamberOfTheSagesTitleCardFRATex[] = dgChamberOfTheSagesTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gChamberOfTheSagesTitleCardFRATex[] = dgChamberOfTheSagesTitleCardFRATex; + +#endif // TEXTURES_G_PN_14_H diff --git a/soh/assets/textures/place_title_cards/g_pn_15.h b/soh/assets/textures/place_title_cards/g_pn_15.h index f145ed98d..ab1c89bce 100644 --- a/soh/assets/textures/place_title_cards/g_pn_15.h +++ b/soh/assets/textures/place_title_cards/g_pn_15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_15_H +#define TEXTURES_G_PN_15_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gShootingGalleryTitleCardENGTex[] = dgShootingG static const ALIGN_ASSET(2) char gShootingGalleryTitleCardGERTex[] = dgShootingGalleryTitleCardGERTex; #define dgShootingGalleryTitleCardFRATex "__OTR__textures/g_pn_15/gShootingGalleryTitleCardFRATex" -static const ALIGN_ASSET(2) char gShootingGalleryTitleCardFRATex[] = dgShootingGalleryTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gShootingGalleryTitleCardFRATex[] = dgShootingGalleryTitleCardFRATex; + +#endif // TEXTURES_G_PN_15_H diff --git a/soh/assets/textures/place_title_cards/g_pn_16.h b/soh/assets/textures/place_title_cards/g_pn_16.h index 24919ba74..e88ccd672 100644 --- a/soh/assets/textures/place_title_cards/g_pn_16.h +++ b/soh/assets/textures/place_title_cards/g_pn_16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_16_H +#define TEXTURES_G_PN_16_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gTempleOfTimeTitleCardENGTex[] = dgTempleOfTime static const ALIGN_ASSET(2) char gTempleOfTimeTitleCardGERTex[] = dgTempleOfTimeTitleCardGERTex; #define dgTempleOfTimeTitleCardFRATex "__OTR__textures/g_pn_16/gTempleOfTimeTitleCardFRATex" -static const ALIGN_ASSET(2) char gTempleOfTimeTitleCardFRATex[] = dgTempleOfTimeTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gTempleOfTimeTitleCardFRATex[] = dgTempleOfTimeTitleCardFRATex; + +#endif // TEXTURES_G_PN_16_H diff --git a/soh/assets/textures/place_title_cards/g_pn_17.h b/soh/assets/textures/place_title_cards/g_pn_17.h index e0d296397..7384b3c83 100644 --- a/soh/assets/textures/place_title_cards/g_pn_17.h +++ b/soh/assets/textures/place_title_cards/g_pn_17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_17_H +#define TEXTURES_G_PN_17_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gMarketTitleCardENGTex[] = dgMarketTitleCardENG static const ALIGN_ASSET(2) char gMarketTitleCardGERTex[] = dgMarketTitleCardGERTex; #define dgMarketTitleCardFRATex "__OTR__textures/g_pn_17/gMarketTitleCardFRATex" -static const ALIGN_ASSET(2) char gMarketTitleCardFRATex[] = dgMarketTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gMarketTitleCardFRATex[] = dgMarketTitleCardFRATex; + +#endif // TEXTURES_G_PN_17_H diff --git a/soh/assets/textures/place_title_cards/g_pn_18.h b/soh/assets/textures/place_title_cards/g_pn_18.h index 67e1f2a07..ae7ecf991 100644 --- a/soh/assets/textures/place_title_cards/g_pn_18.h +++ b/soh/assets/textures/place_title_cards/g_pn_18.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_18_H +#define TEXTURES_G_PN_18_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBackAlleyTitleCardENGTex[] = dgBackAlleyTitleC static const ALIGN_ASSET(2) char gBackAlleyTitleCardGERTex[] = dgBackAlleyTitleCardGERTex; #define dgBackAlleyTitleCardFRATex "__OTR__textures/g_pn_18/gBackAlleyTitleCardFRATex" -static const ALIGN_ASSET(2) char gBackAlleyTitleCardFRATex[] = dgBackAlleyTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBackAlleyTitleCardFRATex[] = dgBackAlleyTitleCardFRATex; + +#endif // TEXTURES_G_PN_18_H diff --git a/soh/assets/textures/place_title_cards/g_pn_19.h b/soh/assets/textures/place_title_cards/g_pn_19.h index 0d8d51207..3b041b9d2 100644 --- a/soh/assets/textures/place_title_cards/g_pn_19.h +++ b/soh/assets/textures/place_title_cards/g_pn_19.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_19_H +#define TEXTURES_G_PN_19_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gKokiriShopTitleCardENGTex[] = dgKokiriShopTitl static const ALIGN_ASSET(2) char gKokiriShopTitleCardGERTex[] = dgKokiriShopTitleCardGERTex; #define dgKokiriShopTitleCardFRATex "__OTR__textures/g_pn_19/gKokiriShopTitleCardFRATex" -static const ALIGN_ASSET(2) char gKokiriShopTitleCardFRATex[] = dgKokiriShopTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKokiriShopTitleCardFRATex[] = dgKokiriShopTitleCardFRATex; + +#endif // TEXTURES_G_PN_19_H diff --git a/soh/assets/textures/place_title_cards/g_pn_20.h b/soh/assets/textures/place_title_cards/g_pn_20.h index be49815de..f65dfb4c7 100644 --- a/soh/assets/textures/place_title_cards/g_pn_20.h +++ b/soh/assets/textures/place_title_cards/g_pn_20.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_20_H +#define TEXTURES_G_PN_20_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGoronShopTitleCardENGTex[] = dgGoronShopTitleC static const ALIGN_ASSET(2) char gGoronShopTitleCardGERTex[] = dgGoronShopTitleCardGERTex; #define dgGoronShopTitleCardFRATex "__OTR__textures/g_pn_20/gGoronShopTitleCardFRATex" -static const ALIGN_ASSET(2) char gGoronShopTitleCardFRATex[] = dgGoronShopTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoronShopTitleCardFRATex[] = dgGoronShopTitleCardFRATex; + +#endif // TEXTURES_G_PN_20_H diff --git a/soh/assets/textures/place_title_cards/g_pn_21.h b/soh/assets/textures/place_title_cards/g_pn_21.h index 4d6eb0cf5..88e16867b 100644 --- a/soh/assets/textures/place_title_cards/g_pn_21.h +++ b/soh/assets/textures/place_title_cards/g_pn_21.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_21_H +#define TEXTURES_G_PN_21_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gZoraShopTitleCardENGTex[] = dgZoraShopTitleCar static const ALIGN_ASSET(2) char gZoraShopTitleCardGERTex[] = dgZoraShopTitleCardGERTex; #define dgZoraShopTitleCardFRATex "__OTR__textures/g_pn_21/gZoraShopTitleCardFRATex" -static const ALIGN_ASSET(2) char gZoraShopTitleCardFRATex[] = dgZoraShopTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gZoraShopTitleCardFRATex[] = dgZoraShopTitleCardFRATex; + +#endif // TEXTURES_G_PN_21_H diff --git a/soh/assets/textures/place_title_cards/g_pn_22.h b/soh/assets/textures/place_title_cards/g_pn_22.h index 7a68835e8..a4db8707a 100644 --- a/soh/assets/textures/place_title_cards/g_pn_22.h +++ b/soh/assets/textures/place_title_cards/g_pn_22.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_22_H +#define TEXTURES_G_PN_22_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gHouseOfSkulltulaTitleCardENGTex[] = dgHouseOfS static const ALIGN_ASSET(2) char gHouseOfSkulltulaTitleCardGERTex[] = dgHouseOfSkulltulaTitleCardGERTex; #define dgHouseOfSkulltulaTitleCardFRATex "__OTR__textures/g_pn_22/gHouseOfSkulltulaTitleCardFRATex" -static const ALIGN_ASSET(2) char gHouseOfSkulltulaTitleCardFRATex[] = dgHouseOfSkulltulaTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHouseOfSkulltulaTitleCardFRATex[] = dgHouseOfSkulltulaTitleCardFRATex; + +#endif // TEXTURES_G_PN_22_H diff --git a/soh/assets/textures/place_title_cards/g_pn_23.h b/soh/assets/textures/place_title_cards/g_pn_23.h index f91cc59bb..4fbc3f08f 100644 --- a/soh/assets/textures/place_title_cards/g_pn_23.h +++ b/soh/assets/textures/place_title_cards/g_pn_23.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_23_H +#define TEXTURES_G_PN_23_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBazaarTitleCardENGTex[] = dgBazaarTitleCardENG static const ALIGN_ASSET(2) char gBazaarTitleCardGERTex[] = dgBazaarTitleCardGERTex; #define dgBazaarTitleCardFRATex "__OTR__textures/g_pn_23/gBazaarTitleCardFRATex" -static const ALIGN_ASSET(2) char gBazaarTitleCardFRATex[] = dgBazaarTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBazaarTitleCardFRATex[] = dgBazaarTitleCardFRATex; + +#endif // TEXTURES_G_PN_23_H diff --git a/soh/assets/textures/place_title_cards/g_pn_24.h b/soh/assets/textures/place_title_cards/g_pn_24.h index ffede7dc9..b0f928c58 100644 --- a/soh/assets/textures/place_title_cards/g_pn_24.h +++ b/soh/assets/textures/place_title_cards/g_pn_24.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_24_H +#define TEXTURES_G_PN_24_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gPotionShopTitleCardENGTex[] = dgPotionShopTitl static const ALIGN_ASSET(2) char gPotionShopTitleCardGERTex[] = dgPotionShopTitleCardGERTex; #define dgPotionShopTitleCardFRATex "__OTR__textures/g_pn_24/gPotionShopTitleCardFRATex" -static const ALIGN_ASSET(2) char gPotionShopTitleCardFRATex[] = dgPotionShopTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gPotionShopTitleCardFRATex[] = dgPotionShopTitleCardFRATex; + +#endif // TEXTURES_G_PN_24_H diff --git a/soh/assets/textures/place_title_cards/g_pn_25.h b/soh/assets/textures/place_title_cards/g_pn_25.h index 08b9ddb3d..39363fdd0 100644 --- a/soh/assets/textures/place_title_cards/g_pn_25.h +++ b/soh/assets/textures/place_title_cards/g_pn_25.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_25_H +#define TEXTURES_G_PN_25_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGravekeepersHutTitleCardENGTex[] = dgGravekeep static const ALIGN_ASSET(2) char gGravekeepersHutTitleCardGERTex[] = dgGravekeepersHutTitleCardGERTex; #define dgGravekeepersHutTitleCardFRATex "__OTR__textures/g_pn_25/gGravekeepersHutTitleCardFRATex" -static const ALIGN_ASSET(2) char gGravekeepersHutTitleCardFRATex[] = dgGravekeepersHutTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGravekeepersHutTitleCardFRATex[] = dgGravekeepersHutTitleCardFRATex; + +#endif // TEXTURES_G_PN_25_H diff --git a/soh/assets/textures/place_title_cards/g_pn_26.h b/soh/assets/textures/place_title_cards/g_pn_26.h index 6c274a2a1..69a97da3b 100644 --- a/soh/assets/textures/place_title_cards/g_pn_26.h +++ b/soh/assets/textures/place_title_cards/g_pn_26.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_26_H +#define TEXTURES_G_PN_26_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gLakesideLaboratoryTitleCardENGTex[] = dgLakesi static const ALIGN_ASSET(2) char gLakesideLaboratoryTitleCardGERTex[] = dgLakesideLaboratoryTitleCardGERTex; #define dgLakesideLaboratoryTitleCardFRATex "__OTR__textures/g_pn_26/gLakesideLaboratoryTitleCardFRATex" -static const ALIGN_ASSET(2) char gLakesideLaboratoryTitleCardFRATex[] = dgLakesideLaboratoryTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLakesideLaboratoryTitleCardFRATex[] = dgLakesideLaboratoryTitleCardFRATex; + +#endif // TEXTURES_G_PN_26_H diff --git a/soh/assets/textures/place_title_cards/g_pn_27.h b/soh/assets/textures/place_title_cards/g_pn_27.h index fda1bd4e5..920f49831 100644 --- a/soh/assets/textures/place_title_cards/g_pn_27.h +++ b/soh/assets/textures/place_title_cards/g_pn_27.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_27_H +#define TEXTURES_G_PN_27_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gHyruleFieldTitleCardENGTex[] = dgHyruleFieldTi static const ALIGN_ASSET(2) char gHyruleFieldTitleCardGERTex[] = dgHyruleFieldTitleCardGERTex; #define dgHyruleFieldTitleCardFRATex "__OTR__textures/g_pn_27/gHyruleFieldTitleCardFRATex" -static const ALIGN_ASSET(2) char gHyruleFieldTitleCardFRATex[] = dgHyruleFieldTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHyruleFieldTitleCardFRATex[] = dgHyruleFieldTitleCardFRATex; + +#endif // TEXTURES_G_PN_27_H diff --git a/soh/assets/textures/place_title_cards/g_pn_28.h b/soh/assets/textures/place_title_cards/g_pn_28.h index 85f4ebd27..ef868931a 100644 --- a/soh/assets/textures/place_title_cards/g_pn_28.h +++ b/soh/assets/textures/place_title_cards/g_pn_28.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_28_H +#define TEXTURES_G_PN_28_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gKakarikoVillageTitleCardENGTex[] = dgKakarikoV static const ALIGN_ASSET(2) char gKakarikoVillageTitleCardGERTex[] = dgKakarikoVillageTitleCardGERTex; #define dgKakarikoVillageTitleCardFRATex "__OTR__textures/g_pn_28/gKakarikoVillageTitleCardFRATex" -static const ALIGN_ASSET(2) char gKakarikoVillageTitleCardFRATex[] = dgKakarikoVillageTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKakarikoVillageTitleCardFRATex[] = dgKakarikoVillageTitleCardFRATex; + +#endif // TEXTURES_G_PN_28_H diff --git a/soh/assets/textures/place_title_cards/g_pn_29.h b/soh/assets/textures/place_title_cards/g_pn_29.h index 0f80a0bf4..6d13ed007 100644 --- a/soh/assets/textures/place_title_cards/g_pn_29.h +++ b/soh/assets/textures/place_title_cards/g_pn_29.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_29_H +#define TEXTURES_G_PN_29_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGraveyardTitleCardENGTex[] = dgGraveyardTitleC static const ALIGN_ASSET(2) char gGraveyardTitleCardGERTex[] = dgGraveyardTitleCardGERTex; #define dgGraveyardTitleCardFRATex "__OTR__textures/g_pn_29/gGraveyardTitleCardFRATex" -static const ALIGN_ASSET(2) char gGraveyardTitleCardFRATex[] = dgGraveyardTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGraveyardTitleCardFRATex[] = dgGraveyardTitleCardFRATex; + +#endif // TEXTURES_G_PN_29_H diff --git a/soh/assets/textures/place_title_cards/g_pn_30.h b/soh/assets/textures/place_title_cards/g_pn_30.h index abb6e6450..48f9672ff 100644 --- a/soh/assets/textures/place_title_cards/g_pn_30.h +++ b/soh/assets/textures/place_title_cards/g_pn_30.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_30_H +#define TEXTURES_G_PN_30_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gZorasRiverTitleCardENGTex[] = dgZorasRiverTitl static const ALIGN_ASSET(2) char gZorasRiverTitleCardGERTex[] = dgZorasRiverTitleCardGERTex; #define dgZorasRiverTitleCardFRATex "__OTR__textures/g_pn_30/gZorasRiverTitleCardFRATex" -static const ALIGN_ASSET(2) char gZorasRiverTitleCardFRATex[] = dgZorasRiverTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gZorasRiverTitleCardFRATex[] = dgZorasRiverTitleCardFRATex; + +#endif // TEXTURES_G_PN_30_H diff --git a/soh/assets/textures/place_title_cards/g_pn_31.h b/soh/assets/textures/place_title_cards/g_pn_31.h index 1905e0103..318771c65 100644 --- a/soh/assets/textures/place_title_cards/g_pn_31.h +++ b/soh/assets/textures/place_title_cards/g_pn_31.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_31_H +#define TEXTURES_G_PN_31_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gKokiriForestTitleCardENGTex[] = dgKokiriForest static const ALIGN_ASSET(2) char gKokiriForestTitleCardGERTex[] = dgKokiriForestTitleCardGERTex; #define dgKokiriForestTitleCardFRATex "__OTR__textures/g_pn_31/gKokiriForestTitleCardFRATex" -static const ALIGN_ASSET(2) char gKokiriForestTitleCardFRATex[] = dgKokiriForestTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gKokiriForestTitleCardFRATex[] = dgKokiriForestTitleCardFRATex; + +#endif // TEXTURES_G_PN_31_H diff --git a/soh/assets/textures/place_title_cards/g_pn_32.h b/soh/assets/textures/place_title_cards/g_pn_32.h index f971171f8..98f1be874 100644 --- a/soh/assets/textures/place_title_cards/g_pn_32.h +++ b/soh/assets/textures/place_title_cards/g_pn_32.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_32_H +#define TEXTURES_G_PN_32_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gLakeHyliaTitleCardENGTex[] = dgLakeHyliaTitleC static const ALIGN_ASSET(2) char gLakeHyliaTitleCardGERTex[] = dgLakeHyliaTitleCardGERTex; #define dgLakeHyliaTitleCardFRATex "__OTR__textures/g_pn_32/gLakeHyliaTitleCardFRATex" -static const ALIGN_ASSET(2) char gLakeHyliaTitleCardFRATex[] = dgLakeHyliaTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLakeHyliaTitleCardFRATex[] = dgLakeHyliaTitleCardFRATex; + +#endif // TEXTURES_G_PN_32_H diff --git a/soh/assets/textures/place_title_cards/g_pn_33.h b/soh/assets/textures/place_title_cards/g_pn_33.h index 0298fdc06..2f0ed4b89 100644 --- a/soh/assets/textures/place_title_cards/g_pn_33.h +++ b/soh/assets/textures/place_title_cards/g_pn_33.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_33_H +#define TEXTURES_G_PN_33_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gZorasDomainTitleCardENGTex[] = dgZorasDomainTi static const ALIGN_ASSET(2) char gZorasDomainTitleCardGERTex[] = dgZorasDomainTitleCardGERTex; #define dgZorasDomainTitleCardFRATex "__OTR__textures/g_pn_33/gZorasDomainTitleCardFRATex" -static const ALIGN_ASSET(2) char gZorasDomainTitleCardFRATex[] = dgZorasDomainTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gZorasDomainTitleCardFRATex[] = dgZorasDomainTitleCardFRATex; + +#endif // TEXTURES_G_PN_33_H diff --git a/soh/assets/textures/place_title_cards/g_pn_34.h b/soh/assets/textures/place_title_cards/g_pn_34.h index ddadc9157..b76273be5 100644 --- a/soh/assets/textures/place_title_cards/g_pn_34.h +++ b/soh/assets/textures/place_title_cards/g_pn_34.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_34_H +#define TEXTURES_G_PN_34_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gZorasFountainTitleCardENGTex[] = dgZorasFounta static const ALIGN_ASSET(2) char gZorasFountainTitleCardGERTex[] = dgZorasFountainTitleCardGERTex; #define dgZorasFountainTitleCardFRATex "__OTR__textures/g_pn_34/gZorasFountainTitleCardFRATex" -static const ALIGN_ASSET(2) char gZorasFountainTitleCardFRATex[] = dgZorasFountainTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gZorasFountainTitleCardFRATex[] = dgZorasFountainTitleCardFRATex; + +#endif // TEXTURES_G_PN_34_H diff --git a/soh/assets/textures/place_title_cards/g_pn_35.h b/soh/assets/textures/place_title_cards/g_pn_35.h index b1b0c202c..5d80e6355 100644 --- a/soh/assets/textures/place_title_cards/g_pn_35.h +++ b/soh/assets/textures/place_title_cards/g_pn_35.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_35_H +#define TEXTURES_G_PN_35_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGERudoValleyTitleCardENGTex[] = dgGERudoValley static const ALIGN_ASSET(2) char gGERudoValleyTitleCardGERTex[] = dgGERudoValleyTitleCardGERTex; #define dgGERudoValleyTitleCardFRATex "__OTR__textures/g_pn_35/gGERudoValleyTitleCardFRATex" -static const ALIGN_ASSET(2) char gGERudoValleyTitleCardFRATex[] = dgGERudoValleyTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGERudoValleyTitleCardFRATex[] = dgGERudoValleyTitleCardFRATex; + +#endif // TEXTURES_G_PN_35_H diff --git a/soh/assets/textures/place_title_cards/g_pn_36.h b/soh/assets/textures/place_title_cards/g_pn_36.h index ea3b843bc..ef7d8763c 100644 --- a/soh/assets/textures/place_title_cards/g_pn_36.h +++ b/soh/assets/textures/place_title_cards/g_pn_36.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_36_H +#define TEXTURES_G_PN_36_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gLostWoodsTitleCardENGTex[] = dgLostWoodsTitleC static const ALIGN_ASSET(2) char gLostWoodsTitleCardGERTex[] = dgLostWoodsTitleCardGERTex; #define dgLostWoodsTitleCardFRATex "__OTR__textures/g_pn_36/gLostWoodsTitleCardFRATex" -static const ALIGN_ASSET(2) char gLostWoodsTitleCardFRATex[] = dgLostWoodsTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLostWoodsTitleCardFRATex[] = dgLostWoodsTitleCardFRATex; + +#endif // TEXTURES_G_PN_36_H diff --git a/soh/assets/textures/place_title_cards/g_pn_37.h b/soh/assets/textures/place_title_cards/g_pn_37.h index 41d8f2d14..6cf37fc17 100644 --- a/soh/assets/textures/place_title_cards/g_pn_37.h +++ b/soh/assets/textures/place_title_cards/g_pn_37.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_37_H +#define TEXTURES_G_PN_37_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gHauntedWastelandTitleCardENGTex[] = dgHauntedW static const ALIGN_ASSET(2) char gHauntedWastelandTitleCardGERTex[] = dgHauntedWastelandTitleCardGERTex; #define dgHauntedWastelandTitleCardFRATex "__OTR__textures/g_pn_37/gHauntedWastelandTitleCardFRATex" -static const ALIGN_ASSET(2) char gHauntedWastelandTitleCardFRATex[] = dgHauntedWastelandTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHauntedWastelandTitleCardFRATex[] = dgHauntedWastelandTitleCardFRATex; + +#endif // TEXTURES_G_PN_37_H diff --git a/soh/assets/textures/place_title_cards/g_pn_38.h b/soh/assets/textures/place_title_cards/g_pn_38.h index fdc80d217..64925b3d4 100644 --- a/soh/assets/textures/place_title_cards/g_pn_38.h +++ b/soh/assets/textures/place_title_cards/g_pn_38.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_38_H +#define TEXTURES_G_PN_38_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gHyruleCastleTitleCardENGTex[] = dgHyruleCastle static const ALIGN_ASSET(2) char gHyruleCastleTitleCardGERTex[] = dgHyruleCastleTitleCardGERTex; #define dgHyruleCastleTitleCardFRATex "__OTR__textures/g_pn_38/gHyruleCastleTitleCardFRATex" -static const ALIGN_ASSET(2) char gHyruleCastleTitleCardFRATex[] = dgHyruleCastleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHyruleCastleTitleCardFRATex[] = dgHyruleCastleTitleCardFRATex; + +#endif // TEXTURES_G_PN_38_H diff --git a/soh/assets/textures/place_title_cards/g_pn_39.h b/soh/assets/textures/place_title_cards/g_pn_39.h index 601b533f1..840314c93 100644 --- a/soh/assets/textures/place_title_cards/g_pn_39.h +++ b/soh/assets/textures/place_title_cards/g_pn_39.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_39_H +#define TEXTURES_G_PN_39_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gDeathMountainTrailTitleCardENGTex[] = dgDeathM static const ALIGN_ASSET(2) char gDeathMountainTrailTitleCardGERTex[] = dgDeathMountainTrailTitleCardGERTex; #define dgDeathMountainTrailTitleCardFRATex "__OTR__textures/g_pn_39/gDeathMountainTrailTitleCardFRATex" -static const ALIGN_ASSET(2) char gDeathMountainTrailTitleCardFRATex[] = dgDeathMountainTrailTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDeathMountainTrailTitleCardFRATex[] = dgDeathMountainTrailTitleCardFRATex; + +#endif // TEXTURES_G_PN_39_H diff --git a/soh/assets/textures/place_title_cards/g_pn_40.h b/soh/assets/textures/place_title_cards/g_pn_40.h index 660e9a49d..f87928212 100644 --- a/soh/assets/textures/place_title_cards/g_pn_40.h +++ b/soh/assets/textures/place_title_cards/g_pn_40.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_40_H +#define TEXTURES_G_PN_40_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gDeathMountainCraterTitleCardENGTex[] = dgDeath static const ALIGN_ASSET(2) char gDeathMountainCraterTitleCardGERTex[] = dgDeathMountainCraterTitleCardGERTex; #define dgDeathMountainCraterTitleCardFRATex "__OTR__textures/g_pn_40/gDeathMountainCraterTitleCardFRATex" -static const ALIGN_ASSET(2) char gDeathMountainCraterTitleCardFRATex[] = dgDeathMountainCraterTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDeathMountainCraterTitleCardFRATex[] = dgDeathMountainCraterTitleCardFRATex; + +#endif // TEXTURES_G_PN_40_H diff --git a/soh/assets/textures/place_title_cards/g_pn_41.h b/soh/assets/textures/place_title_cards/g_pn_41.h index 0e943a366..3403142db 100644 --- a/soh/assets/textures/place_title_cards/g_pn_41.h +++ b/soh/assets/textures/place_title_cards/g_pn_41.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_41_H +#define TEXTURES_G_PN_41_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGoronCityTitleCardENGTex[] = dgGoronCityTitleC static const ALIGN_ASSET(2) char gGoronCityTitleCardGERTex[] = dgGoronCityTitleCardGERTex; #define dgGoronCityTitleCardFRATex "__OTR__textures/g_pn_41/gGoronCityTitleCardFRATex" -static const ALIGN_ASSET(2) char gGoronCityTitleCardFRATex[] = dgGoronCityTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGoronCityTitleCardFRATex[] = dgGoronCityTitleCardFRATex; + +#endif // TEXTURES_G_PN_41_H diff --git a/soh/assets/textures/place_title_cards/g_pn_42.h b/soh/assets/textures/place_title_cards/g_pn_42.h index 3cea7c67c..2f702ae87 100644 --- a/soh/assets/textures/place_title_cards/g_pn_42.h +++ b/soh/assets/textures/place_title_cards/g_pn_42.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_42_H +#define TEXTURES_G_PN_42_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gLonLonRanchTitleCardENGTex[] = dgLonLonRanchTi static const ALIGN_ASSET(2) char gLonLonRanchTitleCardGERTex[] = dgLonLonRanchTitleCardGERTex; #define dgLonLonRanchTitleCardFRATex "__OTR__textures/g_pn_42/gLonLonRanchTitleCardFRATex" -static const ALIGN_ASSET(2) char gLonLonRanchTitleCardFRATex[] = dgLonLonRanchTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gLonLonRanchTitleCardFRATex[] = dgLonLonRanchTitleCardFRATex; + +#endif // TEXTURES_G_PN_42_H diff --git a/soh/assets/textures/place_title_cards/g_pn_43.h b/soh/assets/textures/place_title_cards/g_pn_43.h index 8fccd6c70..0b20b2f53 100644 --- a/soh/assets/textures/place_title_cards/g_pn_43.h +++ b/soh/assets/textures/place_title_cards/g_pn_43.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_43_H +#define TEXTURES_G_PN_43_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGanonsCastleTitleCardENGTex[] = dgGanonsCastle static const ALIGN_ASSET(2) char gGanonsCastleTitleCardGERTex[] = dgGanonsCastleTitleCardGERTex; #define dgGanonsCastleTitleCardFRATex "__OTR__textures/g_pn_43/gGanonsCastleTitleCardFRATex" -static const ALIGN_ASSET(2) char gGanonsCastleTitleCardFRATex[] = dgGanonsCastleTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGanonsCastleTitleCardFRATex[] = dgGanonsCastleTitleCardFRATex; + +#endif // TEXTURES_G_PN_43_H diff --git a/soh/assets/textures/place_title_cards/g_pn_44.h b/soh/assets/textures/place_title_cards/g_pn_44.h index f1d36d254..92a11029d 100644 --- a/soh/assets/textures/place_title_cards/g_pn_44.h +++ b/soh/assets/textures/place_title_cards/g_pn_44.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_44_H +#define TEXTURES_G_PN_44_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gRoyalFamilysTombTitleCardENGTex[] = dgRoyalFam static const ALIGN_ASSET(2) char gRoyalFamilysTombTitleCardGERTex[] = dgRoyalFamilysTombTitleCardGERTex; #define dgRoyalFamilysTombTitleCardFRATex "__OTR__textures/g_pn_44/gRoyalFamilysTombTitleCardFRATex" -static const ALIGN_ASSET(2) char gRoyalFamilysTombTitleCardFRATex[] = dgRoyalFamilysTombTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gRoyalFamilysTombTitleCardFRATex[] = dgRoyalFamilysTombTitleCardFRATex; + +#endif // TEXTURES_G_PN_44_H diff --git a/soh/assets/textures/place_title_cards/g_pn_45.h b/soh/assets/textures/place_title_cards/g_pn_45.h index 636dd2851..5e018353b 100644 --- a/soh/assets/textures/place_title_cards/g_pn_45.h +++ b/soh/assets/textures/place_title_cards/g_pn_45.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_45_H +#define TEXTURES_G_PN_45_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gFairysFountainTitleCardENGTex[] = dgFairysFoun static const ALIGN_ASSET(2) char gFairysFountainTitleCardGERTex[] = dgFairysFountainTitleCardGERTex; #define dgFairysFountainTitleCardFRATex "__OTR__textures/g_pn_45/gFairysFountainTitleCardFRATex" -static const ALIGN_ASSET(2) char gFairysFountainTitleCardFRATex[] = dgFairysFountainTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gFairysFountainTitleCardFRATex[] = dgFairysFountainTitleCardFRATex; + +#endif // TEXTURES_G_PN_45_H diff --git a/soh/assets/textures/place_title_cards/g_pn_46.h b/soh/assets/textures/place_title_cards/g_pn_46.h index 4cfba7984..e3ab3c04e 100644 --- a/soh/assets/textures/place_title_cards/g_pn_46.h +++ b/soh/assets/textures/place_title_cards/g_pn_46.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_46_H +#define TEXTURES_G_PN_46_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gFishingPondTitleCardENGTex[] = dgFishingPondTi static const ALIGN_ASSET(2) char gFishingPondTitleCardGERTex[] = dgFishingPondTitleCardGERTex; #define dgFishingPondTitleCardFRATex "__OTR__textures/g_pn_46/gFishingPondTitleCardFRATex" -static const ALIGN_ASSET(2) char gFishingPondTitleCardFRATex[] = dgFishingPondTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gFishingPondTitleCardFRATex[] = dgFishingPondTitleCardFRATex; + +#endif // TEXTURES_G_PN_46_H diff --git a/soh/assets/textures/place_title_cards/g_pn_47.h b/soh/assets/textures/place_title_cards/g_pn_47.h index c7d781aab..838083a6f 100644 --- a/soh/assets/textures/place_title_cards/g_pn_47.h +++ b/soh/assets/textures/place_title_cards/g_pn_47.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_47_H +#define TEXTURES_G_PN_47_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBombchuBowlingAlleyCardENGTex[] = dgBombchuBow static const ALIGN_ASSET(2) char gBombchuBowlingAlleyCardGERTex[] = dgBombchuBowlingAlleyCardGERTex; #define dgBombchuBowlingAlleyCardFRATex "__OTR__textures/g_pn_47/gBombchuBowlingAlleyCardFRATex" -static const ALIGN_ASSET(2) char gBombchuBowlingAlleyCardFRATex[] = dgBombchuBowlingAlleyCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBombchuBowlingAlleyCardFRATex[] = dgBombchuBowlingAlleyCardFRATex; + +#endif // TEXTURES_G_PN_47_H diff --git a/soh/assets/textures/place_title_cards/g_pn_48.h b/soh/assets/textures/place_title_cards/g_pn_48.h index bc9614832..2850b9077 100644 --- a/soh/assets/textures/place_title_cards/g_pn_48.h +++ b/soh/assets/textures/place_title_cards/g_pn_48.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_48_H +#define TEXTURES_G_PN_48_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gStableTitleCardENGTex[] = dgStableTitleCardENG static const ALIGN_ASSET(2) char gStableTitleCardGERTex[] = dgStableTitleCardGERTex; #define dgStableTitleCardFRATex "__OTR__textures/g_pn_48/gStableTitleCardFRATex" -static const ALIGN_ASSET(2) char gStableTitleCardFRATex[] = dgStableTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gStableTitleCardFRATex[] = dgStableTitleCardFRATex; + +#endif // TEXTURES_G_PN_48_H diff --git a/soh/assets/textures/place_title_cards/g_pn_49.h b/soh/assets/textures/place_title_cards/g_pn_49.h index c4971c070..05f158598 100644 --- a/soh/assets/textures/place_title_cards/g_pn_49.h +++ b/soh/assets/textures/place_title_cards/g_pn_49.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_49_H +#define TEXTURES_G_PN_49_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gThievesHideoutTitleCardENGTex[] = dgThievesHid static const ALIGN_ASSET(2) char gThievesHideoutTitleCardGERTex[] = dgThievesHideoutTitleCardGERTex; #define dgThievesHideoutTitleCardFRATex "__OTR__textures/g_pn_49/gThievesHideoutTitleCardFRATex" -static const ALIGN_ASSET(2) char gThievesHideoutTitleCardFRATex[] = dgThievesHideoutTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gThievesHideoutTitleCardFRATex[] = dgThievesHideoutTitleCardFRATex; + +#endif // TEXTURES_G_PN_49_H diff --git a/soh/assets/textures/place_title_cards/g_pn_50.h b/soh/assets/textures/place_title_cards/g_pn_50.h index 3ea3e8415..02ddbf4cc 100644 --- a/soh/assets/textures/place_title_cards/g_pn_50.h +++ b/soh/assets/textures/place_title_cards/g_pn_50.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_50_H +#define TEXTURES_G_PN_50_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gHappyMaskShopTitleCardENGTex[] = dgHappyMaskSh static const ALIGN_ASSET(2) char gHappyMaskShopTitleCardGERTex[] = dgHappyMaskShopTitleCardGERTex; #define dgHappyMaskShopTitleCardFRATex "__OTR__textures/g_pn_50/gHappyMaskShopTitleCardFRATex" -static const ALIGN_ASSET(2) char gHappyMaskShopTitleCardFRATex[] = dgHappyMaskShopTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHappyMaskShopTitleCardFRATex[] = dgHappyMaskShopTitleCardFRATex; + +#endif // TEXTURES_G_PN_50_H diff --git a/soh/assets/textures/place_title_cards/g_pn_51.h b/soh/assets/textures/place_title_cards/g_pn_51.h index c6eff745e..5083b9590 100644 --- a/soh/assets/textures/place_title_cards/g_pn_51.h +++ b/soh/assets/textures/place_title_cards/g_pn_51.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_51_H +#define TEXTURES_G_PN_51_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gTreasureBoxShopTitleCardENGTex[] = dgTreasureB static const ALIGN_ASSET(2) char gTreasureBoxShopTitleCardGERTex[] = dgTreasureBoxShopTitleCardGERTex; #define dgTreasureBoxShopTitleCardFRATex "__OTR__textures/g_pn_51/gTreasureBoxShopTitleCardFRATex" -static const ALIGN_ASSET(2) char gTreasureBoxShopTitleCardFRATex[] = dgTreasureBoxShopTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gTreasureBoxShopTitleCardFRATex[] = dgTreasureBoxShopTitleCardFRATex; + +#endif // TEXTURES_G_PN_51_H diff --git a/soh/assets/textures/place_title_cards/g_pn_52.h b/soh/assets/textures/place_title_cards/g_pn_52.h index 37f408931..3b514ef21 100644 --- a/soh/assets/textures/place_title_cards/g_pn_52.h +++ b/soh/assets/textures/place_title_cards/g_pn_52.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_52_H +#define TEXTURES_G_PN_52_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gSacredForestMeadowTitleCardENGTex[] = dgSacred static const ALIGN_ASSET(2) char gSacredForestMeadowTitleCardGERTex[] = dgSacredForestMeadowTitleCardGERTex; #define dgSacredForestMeadowTitleCardFRATex "__OTR__textures/g_pn_52/gSacredForestMeadowTitleCardFRATex" -static const ALIGN_ASSET(2) char gSacredForestMeadowTitleCardFRATex[] = dgSacredForestMeadowTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSacredForestMeadowTitleCardFRATex[] = dgSacredForestMeadowTitleCardFRATex; + +#endif // TEXTURES_G_PN_52_H diff --git a/soh/assets/textures/place_title_cards/g_pn_53.h b/soh/assets/textures/place_title_cards/g_pn_53.h index e3e187cba..9ab2366ab 100644 --- a/soh/assets/textures/place_title_cards/g_pn_53.h +++ b/soh/assets/textures/place_title_cards/g_pn_53.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_53_H +#define TEXTURES_G_PN_53_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gGERudosFortressTitleCardENGTex[] = dgGERudosFo static const ALIGN_ASSET(2) char gGERudosFortressTitleCardGERTex[] = dgGERudosFortressTitleCardGERTex; #define dgGERudosFortressTitleCardFRATex "__OTR__textures/g_pn_53/gGERudosFortressTitleCardFRATex" -static const ALIGN_ASSET(2) char gGERudosFortressTitleCardFRATex[] = dgGERudosFortressTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gGERudosFortressTitleCardFRATex[] = dgGERudosFortressTitleCardFRATex; + +#endif // TEXTURES_G_PN_53_H diff --git a/soh/assets/textures/place_title_cards/g_pn_54.h b/soh/assets/textures/place_title_cards/g_pn_54.h index a4359a0b8..c4645d989 100644 --- a/soh/assets/textures/place_title_cards/g_pn_54.h +++ b/soh/assets/textures/place_title_cards/g_pn_54.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_54_H +#define TEXTURES_G_PN_54_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBottomOfTheWellTitleCardENGTex[] = dgBottomOfT static const ALIGN_ASSET(2) char gBottomOfTheWellTitleCardGERTex[] = dgBottomOfTheWellTitleCardGERTex; #define dgBottomOfTheWellTitleCardFRATex "__OTR__textures/g_pn_54/gBottomOfTheWellTitleCardFRATex" -static const ALIGN_ASSET(2) char gBottomOfTheWellTitleCardFRATex[] = dgBottomOfTheWellTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBottomOfTheWellTitleCardFRATex[] = dgBottomOfTheWellTitleCardFRATex; + +#endif // TEXTURES_G_PN_54_H diff --git a/soh/assets/textures/place_title_cards/g_pn_55.h b/soh/assets/textures/place_title_cards/g_pn_55.h index 373f7035e..efcd814bc 100644 --- a/soh/assets/textures/place_title_cards/g_pn_55.h +++ b/soh/assets/textures/place_title_cards/g_pn_55.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_55_H +#define TEXTURES_G_PN_55_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gDesertColossusTitleCardENGTex[] = dgDesertColo static const ALIGN_ASSET(2) char gDesertColossusTitleCardGERTex[] = dgDesertColossusTitleCardGERTex; #define dgDesertColossusTitleCardFRATex "__OTR__textures/g_pn_55/gDesertColossusTitleCardFRATex" -static const ALIGN_ASSET(2) char gDesertColossusTitleCardFRATex[] = dgDesertColossusTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDesertColossusTitleCardFRATex[] = dgDesertColossusTitleCardFRATex; + +#endif // TEXTURES_G_PN_55_H diff --git a/soh/assets/textures/place_title_cards/g_pn_56.h b/soh/assets/textures/place_title_cards/g_pn_56.h index 63461bdee..b1c10a366 100644 --- a/soh/assets/textures/place_title_cards/g_pn_56.h +++ b/soh/assets/textures/place_title_cards/g_pn_56.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_56_H +#define TEXTURES_G_PN_56_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gBombchuShopTitleCardENGTex[] = dgBombchuShopTi static const ALIGN_ASSET(2) char gBombchuShopTitleCardGERTex[] = dgBombchuShopTitleCardGERTex; #define dgBombchuShopTitleCardFRATex "__OTR__textures/g_pn_56/gBombchuShopTitleCardFRATex" -static const ALIGN_ASSET(2) char gBombchuShopTitleCardFRATex[] = dgBombchuShopTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gBombchuShopTitleCardFRATex[] = dgBombchuShopTitleCardFRATex; + +#endif // TEXTURES_G_PN_56_H diff --git a/soh/assets/textures/place_title_cards/g_pn_57.h b/soh/assets/textures/place_title_cards/g_pn_57.h index dfaee5233..8ead69f7d 100644 --- a/soh/assets/textures/place_title_cards/g_pn_57.h +++ b/soh/assets/textures/place_title_cards/g_pn_57.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_G_PN_57_H +#define TEXTURES_G_PN_57_H 1 #include "align_asset_macro.h" @@ -9,4 +10,6 @@ static const ALIGN_ASSET(2) char gQuestionMarkTitleCardENGTex[] = dgQuestionMark static const ALIGN_ASSET(2) char gQuestionMarkTitleCardGERTex[] = dgQuestionMarkTitleCardGERTex; #define dgQuestionMarkTitleCardFRATex "__OTR__textures/g_pn_57/gQuestionMarkTitleCardFRATex" -static const ALIGN_ASSET(2) char gQuestionMarkTitleCardFRATex[] = dgQuestionMarkTitleCardFRATex; \ No newline at end of file +static const ALIGN_ASSET(2) char gQuestionMarkTitleCardFRATex[] = dgQuestionMarkTitleCardFRATex; + +#endif // TEXTURES_G_PN_57_H diff --git a/soh/assets/textures/skyboxes/vr_cloud0_pal_static.h b/soh/assets/textures/skyboxes/vr_cloud0_pal_static.h index 286933b9f..bff9cda7c 100644 --- a/soh/assets/textures/skyboxes/vr_cloud0_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud0_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD0_PAL_STATIC_H +#define TEXTURES_VR_CLOUD0_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgSunriseOvercastSkyboxTLUT "__OTR__textures/vr_cloud0_pal_static/gSunriseOvercastSkyboxTLUT" -static const ALIGN_ASSET(2) char gSunriseOvercastSkyboxTLUT[] = dgSunriseOvercastSkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunriseOvercastSkyboxTLUT[] = dgSunriseOvercastSkyboxTLUT; + +#endif // TEXTURES_VR_CLOUD0_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_cloud0_static.h b/soh/assets/textures/skyboxes/vr_cloud0_static.h index 59a31a7f6..87d547d81 100644 --- a/soh/assets/textures/skyboxes/vr_cloud0_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud0_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD0_STATIC_H +#define TEXTURES_VR_CLOUD0_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gSunriseOvercastSkybox3Tex[] = dgSunriseOvercas static const ALIGN_ASSET(2) char gSunriseOvercastSkybox4Tex[] = dgSunriseOvercastSkybox4Tex; #define dgSunriseOvercastSkybox5Tex "__OTR__textures/vr_cloud0_static/gSunriseOvercastSkybox5Tex" -static const ALIGN_ASSET(2) char gSunriseOvercastSkybox5Tex[] = dgSunriseOvercastSkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunriseOvercastSkybox5Tex[] = dgSunriseOvercastSkybox5Tex; + +#endif // TEXTURES_VR_CLOUD0_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_cloud1_pal_static.h b/soh/assets/textures/skyboxes/vr_cloud1_pal_static.h index 3456690e7..7cbae7ab2 100644 --- a/soh/assets/textures/skyboxes/vr_cloud1_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud1_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD1_PAL_STATIC_H +#define TEXTURES_VR_CLOUD1_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgDayOvercastSkyboxTLUT "__OTR__textures/vr_cloud1_pal_static/gDayOvercastSkyboxTLUT" -static const ALIGN_ASSET(2) char gDayOvercastSkyboxTLUT[] = dgDayOvercastSkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gDayOvercastSkyboxTLUT[] = dgDayOvercastSkyboxTLUT; + +#endif // TEXTURES_VR_CLOUD1_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_cloud1_static.h b/soh/assets/textures/skyboxes/vr_cloud1_static.h index 5b8064785..09bcb30ad 100644 --- a/soh/assets/textures/skyboxes/vr_cloud1_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud1_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD1_STATIC_H +#define TEXTURES_VR_CLOUD1_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gDayOvercastSkybox3Tex[] = dgDayOvercastSkybox3 static const ALIGN_ASSET(2) char gDayOvercastSkybox4Tex[] = dgDayOvercastSkybox4Tex; #define dgDayOvercastSkybox5Tex "__OTR__textures/vr_cloud1_static/gDayOvercastSkybox5Tex" -static const ALIGN_ASSET(2) char gDayOvercastSkybox5Tex[] = dgDayOvercastSkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDayOvercastSkybox5Tex[] = dgDayOvercastSkybox5Tex; + +#endif // TEXTURES_VR_CLOUD1_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_cloud2_pal_static.h b/soh/assets/textures/skyboxes/vr_cloud2_pal_static.h index 322c42034..4b846dd99 100644 --- a/soh/assets/textures/skyboxes/vr_cloud2_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud2_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD2_PAL_STATIC_H +#define TEXTURES_VR_CLOUD2_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgSunsetOvercastSkyboxTLUT "__OTR__textures/vr_cloud2_pal_static/gSunsetOvercastSkyboxTLUT" -static const ALIGN_ASSET(2) char gSunsetOvercastSkyboxTLUT[] = dgSunsetOvercastSkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunsetOvercastSkyboxTLUT[] = dgSunsetOvercastSkyboxTLUT; + +#endif // TEXTURES_VR_CLOUD2_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_cloud2_static.h b/soh/assets/textures/skyboxes/vr_cloud2_static.h index 20925a95a..c42cebaa4 100644 --- a/soh/assets/textures/skyboxes/vr_cloud2_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud2_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD2_STATIC_H +#define TEXTURES_VR_CLOUD2_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gSunsetOvercastSkybox3Tex[] = dgSunsetOvercastS static const ALIGN_ASSET(2) char gSunsetOvercastSkybox4Tex[] = dgSunsetOvercastSkybox4Tex; #define dgSunsetOvercastSkybox5Tex "__OTR__textures/vr_cloud2_static/gSunsetOvercastSkybox5Tex" -static const ALIGN_ASSET(2) char gSunsetOvercastSkybox5Tex[] = dgSunsetOvercastSkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunsetOvercastSkybox5Tex[] = dgSunsetOvercastSkybox5Tex; + +#endif // TEXTURES_VR_CLOUD2_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_cloud3_pal_static.h b/soh/assets/textures/skyboxes/vr_cloud3_pal_static.h index 4b765a997..f17b1c5b8 100644 --- a/soh/assets/textures/skyboxes/vr_cloud3_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud3_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD3_PAL_STATIC_H +#define TEXTURES_VR_CLOUD3_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgNightOvercastSkyboxTLUT "__OTR__textures/vr_cloud3_pal_static/gNightOvercastSkyboxTLUT" -static const ALIGN_ASSET(2) char gNightOvercastSkyboxTLUT[] = dgNightOvercastSkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gNightOvercastSkyboxTLUT[] = dgNightOvercastSkyboxTLUT; + +#endif // TEXTURES_VR_CLOUD3_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_cloud3_static.h b/soh/assets/textures/skyboxes/vr_cloud3_static.h index a6e5eff64..28fc6669a 100644 --- a/soh/assets/textures/skyboxes/vr_cloud3_static.h +++ b/soh/assets/textures/skyboxes/vr_cloud3_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_CLOUD3_STATIC_H +#define TEXTURES_VR_CLOUD3_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gNightOvercastSkybox3Tex[] = dgNightOvercastSky static const ALIGN_ASSET(2) char gNightOvercastSkybox4Tex[] = dgNightOvercastSkybox4Tex; #define dgNightOvercastSkybox5Tex "__OTR__textures/vr_cloud3_static/gNightOvercastSkybox5Tex" -static const ALIGN_ASSET(2) char gNightOvercastSkybox5Tex[] = dgNightOvercastSkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gNightOvercastSkybox5Tex[] = dgNightOvercastSkybox5Tex; + +#endif // TEXTURES_VR_CLOUD3_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine0_pal_static.h b/soh/assets/textures/skyboxes/vr_fine0_pal_static.h index 4f1f3dc9b..75adde769 100644 --- a/soh/assets/textures/skyboxes/vr_fine0_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_fine0_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_FINE0_PAL_STATIC_H +#define TEXTURES_VR_FINE0_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgSunriseSkyboxTLUT "__OTR__textures/vr_fine0_pal_static/gSunriseSkyboxTLUT" -static const ALIGN_ASSET(2) char gSunriseSkyboxTLUT[] = dgSunriseSkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunriseSkyboxTLUT[] = dgSunriseSkyboxTLUT; + +#endif // TEXTURES_VR_FINE0_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine0_static.h b/soh/assets/textures/skyboxes/vr_fine0_static.h index b91350dab..08d4aa43e 100644 --- a/soh/assets/textures/skyboxes/vr_fine0_static.h +++ b/soh/assets/textures/skyboxes/vr_fine0_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_FINE0_STATIC_H +#define TEXTURES_VR_FINE0_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gSunriseSkybox3Tex[] = dgSunriseSkybox3Tex; static const ALIGN_ASSET(2) char gSunriseSkybox4Tex[] = dgSunriseSkybox4Tex; #define dgSunriseSkybox5Tex "__OTR__textures/vr_fine0_static/gSunriseSkybox5Tex" -static const ALIGN_ASSET(2) char gSunriseSkybox5Tex[] = dgSunriseSkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunriseSkybox5Tex[] = dgSunriseSkybox5Tex; + +#endif // TEXTURES_VR_FINE0_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine1_pal_static.h b/soh/assets/textures/skyboxes/vr_fine1_pal_static.h index bba21d387..9ba7bd814 100644 --- a/soh/assets/textures/skyboxes/vr_fine1_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_fine1_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_FINE1_PAL_STATIC_H +#define TEXTURES_VR_FINE1_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgDaySkyboxTLUT "__OTR__textures/vr_fine1_pal_static/gDaySkyboxTLUT" -static const ALIGN_ASSET(2) char gDaySkyboxTLUT[] = dgDaySkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gDaySkyboxTLUT[] = dgDaySkyboxTLUT; + +#endif // TEXTURES_VR_FINE1_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine1_static.h b/soh/assets/textures/skyboxes/vr_fine1_static.h index 70dc20064..bccf3fac4 100644 --- a/soh/assets/textures/skyboxes/vr_fine1_static.h +++ b/soh/assets/textures/skyboxes/vr_fine1_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_FINE1_STATIC_H +#define TEXTURES_VR_FINE1_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gDaySkybox3Tex[] = dgDaySkybox3Tex; static const ALIGN_ASSET(2) char gDaySkybox4Tex[] = dgDaySkybox4Tex; #define dgDaySkybox5Tex "__OTR__textures/vr_fine1_static/gDaySkybox5Tex" -static const ALIGN_ASSET(2) char gDaySkybox5Tex[] = dgDaySkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gDaySkybox5Tex[] = dgDaySkybox5Tex; + +#endif // TEXTURES_VR_FINE1_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine2_pal_static.h b/soh/assets/textures/skyboxes/vr_fine2_pal_static.h index 2f69da6b1..ebbef49ae 100644 --- a/soh/assets/textures/skyboxes/vr_fine2_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_fine2_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_FINE2_PAL_STATIC_H +#define TEXTURES_VR_FINE2_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgSunsetSkyboxTLUT "__OTR__textures/vr_fine2_pal_static/gSunsetSkyboxTLUT" -static const ALIGN_ASSET(2) char gSunsetSkyboxTLUT[] = dgSunsetSkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunsetSkyboxTLUT[] = dgSunsetSkyboxTLUT; + +#endif // TEXTURES_VR_FINE2_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine2_static.h b/soh/assets/textures/skyboxes/vr_fine2_static.h index 5c1bbefcd..0db97892e 100644 --- a/soh/assets/textures/skyboxes/vr_fine2_static.h +++ b/soh/assets/textures/skyboxes/vr_fine2_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_FINE2_STATIC_H +#define TEXTURES_VR_FINE2_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gSunsetSkybox3Tex[] = dgSunsetSkybox3Tex; static const ALIGN_ASSET(2) char gSunsetSkybox4Tex[] = dgSunsetSkybox4Tex; #define dgSunsetSkybox5Tex "__OTR__textures/vr_fine2_static/gSunsetSkybox5Tex" -static const ALIGN_ASSET(2) char gSunsetSkybox5Tex[] = dgSunsetSkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gSunsetSkybox5Tex[] = dgSunsetSkybox5Tex; + +#endif // TEXTURES_VR_FINE2_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine3_pal_static.h b/soh/assets/textures/skyboxes/vr_fine3_pal_static.h index a6abc1794..c747f0eaf 100644 --- a/soh/assets/textures/skyboxes/vr_fine3_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_fine3_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_FINE3_PAL_STATIC_H +#define TEXTURES_VR_FINE3_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgNightSkyboxTLUT "__OTR__textures/vr_fine3_pal_static/gNightSkyboxTLUT" -static const ALIGN_ASSET(2) char gNightSkyboxTLUT[] = dgNightSkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gNightSkyboxTLUT[] = dgNightSkyboxTLUT; + +#endif // TEXTURES_VR_FINE3_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_fine3_static.h b/soh/assets/textures/skyboxes/vr_fine3_static.h index 8e78406e4..226d9d4e0 100644 --- a/soh/assets/textures/skyboxes/vr_fine3_static.h +++ b/soh/assets/textures/skyboxes/vr_fine3_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_FINE3_STATIC_H +#define TEXTURES_VR_FINE3_STATIC_H 1 #include "align_asset_macro.h" @@ -15,4 +16,6 @@ static const ALIGN_ASSET(2) char gNightSkybox3Tex[] = dgNightSkybox3Tex; static const ALIGN_ASSET(2) char gNightSkybox4Tex[] = dgNightSkybox4Tex; #define dgNightSkybox5Tex "__OTR__textures/vr_fine3_static/gNightSkybox5Tex" -static const ALIGN_ASSET(2) char gNightSkybox5Tex[] = dgNightSkybox5Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gNightSkybox5Tex[] = dgNightSkybox5Tex; + +#endif // TEXTURES_VR_FINE3_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_holy0_pal_static.h b/soh/assets/textures/skyboxes/vr_holy0_pal_static.h index f7f061630..ed7164750 100644 --- a/soh/assets/textures/skyboxes/vr_holy0_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_holy0_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_HOLY0_PAL_STATIC_H +#define TEXTURES_VR_HOLY0_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgHoly0SkyboxTLUT "__OTR__textures/vr_holy0_pal_static/gHoly0SkyboxTLUT" -static const ALIGN_ASSET(2) char gHoly0SkyboxTLUT[] = dgHoly0SkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gHoly0SkyboxTLUT[] = dgHoly0SkyboxTLUT; + +#endif // TEXTURES_VR_HOLY0_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_holy0_static.h b/soh/assets/textures/skyboxes/vr_holy0_static.h index 9d6c83406..b49a6dc92 100644 --- a/soh/assets/textures/skyboxes/vr_holy0_static.h +++ b/soh/assets/textures/skyboxes/vr_holy0_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_HOLY0_STATIC_H +#define TEXTURES_VR_HOLY0_STATIC_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gHoly0Skybox4Tex[] = dgHoly0Skybox4Tex; static const ALIGN_ASSET(2) char gHoly0Skybox5Tex[] = dgHoly0Skybox5Tex; #define dgHoly0Skybox6Tex "__OTR__textures/vr_holy0_static/gHoly0Skybox6Tex" -static const ALIGN_ASSET(2) char gHoly0Skybox6Tex[] = dgHoly0Skybox6Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHoly0Skybox6Tex[] = dgHoly0Skybox6Tex; + +#endif // TEXTURES_VR_HOLY0_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_holy1_pal_static.h b/soh/assets/textures/skyboxes/vr_holy1_pal_static.h index 80ae2edd1..fb15c49fe 100644 --- a/soh/assets/textures/skyboxes/vr_holy1_pal_static.h +++ b/soh/assets/textures/skyboxes/vr_holy1_pal_static.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef TEXTURES_VR_HOLY1_PAL_STATIC_H +#define TEXTURES_VR_HOLY1_PAL_STATIC_H 1 #include "align_asset_macro.h" #define dgHoly1SkyboxTLUT "__OTR__textures/vr_holy1_pal_static/gHoly1SkyboxTLUT" -static const ALIGN_ASSET(2) char gHoly1SkyboxTLUT[] = dgHoly1SkyboxTLUT; \ No newline at end of file +static const ALIGN_ASSET(2) char gHoly1SkyboxTLUT[] = dgHoly1SkyboxTLUT; + +#endif // TEXTURES_VR_HOLY1_PAL_STATIC_H diff --git a/soh/assets/textures/skyboxes/vr_holy1_static.h b/soh/assets/textures/skyboxes/vr_holy1_static.h index 61321ac25..443568263 100644 --- a/soh/assets/textures/skyboxes/vr_holy1_static.h +++ b/soh/assets/textures/skyboxes/vr_holy1_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_VR_HOLY1_STATIC_H +#define TEXTURES_VR_HOLY1_STATIC_H 1 #include "align_asset_macro.h" @@ -18,4 +19,6 @@ static const ALIGN_ASSET(2) char gHoly1Skybox4Tex[] = dgHoly1Skybox4Tex; static const ALIGN_ASSET(2) char gHoly1Skybox5Tex[] = dgHoly1Skybox5Tex; #define dgHoly1Skybox6Tex "__OTR__textures/vr_holy1_static/gHoly1Skybox6Tex" -static const ALIGN_ASSET(2) char gHoly1Skybox6Tex[] = dgHoly1Skybox6Tex; \ No newline at end of file +static const ALIGN_ASSET(2) char gHoly1Skybox6Tex[] = dgHoly1Skybox6Tex; + +#endif // TEXTURES_VR_HOLY1_STATIC_H diff --git a/soh/assets/textures/title_static/title_static.h b/soh/assets/textures/title_static/title_static.h index 6cccc5744..88ea9a555 100644 --- a/soh/assets/textures/title_static/title_static.h +++ b/soh/assets/textures/title_static/title_static.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_TITLE_STATIC_H +#define TEXTURES_TITLE_STATIC_H 1 #include "align_asset_macro.h" @@ -444,4 +445,6 @@ static const ALIGN_ASSET(2) char gFileSelWindow1DL[] = dgFileSelWindow1DL; static const ALIGN_ASSET(2) char gFileSelWindow2DL[] = dgFileSelWindow2DL; #define dgFileSelWindow3DL "__OTR__textures/title_static/gFileSelWindow3DL" -static const ALIGN_ASSET(2) char gFileSelWindow3DL[] = dgFileSelWindow3DL; \ No newline at end of file +static const ALIGN_ASSET(2) char gFileSelWindow3DL[] = dgFileSelWindow3DL; + +#endif // TEXTURES_TITLE_STATIC_H diff --git a/soh/assets/xml/GC_MQ_D/code/fbdemo_circle.xml b/soh/assets/xml/GC_MQ_D/code/fbdemo_circle.xml index 448a999ba..a061eddca 100644 --- a/soh/assets/xml/GC_MQ_D/code/fbdemo_circle.xml +++ b/soh/assets/xml/GC_MQ_D/code/fbdemo_circle.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/GC_MQ_D/code/fbdemo_triforce.xml b/soh/assets/xml/GC_MQ_D/code/fbdemo_triforce.xml index 1a21af3bc..a20e07075 100644 --- a/soh/assets/xml/GC_MQ_D/code/fbdemo_triforce.xml +++ b/soh/assets/xml/GC_MQ_D/code/fbdemo_triforce.xml @@ -1,7 +1,7 @@ - - + + diff --git a/soh/assets/xml/GC_MQ_D/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_MQ_D/code/fbdemo_wipe1.xml index f826fec32..ce95d8e3c 100644 --- a/soh/assets/xml/GC_MQ_D/code/fbdemo_wipe1.xml +++ b/soh/assets/xml/GC_MQ_D/code/fbdemo_wipe1.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/soh/assets/xml/GC_MQ_D/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_MQ_D/objects/gameplay_dangeon_keep.xml index d16eb4c41..5b1a9050d 100644 --- a/soh/assets/xml/GC_MQ_D/objects/gameplay_dangeon_keep.xml +++ b/soh/assets/xml/GC_MQ_D/objects/gameplay_dangeon_keep.xml @@ -1,10 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml b/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml index 2a8ca9b44..992525114 100644 --- a/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml +++ b/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml @@ -1,6 +1,10 @@ + + + + @@ -933,10 +937,10 @@ - - - - + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_am.xml b/soh/assets/xml/GC_MQ_D/objects/object_am.xml index 0a4b88ddf..b70c70d70 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_am.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_am.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_ani.xml b/soh/assets/xml/GC_MQ_D/objects/object_ani.xml index 25ad7af35..c70621c6f 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_ani.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_ani.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_anubice.xml b/soh/assets/xml/GC_MQ_D/objects/object_anubice.xml index 2140187e4..fb029586b 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_anubice.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_anubice.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_bdoor.xml b/soh/assets/xml/GC_MQ_D/objects/object_bdoor.xml index 644c06ea8..a092f0c23 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_bdoor.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_bdoor.xml @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_blkobj.xml b/soh/assets/xml/GC_MQ_D/objects/object_blkobj.xml index 952729283..8d6bb13dc 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_blkobj.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_blkobj.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_box.xml b/soh/assets/xml/GC_MQ_D/objects/object_box.xml index 34162fc94..f27737453 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_box.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_box.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_bv.xml b/soh/assets/xml/GC_MQ_D/objects/object_bv.xml index b6ef9e45f..af3c295a3 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_bv.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_bv.xml @@ -1,5 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_bw.xml b/soh/assets/xml/GC_MQ_D/objects/object_bw.xml index f7d5ecead..6fd39fbb1 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_bw.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_bw.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_MQ_D/objects/object_demo_kekkai.xml index 1b9c9b402..aa54bc2ee 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_demo_kekkai.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_demo_kekkai.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_dnk.xml b/soh/assets/xml/GC_MQ_D/objects/object_dnk.xml index 1efec46aa..4928de822 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_dnk.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_dnk.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_dns.xml b/soh/assets/xml/GC_MQ_D/objects/object_dns.xml index e66a63987..53a75f7cf 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_dns.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_dns.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_fd.xml b/soh/assets/xml/GC_MQ_D/objects/object_fd.xml index d915b38c2..80313d34d 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_fd.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_fd.xml @@ -1,7 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_fd2.xml b/soh/assets/xml/GC_MQ_D/objects/object_fd2.xml index b3fbdcb21..a24eb2b7b 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_fd2.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_fd2.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_fhg.xml b/soh/assets/xml/GC_MQ_D/objects/object_fhg.xml index eb07d8eb3..35c393450 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_fhg.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_fhg.xml @@ -1,6 +1,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_fw.xml b/soh/assets/xml/GC_MQ_D/objects/object_fw.xml index 51462a316..6bf291f34 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_fw.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_fw.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_geldb.xml b/soh/assets/xml/GC_MQ_D/objects/object_geldb.xml index a1dbd18f4..49b12ef2e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_geldb.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_geldb.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_boots_2.xml index 8e9cd1028..3bcb6a47a 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_boots_2.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_boots_2.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_butterfly.xml index 76ac70609..7b60a7724 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_butterfly.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_butterfly.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_clothes.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_clothes.xml index 2a10dce11..3f897b6d1 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_clothes.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_clothes.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_dekupouch.xml index 3d6d95d98..8925e6fa5 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_dekupouch.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_dekupouch.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_fire.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_fire.xml index a57fba6e8..4bfd76a7c 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_fire.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_fire.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_frog.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_frog.xml index f180fd267..a656c306b 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_frog.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_frog.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudo.xml index 3be8d3462..d65daee8e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudo.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudo.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudomask.xml index b53bf24af..cfcb878d9 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudomask.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_gerudomask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_ghost.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_ghost.xml index 186f4c74b..795f0cfd1 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_ghost.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_ghost.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_gloves.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_gloves.xml index 1b4282dca..0e1c4259d 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_gloves.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_gloves.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_golonmask.xml index 98f53f1c2..844d90e71 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_golonmask.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_golonmask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_hoverboots.xml index c4a67877b..6d41df8fd 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_hoverboots.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_hoverboots.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_ki_tan_mask.xml index f66535af3..46eff7d3e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_ki_tan_mask.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_ki_tan_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_letter.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_letter.xml index 167a7ff5d..bea868339 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_letter.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_letter.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_liquid.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_liquid.xml index 5eeeca0fd..18a5c3d7a 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_liquid.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_liquid.xml @@ -1,5 +1,8 @@ + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_map.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_map.xml index 8887dd22c..471c1dab9 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_map.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_map.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_milk.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_milk.xml index 00b9530d9..a3e223b3e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_milk.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_milk.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_niwatori.xml index 713cc1ce5..c8389f62c 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_niwatori.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_niwatori.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_nuts.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_nuts.xml index 5508fe856..c59903c43 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_nuts.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_nuts.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina.xml index 7693cc122..82607677d 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina_0.xml index 336d33894..2c5f70d98 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina_0.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_ocarina_0.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_prescription.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_prescription.xml index 081de301c..75ae7eb2b 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_prescription.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_prescription.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_purse.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_purse.xml index 3034942ff..054731dec 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_purse.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_purse.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_rabit_mask.xml index 75f855550..9d4eb9487 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_rabit_mask.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_rabit_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_1.xml index 2e9369569..2f11e3f6d 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_1.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_3.xml index 250bf7fea..8d1e5dafd 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_3.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_shield_3.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_soldout.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_soldout.xml index ae3f4685f..a15b1253e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_soldout.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_soldout.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_soul.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_soul.xml index 76ffc5685..a68178eba 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_soul.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_soul.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_ticketstone.xml index 0fa37fe11..73bf888d1 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_ticketstone.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_ticketstone.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_truth_mask.xml index f28c7cbca..3b4edf3de 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_truth_mask.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_truth_mask.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_MQ_D/objects/object_gi_zoramask.xml index 096fdeedf..e3b1ab10e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gi_zoramask.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gi_zoramask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gj.xml b/soh/assets/xml/GC_MQ_D/objects/object_gj.xml index 50d6337b4..ee6dab74f 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gj.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gj.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gnd.xml b/soh/assets/xml/GC_MQ_D/objects/object_gnd.xml index 53d2bbde4..1a5881730 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gnd.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gnd.xml @@ -1,6 +1,7 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_gr.xml b/soh/assets/xml/GC_MQ_D/objects/object_gr.xml index 103d4412e..5f7360ae5 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_gr.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_gr.xml @@ -1,12 +1,23 @@ + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_hakach_objects.xml b/soh/assets/xml/GC_MQ_D/objects/object_hakach_objects.xml index b978e77a3..0de02aaf1 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_hakach_objects.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_hakach_objects.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_hidan_objects.xml b/soh/assets/xml/GC_MQ_D/objects/object_hidan_objects.xml index ed265da62..f41c0ee5e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_hidan_objects.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_hidan_objects.xml @@ -1,5 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_hintnuts.xml b/soh/assets/xml/GC_MQ_D/objects/object_hintnuts.xml index f7da2e8f5..90387378c 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_hintnuts.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_hintnuts.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_horse_ganon.xml b/soh/assets/xml/GC_MQ_D/objects/object_horse_ganon.xml index 98babb080..0a55462e2 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_horse_ganon.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_horse_ganon.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_horse_link_child.xml b/soh/assets/xml/GC_MQ_D/objects/object_horse_link_child.xml index 1491189a1..146c564f5 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_horse_link_child.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_horse_link_child.xml @@ -1,5 +1,14 @@ + + + + + + + + + @@ -14,8 +23,8 @@ - - - + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_horse_normal.xml b/soh/assets/xml/GC_MQ_D/objects/object_horse_normal.xml index 2bc2cb0c6..2facab39c 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_horse_normal.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_horse_normal.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_horse_zelda.xml b/soh/assets/xml/GC_MQ_D/objects/object_horse_zelda.xml index 9595c3245..af270c658 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_horse_zelda.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_horse_zelda.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_ice_objects.xml b/soh/assets/xml/GC_MQ_D/objects/object_ice_objects.xml index a4e2e9b12..c7d059d70 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_ice_objects.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_ice_objects.xml @@ -2,23 +2,23 @@ - - - + + + - + - + - + - - + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_ik.xml b/soh/assets/xml/GC_MQ_D/objects/object_ik.xml index 7d10babfa..8a6028f7c 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_ik.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_ik.xml @@ -10,66 +10,66 @@ - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - - - + + + - - - - + + + + - + - - - + + + - - - + + + @@ -79,14 +79,14 @@ - + - - - - + + + + @@ -101,8 +101,8 @@ - - + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_jya_obj.xml b/soh/assets/xml/GC_MQ_D/objects/object_jya_obj.xml index 4a203b0b9..a1f19b806 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_jya_obj.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_jya_obj.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml index c2c424b5e..8500b975b 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_MQ_D/objects/object_masterkokirihead.xml index 1e489323c..c64aa1c49 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_masterkokirihead.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_masterkokirihead.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_mb.xml b/soh/assets/xml/GC_MQ_D/objects/object_mb.xml index a8471429d..23c0930c0 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_mb.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_mb.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_mizu_objects.xml b/soh/assets/xml/GC_MQ_D/objects/object_mizu_objects.xml index f25c29d6c..9bfabd80c 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_mizu_objects.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_mizu_objects.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_mm.xml b/soh/assets/xml/GC_MQ_D/objects/object_mm.xml index 834afe5ef..b27837e57 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_mm.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_mm.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_mo.xml b/soh/assets/xml/GC_MQ_D/objects/object_mo.xml index 165b4e112..f25286df8 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_mo.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_mo.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_mori_tex.xml b/soh/assets/xml/GC_MQ_D/objects/object_mori_tex.xml index 175b875fb..8ba4ff2d3 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_mori_tex.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_mori_tex.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_oE1s.xml b/soh/assets/xml/GC_MQ_D/objects/object_oE1s.xml index faf6ab734..d311e6010 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_oE1s.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_oE1s.xml @@ -1,5 +1,7 @@ + + @@ -21,15 +23,15 @@ - + - + - + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_oE4s.xml b/soh/assets/xml/GC_MQ_D/objects/object_oE4s.xml index 584019568..6037de52f 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_oE4s.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_oE4s.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_oF1d_map.xml b/soh/assets/xml/GC_MQ_D/objects/object_oF1d_map.xml index 09a35dbd1..f14fecd82 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_oF1d_map.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_oF1d_map.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_os.xml b/soh/assets/xml/GC_MQ_D/objects/object_os.xml index 7c3029443..5880a9293 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_os.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_os.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_os_anime.xml b/soh/assets/xml/GC_MQ_D/objects/object_os_anime.xml index c90e37b37..f23636343 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_os_anime.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_os_anime.xml @@ -35,34 +35,34 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_ossan.xml b/soh/assets/xml/GC_MQ_D/objects/object_ossan.xml index 963053f3f..5788e3a20 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_ossan.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_ossan.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_owl.xml b/soh/assets/xml/GC_MQ_D/objects/object_owl.xml index 24be37898..64fdf64c5 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_owl.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_owl.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_po_composer.xml b/soh/assets/xml/GC_MQ_D/objects/object_po_composer.xml index 1a07dccd2..9a31bfa6e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_po_composer.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_po_composer.xml @@ -1,6 +1,19 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_po_field.xml b/soh/assets/xml/GC_MQ_D/objects/object_po_field.xml index c20c3ea19..88f8dc88a 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_po_field.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_po_field.xml @@ -1,6 +1,17 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_po_sisters.xml b/soh/assets/xml/GC_MQ_D/objects/object_po_sisters.xml index 775284344..6306ac0f2 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_po_sisters.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_po_sisters.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_poh.xml b/soh/assets/xml/GC_MQ_D/objects/object_poh.xml index 10887ffa9..2674b130d 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_poh.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_poh.xml @@ -1,6 +1,17 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_ps.xml b/soh/assets/xml/GC_MQ_D/objects/object_ps.xml index 2041be523..0548d9a01 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_ps.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_ps.xml @@ -1,6 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_rl.xml b/soh/assets/xml/GC_MQ_D/objects/object_rl.xml index bbe0246ac..dc895a4f2 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_rl.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_rl.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_rs.xml b/soh/assets/xml/GC_MQ_D/objects/object_rs.xml index 1da1488af..152b5489e 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_rs.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_rs.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_ru2.xml b/soh/assets/xml/GC_MQ_D/objects/object_ru2.xml index d6cea2291..adeba89e6 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_ru2.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_ru2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_sa.xml b/soh/assets/xml/GC_MQ_D/objects/object_sa.xml index 8a6384040..9800f1baf 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_sa.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_sa.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_skj.xml b/soh/assets/xml/GC_MQ_D/objects/object_skj.xml index 38636256f..74548e518 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_skj.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_skj.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_spot09_obj.xml b/soh/assets/xml/GC_MQ_D/objects/object_spot09_obj.xml index b4d9ae42a..eb6528393 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_spot09_obj.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_spot09_obj.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_sst.xml b/soh/assets/xml/GC_MQ_D/objects/object_sst.xml index 3e17b8bf9..31e4f8140 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_sst.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_sst.xml @@ -1,6 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_tk.xml b/soh/assets/xml/GC_MQ_D/objects/object_tk.xml index 5b2fd1380..b74673316 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_tk.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_tk.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_torch2.xml b/soh/assets/xml/GC_MQ_D/objects/object_torch2.xml index ec55bbe26..3388e7d34 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_torch2.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_torch2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_tr.xml b/soh/assets/xml/GC_MQ_D/objects/object_tr.xml index e84d0896d..17ab9ae39 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_tr.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_tr.xml @@ -1,149 +1,149 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_tw.xml b/soh/assets/xml/GC_MQ_D/objects/object_tw.xml index 66cd3a7c2..be51f0b6c 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_tw.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_tw.xml @@ -1,332 +1,332 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_xc.xml b/soh/assets/xml/GC_MQ_D/objects/object_xc.xml index 7fae3a087..0b985b67d 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_xc.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_xc.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_zl1.xml b/soh/assets/xml/GC_MQ_D/objects/object_zl1.xml index 1b8355060..411286575 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_zl1.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_zl1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_zl2.xml b/soh/assets/xml/GC_MQ_D/objects/object_zl2.xml index 9af0a6527..959a919ec 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_zl2.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_zl2.xml @@ -1,5 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19,9 +52,9 @@ - - - + + + diff --git a/soh/assets/xml/GC_MQ_D/objects/object_zl4.xml b/soh/assets/xml/GC_MQ_D/objects/object_zl4.xml index e87a65465..22d8f6339 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_zl4.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_zl4.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon.xml index c03366be1..659a86cf3 100644 --- a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon.xml @@ -1,6 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon2.xml index ed02bb4d0..5ce8dacf3 100644 --- a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Ganon2.xml @@ -1,50 +1,50 @@ - + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - - + + + @@ -72,6 +72,6 @@ - + diff --git a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Sst.xml index e65a58ccd..0ed18666b 100644 --- a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Sst.xml +++ b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Sst.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_MQ_D/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_MQ_D/overlays/ovl_Demo_Shd.xml index 2ac9a9b48..524f604b0 100644 --- a/soh/assets/xml/GC_MQ_D/overlays/ovl_Demo_Shd.xml +++ b/soh/assets/xml/GC_MQ_D/overlays/ovl_Demo_Shd.xml @@ -1,7 +1,9 @@ - + + + diff --git a/soh/assets/xml/GC_MQ_D/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_MQ_D/overlays/ovl_En_Clear_Tag.xml index cd67b1f48..0d91bf070 100644 --- a/soh/assets/xml/GC_MQ_D/overlays/ovl_En_Clear_Tag.xml +++ b/soh/assets/xml/GC_MQ_D/overlays/ovl_En_Clear_Tag.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/Bmori1.xml index 70aac3464..a39e5ccd1 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/Bmori1.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/Bmori1.xml @@ -1,76 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/FIRE_bs.xml index 9e65ba617..89331ecc2 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/FIRE_bs.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/FIRE_bs.xml @@ -1,11 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan.xml index cc2935a1c..a2c20d692 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan.xml @@ -1,74 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdanCH.xml index 61c141689..ea300b96c 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdanCH.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdanCH.xml @@ -1,27 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan_bs.xml index d3280ffe6..d36ac6b77 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan_bs.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HAKAdan_bs.xml @@ -1,11 +1,23 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HIDAN.xml index d9c693c00..502dcd839 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/HIDAN.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/HIDAN.xml @@ -1,87 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin.xml index bd0e260ac..f8b5d8b6c 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin.xml @@ -1,77 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin_bs.xml index b64089530..99ae2b3ef 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin_bs.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/MIZUsin_bs.xml @@ -3,9 +3,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan.xml index 0aee687a8..18d39d57b 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan.xml @@ -1,36 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,12 +73,20 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan_boss.xml index 12d8d3e12..b88d6eb03 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan_boss.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan_boss.xml @@ -3,9 +3,17 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan.xml index a42e97cfc..c46e8ad27 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan.xml @@ -1,5 +1,6 @@ + @@ -17,54 +18,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan_boss.xml index 2b6102490..05633e53e 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ddan_boss.xml @@ -1,11 +1,21 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon.xml index 0582da79f..f857dbe94 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon.xml @@ -1,35 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_boss.xml index c75914c29..36c5e8107 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_boss.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_boss.xml @@ -1,5 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_demo.xml index 779cb9335..56c98efed 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_demo.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_demo.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_final.xml index a92367372..1c9bf84b4 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_final.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_final.xml @@ -1,5 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_sonogo.xml index 580366878..7d5f5a123 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_sonogo.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_sonogo.xml @@ -1,21 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_tou.xml index 6642a8902..1ae37b963 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_tou.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganon_tou.xml @@ -1,10 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontika.xml index b2673e10c..ba5542faa 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontika.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontika.xml @@ -1,5 +1,11 @@ + + + + + + @@ -20,63 +26,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontikasonogo.xml index b70310d6b..a441206b0 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontikasonogo.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ganontikasonogo.xml @@ -1,12 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/gerudoway.xml index d6abe7ed0..f2d07a288 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/gerudoway.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/gerudoway.xml @@ -1,26 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ice_doukutu.xml index a6e6b415d..7ad60c2a0 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ice_doukutu.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ice_doukutu.xml @@ -1,5 +1,11 @@ + + + + + + @@ -7,39 +13,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinboss.xml index 0f81c26fb..86c0d317b 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinboss.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinboss.xml @@ -1,19 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinzou.xml index 556f99900..166244e29 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinzou.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/jyasinzou.xml @@ -1,95 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/men.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/men.xml index e87b44d8e..679436de0 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/men.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/men.xml @@ -1,42 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/moribossroom.xml index 9c4552e9e..b9959eefa 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/moribossroom.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/moribossroom.xml @@ -1,11 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan.xml index c0a47d6da..377c7a682 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan.xml @@ -1,5 +1,6 @@ + @@ -7,39 +8,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan_boss.xml index f4971e7fe..7ea240547 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan_boss.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/dungeons/ydan_boss.xml @@ -1,11 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/bowling.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/bowling.xml index e12fd269a..9a41763a2 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/bowling.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/bowling.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/daiyousei_izumi.xml index 3c1fafb8d..4f9a03fc0 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/daiyousei_izumi.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/daiyousei_izumi.xml @@ -1,8 +1,22 @@ + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa.xml index ff8fab363..f09046b92 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa2.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa2.xml index 4cc41acec..5927169b7 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa2.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa2.xml @@ -3,6 +3,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa_n.xml index a33d77b07..6f4c181e0 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa_n.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/hairal_niwa_n.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/hakasitarelay.xml index bc1e2b966..91be63d14 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/hakasitarelay.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/hakasitarelay.xml @@ -1,27 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/hylia_labo.xml index 829708604..56822e67a 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/hylia_labo.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/hylia_labo.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/kenjyanoma.xml index e6bcef90a..4e8a58f3b 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/kenjyanoma.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/kenjyanoma.xml @@ -3,6 +3,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/mahouya.xml index 653cffc3b..8ae462f9d 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/mahouya.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/mahouya.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/miharigoya.xml index 41ff2db9f..63f8676ac 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/miharigoya.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/miharigoya.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/nakaniwa.xml index 49ff4a29c..2fb2d5e6a 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/nakaniwa.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/nakaniwa.xml @@ -8,6 +8,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/syatekijyou.xml index 5490e84f1..05243b52c 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/syatekijyou.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/syatekijyou.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/takaraya.xml index ddee91543..5b438980b 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/takaraya.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/takaraya.xml @@ -1,26 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/tokinoma.xml index e43f0a933..d7878b895 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/tokinoma.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/tokinoma.xml @@ -1,14 +1,47 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_tate.xml index 990e1763b..3b6dd2dec 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_tate.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_tate.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_yoko.xml index 98923c569..90a8d95d0 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_yoko.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/indoors/yousei_izumi_yoko.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana.xml b/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana.xml index b13273bed..e7dc93dd0 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana.xml @@ -3,6 +3,16 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana2.xml index 146d0ce45..2d8ba4906 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana2.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana2.xml @@ -1,5 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana_ouke.xml index 1d31d66a4..17f53613e 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana_ouke.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/misc/hakaana_ouke.xml @@ -1,16 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_MQ_D/scenes/misc/kakusiana.xml index e4254b750..c3f993ff4 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/misc/kakusiana.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/misc/kakusiana.xml @@ -1,47 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_MQ_D/scenes/misc/kinsuta.xml index d5dbacdb7..aac0f6c4e 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/misc/kinsuta.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/misc/kinsuta.xml @@ -3,6 +3,19 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/misc/turibori.xml b/soh/assets/xml/GC_MQ_D/scenes/misc/turibori.xml index ef6848edf..0633224d9 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/misc/turibori.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/misc/turibori.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/souko.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/souko.xml index bc6336b36..524ee570e 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/souko.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/souko.xml @@ -1,16 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot00.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot00.xml index 7e94ff3a6..b28e40889 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot00.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot00.xml @@ -1,5 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot01.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot01.xml index 4a5796411..6c1439b41 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot01.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot01.xml @@ -1,5 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot02.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot02.xml index 334d0e599..c7924c29d 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot02.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot02.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + @@ -12,6 +23,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot03.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot03.xml index 5dbb965a2..6ac31277e 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot03.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot03.xml @@ -1,14 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot04.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot04.xml index 3cfc14095..91edd98d2 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot04.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot04.xml @@ -1,5 +1,12 @@ + + + + + + + @@ -8,12 +15,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot05.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot05.xml index b799f21d1..7f1390ded 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot05.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot05.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot06.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot06.xml index 0c5ccea25..aa655a6a3 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot06.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot06.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot07.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot07.xml index 9b9b5ac66..a3286028e 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot07.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot07.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + @@ -7,9 +24,24 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot08.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot08.xml index 136727c6d..86582f0dc 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot08.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot08.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot09.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot09.xml index a447c9df4..60a61de1b 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot09.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot09.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot10.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot10.xml index 58080b9c0..53c0e624b 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot10.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot10.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -8,21 +16,44 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -32,6 +63,10 @@ + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot11.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot11.xml index 99bf24c82..76ff3b822 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot11.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot11.xml @@ -1,5 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot12.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot12.xml index 77b0cfb07..e21523b21 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot12.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot12.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + @@ -7,9 +19,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot13.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot13.xml index 5686bbde5..c68913065 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot13.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot13.xml @@ -1,11 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot15.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot15.xml index f17e76d55..e75f7b684 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot15.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot15.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot16.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot16.xml index b6a105c65..6002d1268 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot16.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot16.xml @@ -1,5 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot17.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot17.xml index 3aecc15a6..6fe3f377c 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot17.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot17.xml @@ -1,13 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot18.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot18.xml index 513e67cbc..8e87b8dd8 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot18.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot18.xml @@ -1,5 +1,10 @@ + + + + + @@ -9,15 +14,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot20.xml b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot20.xml index cc94f8443..5f2022f68 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/overworld/spot20.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/overworld/spot20.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/test_levels/besitu.xml b/soh/assets/xml/GC_MQ_D/scenes/test_levels/besitu.xml index e80f79299..e71e804c3 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/test_levels/besitu.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/test_levels/besitu.xml @@ -3,6 +3,13 @@ + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/test_levels/sutaru.xml b/soh/assets/xml/GC_MQ_D/scenes/test_levels/sutaru.xml index 7c3e822d8..dd316ac15 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/test_levels/sutaru.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/test_levels/sutaru.xml @@ -3,6 +3,13 @@ + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes.xml b/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes.xml index 3a7b594d1..74128177a 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes.xml @@ -3,6 +3,17 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes2.xml b/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes2.xml index 2dc61577f..54b4f7b42 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes2.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/test_levels/syotes2.xml @@ -3,6 +3,13 @@ + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/test_levels/test01.xml b/soh/assets/xml/GC_MQ_D/scenes/test_levels/test01.xml index e12e79ac1..eaef7a505 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/test_levels/test01.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/test_levels/test01.xml @@ -3,6 +3,11 @@ + + + + + diff --git a/soh/assets/xml/GC_MQ_D/scenes/test_levels/testroom.xml b/soh/assets/xml/GC_MQ_D/scenes/test_levels/testroom.xml index da575355c..0be3fc46a 100644 --- a/soh/assets/xml/GC_MQ_D/scenes/test_levels/testroom.xml +++ b/soh/assets/xml/GC_MQ_D/scenes/test_levels/testroom.xml @@ -1,17 +1,36 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/textures/icon_item_24_static.xml b/soh/assets/xml/GC_MQ_D/textures/icon_item_24_static.xml index 0c5f7621e..cdb8cc737 100644 --- a/soh/assets/xml/GC_MQ_D/textures/icon_item_24_static.xml +++ b/soh/assets/xml/GC_MQ_D/textures/icon_item_24_static.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/textures/icon_item_static.xml b/soh/assets/xml/GC_MQ_D/textures/icon_item_static.xml index 7b61cf35c..2bd26b79d 100644 --- a/soh/assets/xml/GC_MQ_D/textures/icon_item_static.xml +++ b/soh/assets/xml/GC_MQ_D/textures/icon_item_static.xml @@ -1,95 +1,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_MQ_D/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_MQ_D/textures/nintendo_rogo_static.xml index 7a60524b2..f09de3b0f 100644 --- a/soh/assets/xml/GC_MQ_D/textures/nintendo_rogo_static.xml +++ b/soh/assets/xml/GC_MQ_D/textures/nintendo_rogo_static.xml @@ -1,7 +1,8 @@ - + + diff --git a/soh/assets/xml/GC_MQ_D/textures/parameter_static.xml b/soh/assets/xml/GC_MQ_D/textures/parameter_static.xml index 4fd642c7c..4cfe67916 100644 --- a/soh/assets/xml/GC_MQ_D/textures/parameter_static.xml +++ b/soh/assets/xml/GC_MQ_D/textures/parameter_static.xml @@ -23,11 +23,11 @@ - - - - - + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml b/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml index 972baf88a..5f23b6746 100644 --- a/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml +++ b/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml b/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml index 1a21af3bc..a20e07075 100644 --- a/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml +++ b/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml @@ -1,7 +1,7 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_NMQ_D/code/fbdemo_wipe1.xml index f826fec32..ce95d8e3c 100644 --- a/soh/assets/xml/GC_NMQ_D/code/fbdemo_wipe1.xml +++ b/soh/assets/xml/GC_NMQ_D/code/fbdemo_wipe1.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_NMQ_D/objects/gameplay_dangeon_keep.xml index d16eb4c41..5b1a9050d 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/gameplay_dangeon_keep.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/gameplay_dangeon_keep.xml @@ -1,10 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml index 28b2bab81..5ffc52f65 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml @@ -1,6 +1,10 @@ + + + + @@ -930,10 +934,10 @@ - - - - + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_am.xml b/soh/assets/xml/GC_NMQ_D/objects/object_am.xml index 0a4b88ddf..b70c70d70 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_am.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_am.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml index 25ad7af35..c70621c6f 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_anubice.xml b/soh/assets/xml/GC_NMQ_D/objects/object_anubice.xml index 2140187e4..fb029586b 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_anubice.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_anubice.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_bdoor.xml b/soh/assets/xml/GC_NMQ_D/objects/object_bdoor.xml index 644c06ea8..a092f0c23 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_bdoor.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_bdoor.xml @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_blkobj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_blkobj.xml index a073077b8..345a8ebd9 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_blkobj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_blkobj.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_box.xml b/soh/assets/xml/GC_NMQ_D/objects/object_box.xml index efcec619b..106d2d335 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_box.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_box.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_bv.xml b/soh/assets/xml/GC_NMQ_D/objects/object_bv.xml index 83ff039f5..f8ffddaee 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_bv.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_bv.xml @@ -1,5 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_bw.xml b/soh/assets/xml/GC_NMQ_D/objects/object_bw.xml index f7d5ecead..6fd39fbb1 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_bw.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_bw.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_NMQ_D/objects/object_demo_kekkai.xml index 1b9c9b402..aa54bc2ee 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_demo_kekkai.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_demo_kekkai.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_dnk.xml b/soh/assets/xml/GC_NMQ_D/objects/object_dnk.xml index b1e79464b..3bce34304 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_dnk.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_dnk.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_dns.xml b/soh/assets/xml/GC_NMQ_D/objects/object_dns.xml index 086c4bd11..8b78ffcf2 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_dns.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_dns.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_fd.xml b/soh/assets/xml/GC_NMQ_D/objects/object_fd.xml index 1b96e9f22..a1c51c724 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_fd.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_fd.xml @@ -1,7 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_fd2.xml b/soh/assets/xml/GC_NMQ_D/objects/object_fd2.xml index 8689098b9..44b5f5f9c 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_fd2.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_fd2.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_fhg.xml b/soh/assets/xml/GC_NMQ_D/objects/object_fhg.xml index f3a4a55ca..e159e2504 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_fhg.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_fhg.xml @@ -1,6 +1,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_fw.xml b/soh/assets/xml/GC_NMQ_D/objects/object_fw.xml index e71f83092..ee9821d26 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_fw.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_fw.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_geldb.xml b/soh/assets/xml/GC_NMQ_D/objects/object_geldb.xml index a1dbd18f4..49b12ef2e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_geldb.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_geldb.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_boots_2.xml index 8e9cd1028..3bcb6a47a 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_boots_2.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_boots_2.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_butterfly.xml index 76ac70609..7b60a7724 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_butterfly.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_butterfly.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_clothes.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_clothes.xml index 2a10dce11..3f897b6d1 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_clothes.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_clothes.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_dekupouch.xml index 3d6d95d98..8925e6fa5 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_dekupouch.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_dekupouch.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_fire.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_fire.xml index a57fba6e8..4bfd76a7c 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_fire.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_fire.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_frog.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_frog.xml index f180fd267..a656c306b 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_frog.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_frog.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudo.xml index 3be8d3462..d65daee8e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudo.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudo.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudomask.xml index b53bf24af..cfcb878d9 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudomask.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_gerudomask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ghost.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ghost.xml index 186f4c74b..795f0cfd1 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ghost.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ghost.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_gloves.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_gloves.xml index 1b4282dca..0e1c4259d 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_gloves.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_gloves.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_golonmask.xml index 98f53f1c2..844d90e71 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_golonmask.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_golonmask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_hoverboots.xml index c4a67877b..6d41df8fd 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_hoverboots.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_hoverboots.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ki_tan_mask.xml index f66535af3..46eff7d3e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ki_tan_mask.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ki_tan_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_letter.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_letter.xml index 167a7ff5d..bea868339 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_letter.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_letter.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_liquid.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_liquid.xml index 5eeeca0fd..18a5c3d7a 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_liquid.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_liquid.xml @@ -1,5 +1,8 @@ + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_map.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_map.xml index 8887dd22c..471c1dab9 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_map.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_map.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_milk.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_milk.xml index 00b9530d9..a3e223b3e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_milk.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_milk.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_niwatori.xml index 713cc1ce5..c8389f62c 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_niwatori.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_niwatori.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_nuts.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_nuts.xml index 5508fe856..c59903c43 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_nuts.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_nuts.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina.xml index 7693cc122..82607677d 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina_0.xml index 336d33894..2c5f70d98 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina_0.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ocarina_0.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_prescription.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_prescription.xml index 081de301c..75ae7eb2b 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_prescription.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_prescription.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_purse.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_purse.xml index 3034942ff..054731dec 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_purse.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_purse.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_rabit_mask.xml index 75f855550..9d4eb9487 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_rabit_mask.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_rabit_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_1.xml index 2e9369569..2f11e3f6d 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_1.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_3.xml index 250bf7fea..8d1e5dafd 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_3.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_shield_3.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_soldout.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_soldout.xml index ae3f4685f..a15b1253e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_soldout.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_soldout.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_soul.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_soul.xml index 76ffc5685..a68178eba 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_soul.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_soul.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ticketstone.xml index 0fa37fe11..73bf888d1 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_ticketstone.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_ticketstone.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_truth_mask.xml index f28c7cbca..3b4edf3de 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_truth_mask.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_truth_mask.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gi_zoramask.xml index 096fdeedf..e3b1ab10e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gi_zoramask.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gi_zoramask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gj.xml index 50d6337b4..ee6dab74f 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gj.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gnd.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gnd.xml index dfbe02315..3ae3b57f3 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gnd.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gnd.xml @@ -1,6 +1,7 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gr.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gr.xml index 103d4412e..5f7360ae5 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gr.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gr.xml @@ -1,12 +1,23 @@ + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_hakach_objects.xml b/soh/assets/xml/GC_NMQ_D/objects/object_hakach_objects.xml index b978e77a3..0de02aaf1 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_hakach_objects.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_hakach_objects.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml b/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml index ed265da62..f41c0ee5e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml @@ -1,5 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_hintnuts.xml b/soh/assets/xml/GC_NMQ_D/objects/object_hintnuts.xml index f419f7546..a7290f395 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_hintnuts.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_hintnuts.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_horse_ganon.xml b/soh/assets/xml/GC_NMQ_D/objects/object_horse_ganon.xml index 98babb080..0a55462e2 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_horse_ganon.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_horse_ganon.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_horse_link_child.xml b/soh/assets/xml/GC_NMQ_D/objects/object_horse_link_child.xml index 1491189a1..146c564f5 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_horse_link_child.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_horse_link_child.xml @@ -1,5 +1,14 @@ + + + + + + + + + @@ -14,8 +23,8 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_horse_normal.xml b/soh/assets/xml/GC_NMQ_D/objects/object_horse_normal.xml index 2bc2cb0c6..2facab39c 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_horse_normal.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_horse_normal.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_horse_zelda.xml b/soh/assets/xml/GC_NMQ_D/objects/object_horse_zelda.xml index 9595c3245..af270c658 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_horse_zelda.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_horse_zelda.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ice_objects.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ice_objects.xml index a4e2e9b12..c7d059d70 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ice_objects.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ice_objects.xml @@ -2,23 +2,23 @@ - - - + + + - + - + - + - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ik.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ik.xml index 7d10babfa..8a6028f7c 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ik.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ik.xml @@ -10,66 +10,66 @@ - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - - - + + + - - - - + + + + - + - - - + + + - - - + + + @@ -79,14 +79,14 @@ - + - - - - + + + + @@ -101,8 +101,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_jya_obj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_jya_obj.xml index 4a203b0b9..a1f19b806 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_jya_obj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_jya_obj.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml index 946159a12..7c0014699 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_NMQ_D/objects/object_masterkokirihead.xml index 1e489323c..c64aa1c49 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_masterkokirihead.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_masterkokirihead.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_mb.xml b/soh/assets/xml/GC_NMQ_D/objects/object_mb.xml index a8471429d..23c0930c0 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_mb.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_mb.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_mizu_objects.xml b/soh/assets/xml/GC_NMQ_D/objects/object_mizu_objects.xml index 1abd73bc0..5a18b95cf 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_mizu_objects.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_mizu_objects.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_mm.xml b/soh/assets/xml/GC_NMQ_D/objects/object_mm.xml index 834afe5ef..b27837e57 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_mm.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_mm.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml b/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml index 526fa94dd..2a6247c9f 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_mori_tex.xml b/soh/assets/xml/GC_NMQ_D/objects/object_mori_tex.xml index 175b875fb..8ba4ff2d3 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_mori_tex.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_mori_tex.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_oE1s.xml b/soh/assets/xml/GC_NMQ_D/objects/object_oE1s.xml index faf6ab734..d311e6010 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_oE1s.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_oE1s.xml @@ -1,5 +1,7 @@ + + @@ -21,15 +23,15 @@ - + - + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_oE4s.xml b/soh/assets/xml/GC_NMQ_D/objects/object_oE4s.xml index 584019568..6037de52f 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_oE4s.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_oE4s.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml b/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml index 09a35dbd1..f14fecd82 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_os.xml b/soh/assets/xml/GC_NMQ_D/objects/object_os.xml index 7c3029443..5880a9293 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_os.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_os.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_os_anime.xml b/soh/assets/xml/GC_NMQ_D/objects/object_os_anime.xml index c90e37b37..f23636343 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_os_anime.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_os_anime.xml @@ -35,34 +35,34 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ossan.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ossan.xml index 963053f3f..5788e3a20 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ossan.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ossan.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_owl.xml b/soh/assets/xml/GC_NMQ_D/objects/object_owl.xml index fdc64b3aa..7d4b80078 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_owl.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_owl.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -53,11 +61,17 @@ - - - - + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_po_composer.xml b/soh/assets/xml/GC_NMQ_D/objects/object_po_composer.xml index 2ab8d64d8..ff995efce 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_po_composer.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_po_composer.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_po_field.xml b/soh/assets/xml/GC_NMQ_D/objects/object_po_field.xml index 10b402e2c..78bc0d65a 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_po_field.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_po_field.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_po_sisters.xml b/soh/assets/xml/GC_NMQ_D/objects/object_po_sisters.xml index e0c9f0834..b429be258 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_po_sisters.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_po_sisters.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_poh.xml b/soh/assets/xml/GC_NMQ_D/objects/object_poh.xml index 009d0fca3..be6d6eff4 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_poh.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_poh.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ps.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ps.xml index 043e232d6..9f9c894a6 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ps.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ps.xml @@ -1,5 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_rl.xml b/soh/assets/xml/GC_NMQ_D/objects/object_rl.xml index 625ab83a1..2a5ad30f6 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_rl.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_rl.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_rs.xml b/soh/assets/xml/GC_NMQ_D/objects/object_rs.xml index 1da1488af..152b5489e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_rs.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_rs.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ru2.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ru2.xml index 2a8d70af3..fedf37d48 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ru2.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ru2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_sa.xml b/soh/assets/xml/GC_NMQ_D/objects/object_sa.xml index a19446453..ec45ac961 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_sa.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_sa.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml index 686a96de5..74548e518 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -64,4 +72,4 @@ - \ No newline at end of file + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_spot09_obj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_spot09_obj.xml index b4d9ae42a..eb6528393 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_spot09_obj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_spot09_obj.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_sst.xml b/soh/assets/xml/GC_NMQ_D/objects/object_sst.xml index a80780741..191c67cc8 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_sst.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_sst.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_tk.xml b/soh/assets/xml/GC_NMQ_D/objects/object_tk.xml index 6869280e6..6b6cce724 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_tk.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_tk.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_torch2.xml b/soh/assets/xml/GC_NMQ_D/objects/object_torch2.xml index ec55bbe26..3388e7d34 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_torch2.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_torch2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_tr.xml b/soh/assets/xml/GC_NMQ_D/objects/object_tr.xml index e84d0896d..17ab9ae39 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_tr.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_tr.xml @@ -1,149 +1,149 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_tw.xml b/soh/assets/xml/GC_NMQ_D/objects/object_tw.xml index 66cd3a7c2..be51f0b6c 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_tw.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_tw.xml @@ -1,332 +1,332 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_xc.xml b/soh/assets/xml/GC_NMQ_D/objects/object_xc.xml index 030ae9394..06be2d891 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_xc.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_xc.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8,6 +35,7 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_zl1.xml b/soh/assets/xml/GC_NMQ_D/objects/object_zl1.xml index c7082a3db..001e5be14 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_zl1.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_zl1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_zl2.xml b/soh/assets/xml/GC_NMQ_D/objects/object_zl2.xml index 9af0a6527..959a919ec 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_zl2.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_zl2.xml @@ -1,5 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19,9 +52,9 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_zl4.xml b/soh/assets/xml/GC_NMQ_D/objects/object_zl4.xml index b43e5ba34..8e7a2837e 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_zl4.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_zl4.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml index b3b33fccf..4e3b2de5d 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon2.xml index fd25d4e51..2482c07f9 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon2.xml @@ -1,49 +1,49 @@ - + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - - + + + @@ -71,6 +71,6 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Sst.xml index 3a5f81f7d..c789abd96 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Sst.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Sst.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Demo_Shd.xml index 3f40a3688..df3533cef 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Demo_Shd.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Demo_Shd.xml @@ -1,7 +1,9 @@ - + + + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_En_Clear_Tag.xml index 36c893f3b..47f264ff6 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_En_Clear_Tag.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_En_Clear_Tag.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/Bmori1.xml index 70aac3464..373f36030 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/Bmori1.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/Bmori1.xml @@ -1,76 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/FIRE_bs.xml index 9e65ba617..89331ecc2 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/FIRE_bs.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/FIRE_bs.xml @@ -1,11 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan.xml index cc2935a1c..e557c80a5 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan.xml @@ -1,74 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdanCH.xml index eb55a19f5..97401aff6 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdanCH.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdanCH.xml @@ -1,26 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan_bs.xml index d3280ffe6..d36ac6b77 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan_bs.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HAKAdan_bs.xml @@ -1,11 +1,23 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HIDAN.xml index dc4d56849..fa4d784f1 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HIDAN.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/HIDAN.xml @@ -1,87 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin.xml index beb765c85..00c5aa82d 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin.xml @@ -1,77 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin_bs.xml index b64089530..99ae2b3ef 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin_bs.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/MIZUsin_bs.xml @@ -3,9 +3,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan.xml index c4edc9bea..41c009d7d 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan.xml @@ -1,36 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,12 +73,20 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan_boss.xml index 12d8d3e12..b88d6eb03 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan_boss.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan_boss.xml @@ -3,9 +3,17 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan.xml index f6572b9f8..1446a9c98 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan.xml @@ -1,5 +1,6 @@ + @@ -17,54 +18,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml index 03eb73ea3..5eeac3773 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml @@ -1,11 +1,21 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon.xml index 0582da79f..f857dbe94 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon.xml @@ -1,35 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_boss.xml index c75914c29..36c5e8107 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_boss.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_boss.xml @@ -1,5 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_demo.xml index 779cb9335..56c98efed 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_demo.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_demo.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_final.xml index afe1cffdf..3ec568cfb 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_final.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_final.xml @@ -1,5 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_sonogo.xml index 70313c8cf..84ef36950 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_sonogo.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_sonogo.xml @@ -1,21 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_tou.xml index 6642a8902..1ae37b963 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_tou.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganon_tou.xml @@ -1,10 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontika.xml index de24b26ff..a5ff210ce 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontika.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontika.xml @@ -1,5 +1,11 @@ + + + + + + @@ -20,63 +26,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontikasonogo.xml index 60020188f..060d4941b 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontikasonogo.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ganontikasonogo.xml @@ -1,12 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/gerudoway.xml index 531724ead..827277614 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/gerudoway.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/gerudoway.xml @@ -1,26 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ice_doukutu.xml index 4d25aa74f..46a9be3f8 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ice_doukutu.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ice_doukutu.xml @@ -1,44 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinboss.xml index 0f81c26fb..86c0d317b 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinboss.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinboss.xml @@ -1,19 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinzou.xml index ca5d0024a..bc14a46ac 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinzou.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/jyasinzou.xml @@ -1,95 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/men.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/men.xml index acba3e7cb..d9e5960e8 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/men.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/men.xml @@ -1,43 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/moribossroom.xml index 9c4552e9e..b9959eefa 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/moribossroom.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/moribossroom.xml @@ -1,11 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan.xml index 465c5f0ca..aed7d2660 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan.xml @@ -1,5 +1,6 @@ + @@ -7,39 +8,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan_boss.xml index f4971e7fe..7ea240547 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan_boss.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ydan_boss.xml @@ -1,11 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/bowling.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/bowling.xml index e12fd269a..9a41763a2 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/bowling.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/bowling.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/daiyousei_izumi.xml index 3c1fafb8d..4f9a03fc0 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/daiyousei_izumi.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/daiyousei_izumi.xml @@ -1,8 +1,22 @@ + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa.xml index 04547ab21..06d89f2fe 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa2.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa2.xml index 4cc41acec..5927169b7 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa2.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa2.xml @@ -3,6 +3,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa_n.xml index a33d77b07..6f4c181e0 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa_n.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hairal_niwa_n.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hakasitarelay.xml index bc1e2b966..91be63d14 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hakasitarelay.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hakasitarelay.xml @@ -1,27 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hylia_labo.xml index 829708604..56822e67a 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/hylia_labo.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/hylia_labo.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/kenjyanoma.xml index e6bcef90a..4e8a58f3b 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/kenjyanoma.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/kenjyanoma.xml @@ -3,6 +3,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/mahouya.xml index 653cffc3b..8ae462f9d 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/mahouya.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/mahouya.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/miharigoya.xml index 41ff2db9f..63f8676ac 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/miharigoya.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/miharigoya.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/nakaniwa.xml index 49ff4a29c..2fb2d5e6a 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/nakaniwa.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/nakaniwa.xml @@ -8,6 +8,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/syatekijyou.xml index 5490e84f1..05243b52c 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/syatekijyou.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/syatekijyou.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/takaraya.xml index ddee91543..5b438980b 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/takaraya.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/takaraya.xml @@ -1,26 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/tokinoma.xml index e43f0a933..d7878b895 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/tokinoma.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/tokinoma.xml @@ -1,14 +1,47 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_tate.xml index 990e1763b..3b6dd2dec 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_tate.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_tate.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_yoko.xml index 98923c569..90a8d95d0 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_yoko.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/indoors/yousei_izumi_yoko.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana.xml b/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana.xml index b13273bed..e7dc93dd0 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana.xml @@ -3,6 +3,16 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana2.xml index 146d0ce45..2d8ba4906 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana2.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana2.xml @@ -1,5 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana_ouke.xml index 1d31d66a4..17f53613e 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana_ouke.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/misc/hakaana_ouke.xml @@ -1,16 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_NMQ_D/scenes/misc/kakusiana.xml index e4254b750..c3f993ff4 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/misc/kakusiana.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/misc/kakusiana.xml @@ -1,47 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_NMQ_D/scenes/misc/kinsuta.xml index d5dbacdb7..aac0f6c4e 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/misc/kinsuta.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/misc/kinsuta.xml @@ -3,6 +3,19 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/misc/turibori.xml b/soh/assets/xml/GC_NMQ_D/scenes/misc/turibori.xml index ef6848edf..0633224d9 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/misc/turibori.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/misc/turibori.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/souko.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/souko.xml index 508beb85d..8dd9d9e48 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/souko.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/souko.xml @@ -1,16 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot00.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot00.xml index 4e933910c..508d9309b 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot00.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot00.xml @@ -1,5 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot01.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot01.xml index e2da37e2d..eb725afa6 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot01.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot01.xml @@ -1,5 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot02.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot02.xml index 334d0e599..c7924c29d 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot02.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot02.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + @@ -12,6 +23,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot03.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot03.xml index bf4039249..9434185f4 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot03.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot03.xml @@ -1,14 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot04.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot04.xml index c5824727f..6587eeaa8 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot04.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot04.xml @@ -1,5 +1,12 @@ + + + + + + + @@ -8,12 +15,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot05.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot05.xml index 7c2c012bf..4f7c62b91 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot05.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot05.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot06.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot06.xml index c369533bb..f4af602cf 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot06.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot06.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot07.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot07.xml index e083e336d..4dce8e283 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot07.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot07.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + @@ -7,9 +24,24 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot08.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot08.xml index 136727c6d..86582f0dc 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot08.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot08.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot09.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot09.xml index 175fac890..5bb9e059c 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot09.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot09.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot10.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot10.xml index 06349cf1e..66365e3d8 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot10.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot10.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -7,21 +15,44 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -31,6 +62,10 @@ + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot11.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot11.xml index 99bf24c82..76ff3b822 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot11.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot11.xml @@ -1,5 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot12.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot12.xml index 77b0cfb07..e21523b21 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot12.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot12.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + @@ -7,9 +19,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot13.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot13.xml index 5686bbde5..c68913065 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot13.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot13.xml @@ -1,11 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot15.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot15.xml index f17e76d55..e75f7b684 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot15.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot15.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot16.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot16.xml index 026da9fd2..f41b226f8 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot16.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot16.xml @@ -1,5 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot17.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot17.xml index 3aecc15a6..6fe3f377c 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot17.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot17.xml @@ -1,13 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot18.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot18.xml index 513e67cbc..8e87b8dd8 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot18.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot18.xml @@ -1,5 +1,10 @@ + + + + + @@ -9,15 +14,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot20.xml b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot20.xml index b75f3f5c0..5580e832c 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot20.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/overworld/spot20.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/besitu.xml b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/besitu.xml index e80f79299..e71e804c3 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/besitu.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/besitu.xml @@ -3,6 +3,13 @@ + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/sutaru.xml b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/sutaru.xml index 7c3e822d8..dd316ac15 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/sutaru.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/sutaru.xml @@ -3,6 +3,13 @@ + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes.xml b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes.xml index 3a7b594d1..74128177a 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes.xml @@ -3,6 +3,17 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes2.xml b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes2.xml index 2dc61577f..54b4f7b42 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes2.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/syotes2.xml @@ -3,6 +3,13 @@ + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/test01.xml b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/test01.xml index e12e79ac1..eaef7a505 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/test01.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/test01.xml @@ -3,6 +3,11 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/testroom.xml b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/testroom.xml index da575355c..0be3fc46a 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/test_levels/testroom.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/test_levels/testroom.xml @@ -1,17 +1,36 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/textures/icon_item_24_static.xml b/soh/assets/xml/GC_NMQ_D/textures/icon_item_24_static.xml index 0c5f7621e..cdb8cc737 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/icon_item_24_static.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/icon_item_24_static.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/textures/icon_item_static.xml b/soh/assets/xml/GC_NMQ_D/textures/icon_item_static.xml index 7b61cf35c..2bd26b79d 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/icon_item_static.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/icon_item_static.xml @@ -1,95 +1,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_NMQ_D/textures/nintendo_rogo_static.xml index 7a60524b2..f09de3b0f 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/nintendo_rogo_static.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/nintendo_rogo_static.xml @@ -1,7 +1,8 @@ - + + diff --git a/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml b/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml index 4fd642c7c..4cfe67916 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml @@ -23,11 +23,11 @@ - - - - - + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml index a3b79fb17..e6e4af232 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_triforce.xml b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_triforce.xml index f4eff13ae..5182a45e9 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_triforce.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_triforce.xml @@ -1,7 +1,7 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_wipe1.xml index 537706cd1..19cac4e02 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_wipe1.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_wipe1.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_dangeon_keep.xml index d16eb4c41..5b1a9050d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_dangeon_keep.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_dangeon_keep.xml @@ -1,10 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml index 28b2bab81..5ffc52f65 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml @@ -1,6 +1,10 @@ + + + + @@ -930,10 +934,10 @@ - - - - + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_am.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_am.xml index 0a4b88ddf..b70c70d70 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_am.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_am.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml index 25ad7af35..c70621c6f 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_anubice.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_anubice.xml index 2140187e4..fb029586b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_anubice.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_anubice.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bdoor.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bdoor.xml index 644c06ea8..a092f0c23 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bdoor.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bdoor.xml @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_blkobj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_blkobj.xml index a073077b8..345a8ebd9 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_blkobj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_blkobj.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_box.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_box.xml index efcec619b..106d2d335 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_box.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_box.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bv.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bv.xml index 83ff039f5..f8ffddaee 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bv.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bv.xml @@ -1,5 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bw.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bw.xml index f7d5ecead..6fd39fbb1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bw.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bw.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_demo_kekkai.xml index 1b9c9b402..aa54bc2ee 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_demo_kekkai.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_demo_kekkai.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dnk.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dnk.xml index b1e79464b..3bce34304 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dnk.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dnk.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dns.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dns.xml index 086c4bd11..8b78ffcf2 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dns.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dns.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd.xml index 1b96e9f22..a1c51c724 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd.xml @@ -1,7 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd2.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd2.xml index 8689098b9..44b5f5f9c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fd2.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fhg.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fhg.xml index f3a4a55ca..e159e2504 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fhg.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fhg.xml @@ -1,6 +1,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fw.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fw.xml index e71f83092..ee9821d26 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fw.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_fw.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_geldb.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_geldb.xml index a1dbd18f4..49b12ef2e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_geldb.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_geldb.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_boots_2.xml index 8e9cd1028..3bcb6a47a 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_boots_2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_boots_2.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_butterfly.xml index 76ac70609..7b60a7724 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_butterfly.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_butterfly.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_clothes.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_clothes.xml index 2a10dce11..3f897b6d1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_clothes.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_clothes.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_dekupouch.xml index 3d6d95d98..8925e6fa5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_dekupouch.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_dekupouch.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_fire.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_fire.xml index a57fba6e8..4bfd76a7c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_fire.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_fire.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_frog.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_frog.xml index f180fd267..a656c306b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_frog.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_frog.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudo.xml index 3be8d3462..d65daee8e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudo.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudomask.xml index b53bf24af..cfcb878d9 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudomask.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gerudomask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ghost.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ghost.xml index 186f4c74b..795f0cfd1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ghost.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ghost.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gloves.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gloves.xml index 1b4282dca..0e1c4259d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gloves.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_gloves.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_golonmask.xml index 98f53f1c2..844d90e71 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_golonmask.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_golonmask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_hoverboots.xml index c4a67877b..6d41df8fd 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_hoverboots.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_hoverboots.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ki_tan_mask.xml index f66535af3..46eff7d3e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ki_tan_mask.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ki_tan_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_letter.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_letter.xml index 167a7ff5d..bea868339 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_letter.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_letter.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_liquid.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_liquid.xml index 5eeeca0fd..18a5c3d7a 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_liquid.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_liquid.xml @@ -1,5 +1,8 @@ + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_map.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_map.xml index 8887dd22c..471c1dab9 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_map.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_map.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_milk.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_milk.xml index 00b9530d9..a3e223b3e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_milk.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_milk.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_niwatori.xml index 713cc1ce5..c8389f62c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_niwatori.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_niwatori.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_nuts.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_nuts.xml index 5508fe856..c59903c43 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_nuts.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_nuts.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina.xml index 7693cc122..82607677d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina_0.xml index 336d33894..2c5f70d98 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina_0.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ocarina_0.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_prescription.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_prescription.xml index 081de301c..75ae7eb2b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_prescription.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_prescription.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_purse.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_purse.xml index 3034942ff..054731dec 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_purse.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_purse.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_rabit_mask.xml index 75f855550..9d4eb9487 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_rabit_mask.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_rabit_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_1.xml index 2e9369569..2f11e3f6d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_1.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_3.xml index 250bf7fea..8d1e5dafd 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_3.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_shield_3.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soldout.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soldout.xml index ae3f4685f..a15b1253e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soldout.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soldout.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soul.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soul.xml index 76ffc5685..a68178eba 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soul.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_soul.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ticketstone.xml index 0fa37fe11..73bf888d1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ticketstone.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_ticketstone.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_truth_mask.xml index f28c7cbca..3b4edf3de 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_truth_mask.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_truth_mask.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_zoramask.xml index 096fdeedf..e3b1ab10e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_zoramask.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gi_zoramask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gj.xml index 50d6337b4..ee6dab74f 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gj.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gnd.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gnd.xml index dfbe02315..3ae3b57f3 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gnd.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gnd.xml @@ -1,6 +1,7 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gr.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gr.xml index 103d4412e..5f7360ae5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gr.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gr.xml @@ -1,12 +1,23 @@ + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hakach_objects.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hakach_objects.xml index b978e77a3..0de02aaf1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hakach_objects.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hakach_objects.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml index ed265da62..f41c0ee5e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml @@ -1,5 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hintnuts.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hintnuts.xml index f419f7546..a7290f395 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hintnuts.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hintnuts.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_ganon.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_ganon.xml index 98babb080..0a55462e2 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_ganon.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_ganon.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_link_child.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_link_child.xml index 1491189a1..146c564f5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_link_child.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_link_child.xml @@ -1,5 +1,14 @@ + + + + + + + + + @@ -14,8 +23,8 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_normal.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_normal.xml index 2bc2cb0c6..2facab39c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_normal.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_normal.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_zelda.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_zelda.xml index 9595c3245..af270c658 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_zelda.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_horse_zelda.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ice_objects.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ice_objects.xml index a4e2e9b12..c7d059d70 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ice_objects.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ice_objects.xml @@ -2,23 +2,23 @@ - - - + + + - + - + - + - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ik.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ik.xml index 7d10babfa..8a6028f7c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ik.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ik.xml @@ -10,66 +10,66 @@ - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - - - + + + - - - - + + + + - + - - - + + + - - - + + + @@ -79,14 +79,14 @@ - + - - - - + + + + @@ -101,8 +101,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_jya_obj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_jya_obj.xml index 4a203b0b9..a1f19b806 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_jya_obj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_jya_obj.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml index b26b36068..02075c999 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_masterkokirihead.xml index 1e489323c..c64aa1c49 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_masterkokirihead.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_masterkokirihead.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mb.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mb.xml index a8471429d..23c0930c0 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mb.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mb.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mizu_objects.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mizu_objects.xml index 1abd73bc0..5a18b95cf 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mizu_objects.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mizu_objects.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mm.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mm.xml index 834afe5ef..b27837e57 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mm.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mm.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml index 526fa94dd..2a6247c9f 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mori_tex.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mori_tex.xml index 175b875fb..8ba4ff2d3 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mori_tex.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mori_tex.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE1s.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE1s.xml index faf6ab734..d311e6010 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE1s.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE1s.xml @@ -1,5 +1,7 @@ + + @@ -21,15 +23,15 @@ - + - + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE4s.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE4s.xml index 584019568..6037de52f 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE4s.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oE4s.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml index 09a35dbd1..f14fecd82 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os.xml index 7c3029443..5880a9293 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os_anime.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os_anime.xml index c90e37b37..f23636343 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os_anime.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_os_anime.xml @@ -35,34 +35,34 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ossan.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ossan.xml index 963053f3f..5788e3a20 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ossan.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ossan.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_owl.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_owl.xml index fdc64b3aa..606fb8178 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_owl.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_owl.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -53,11 +61,17 @@ - - - - + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_composer.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_composer.xml index 2ab8d64d8..ff995efce 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_composer.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_composer.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_field.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_field.xml index 10b402e2c..78bc0d65a 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_field.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_field.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_sisters.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_sisters.xml index e0c9f0834..b429be258 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_sisters.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_po_sisters.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_poh.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_poh.xml index 009d0fca3..be6d6eff4 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_poh.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_poh.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ps.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ps.xml index 043e232d6..9f9c894a6 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ps.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ps.xml @@ -1,5 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rl.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rl.xml index 625ab83a1..2a5ad30f6 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rl.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rl.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rs.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rs.xml index 1da1488af..152b5489e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rs.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rs.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ru2.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ru2.xml index 2a8d70af3..fedf37d48 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ru2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ru2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sa.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sa.xml index a19446453..ec45ac961 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sa.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sa.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml index 686a96de5..74548e518 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -64,4 +72,4 @@ - \ No newline at end of file + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_spot09_obj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_spot09_obj.xml index b4d9ae42a..eb6528393 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_spot09_obj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_spot09_obj.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sst.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sst.xml index a80780741..191c67cc8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sst.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sst.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tk.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tk.xml index 6869280e6..6b6cce724 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tk.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tk.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_torch2.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_torch2.xml index ec55bbe26..3388e7d34 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_torch2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_torch2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tr.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tr.xml index e84d0896d..17ab9ae39 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tr.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tr.xml @@ -1,149 +1,149 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tw.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tw.xml index 66cd3a7c2..be51f0b6c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tw.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_tw.xml @@ -1,332 +1,332 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_xc.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_xc.xml index 030ae9394..06be2d891 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_xc.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_xc.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8,6 +35,7 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl1.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl1.xml index c7082a3db..001e5be14 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl1.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl2.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl2.xml index 9af0a6527..959a919ec 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl2.xml @@ -1,5 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19,9 +52,9 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl4.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl4.xml index b43e5ba34..8e7a2837e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl4.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_zl4.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml index ef5da89c1..841bd7c2a 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml index 8b0e9d31d..823c6b0f2 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml @@ -1,49 +1,49 @@ - + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - - + + + @@ -71,6 +71,6 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Sst.xml index 4e08c34f1..6e8e49d4a 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Sst.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Sst.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Demo_Shd.xml index 1682fd16a..3b0974e15 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Demo_Shd.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Demo_Shd.xml @@ -1,7 +1,9 @@ - + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Clear_Tag.xml index fee5c6302..d993286dd 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Clear_Tag.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Clear_Tag.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/Bmori1.xml index 70aac3464..373f36030 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/Bmori1.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/Bmori1.xml @@ -1,76 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/FIRE_bs.xml index 9e65ba617..89331ecc2 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/FIRE_bs.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/FIRE_bs.xml @@ -1,11 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan.xml index cc2935a1c..e557c80a5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan.xml @@ -1,74 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdanCH.xml index eb55a19f5..97401aff6 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdanCH.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdanCH.xml @@ -1,26 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan_bs.xml index d3280ffe6..d36ac6b77 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan_bs.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HAKAdan_bs.xml @@ -1,11 +1,23 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HIDAN.xml index dc4d56849..fa4d784f1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HIDAN.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/HIDAN.xml @@ -1,87 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin.xml index beb765c85..00c5aa82d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin.xml @@ -1,77 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin_bs.xml index b64089530..99ae2b3ef 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin_bs.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/MIZUsin_bs.xml @@ -3,9 +3,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan.xml index c4edc9bea..41c009d7d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan.xml @@ -1,36 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,12 +73,20 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan_boss.xml index 12d8d3e12..b88d6eb03 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan_boss.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan_boss.xml @@ -3,9 +3,17 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan.xml index f6572b9f8..1446a9c98 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan.xml @@ -1,5 +1,6 @@ + @@ -17,54 +18,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml index 03eb73ea3..5eeac3773 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml @@ -1,11 +1,21 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon.xml index 0582da79f..f857dbe94 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon.xml @@ -1,35 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_boss.xml index c75914c29..36c5e8107 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_boss.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_boss.xml @@ -1,5 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_demo.xml index 779cb9335..56c98efed 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_demo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_demo.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_final.xml index afe1cffdf..3ec568cfb 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_final.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_final.xml @@ -1,5 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_sonogo.xml index 70313c8cf..84ef36950 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_sonogo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_sonogo.xml @@ -1,21 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_tou.xml index 6642a8902..1ae37b963 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_tou.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganon_tou.xml @@ -1,10 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontika.xml index de24b26ff..a5ff210ce 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontika.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontika.xml @@ -1,5 +1,11 @@ + + + + + + @@ -20,63 +26,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontikasonogo.xml index 60020188f..060d4941b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontikasonogo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ganontikasonogo.xml @@ -1,12 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/gerudoway.xml index 531724ead..827277614 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/gerudoway.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/gerudoway.xml @@ -1,26 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ice_doukutu.xml index 4d25aa74f..46a9be3f8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ice_doukutu.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ice_doukutu.xml @@ -1,44 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinboss.xml index 0f81c26fb..86c0d317b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinboss.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinboss.xml @@ -1,19 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinzou.xml index ca5d0024a..bc14a46ac 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinzou.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/jyasinzou.xml @@ -1,95 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/men.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/men.xml index acba3e7cb..d9e5960e8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/men.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/men.xml @@ -1,43 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/moribossroom.xml index 9c4552e9e..b9959eefa 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/moribossroom.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/moribossroom.xml @@ -1,11 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan.xml index 465c5f0ca..aed7d2660 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan.xml @@ -1,5 +1,6 @@ + @@ -7,39 +8,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan_boss.xml index f4971e7fe..7ea240547 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan_boss.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ydan_boss.xml @@ -1,11 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/bowling.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/bowling.xml index e12fd269a..9a41763a2 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/bowling.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/bowling.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/daiyousei_izumi.xml index 3c1fafb8d..4f9a03fc0 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/daiyousei_izumi.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/daiyousei_izumi.xml @@ -1,8 +1,22 @@ + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa.xml index 04547ab21..06d89f2fe 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa_n.xml index a33d77b07..6f4c181e0 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa_n.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hairal_niwa_n.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hakasitarelay.xml index bc1e2b966..91be63d14 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hakasitarelay.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hakasitarelay.xml @@ -1,27 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hylia_labo.xml index 829708604..56822e67a 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hylia_labo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/hylia_labo.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/kenjyanoma.xml index e6bcef90a..4e8a58f3b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/kenjyanoma.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/kenjyanoma.xml @@ -3,6 +3,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/mahouya.xml index 653cffc3b..8ae462f9d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/mahouya.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/mahouya.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/miharigoya.xml index 41ff2db9f..63f8676ac 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/miharigoya.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/miharigoya.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/nakaniwa.xml index 49ff4a29c..2fb2d5e6a 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/nakaniwa.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/nakaniwa.xml @@ -8,6 +8,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/syatekijyou.xml index 5490e84f1..05243b52c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/syatekijyou.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/syatekijyou.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/takaraya.xml index ddee91543..5b438980b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/takaraya.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/takaraya.xml @@ -1,26 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/tokinoma.xml index e43f0a933..d7878b895 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/tokinoma.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/tokinoma.xml @@ -1,14 +1,47 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_tate.xml index 990e1763b..3b6dd2dec 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_tate.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_tate.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_yoko.xml index 98923c569..90a8d95d0 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_yoko.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/indoors/yousei_izumi_yoko.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana.xml index b13273bed..e7dc93dd0 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana.xml @@ -3,6 +3,16 @@ + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana2.xml index 146d0ce45..2d8ba4906 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana2.xml @@ -1,5 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana_ouke.xml index 1d31d66a4..17f53613e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana_ouke.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/hakaana_ouke.xml @@ -1,16 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kakusiana.xml index e4254b750..c3f993ff4 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kakusiana.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kakusiana.xml @@ -1,47 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kinsuta.xml index d5dbacdb7..aac0f6c4e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kinsuta.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/kinsuta.xml @@ -3,6 +3,19 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/turibori.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/turibori.xml index ef6848edf..0633224d9 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/turibori.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/misc/turibori.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/souko.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/souko.xml index 508beb85d..8dd9d9e48 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/souko.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/souko.xml @@ -1,16 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot00.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot00.xml index 4e933910c..508d9309b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot00.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot00.xml @@ -1,5 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot01.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot01.xml index e2da37e2d..eb725afa6 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot01.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot01.xml @@ -1,5 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot02.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot02.xml index 334d0e599..c7924c29d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot02.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot02.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + @@ -12,6 +23,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot03.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot03.xml index bf4039249..9434185f4 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot03.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot03.xml @@ -1,14 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot04.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot04.xml index c5824727f..6587eeaa8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot04.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot04.xml @@ -1,5 +1,12 @@ + + + + + + + @@ -8,12 +15,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot05.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot05.xml index 7c2c012bf..4f7c62b91 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot05.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot05.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot06.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot06.xml index c369533bb..f4af602cf 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot06.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot06.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot07.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot07.xml index e083e336d..4dce8e283 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot07.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot07.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + @@ -7,9 +24,24 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot08.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot08.xml index 136727c6d..86582f0dc 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot08.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot08.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot09.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot09.xml index 175fac890..5bb9e059c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot09.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot09.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot10.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot10.xml index 06349cf1e..66365e3d8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot10.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot10.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -7,21 +15,44 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -31,6 +62,10 @@ + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot11.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot11.xml index 99bf24c82..76ff3b822 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot11.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot11.xml @@ -1,5 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot12.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot12.xml index 77b0cfb07..e21523b21 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot12.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot12.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + @@ -7,9 +19,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot13.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot13.xml index 5686bbde5..c68913065 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot13.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot13.xml @@ -1,11 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot15.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot15.xml index f17e76d55..e75f7b684 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot15.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot15.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot16.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot16.xml index 026da9fd2..f41b226f8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot16.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot16.xml @@ -1,5 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot17.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot17.xml index 3aecc15a6..6fe3f377c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot17.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot17.xml @@ -1,13 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot18.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot18.xml index 513e67cbc..8e87b8dd8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot18.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot18.xml @@ -1,5 +1,10 @@ + + + + + @@ -9,15 +14,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot20.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot20.xml index b75f3f5c0..5580e832c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot20.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/overworld/spot20.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_24_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_24_static.xml index 0c5f7621e..cdb8cc737 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_24_static.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_24_static.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_static.xml index 7b61cf35c..2bd26b79d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_static.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/icon_item_static.xml @@ -1,95 +1,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/nintendo_rogo_static.xml index 7a60524b2..f09de3b0f 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/nintendo_rogo_static.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/nintendo_rogo_static.xml @@ -1,7 +1,8 @@ - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml index 2df06512f..c51dacf1f 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml @@ -23,11 +23,11 @@ - - - - - + + + + + diff --git a/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml b/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml index b21d3eea2..36d70566d 100644 --- a/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml +++ b/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/code/fbdemo_triforce.xml b/soh/assets/xml/N64_PAL_11/code/fbdemo_triforce.xml index 686cc058c..4691ead40 100644 --- a/soh/assets/xml/N64_PAL_11/code/fbdemo_triforce.xml +++ b/soh/assets/xml/N64_PAL_11/code/fbdemo_triforce.xml @@ -1,7 +1,7 @@ - - + + diff --git a/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml index 537706cd1..19cac4e02 100644 --- a/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml +++ b/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/soh/assets/xml/N64_PAL_11/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/N64_PAL_11/objects/gameplay_dangeon_keep.xml index d16eb4c41..5b1a9050d 100644 --- a/soh/assets/xml/N64_PAL_11/objects/gameplay_dangeon_keep.xml +++ b/soh/assets/xml/N64_PAL_11/objects/gameplay_dangeon_keep.xml @@ -1,10 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml b/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml index 28b2bab81..5ffc52f65 100644 --- a/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml +++ b/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml @@ -1,6 +1,10 @@ + + + + @@ -930,10 +934,10 @@ - - - - + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_am.xml b/soh/assets/xml/N64_PAL_11/objects/object_am.xml index 0a4b88ddf..b70c70d70 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_am.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_am.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_ani.xml b/soh/assets/xml/N64_PAL_11/objects/object_ani.xml index 25ad7af35..c70621c6f 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_ani.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_ani.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_anubice.xml b/soh/assets/xml/N64_PAL_11/objects/object_anubice.xml index 2140187e4..fb029586b 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_anubice.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_anubice.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_bdoor.xml b/soh/assets/xml/N64_PAL_11/objects/object_bdoor.xml index 644c06ea8..a092f0c23 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_bdoor.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_bdoor.xml @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_blkobj.xml b/soh/assets/xml/N64_PAL_11/objects/object_blkobj.xml index a073077b8..345a8ebd9 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_blkobj.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_blkobj.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_box.xml b/soh/assets/xml/N64_PAL_11/objects/object_box.xml index efcec619b..106d2d335 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_box.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_box.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_bv.xml b/soh/assets/xml/N64_PAL_11/objects/object_bv.xml index 83ff039f5..f8ffddaee 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_bv.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_bv.xml @@ -1,5 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_bw.xml b/soh/assets/xml/N64_PAL_11/objects/object_bw.xml index f7d5ecead..6fd39fbb1 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_bw.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_bw.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_demo_kekkai.xml b/soh/assets/xml/N64_PAL_11/objects/object_demo_kekkai.xml index 1b9c9b402..aa54bc2ee 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_demo_kekkai.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_demo_kekkai.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_dnk.xml b/soh/assets/xml/N64_PAL_11/objects/object_dnk.xml index b1e79464b..3bce34304 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_dnk.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_dnk.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_dns.xml b/soh/assets/xml/N64_PAL_11/objects/object_dns.xml index 086c4bd11..8b78ffcf2 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_dns.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_dns.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_fd.xml b/soh/assets/xml/N64_PAL_11/objects/object_fd.xml index 1b96e9f22..a1c51c724 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_fd.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_fd.xml @@ -1,7 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_fd2.xml b/soh/assets/xml/N64_PAL_11/objects/object_fd2.xml index 8689098b9..44b5f5f9c 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_fd2.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_fd2.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_fhg.xml b/soh/assets/xml/N64_PAL_11/objects/object_fhg.xml index f3a4a55ca..e159e2504 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_fhg.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_fhg.xml @@ -1,6 +1,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_fw.xml b/soh/assets/xml/N64_PAL_11/objects/object_fw.xml index e71f83092..ee9821d26 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_fw.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_fw.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_geldb.xml b/soh/assets/xml/N64_PAL_11/objects/object_geldb.xml index a1dbd18f4..49b12ef2e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_geldb.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_geldb.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_boots_2.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_boots_2.xml index 8e9cd1028..3bcb6a47a 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_boots_2.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_boots_2.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_butterfly.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_butterfly.xml index 76ac70609..7b60a7724 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_butterfly.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_butterfly.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_clothes.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_clothes.xml index 2a10dce11..3f897b6d1 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_clothes.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_clothes.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_dekupouch.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_dekupouch.xml index 3d6d95d98..8925e6fa5 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_dekupouch.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_dekupouch.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_fire.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_fire.xml index a57fba6e8..4bfd76a7c 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_fire.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_fire.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_frog.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_frog.xml index f180fd267..a656c306b 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_frog.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_frog.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudo.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudo.xml index 3be8d3462..d65daee8e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudo.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudo.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudomask.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudomask.xml index b53bf24af..cfcb878d9 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudomask.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_gerudomask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_ghost.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_ghost.xml index 186f4c74b..795f0cfd1 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_ghost.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_ghost.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_gloves.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_gloves.xml index 1b4282dca..0e1c4259d 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_gloves.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_gloves.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_golonmask.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_golonmask.xml index 98f53f1c2..844d90e71 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_golonmask.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_golonmask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_hoverboots.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_hoverboots.xml index c4a67877b..6d41df8fd 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_hoverboots.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_hoverboots.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_ki_tan_mask.xml index f66535af3..46eff7d3e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_ki_tan_mask.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_ki_tan_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_letter.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_letter.xml index 167a7ff5d..bea868339 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_letter.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_letter.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_liquid.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_liquid.xml index 5eeeca0fd..18a5c3d7a 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_liquid.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_liquid.xml @@ -1,5 +1,8 @@ + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_map.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_map.xml index 8887dd22c..471c1dab9 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_map.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_map.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_milk.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_milk.xml index 00b9530d9..a3e223b3e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_milk.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_milk.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_niwatori.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_niwatori.xml index 713cc1ce5..c8389f62c 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_niwatori.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_niwatori.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_nuts.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_nuts.xml index 5508fe856..c59903c43 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_nuts.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_nuts.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina.xml index 7693cc122..82607677d 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina_0.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina_0.xml index 336d33894..2c5f70d98 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina_0.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_ocarina_0.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_prescription.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_prescription.xml index 081de301c..75ae7eb2b 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_prescription.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_prescription.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_purse.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_purse.xml index 3034942ff..054731dec 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_purse.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_purse.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_rabit_mask.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_rabit_mask.xml index 75f855550..9d4eb9487 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_rabit_mask.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_rabit_mask.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_1.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_1.xml index 2e9369569..2f11e3f6d 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_1.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_3.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_3.xml index 250bf7fea..8d1e5dafd 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_3.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_shield_3.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_soldout.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_soldout.xml index ae3f4685f..a15b1253e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_soldout.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_soldout.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_soul.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_soul.xml index 76ffc5685..a68178eba 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_soul.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_soul.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_ticketstone.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_ticketstone.xml index 0fa37fe11..73bf888d1 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_ticketstone.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_ticketstone.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_truth_mask.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_truth_mask.xml index f28c7cbca..3b4edf3de 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_truth_mask.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_truth_mask.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gi_zoramask.xml b/soh/assets/xml/N64_PAL_11/objects/object_gi_zoramask.xml index 096fdeedf..e3b1ab10e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gi_zoramask.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gi_zoramask.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gj.xml b/soh/assets/xml/N64_PAL_11/objects/object_gj.xml index 50d6337b4..ee6dab74f 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gj.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gj.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gnd.xml b/soh/assets/xml/N64_PAL_11/objects/object_gnd.xml index dfbe02315..3ae3b57f3 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gnd.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gnd.xml @@ -1,6 +1,7 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_gr.xml b/soh/assets/xml/N64_PAL_11/objects/object_gr.xml index 103d4412e..5f7360ae5 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_gr.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_gr.xml @@ -1,12 +1,23 @@ + + + + + + + + + + + - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_hakach_objects.xml b/soh/assets/xml/N64_PAL_11/objects/object_hakach_objects.xml index b978e77a3..0de02aaf1 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_hakach_objects.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_hakach_objects.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_hidan_objects.xml b/soh/assets/xml/N64_PAL_11/objects/object_hidan_objects.xml index ed265da62..f41c0ee5e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_hidan_objects.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_hidan_objects.xml @@ -1,5 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_hintnuts.xml b/soh/assets/xml/N64_PAL_11/objects/object_hintnuts.xml index f419f7546..a7290f395 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_hintnuts.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_hintnuts.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_horse_ganon.xml b/soh/assets/xml/N64_PAL_11/objects/object_horse_ganon.xml index 98babb080..0a55462e2 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_horse_ganon.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_horse_ganon.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_horse_link_child.xml b/soh/assets/xml/N64_PAL_11/objects/object_horse_link_child.xml index 1491189a1..146c564f5 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_horse_link_child.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_horse_link_child.xml @@ -1,5 +1,14 @@ + + + + + + + + + @@ -14,8 +23,8 @@ - - - + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_horse_normal.xml b/soh/assets/xml/N64_PAL_11/objects/object_horse_normal.xml index 2bc2cb0c6..2facab39c 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_horse_normal.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_horse_normal.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_horse_zelda.xml b/soh/assets/xml/N64_PAL_11/objects/object_horse_zelda.xml index 9595c3245..af270c658 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_horse_zelda.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_horse_zelda.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_ice_objects.xml b/soh/assets/xml/N64_PAL_11/objects/object_ice_objects.xml index a4e2e9b12..c7d059d70 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_ice_objects.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_ice_objects.xml @@ -2,23 +2,23 @@ - - - + + + - + - + - + - - + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_ik.xml b/soh/assets/xml/N64_PAL_11/objects/object_ik.xml index 7d10babfa..8a6028f7c 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_ik.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_ik.xml @@ -10,66 +10,66 @@ - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - - - + + + - - - - + + + + - + - - - + + + - - - + + + @@ -79,14 +79,14 @@ - + - - - - + + + + @@ -101,8 +101,8 @@ - - + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_jya_obj.xml b/soh/assets/xml/N64_PAL_11/objects/object_jya_obj.xml index 4a203b0b9..a1f19b806 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_jya_obj.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_jya_obj.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml index b26b36068..02075c999 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml @@ -1,5 +1,12 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_masterkokirihead.xml b/soh/assets/xml/N64_PAL_11/objects/object_masterkokirihead.xml index 1e489323c..c64aa1c49 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_masterkokirihead.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_masterkokirihead.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_mb.xml b/soh/assets/xml/N64_PAL_11/objects/object_mb.xml index a8471429d..23c0930c0 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_mb.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_mb.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_mizu_objects.xml b/soh/assets/xml/N64_PAL_11/objects/object_mizu_objects.xml index 1abd73bc0..5a18b95cf 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_mizu_objects.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_mizu_objects.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_mm.xml b/soh/assets/xml/N64_PAL_11/objects/object_mm.xml index 834afe5ef..b27837e57 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_mm.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_mm.xml @@ -1,5 +1,14 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_mo.xml b/soh/assets/xml/N64_PAL_11/objects/object_mo.xml index 526fa94dd..2a6247c9f 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_mo.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_mo.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_mori_tex.xml b/soh/assets/xml/N64_PAL_11/objects/object_mori_tex.xml index 175b875fb..8ba4ff2d3 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_mori_tex.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_mori_tex.xml @@ -4,7 +4,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_oE1s.xml b/soh/assets/xml/N64_PAL_11/objects/object_oE1s.xml index faf6ab734..d311e6010 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_oE1s.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_oE1s.xml @@ -1,5 +1,7 @@ + + @@ -21,15 +23,15 @@ - + - + - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_oE4s.xml b/soh/assets/xml/N64_PAL_11/objects/object_oE4s.xml index 584019568..6037de52f 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_oE4s.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_oE4s.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_oF1d_map.xml b/soh/assets/xml/N64_PAL_11/objects/object_oF1d_map.xml index 09a35dbd1..f14fecd82 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_oF1d_map.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_oF1d_map.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_os.xml b/soh/assets/xml/N64_PAL_11/objects/object_os.xml index 7c3029443..5880a9293 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_os.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_os.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_os_anime.xml b/soh/assets/xml/N64_PAL_11/objects/object_os_anime.xml index c90e37b37..f23636343 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_os_anime.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_os_anime.xml @@ -35,34 +35,34 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_ossan.xml b/soh/assets/xml/N64_PAL_11/objects/object_ossan.xml index 963053f3f..5788e3a20 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_ossan.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_ossan.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_owl.xml b/soh/assets/xml/N64_PAL_11/objects/object_owl.xml index fdc64b3aa..606fb8178 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_owl.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_owl.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -53,11 +61,17 @@ - - - - + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_po_composer.xml b/soh/assets/xml/N64_PAL_11/objects/object_po_composer.xml index 2ab8d64d8..ff995efce 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_po_composer.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_po_composer.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_po_field.xml b/soh/assets/xml/N64_PAL_11/objects/object_po_field.xml index 10b402e2c..78bc0d65a 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_po_field.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_po_field.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_po_sisters.xml b/soh/assets/xml/N64_PAL_11/objects/object_po_sisters.xml index e0c9f0834..b429be258 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_po_sisters.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_po_sisters.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_poh.xml b/soh/assets/xml/N64_PAL_11/objects/object_poh.xml index 009d0fca3..be6d6eff4 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_poh.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_poh.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_ps.xml b/soh/assets/xml/N64_PAL_11/objects/object_ps.xml index 043e232d6..9f9c894a6 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_ps.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_ps.xml @@ -1,5 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_rl.xml b/soh/assets/xml/N64_PAL_11/objects/object_rl.xml index 625ab83a1..2a5ad30f6 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_rl.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_rl.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_rs.xml b/soh/assets/xml/N64_PAL_11/objects/object_rs.xml index 1da1488af..152b5489e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_rs.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_rs.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_ru2.xml b/soh/assets/xml/N64_PAL_11/objects/object_ru2.xml index 2a8d70af3..fedf37d48 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_ru2.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_ru2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_sa.xml b/soh/assets/xml/N64_PAL_11/objects/object_sa.xml index a19446453..ec45ac961 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_sa.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_sa.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_skj.xml b/soh/assets/xml/N64_PAL_11/objects/object_skj.xml index 686a96de5..74548e518 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_skj.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_skj.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -64,4 +72,4 @@ - \ No newline at end of file + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_spot09_obj.xml b/soh/assets/xml/N64_PAL_11/objects/object_spot09_obj.xml index b4d9ae42a..eb6528393 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_spot09_obj.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_spot09_obj.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_sst.xml b/soh/assets/xml/N64_PAL_11/objects/object_sst.xml index a80780741..191c67cc8 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_sst.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_sst.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_tk.xml b/soh/assets/xml/N64_PAL_11/objects/object_tk.xml index 6869280e6..6b6cce724 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_tk.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_tk.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_torch2.xml b/soh/assets/xml/N64_PAL_11/objects/object_torch2.xml index ec55bbe26..3388e7d34 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_torch2.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_torch2.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_tr.xml b/soh/assets/xml/N64_PAL_11/objects/object_tr.xml index e84d0896d..17ab9ae39 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_tr.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_tr.xml @@ -1,149 +1,149 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_tw.xml b/soh/assets/xml/N64_PAL_11/objects/object_tw.xml index 66cd3a7c2..be51f0b6c 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_tw.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_tw.xml @@ -1,332 +1,332 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_xc.xml b/soh/assets/xml/N64_PAL_11/objects/object_xc.xml index 030ae9394..06be2d891 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_xc.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_xc.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8,6 +35,7 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_zl1.xml b/soh/assets/xml/N64_PAL_11/objects/object_zl1.xml index c7082a3db..001e5be14 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_zl1.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_zl1.xml @@ -1,5 +1,6 @@ + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_zl2.xml b/soh/assets/xml/N64_PAL_11/objects/object_zl2.xml index 9af0a6527..959a919ec 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_zl2.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_zl2.xml @@ -1,5 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19,9 +52,9 @@ - - - + + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_zl4.xml b/soh/assets/xml/N64_PAL_11/objects/object_zl4.xml index b43e5ba34..8e7a2837e 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_zl4.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_zl4.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml index b1bec2b0b..25d29f441 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml @@ -1,5 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml index 2b11fb42f..f09784a55 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml @@ -1,49 +1,49 @@ - + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - - + + + @@ -71,6 +71,6 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Sst.xml index cb9ccd830..eacf95661 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Sst.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Sst.xml @@ -1,5 +1,7 @@ + + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Demo_Shd.xml index 5f634e3ef..0351ddcbb 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Demo_Shd.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Demo_Shd.xml @@ -1,7 +1,9 @@ - + + + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_En_Clear_Tag.xml index e8615ceb0..712a94f60 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_En_Clear_Tag.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_En_Clear_Tag.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_File_Choose.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_File_Choose.xml index de41882eb..b97861d62 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_File_Choose.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_File_Choose.xml @@ -3,18 +3,16 @@ - + - - - + + - + @@ -26,6 +24,9 @@ - + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/Bmori1.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/Bmori1.xml index 70aac3464..ad4311426 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/Bmori1.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/Bmori1.xml @@ -1,76 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/FIRE_bs.xml index 9e65ba617..89331ecc2 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/FIRE_bs.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/FIRE_bs.xml @@ -1,11 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan.xml index cc2935a1c..e557c80a5 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan.xml @@ -1,74 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdanCH.xml index eb55a19f5..97401aff6 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdanCH.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdanCH.xml @@ -1,26 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan_bs.xml index d3280ffe6..d36ac6b77 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan_bs.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HAKAdan_bs.xml @@ -1,11 +1,23 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HIDAN.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HIDAN.xml index dc4d56849..fa4d784f1 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/HIDAN.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/HIDAN.xml @@ -1,87 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin.xml index beb765c85..00c5aa82d 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin.xml @@ -1,77 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin_bs.xml index b64089530..99ae2b3ef 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin_bs.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/MIZUsin_bs.xml @@ -3,9 +3,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan.xml index c4edc9bea..41c009d7d 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan.xml @@ -1,36 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,12 +73,20 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan_boss.xml index 12d8d3e12..b88d6eb03 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan_boss.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan_boss.xml @@ -3,9 +3,17 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan.xml index f6572b9f8..1446a9c98 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan.xml @@ -1,5 +1,6 @@ + @@ -17,54 +18,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml index 03eb73ea3..5eeac3773 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml @@ -1,11 +1,21 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon.xml index 0582da79f..f857dbe94 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon.xml @@ -1,35 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_boss.xml index c75914c29..36c5e8107 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_boss.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_boss.xml @@ -1,5 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_demo.xml index 779cb9335..56c98efed 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_demo.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_demo.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_final.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_final.xml index afe1cffdf..3ec568cfb 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_final.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_final.xml @@ -1,5 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_sonogo.xml index 70313c8cf..84ef36950 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_sonogo.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_sonogo.xml @@ -1,21 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_tou.xml index 6642a8902..1ae37b963 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_tou.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganon_tou.xml @@ -1,10 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontika.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontika.xml index de24b26ff..a5ff210ce 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontika.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontika.xml @@ -1,5 +1,11 @@ + + + + + + @@ -20,63 +26,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontikasonogo.xml index 60020188f..060d4941b 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontikasonogo.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ganontikasonogo.xml @@ -1,12 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/gerudoway.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/gerudoway.xml index 531724ead..827277614 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/gerudoway.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/gerudoway.xml @@ -1,26 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml index 0ffd1fde3..4369cf579 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml @@ -1,44 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinboss.xml index 0f81c26fb..86c0d317b 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinboss.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinboss.xml @@ -1,19 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinzou.xml index ca5d0024a..bc14a46ac 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinzou.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/jyasinzou.xml @@ -1,95 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/men.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/men.xml index acba3e7cb..d9e5960e8 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/men.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/men.xml @@ -1,43 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/moribossroom.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/moribossroom.xml index 9c4552e9e..b9959eefa 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/moribossroom.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/moribossroom.xml @@ -1,11 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan.xml index 465c5f0ca..aed7d2660 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan.xml @@ -1,5 +1,6 @@ + @@ -7,39 +8,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan_boss.xml index f4971e7fe..7ea240547 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan_boss.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ydan_boss.xml @@ -1,11 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/bowling.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/bowling.xml index e12fd269a..9a41763a2 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/bowling.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/bowling.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/daiyousei_izumi.xml index 3c1fafb8d..4f9a03fc0 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/daiyousei_izumi.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/daiyousei_izumi.xml @@ -1,8 +1,22 @@ + + + + + + + + + + + + + + - + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa.xml index 04547ab21..06d89f2fe 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa_n.xml index a33d77b07..6f4c181e0 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa_n.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/hairal_niwa_n.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/hakasitarelay.xml index bc1e2b966..91be63d14 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/hakasitarelay.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/hakasitarelay.xml @@ -1,27 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/hylia_labo.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/hylia_labo.xml index 829708604..56822e67a 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/hylia_labo.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/hylia_labo.xml @@ -1,5 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/kenjyanoma.xml index e6bcef90a..4e8a58f3b 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/kenjyanoma.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/kenjyanoma.xml @@ -3,6 +3,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/mahouya.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/mahouya.xml index 653cffc3b..8ae462f9d 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/mahouya.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/mahouya.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/miharigoya.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/miharigoya.xml index 41ff2db9f..63f8676ac 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/miharigoya.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/miharigoya.xml @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/nakaniwa.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/nakaniwa.xml index 49ff4a29c..2fb2d5e6a 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/nakaniwa.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/nakaniwa.xml @@ -8,6 +8,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/syatekijyou.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/syatekijyou.xml index 5490e84f1..05243b52c 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/syatekijyou.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/syatekijyou.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/takaraya.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/takaraya.xml index ddee91543..5b438980b 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/takaraya.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/takaraya.xml @@ -1,26 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml index 654df9f8e..88fc3bad3 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml @@ -1,14 +1,47 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_tate.xml index 990e1763b..3b6dd2dec 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_tate.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_tate.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_yoko.xml index 98923c569..90a8d95d0 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_yoko.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/yousei_izumi_yoko.xml @@ -1,5 +1,18 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana.xml b/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana.xml index b13273bed..e7dc93dd0 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana.xml @@ -3,6 +3,16 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana2.xml b/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana2.xml index 146d0ce45..2d8ba4906 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana2.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana2.xml @@ -1,5 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana_ouke.xml index 1d31d66a4..17f53613e 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana_ouke.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/misc/hakaana_ouke.xml @@ -1,16 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/misc/kakusiana.xml b/soh/assets/xml/N64_PAL_11/scenes/misc/kakusiana.xml index e4254b750..c3f993ff4 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/misc/kakusiana.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/misc/kakusiana.xml @@ -1,47 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/misc/kinsuta.xml b/soh/assets/xml/N64_PAL_11/scenes/misc/kinsuta.xml index d5dbacdb7..aac0f6c4e 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/misc/kinsuta.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/misc/kinsuta.xml @@ -3,6 +3,19 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/misc/turibori.xml b/soh/assets/xml/N64_PAL_11/scenes/misc/turibori.xml index ef6848edf..0633224d9 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/misc/turibori.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/misc/turibori.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/souko.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/souko.xml index 508beb85d..8dd9d9e48 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/souko.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/souko.xml @@ -1,16 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot00.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot00.xml index 2c6990595..42d051a44 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot00.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot00.xml @@ -1,5 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot01.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot01.xml index 9f7395fb0..c0af66958 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot01.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot01.xml @@ -1,5 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot02.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot02.xml index 334d0e599..c7924c29d 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot02.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot02.xml @@ -1,5 +1,16 @@ + + + + + + + + + + + @@ -12,6 +23,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot03.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot03.xml index bf4039249..9434185f4 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot03.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot03.xml @@ -1,14 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot04.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot04.xml index 3aa028ae2..16503c1b4 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot04.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot04.xml @@ -1,5 +1,12 @@ + + + + + + + @@ -8,12 +15,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot05.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot05.xml index 2b0c8b2d3..c605e9cc9 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot05.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot05.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot06.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot06.xml index 2f9a2cc97..0d2b16d90 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot06.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot06.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot07.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot07.xml index a948558e1..b833ee3cd 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot07.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot07.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + @@ -7,9 +24,24 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot08.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot08.xml index 136727c6d..86582f0dc 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot08.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot08.xml @@ -1,5 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot09.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot09.xml index ff07a9661..0983f1e26 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot09.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot09.xml @@ -1,5 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot10.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot10.xml index 06349cf1e..66365e3d8 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot10.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot10.xml @@ -1,5 +1,13 @@ + + + + + + + + @@ -7,21 +15,44 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -31,6 +62,10 @@ + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot11.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot11.xml index b66cd8f29..f8682c436 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot11.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot11.xml @@ -1,5 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot12.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot12.xml index 09c16cb7c..6171c7e09 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot12.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot12.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + @@ -7,9 +19,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot13.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot13.xml index 5686bbde5..c68913065 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot13.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot13.xml @@ -1,11 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot15.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot15.xml index f17e76d55..e75f7b684 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot15.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot15.xml @@ -1,5 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot16.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot16.xml index 5397df0d9..4bf535712 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot16.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot16.xml @@ -1,5 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot17.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot17.xml index 6aca94ff7..6d598888d 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot17.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot17.xml @@ -1,13 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot18.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot18.xml index adbbc5112..57cb59b98 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot18.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot18.xml @@ -1,5 +1,10 @@ + + + + + @@ -9,15 +14,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot20.xml b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot20.xml index b75f3f5c0..5580e832c 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/overworld/spot20.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/overworld/spot20.xml @@ -1,5 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/textures/icon_item_24_static.xml b/soh/assets/xml/N64_PAL_11/textures/icon_item_24_static.xml index 0c5f7621e..cdb8cc737 100644 --- a/soh/assets/xml/N64_PAL_11/textures/icon_item_24_static.xml +++ b/soh/assets/xml/N64_PAL_11/textures/icon_item_24_static.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/textures/icon_item_static.xml b/soh/assets/xml/N64_PAL_11/textures/icon_item_static.xml index 7b61cf35c..2bd26b79d 100644 --- a/soh/assets/xml/N64_PAL_11/textures/icon_item_static.xml +++ b/soh/assets/xml/N64_PAL_11/textures/icon_item_static.xml @@ -1,95 +1,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/textures/nintendo_rogo_static.xml b/soh/assets/xml/N64_PAL_11/textures/nintendo_rogo_static.xml index 7a60524b2..f09de3b0f 100644 --- a/soh/assets/xml/N64_PAL_11/textures/nintendo_rogo_static.xml +++ b/soh/assets/xml/N64_PAL_11/textures/nintendo_rogo_static.xml @@ -1,7 +1,8 @@ - + + diff --git a/soh/assets/xml/N64_PAL_11/textures/parameter_static.xml b/soh/assets/xml/N64_PAL_11/textures/parameter_static.xml index 2df06512f..c51dacf1f 100644 --- a/soh/assets/xml/N64_PAL_11/textures/parameter_static.xml +++ b/soh/assets/xml/N64_PAL_11/textures/parameter_static.xml @@ -23,11 +23,11 @@ - - - - - + + + + + diff --git a/soh/assets/xml/N64_PAL_11/textures/title_static.xml b/soh/assets/xml/N64_PAL_11/textures/title_static.xml index 7367190a9..eb8d3288f 100644 --- a/soh/assets/xml/N64_PAL_11/textures/title_static.xml +++ b/soh/assets/xml/N64_PAL_11/textures/title_static.xml @@ -185,6 +185,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/include/functions.h b/soh/include/functions.h index 1d9895523..2420d2a6a 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -472,7 +472,7 @@ void func_8002F6D4(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, void func_8002F71C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); void func_8002F758(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); void func_8002F7A0(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); -void func_8002F7DC(Actor* actor, u16 sfxId); +void Player_PlaySfx(Actor* actor, u16 sfxId); void Audio_PlayActorSound2(Actor* actor, u16 sfxId); void func_8002F850(PlayState* play, Actor* actor); void func_8002F8F0(Actor* actor, u16 sfxId); @@ -1132,8 +1132,8 @@ s32 Player_HoldsHookshot(Player* player); s32 Player_HoldsBow(Player* player); s32 Player_HoldsSlingshot(Player* player); s32 func_8008F128(Player* player); -s32 Player_ActionToSword(s32 actionParam); -s32 Player_GetSwordHeld(Player* player); +s32 Player_ActionToMeleeWeapon(s32 actionParam); +s32 Player_GetMeleeWeaponHeld(Player* player); s32 Player_HoldsTwoHandedWeapon(Player* player); s32 Player_HoldsBrokenKnife(Player* player); s32 Player_ActionToBottle(Player* player, s32 actionParam); @@ -1141,19 +1141,19 @@ s32 Player_GetBottleHeld(Player* player); s32 Player_ActionToExplosive(Player* player, s32 actionParam); s32 Player_GetExplosiveHeld(Player* player); s32 func_8008F2BC(Player* player, s32 actionParam); -s32 func_8008F2F8(PlayState* play); -void func_8008F470(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic, +s32 Player_GetEnvironmentalHazard(PlayState* play); +void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic, s32 boots, s32 face, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* this); -s32 func_8008FCC8(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); -s32 func_80090014(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); -s32 func_800902F0(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); -s32 func_80090440(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); +s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); +s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); +s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); +s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data); u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponDim, Vec3f* newTip, Vec3f* newBase); void Player_DrawGetItem(PlayState* play, Player* player); -void func_80090D20(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* data); +void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* data); u32 func_80091738(PlayState* play, u8* segment, SkelAnime* skelAnime); -void func_8009214C(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale, +void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale, s32 sword, s32 tunic, s32 shield, s32 boots); void PreNMI_Init(GameState* thisx); Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, VecSph* arg2); diff --git a/soh/include/macros.h b/soh/include/macros.h index 2504d363a..5157315ac 100644 --- a/soh/include/macros.h +++ b/soh/include/macros.h @@ -306,15 +306,15 @@ extern GraphicsContext* __gfxCtx; #define NUM_TRIALS 6 #define NUM_SHOP_ITEMS 64 #define NUM_SCRUBS 46 -#define FOREST_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_BMORI1) ? 6 : 5) -#define FIRE_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_HIDAN) ? 5 : 8) -#define WATER_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_MIZUSIN) ? 2 : 6) -#define SPIRIT_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_JYASINZOU) ? 7 : 5) -#define SHADOW_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_HAKADAN) ? 6 : 5) -#define BOTTOM_OF_THE_WELL_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_HAKADANCH) ? 2 : 3) -#define GERUDO_TRAINING_GROUNDS_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_MEN) ? 3 : 9) +#define FOREST_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_FOREST_TEMPLE) ? 6 : 5) +#define FIRE_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_FIRE_TEMPLE) ? 5 : 8) +#define WATER_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_WATER_TEMPLE) ? 2 : 6) +#define SPIRIT_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_SPIRIT_TEMPLE) ? 7 : 5) +#define SHADOW_TEMPLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_SHADOW_TEMPLE) ? 6 : 5) +#define BOTTOM_OF_THE_WELL_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_BOTTOM_OF_THE_WELL) ? 2 : 3) +#define GERUDO_TRAINING_GROUNDS_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_GERUDO_TRAINING_GROUND) ? 3 : 9) #define GERUDO_FORTRESS_SMALL_KEY_MAX 4 -#define GANONS_CASTLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_GANONTIKA) ? 3 : 2) +#define GANONS_CASTLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_INSIDE_GANONS_CASTLE) ? 3 : 2) #define TREASURE_GAME_SMALL_KEY_MAX 6 #define DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(randomizerSettingsKey) \ diff --git a/soh/include/tables/scene_table.h b/soh/include/tables/scene_table.h new file mode 100644 index 000000000..da290bd00 --- /dev/null +++ b/soh/include/tables/scene_table.h @@ -0,0 +1,122 @@ +/** + * Scene Table + * + * DEFINE_SCENE should be used for all scenes (with or without a title card, see argument 2) + * - Argument 1: Name of the scene segment in spec + * - Argument 2: Name of the title card segment in spec, or `none` for no title card + * - Argument 3: Enum value for this scene + * - Argument 4: Scene draw config index + * - Argument 5: ? (Unknown) + * - Argument 6: ? (Unknown) + */ +/* 0x00 */ DEFINE_SCENE(ydan_scene, g_pn_06, SCENE_DEKU_TREE, SDC_DEKU_TREE, 1, 2) +/* 0x01 */ DEFINE_SCENE(ddan_scene, g_pn_08, SCENE_DODONGOS_CAVERN, SDC_DODONGOS_CAVERN, 1, 3) +/* 0x02 */ DEFINE_SCENE(bdan_scene, g_pn_07, SCENE_JABU_JABU, SDC_JABU_JABU, 1, 4) +/* 0x03 */ DEFINE_SCENE(Bmori1_scene, g_pn_01, SCENE_FOREST_TEMPLE, SDC_FOREST_TEMPLE, 2, 5) +/* 0x04 */ DEFINE_SCENE(HIDAN_scene, g_pn_03, SCENE_FIRE_TEMPLE, SDC_FIRE_TEMPLE, 2, 6) +/* 0x05 */ DEFINE_SCENE(MIZUsin_scene, g_pn_04, SCENE_WATER_TEMPLE, SDC_WATER_TEMPLE, 1, 7) +/* 0x06 */ DEFINE_SCENE(jyasinzou_scene, g_pn_05, SCENE_SPIRIT_TEMPLE, SDC_SPIRIT_TEMPLE, 1, 8) +/* 0x07 */ DEFINE_SCENE(HAKAdan_scene, g_pn_02, SCENE_SHADOW_TEMPLE, SDC_SHADOW_TEMPLE_AND_WELL, 2, 9) +/* 0x08 */ DEFINE_SCENE(HAKAdanCH_scene, g_pn_54, SCENE_BOTTOM_OF_THE_WELL, SDC_SHADOW_TEMPLE_AND_WELL, 2, 10) +/* 0x09 */ DEFINE_SCENE(ice_doukutu_scene, g_pn_10, SCENE_ICE_CAVERN, SDC_ICE_CAVERN, 0, 0) +/* 0x0A */ DEFINE_SCENE(ganon_scene, none, SCENE_GANONS_TOWER, SDC_DEFAULT, 2, 0) +/* 0x0B */ DEFINE_SCENE(men_scene, g_pn_11, SCENE_GERUDO_TRAINING_GROUND, SDC_GERUDO_TRAINING_GROUND, 0, 0) +/* 0x0C */ DEFINE_SCENE(gerudoway_scene, g_pn_49, SCENE_THIEVES_HIDEOUT, SDC_THIEVES_HIDEOUT, 0, 0) +/* 0x0D */ DEFINE_SCENE(ganontika_scene, g_pn_09, SCENE_INSIDE_GANONS_CASTLE, SDC_INSIDE_GANONS_CASTLE, 0, 0) +/* 0x0E */ DEFINE_SCENE(ganon_sonogo_scene, none, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, SDC_GANONS_TOWER_COLLAPSE_INTERIOR, 0, 0) +/* 0x0F */ DEFINE_SCENE(ganontikasonogo_scene, none, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, SDC_INSIDE_GANONS_CASTLE_COLLAPSE, 0, 0) +/* 0x10 */ DEFINE_SCENE(takaraya_scene, g_pn_51, SCENE_TREASURE_BOX_SHOP, SDC_DEFAULT, 0, 0) +/* 0x11 */ DEFINE_SCENE(ydan_boss_scene, none, SCENE_DEKU_TREE_BOSS, SDC_DEKU_TREE_BOSS, 0, 0) +/* 0x12 */ DEFINE_SCENE(ddan_boss_scene, none, SCENE_DODONGOS_CAVERN_BOSS, SDC_DEFAULT, 0, 0) +/* 0x13 */ DEFINE_SCENE(bdan_boss_scene, none, SCENE_JABU_JABU_BOSS, SDC_JABU_JABU, 0, 0) +/* 0x14 */ DEFINE_SCENE(moribossroom_scene, none, SCENE_FOREST_TEMPLE_BOSS, SDC_DEFAULT, 1, 0) +/* 0x15 */ DEFINE_SCENE(FIRE_bs_scene, none, SCENE_FIRE_TEMPLE_BOSS, SDC_FIRE_TEMPLE, 0, 0) +/* 0x16 */ DEFINE_SCENE(MIZUsin_bs_scene, none, SCENE_WATER_TEMPLE_BOSS, SDC_WATER_TEMPLE_BOSS, 0, 0) +/* 0x17 */ DEFINE_SCENE(jyasinboss_scene, none, SCENE_SPIRIT_TEMPLE_BOSS, SDC_DEFAULT, 0, 0) +/* 0x18 */ DEFINE_SCENE(HAKAdan_bs_scene, none, SCENE_SHADOW_TEMPLE_BOSS, SDC_SHADOW_TEMPLE_AND_WELL, 0, 0) +/* 0x19 */ DEFINE_SCENE(ganon_boss_scene, none, SCENE_GANONDORF_BOSS, SDC_DEFAULT, 0, 0) +/* 0x1A */ DEFINE_SCENE(ganon_final_scene, none, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, SDC_GANONS_TOWER_COLLAPSE_EXTERIOR, 0, 0) +/* 0x1B */ DEFINE_SCENE(entra_scene, none, SCENE_MARKET_ENTRANCE_DAY, SDC_DEFAULT, 0, 0) +/* 0x1C */ DEFINE_SCENE(entra_n_scene, none, SCENE_MARKET_ENTRANCE_NIGHT, SDC_DEFAULT, 0, 0) +/* 0x1D */ DEFINE_SCENE(enrui_scene, none, SCENE_MARKET_ENTRANCE_RUINS, SDC_DEFAULT, 0, 0) +/* 0x1E */ DEFINE_SCENE(market_alley_scene, g_pn_18, SCENE_BACK_ALLEY_DAY, SDC_DEFAULT, 0, 0) +/* 0x1F */ DEFINE_SCENE(market_alley_n_scene, g_pn_18, SCENE_BACK_ALLEY_NIGHT, SDC_DEFAULT, 0, 0) +/* 0x20 */ DEFINE_SCENE(market_day_scene, g_pn_17, SCENE_MARKET_DAY, SDC_DEFAULT, 0, 0) +/* 0x21 */ DEFINE_SCENE(market_night_scene, g_pn_17, SCENE_MARKET_NIGHT, SDC_DEFAULT, 0, 0) +/* 0x22 */ DEFINE_SCENE(market_ruins_scene, g_pn_17, SCENE_MARKET_RUINS, SDC_DEFAULT, 0, 0) +/* 0x23 */ DEFINE_SCENE(shrine_scene, none, SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY, SDC_DEFAULT, 0, 0) +/* 0x24 */ DEFINE_SCENE(shrine_n_scene, none, SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT, SDC_DEFAULT, 0, 0) +/* 0x25 */ DEFINE_SCENE(shrine_r_scene, none, SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS, SDC_DEFAULT, 0, 0) +/* 0x26 */ DEFINE_SCENE(kokiri_home_scene, none, SCENE_KNOW_IT_ALL_BROS_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x27 */ DEFINE_SCENE(kokiri_home3_scene, none, SCENE_TWINS_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x28 */ DEFINE_SCENE(kokiri_home4_scene, none, SCENE_MIDOS_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x29 */ DEFINE_SCENE(kokiri_home5_scene, none, SCENE_SARIAS_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x2A */ DEFINE_SCENE(kakariko_scene, none, SCENE_KAKARIKO_CENTER_GUEST_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x2B */ DEFINE_SCENE(kakariko3_scene, none, SCENE_BACK_ALLEY_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x2C */ DEFINE_SCENE(shop1_scene, g_pn_23, SCENE_BAZAAR, SDC_DEFAULT, 0, 0) +/* 0x2D */ DEFINE_SCENE(kokiri_shop_scene, g_pn_19, SCENE_KOKIRI_SHOP, SDC_DEFAULT, 0, 0) +/* 0x2E */ DEFINE_SCENE(golon_scene, g_pn_20, SCENE_GORON_SHOP, SDC_DEFAULT, 0, 0) +/* 0x2F */ DEFINE_SCENE(zoora_scene, g_pn_21, SCENE_ZORA_SHOP, SDC_DEFAULT, 0, 0) +/* 0x30 */ DEFINE_SCENE(drag_scene, g_pn_24, SCENE_POTION_SHOP_KAKARIKO, SDC_DEFAULT, 0, 0) +/* 0x31 */ DEFINE_SCENE(alley_shop_scene, g_pn_24, SCENE_POTION_SHOP_MARKET, SDC_DEFAULT, 0, 0) +/* 0x32 */ DEFINE_SCENE(night_shop_scene, g_pn_56, SCENE_BOMBCHU_SHOP, SDC_DEFAULT, 0, 0) +/* 0x33 */ DEFINE_SCENE(face_shop_scene, g_pn_50, SCENE_HAPPY_MASK_SHOP, SDC_DEFAULT, 0, 0) +/* 0x34 */ DEFINE_SCENE(link_home_scene, none, SCENE_LINKS_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x35 */ DEFINE_SCENE(impa_scene, none, SCENE_DOG_LADY_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x36 */ DEFINE_SCENE(malon_stable_scene, g_pn_48, SCENE_STABLE, SDC_DEFAULT, 0, 0) +/* 0x37 */ DEFINE_SCENE(labo_scene, none, SCENE_IMPAS_HOUSE, SDC_DEFAULT, 0, 0) +/* 0x38 */ DEFINE_SCENE(hylia_labo_scene, g_pn_26, SCENE_LAKESIDE_LABORATORY, SDC_LAKESIDE_LABORATORY, 0, 0) +/* 0x39 */ DEFINE_SCENE(tent_scene, none, SCENE_CARPENTERS_TENT, SDC_DEFAULT, 0, 0) +/* 0x3A */ DEFINE_SCENE(hut_scene, g_pn_25, SCENE_GRAVEKEEPERS_HUT, SDC_DEFAULT, 0, 0) +/* 0x3B */ DEFINE_SCENE(daiyousei_izumi_scene, g_pn_13, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, SDC_GREAT_FAIRYS_FOUNTAIN, 0, 0) +/* 0x3C */ DEFINE_SCENE(yousei_izumi_tate_scene, g_pn_45, SCENE_FAIRYS_FOUNTAIN, SDC_FAIRYS_FOUNTAIN, 0, 0) +/* 0x3D */ DEFINE_SCENE(yousei_izumi_yoko_scene, g_pn_13, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, SDC_GREAT_FAIRYS_FOUNTAIN, 0, 0) +/* 0x3E */ DEFINE_SCENE(kakusiana_scene, none, SCENE_GROTTOS, SDC_GROTTOS, 0, 0) +/* 0x3F */ DEFINE_SCENE(hakaana_scene, none, SCENE_REDEAD_GRAVE, SDC_GRAVE_EXIT_LIGHT_SHINING, 0, 0) +/* 0x40 */ DEFINE_SCENE(hakaana2_scene, none, SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN, SDC_FAIRYS_FOUNTAIN, 0, 0) +/* 0x41 */ DEFINE_SCENE(hakaana_ouke_scene, g_pn_44, SCENE_ROYAL_FAMILYS_TOMB, SDC_ROYAL_FAMILYS_TOMB, 0, 0) +/* 0x42 */ DEFINE_SCENE(syatekijyou_scene, g_pn_15, SCENE_SHOOTING_GALLERY, SDC_SHOOTING_GALLERY, 0, 0) +/* 0x43 */ DEFINE_SCENE(tokinoma_scene, g_pn_16, SCENE_TEMPLE_OF_TIME, SDC_TEMPLE_OF_TIME, 0, 0) +/* 0x44 */ DEFINE_SCENE(kenjyanoma_scene, g_pn_14, SCENE_CHAMBER_OF_THE_SAGES, SDC_CHAMBER_OF_THE_SAGES, 0, 0) +/* 0x45 */ DEFINE_SCENE(hairal_niwa_scene, g_pn_12, SCENE_CASTLE_COURTYARD_GUARDS_DAY, SDC_CASTLE_COURTYARD_GUARDS, 0, 0) +/* 0x46 */ DEFINE_SCENE(hairal_niwa_n_scene, g_pn_12, SCENE_CASTLE_COURTYARD_GUARDS_NIGHT, SDC_CASTLE_COURTYARD_GUARDS, 0, 0) +/* 0x47 */ DEFINE_SCENE(hiral_demo_scene, none, SCENE_CUTSCENE_MAP, SDC_DEFAULT, 0, 0) +/* 0x48 */ DEFINE_SCENE(hakasitarelay_scene, g_pn_57, SCENE_WINDMILL_AND_DAMPES_GRAVE, SDC_GRAVE_EXIT_LIGHT_SHINING, 0, 0) +/* 0x49 */ DEFINE_SCENE(turibori_scene, g_pn_46, SCENE_FISHING_POND, SDC_FISHING_POND, 0, 0) +/* 0x4A */ DEFINE_SCENE(nakaniwa_scene, g_pn_12, SCENE_CASTLE_COURTYARD_ZELDA, SDC_CALM_WATER, 0, 0) +/* 0x4B */ DEFINE_SCENE(bowling_scene, g_pn_47, SCENE_BOMBCHU_BOWLING_ALLEY, SDC_BOMBCHU_BOWLING_ALLEY, 0, 0) +/* 0x4C */ DEFINE_SCENE(souko_scene, none, SCENE_LON_LON_BUILDINGS, SDC_LON_LON_BUILDINGS, 0, 0) +/* 0x4D */ DEFINE_SCENE(miharigoya_scene, none, SCENE_MARKET_GUARD_HOUSE, SDC_MARKET_GUARD_HOUSE, 0, 0) +/* 0x4E */ DEFINE_SCENE(mahouya_scene, g_pn_24, SCENE_POTION_SHOP_GRANNY, SDC_POTION_SHOP_GRANNY, 0, 0) +/* 0x4F */ DEFINE_SCENE(ganon_demo_scene, none, SCENE_GANON_BOSS, SDC_OUTSIDE_GANONS_CASTLE, 0, 0) +/* 0x50 */ DEFINE_SCENE(kinsuta_scene, g_pn_22, SCENE_HOUSE_OF_SKULLTULA, SDC_DEFAULT, 0, 0) +/* 0x51 */ DEFINE_SCENE(spot00_scene, g_pn_27, SCENE_HYRULE_FIELD, SDC_HYRULE_FIELD, 0, 0) +/* 0x52 */ DEFINE_SCENE(spot01_scene, g_pn_28, SCENE_KAKARIKO_VILLAGE, SDC_KAKARIKO_VILLAGE, 0, 0) +/* 0x53 */ DEFINE_SCENE(spot02_scene, g_pn_29, SCENE_GRAVEYARD, SDC_DEFAULT, 0, 0) +/* 0x54 */ DEFINE_SCENE(spot03_scene, g_pn_30, SCENE_ZORAS_RIVER, SDC_ZORAS_RIVER, 0, 0) +/* 0x55 */ DEFINE_SCENE(spot04_scene, g_pn_31, SCENE_KOKIRI_FOREST, SDC_KOKIRI_FOREST, 0, 0) +/* 0x56 */ DEFINE_SCENE(spot05_scene, g_pn_52, SCENE_SACRED_FOREST_MEADOW, SDC_CALM_WATER, 0, 0) +/* 0x57 */ DEFINE_SCENE(spot06_scene, g_pn_32, SCENE_LAKE_HYLIA, SDC_LAKE_HYLIA, 0, 0) +/* 0x58 */ DEFINE_SCENE(spot07_scene, g_pn_33, SCENE_ZORAS_DOMAIN, SDC_ZORAS_DOMAIN, 0, 0) +/* 0x59 */ DEFINE_SCENE(spot08_scene, g_pn_34, SCENE_ZORAS_FOUNTAIN, SDC_ZORAS_FOUNTAIN, 0, 0) +/* 0x5A */ DEFINE_SCENE(spot09_scene, g_pn_35, SCENE_GERUDO_VALLEY, SDC_GERUDO_VALLEY, 0, 0) +/* 0x5B */ DEFINE_SCENE(spot10_scene, g_pn_36, SCENE_LOST_WOODS, SDC_LOST_WOODS, 0, 0) +/* 0x5C */ DEFINE_SCENE(spot11_scene, g_pn_55, SCENE_DESERT_COLOSSUS, SDC_DESERT_COLOSSUS, 0, 0) +/* 0x5D */ DEFINE_SCENE(spot12_scene, g_pn_53, SCENE_GERUDOS_FORTRESS, SDC_GERUDOS_FORTRESS, 0, 0) +/* 0x5E */ DEFINE_SCENE(spot13_scene, g_pn_37, SCENE_HAUNTED_WASTELAND, SDC_HAUNTED_WASTELAND, 0, 0) +/* 0x5F */ DEFINE_SCENE(spot15_scene, g_pn_38, SCENE_HYRULE_CASTLE, SDC_HYRULE_CASTLE, 0, 0) +/* 0x60 */ DEFINE_SCENE(spot16_scene, g_pn_39, SCENE_DEATH_MOUNTAIN_TRAIL, SDC_DEATH_MOUNTAIN_TRAIL, 0, 0) +/* 0x61 */ DEFINE_SCENE(spot17_scene, g_pn_40, SCENE_DEATH_MOUNTAIN_CRATER, SDC_DEATH_MOUNTAIN_CRATER, 0, 0) +/* 0x62 */ DEFINE_SCENE(spot18_scene, g_pn_41, SCENE_GORON_CITY, SDC_GORON_CITY, 0, 0) +/* 0x63 */ DEFINE_SCENE(spot20_scene, g_pn_42, SCENE_LON_LON_RANCH, SDC_LON_LON_RANCH, 0, 0) +/* 0x64 */ DEFINE_SCENE(ganon_tou_scene, g_pn_43, SCENE_OUTSIDE_GANONS_CASTLE, SDC_OUTSIDE_GANONS_CASTLE, 0, 0) +// Debug-only scenes +/* 0x65 */ DEFINE_SCENE(test01_scene, none, SCENE_TEST01, SDC_CALM_WATER, 0, 0) +/* 0x66 */ DEFINE_SCENE(besitu_scene, none, SCENE_BESITU, SDC_BESITU, 0, 0) +/* 0x67 */ DEFINE_SCENE(depth_test_scene, none, SCENE_DEPTH_TEST, SDC_DEFAULT, 0, 0) +/* 0x68 */ DEFINE_SCENE(syotes_scene, none, SCENE_SYOTES, SDC_DEFAULT, 0, 0) +/* 0x69 */ DEFINE_SCENE(syotes2_scene, none, SCENE_SYOTES2, SDC_DEFAULT, 0, 0) +/* 0x6A */ DEFINE_SCENE(sutaru_scene, none, SCENE_SUTARU, SDC_DEFAULT, 0, 0) +/* 0x6B */ DEFINE_SCENE(hairal_niwa2_scene, g_pn_12, SCENE_HAIRAL_NIWA2, SDC_CASTLE_COURTYARD_GUARDS, 0, 0) +/* 0x6C */ DEFINE_SCENE(sasatest_scene, none, SCENE_SASATEST, SDC_DEFAULT, 0, 0) +/* 0x6D */ DEFINE_SCENE(testroom_scene, none, SCENE_TESTROOM, SDC_DEFAULT, 0, 0) \ No newline at end of file diff --git a/soh/include/variables.h b/soh/include/variables.h index 853cb3a17..8fd457d18 100644 --- a/soh/include/variables.h +++ b/soh/include/variables.h @@ -83,10 +83,10 @@ extern "C" extern s16 gSpoilingItemReverts[3]; extern FlexSkeletonHeader* gPlayerSkelHeaders[2]; extern u8 gPlayerModelTypes[][5]; - extern Gfx* D_80125DE8[]; - extern Gfx* D_80125E08[]; - extern Gfx* D_80125E18[]; - extern Gfx* D_80125EF8[]; + extern Gfx* gPlayerLeftHandBgsDLs[]; + extern Gfx* gPlayerLeftHandOpenDLs[]; + extern Gfx* gPlayerLeftHandClosedDLs[]; + extern Gfx* gPlayerLeftHandBoomerangDLs[]; extern Gfx gCullBackDList[]; extern Gfx gCullFrontDList[]; extern Gfx gEmptyDL[]; diff --git a/soh/include/z64player.h b/soh/include/z64player.h index 4aaf57586..99445f1d7 100644 --- a/soh/include/z64player.h +++ b/soh/include/z64player.h @@ -13,7 +13,7 @@ typedef enum { /* 0 */ PLAYER_SWORD_NONE, /* 1 */ PLAYER_SWORD_KOKIRI, /* 2 */ PLAYER_SWORD_MASTER, - /* 3 */ PLAYER_SWORD_BGS, + /* 3 */ PLAYER_SWORD_BIGGORON, /* 4 */ PLAYER_SWORD_MAX } PlayerSword; @@ -70,8 +70,8 @@ typedef enum { /* 0x02 */ PLAYER_IA_FISHING_POLE, /* 0x03 */ PLAYER_IA_SWORD_MASTER, /* 0x04 */ PLAYER_IA_SWORD_KOKIRI, - /* 0x05 */ PLAYER_IA_SWORD_BGS, - /* 0x06 */ PLAYER_IA_STICK, + /* 0x05 */ PLAYER_IA_SWORD_BIGGORON, + /* 0x06 */ PLAYER_IA_DEKU_STICK, /* 0x07 */ PLAYER_IA_HAMMER, /* 0x08 */ PLAYER_IA_BOW, /* 0x09 */ PLAYER_IA_BOW_FIRE, @@ -92,33 +92,33 @@ typedef enum { /* 0x18 */ PLAYER_IA_FARORES_WIND, /* 0x19 */ PLAYER_IA_NAYRUS_LOVE, /* 0x1A */ PLAYER_IA_DINS_FIRE, - /* 0x1B */ PLAYER_IA_NUT, + /* 0x1B */ PLAYER_IA_DEKU_NUT, /* 0x1C */ PLAYER_IA_OCARINA_FAIRY, - /* 0x1D */ PLAYER_IA_OCARINA_TIME, + /* 0x1D */ PLAYER_IA_OCARINA_OF_TIME, /* 0x1E */ PLAYER_IA_BOTTLE, /* 0x1F */ PLAYER_IA_BOTTLE_FISH, /* 0x20 */ PLAYER_IA_BOTTLE_FIRE, /* 0x21 */ PLAYER_IA_BOTTLE_BUG, /* 0x22 */ PLAYER_IA_BOTTLE_POE, /* 0x23 */ PLAYER_IA_BOTTLE_BIG_POE, - /* 0x24 */ PLAYER_IA_BOTTLE_LETTER, + /* 0x24 */ PLAYER_IA_BOTTLE_RUTOS_LETTER, /* 0x25 */ PLAYER_IA_BOTTLE_POTION_RED, /* 0x26 */ PLAYER_IA_BOTTLE_POTION_BLUE, /* 0x27 */ PLAYER_IA_BOTTLE_POTION_GREEN, - /* 0x28 */ PLAYER_IA_BOTTLE_MILK, + /* 0x28 */ PLAYER_IA_BOTTLE_MILK_FULL, /* 0x29 */ PLAYER_IA_BOTTLE_MILK_HALF, /* 0x2A */ PLAYER_IA_BOTTLE_FAIRY, - /* 0x2B */ PLAYER_IA_LETTER_ZELDA, + /* 0x2B */ PLAYER_IA_ZELDAS_LETTER, /* 0x2C */ PLAYER_IA_WEIRD_EGG, /* 0x2D */ PLAYER_IA_CHICKEN, - /* 0x2E */ PLAYER_IA_BEAN, + /* 0x2E */ PLAYER_IA_MAGIC_BEAN, /* 0x2F */ PLAYER_IA_POCKET_EGG, /* 0x30 */ PLAYER_IA_POCKET_CUCCO, /* 0x31 */ PLAYER_IA_COJIRO, /* 0x32 */ PLAYER_IA_ODD_MUSHROOM, /* 0x33 */ PLAYER_IA_ODD_POTION, - /* 0x34 */ PLAYER_IA_SAW, - /* 0x35 */ PLAYER_IA_SWORD_BROKEN, + /* 0x34 */ PLAYER_IA_POACHERS_SAW, + /* 0x35 */ PLAYER_IA_BROKEN_GORONS_SWORD, /* 0x36 */ PLAYER_IA_PRESCRIPTION, /* 0x37 */ PLAYER_IA_FROG, /* 0x38 */ PLAYER_IA_EYEDROPS, @@ -126,12 +126,12 @@ typedef enum { /* 0x3A */ PLAYER_IA_MASK_KEATON, /* 0x3B */ PLAYER_IA_MASK_SKULL, /* 0x3C */ PLAYER_IA_MASK_SPOOKY, - /* 0x3D */ PLAYER_IA_MASK_BUNNY, + /* 0x3D */ PLAYER_IA_MASK_BUNNY_HOOD, /* 0x3E */ PLAYER_IA_MASK_GORON, /* 0x3F */ PLAYER_IA_MASK_ZORA, /* 0x40 */ PLAYER_IA_MASK_GERUDO, /* 0x41 */ PLAYER_IA_MASK_TRUTH, - /* 0x42 */ PLAYER_IA_LENS, + /* 0x42 */ PLAYER_IA_LENS_OF_TRUTH, // Upstream TODO: Document why these entries were added /* 0x43 */ PLAYER_IA_SHIELD_DEKU, /* 0x44 */ PLAYER_IA_SHIELD_HYLIAN, @@ -303,51 +303,51 @@ typedef enum { } PlayerAnimType; typedef enum { - /* 0x00 */ PLAYER_ANIMGROUP_0, - /* 0x01 */ PLAYER_ANIMGROUP_1, - /* 0x02 */ PLAYER_ANIMGROUP_2, - /* 0x03 */ PLAYER_ANIMGROUP_3, - /* 0x04 */ PLAYER_ANIMGROUP_4, - /* 0x05 */ PLAYER_ANIMGROUP_5, - /* 0x06 */ PLAYER_ANIMGROUP_6, - /* 0x07 */ PLAYER_ANIMGROUP_7, - /* 0x08 */ PLAYER_ANIMGROUP_8, - /* 0x09 */ PLAYER_ANIMGROUP_9, - /* 0x0A */ PLAYER_ANIMGROUP_10, - /* 0x0B */ PLAYER_ANIMGROUP_11, - /* 0x0C */ PLAYER_ANIMGROUP_12, - /* 0x0D */ PLAYER_ANIMGROUP_13, - /* 0x0E */ PLAYER_ANIMGROUP_14, - /* 0x0F */ PLAYER_ANIMGROUP_15, - /* 0x10 */ PLAYER_ANIMGROUP_16, - /* 0x11 */ PLAYER_ANIMGROUP_17, - /* 0x12 */ PLAYER_ANIMGROUP_18, - /* 0x13 */ PLAYER_ANIMGROUP_19, - /* 0x14 */ PLAYER_ANIMGROUP_20, - /* 0x15 */ PLAYER_ANIMGROUP_21, - /* 0x16 */ PLAYER_ANIMGROUP_22, - /* 0x17 */ PLAYER_ANIMGROUP_23, - /* 0x18 */ PLAYER_ANIMGROUP_24, - /* 0x19 */ PLAYER_ANIMGROUP_25, - /* 0x1A */ PLAYER_ANIMGROUP_26, - /* 0x1B */ PLAYER_ANIMGROUP_27, - /* 0x1C */ PLAYER_ANIMGROUP_28, - /* 0x1D */ PLAYER_ANIMGROUP_29, - /* 0x1E */ PLAYER_ANIMGROUP_30, - /* 0x1F */ PLAYER_ANIMGROUP_31, - /* 0x20 */ PLAYER_ANIMGROUP_32, - /* 0x21 */ PLAYER_ANIMGROUP_33, - /* 0x22 */ PLAYER_ANIMGROUP_34, - /* 0x23 */ PLAYER_ANIMGROUP_35, - /* 0x24 */ PLAYER_ANIMGROUP_36, - /* 0x25 */ PLAYER_ANIMGROUP_37, - /* 0x26 */ PLAYER_ANIMGROUP_38, - /* 0x27 */ PLAYER_ANIMGROUP_39, - /* 0x28 */ PLAYER_ANIMGROUP_40, - /* 0x29 */ PLAYER_ANIMGROUP_41, - /* 0x2A */ PLAYER_ANIMGROUP_42, - /* 0x2B */ PLAYER_ANIMGROUP_43, - /* 0x2C */ PLAYER_ANIMGROUP_44, + /* 0x00 */ PLAYER_ANIMGROUP_wait, + /* 0x01 */ PLAYER_ANIMGROUP_walk, + /* 0x02 */ PLAYER_ANIMGROUP_run, + /* 0x03 */ PLAYER_ANIMGROUP_damage_run, + /* 0x04 */ PLAYER_ANIMGROUP_heavy_run, + /* 0x05 */ PLAYER_ANIMGROUP_waitL, + /* 0x06 */ PLAYER_ANIMGROUP_waitR, + /* 0x07 */ PLAYER_ANIMGROUP_wait2waitR, + /* 0x08 */ PLAYER_ANIMGROUP_normal2fighter, + /* 0x09 */ PLAYER_ANIMGROUP_doorA_free, + /* 0x0A */ PLAYER_ANIMGROUP_doorA, + /* 0x0B */ PLAYER_ANIMGROUP_doorB_free, + /* 0x0C */ PLAYER_ANIMGROUP_doorB, + /* 0x0D */ PLAYER_ANIMGROUP_carryB, + /* 0x0E */ PLAYER_ANIMGROUP_landing, + /* 0x0F */ PLAYER_ANIMGROUP_short_landing, + /* 0x10 */ PLAYER_ANIMGROUP_landing_roll, + /* 0x11 */ PLAYER_ANIMGROUP_hip_down, + /* 0x12 */ PLAYER_ANIMGROUP_walk_endL, + /* 0x13 */ PLAYER_ANIMGROUP_walk_endR, + /* 0x14 */ PLAYER_ANIMGROUP_defense, + /* 0x15 */ PLAYER_ANIMGROUP_defense_wait, + /* 0x16 */ PLAYER_ANIMGROUP_defense_end, + /* 0x17 */ PLAYER_ANIMGROUP_side_walk, + /* 0x18 */ PLAYER_ANIMGROUP_side_walkL, + /* 0x19 */ PLAYER_ANIMGROUP_side_walkR, + /* 0x1A */ PLAYER_ANIMGROUP_45_turn, + /* 0x1B */ PLAYER_ANIMGROUP_waitL2wait, + /* 0x1C */ PLAYER_ANIMGROUP_waitR2wait, + /* 0x1D */ PLAYER_ANIMGROUP_throw, + /* 0x1E */ PLAYER_ANIMGROUP_put, + /* 0x1F */ PLAYER_ANIMGROUP_back_walk, + /* 0x20 */ PLAYER_ANIMGROUP_check, + /* 0x21 */ PLAYER_ANIMGROUP_check_wait, + /* 0x22 */ PLAYER_ANIMGROUP_check_end, + /* 0x23 */ PLAYER_ANIMGROUP_pull_start, + /* 0x24 */ PLAYER_ANIMGROUP_pulling, + /* 0x25 */ PLAYER_ANIMGROUP_pull_end, + /* 0x26 */ PLAYER_ANIMGROUP_fall_up, + /* 0x27 */ PLAYER_ANIMGROUP_jump_climb_hold, + /* 0x28 */ PLAYER_ANIMGROUP_jump_climb_wait, + /* 0x29 */ PLAYER_ANIMGROUP_jump_climb_up, + /* 0x2A */ PLAYER_ANIMGROUP_down_slope_slip_end, + /* 0x2B */ PLAYER_ANIMGROUP_up_slope_slip_end, + /* 0x2C */ PLAYER_ANIMGROUP_nwait, /* 0x2D */ PLAYER_ANIMGROUP_MAX } PlayerAnimGroup; @@ -608,7 +608,7 @@ typedef struct Player { /* 0x083E */ s16 targetYaw; /* 0x0840 */ u16 unk_840; /* 0x0842 */ s8 meleeWeaponAnimation; - /* 0x0843 */ s8 swordState; // Upstream TODO: meleeWeaponState + /* 0x0843 */ s8 meleeWeaponState; /* 0x0844 */ s8 unk_844; /* 0x0845 */ u8 unk_845; /* 0x0846 */ u8 unk_846; diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 4fa02f157..25f051f23 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -316,6 +316,8 @@ typedef struct { /* */ RandomizerCheck ganonHintCheck; /* */ RandomizerCheck gregCheck; /* */ RandomizerCheck dampeCheck; + /* */ char inputSeed[1024]; + /* */ u32 finalSeed; /* */ u8 seedIcons[5]; /* */ u16 randomizerInf[9]; /* */ u16 adultTradeItems; diff --git a/soh/include/z64scene.h b/soh/include/z64scene.h index 046b90caf..361e5f3c8 100644 --- a/soh/include/z64scene.h +++ b/soh/include/z64scene.h @@ -303,125 +303,76 @@ typedef union { SCmdAltHeaders altHeaders; } SceneCmd; // size = 0x8 +#define DEFINE_SCENE(_0, _1, enum, _3, _4, _5) enum, + #ifdef __cplusplus enum SceneID : int { #else enum SceneID { #endif - /* 0x00 */ SCENE_YDAN, - /* 0x01 */ SCENE_DDAN, - /* 0x02 */ SCENE_BDAN, - /* 0x03 */ SCENE_BMORI1, - /* 0x04 */ SCENE_HIDAN, - /* 0x05 */ SCENE_MIZUSIN, - /* 0x06 */ SCENE_JYASINZOU, - /* 0x07 */ SCENE_HAKADAN, - /* 0x08 */ SCENE_HAKADANCH, - /* 0x09 */ SCENE_ICE_DOUKUTO, - /* 0x0A */ SCENE_GANON, - /* 0x0B */ SCENE_MEN, - /* 0x0C */ SCENE_GERUDOWAY, - /* 0x0D */ SCENE_GANONTIKA, - /* 0x0E */ SCENE_GANON_SONOGO, - /* 0x0F */ SCENE_GANONTIKA_SONOGO, - /* 0x10 */ SCENE_TAKARAYA, - /* 0x11 */ SCENE_YDAN_BOSS, - /* 0x12 */ SCENE_DDAN_BOSS, - /* 0x13 */ SCENE_BDAN_BOSS, - /* 0x14 */ SCENE_MORIBOSSROOM, - /* 0x15 */ SCENE_FIRE_BS, - /* 0x16 */ SCENE_MIZUSIN_BS, - /* 0x17 */ SCENE_JYASINBOSS, - /* 0x18 */ SCENE_HAKADAN_BS, - /* 0x19 */ SCENE_GANON_BOSS, - /* 0x1A */ SCENE_GANON_FINAL, - /* 0x1B */ SCENE_ENTRA, - /* 0x1C */ SCENE_ENTRA_N, - /* 0x1D */ SCENE_ENRUI, - /* 0x1E */ SCENE_MARKET_ALLEY, - /* 0x1F */ SCENE_MARKET_ALLEY_N, - /* 0x20 */ SCENE_MARKET_DAY, - /* 0x21 */ SCENE_MARKET_NIGHT, - /* 0x22 */ SCENE_MARKET_RUINS, - /* 0x23 */ SCENE_SHRINE, - /* 0x24 */ SCENE_SHRINE_N, - /* 0x25 */ SCENE_SHRINE_R, - /* 0x26 */ SCENE_KOKIRI_HOME, - /* 0x27 */ SCENE_KOKIRI_HOME3, - /* 0x28 */ SCENE_KOKIRI_HOME4, - /* 0x29 */ SCENE_KOKIRI_HOME5, - /* 0x2A */ SCENE_KAKARIKO, - /* 0x2B */ SCENE_KAKARIKO3, - /* 0x2C */ SCENE_SHOP1, - /* 0x2D */ SCENE_KOKIRI_SHOP, - /* 0x2E */ SCENE_GOLON, - /* 0x2F */ SCENE_ZOORA, - /* 0x30 */ SCENE_DRAG, - /* 0x31 */ SCENE_ALLEY_SHOP, - /* 0x32 */ SCENE_NIGHT_SHOP, - /* 0x33 */ SCENE_FACE_SHOP, - /* 0x34 */ SCENE_LINK_HOME, - /* 0x35 */ SCENE_IMPA, - /* 0x36 */ SCENE_MALON_STABLE, - /* 0x37 */ SCENE_LABO, - /* 0x38 */ SCENE_HYLIA_LABO, - /* 0x39 */ SCENE_TENT, - /* 0x3A */ SCENE_HUT, - /* 0x3B */ SCENE_DAIYOUSEI_IZUMI, - /* 0x3C */ SCENE_YOUSEI_IZUMI_TATE, - /* 0x3D */ SCENE_YOUSEI_IZUMI_YOKO, - /* 0x3E */ SCENE_KAKUSIANA, - /* 0x3F */ SCENE_HAKAANA, - /* 0x40 */ SCENE_HAKAANA2, - /* 0x41 */ SCENE_HAKAANA_OUKE, - /* 0x42 */ SCENE_SYATEKIJYOU, - /* 0x43 */ SCENE_TOKINOMA, - /* 0x44 */ SCENE_KENJYANOMA, - /* 0x45 */ SCENE_HAIRAL_NIWA, - /* 0x46 */ SCENE_HAIRAL_NIWA_N, - /* 0x47 */ SCENE_HIRAL_DEMO, - /* 0x48 */ SCENE_HAKASITARELAY, - /* 0x49 */ SCENE_TURIBORI, - /* 0x4A */ SCENE_NAKANIWA, - /* 0x4B */ SCENE_BOWLING, - /* 0x4C */ SCENE_SOUKO, - /* 0x4D */ SCENE_MIHARIGOYA, - /* 0x4E */ SCENE_MAHOUYA, - /* 0x4F */ SCENE_GANON_DEMO, - /* 0x50 */ SCENE_KINSUTA, - /* 0x51 */ SCENE_SPOT00, - /* 0x52 */ SCENE_SPOT01, - /* 0x53 */ SCENE_SPOT02, - /* 0x54 */ SCENE_SPOT03, - /* 0x55 */ SCENE_SPOT04, - /* 0x56 */ SCENE_SPOT05, - /* 0x57 */ SCENE_SPOT06, - /* 0x58 */ SCENE_SPOT07, - /* 0x59 */ SCENE_SPOT08, - /* 0x5A */ SCENE_SPOT09, - /* 0x5B */ SCENE_SPOT10, - /* 0x5C */ SCENE_SPOT11, - /* 0x5D */ SCENE_SPOT12, - /* 0x5E */ SCENE_SPOT13, - /* 0x5F */ SCENE_SPOT15, - /* 0x60 */ SCENE_SPOT16, - /* 0x61 */ SCENE_SPOT17, - /* 0x62 */ SCENE_SPOT18, - /* 0x63 */ SCENE_SPOT20, - /* 0x64 */ SCENE_GANON_TOU, - // Debug only scenes - /* 0x65 */ SCENE_TEST01, - /* 0x66 */ SCENE_BESITU, - /* 0x67 */ SCENE_DEPTH_TEST, - /* 0x68 */ SCENE_SYOTES, - /* 0x69 */ SCENE_SYOTES2, - /* 0x6A */ SCENE_SUTARU, - /* 0x6B */ SCENE_HAIRAL_NIWA2, - /* 0x6C */ SCENE_SASATEST, - /* 0x6D */ SCENE_TESTROOM, + #include "tables/scene_table.h" /* 0x6E */ SCENE_ID_MAX }; +#undef DEFINE_SCENE + +typedef enum { + /* 0 */ SDC_DEFAULT, + /* 1 */ SDC_HYRULE_FIELD, + /* 2 */ SDC_KAKARIKO_VILLAGE, + /* 3 */ SDC_ZORAS_RIVER, + /* 4 */ SDC_KOKIRI_FOREST, + /* 5 */ SDC_LAKE_HYLIA, + /* 6 */ SDC_ZORAS_DOMAIN, + /* 7 */ SDC_ZORAS_FOUNTAIN, + /* 8 */ SDC_GERUDO_VALLEY, + /* 9 */ SDC_LOST_WOODS, + /* 10 */ SDC_DESERT_COLOSSUS, + /* 11 */ SDC_GERUDOS_FORTRESS, + /* 12 */ SDC_HAUNTED_WASTELAND, + /* 13 */ SDC_HYRULE_CASTLE, + /* 14 */ SDC_DEATH_MOUNTAIN_TRAIL, + /* 15 */ SDC_DEATH_MOUNTAIN_CRATER, + /* 16 */ SDC_GORON_CITY, + /* 17 */ SDC_LON_LON_RANCH, + /* 18 */ SDC_FIRE_TEMPLE, + /* 19 */ SDC_DEKU_TREE, + /* 20 */ SDC_DODONGOS_CAVERN, + /* 21 */ SDC_JABU_JABU, + /* 22 */ SDC_FOREST_TEMPLE, + /* 23 */ SDC_WATER_TEMPLE, + /* 24 */ SDC_SHADOW_TEMPLE_AND_WELL, + /* 25 */ SDC_SPIRIT_TEMPLE, + /* 26 */ SDC_INSIDE_GANONS_CASTLE, + /* 27 */ SDC_GERUDO_TRAINING_GROUND, + /* 28 */ SDC_DEKU_TREE_BOSS, + /* 29 */ SDC_WATER_TEMPLE_BOSS, + /* 30 */ SDC_TEMPLE_OF_TIME, + /* 31 */ SDC_GROTTOS, + /* 32 */ SDC_CHAMBER_OF_THE_SAGES, + /* 33 */ SDC_GREAT_FAIRYS_FOUNTAIN, + /* 34 */ SDC_SHOOTING_GALLERY, + /* 35 */ SDC_CASTLE_COURTYARD_GUARDS, + /* 36 */ SDC_OUTSIDE_GANONS_CASTLE, + /* 37 */ SDC_ICE_CAVERN, + /* 38 */ SDC_GANONS_TOWER_COLLAPSE_EXTERIOR, + /* 39 */ SDC_FAIRYS_FOUNTAIN, + /* 40 */ SDC_THIEVES_HIDEOUT, + /* 41 */ SDC_BOMBCHU_BOWLING_ALLEY, + /* 42 */ SDC_ROYAL_FAMILYS_TOMB, + /* 43 */ SDC_LAKESIDE_LABORATORY, + /* 44 */ SDC_LON_LON_BUILDINGS, + /* 45 */ SDC_MARKET_GUARD_HOUSE, + /* 46 */ SDC_POTION_SHOP_GRANNY, + /* 47 */ SDC_CALM_WATER, + /* 48 */ SDC_GRAVE_EXIT_LIGHT_SHINING, + /* 49 */ SDC_BESITU, + /* 50 */ SDC_FISHING_POND, + /* 51 */ SDC_GANONS_TOWER_COLLAPSE_INTERIOR, + /* 52 */ SDC_INSIDE_GANONS_CASTLE_COLLAPSE, + /* 53 */ SDC_MAX +} SceneDrawConfig; + // Scene commands typedef enum { diff --git a/soh/macosx/soh-macos.sh b/soh/macosx/soh-macos.sh index b77a5a9fa..bf39648c6 100755 --- a/soh/macosx/soh-macos.sh +++ b/soh/macosx/soh-macos.sh @@ -7,6 +7,56 @@ export RESPATH="${SNAME%/MacOS*}/Resources" export LIBPATH="${SNAME%/MacOS*}/Frameworks" export DYLD_FALLBACK_LIBRARY_PATH="$LIBPATH" +remap_hashes () +{ + # Remap v64 and n64 hashes to their z64 has equivalent + # ZAPD will handle converting the data into z64 format + case "$ROMHASH" in + a9059b56e761c9034fbe02fe4c24985aaa835dac) # v64 + ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099 + ;; + 24708102dc504d3f375a37f4ae4e149c167dc515) # n64 + ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099 + ;; + 580dd0bd1b6d2c51cc20a764eece84dba558964c) # v64 + ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 + ;; + d6342c59007e57c1194661ec6880b2f078403f4e) # n64 + ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 + ;; + 663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64 + ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 + ;; + 24c73d378b0620a380ce5ef9f2b186c6c157a68b) # n64 + ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 + ;; + 973bc6fe56010a8d646166a1182a81b4f13b8cf9) # v64 + ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03 + ;; + d327752c46edc70ff3668b9514083dbbee08927c) # v64 + ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03 + ;; + ecdeb1747560834e079c22243febea7f6f26ba3b) # v64 + ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da + ;; + f19f8662ec7abee29484a272a6fda53e39efe0f1) # n64 + ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da + ;; + ab519ce04a33818ce2c39b3c514a751d807a494a) # v64 + ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6 + ;; + c19a34f7646305e1755249fca2071e178bd7cd00) # n64 + ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6 + ;; + 25e8ae79ea0839ca5c984473f7460d8040c36f9c) # v64 + ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f + ;; + 166c02770d67fcc3954c443eb400a6a3573d3fc0) # n64 + ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f + ;; + esac +} + if [ ! -e "$SHIP_HOME" ]; then mkdir "$SHIP_HOME"; fi if [ ! -e "$SHIP_HOME"/mods ]; then @@ -39,6 +89,9 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then # If an invalid rom was selected, let the user know and ask to try again ROMHASH="$(shasum "$DROPROM" | awk '{ print $1 }')" + + remap_hashes + case "$ROMHASH" in cee6bc3c2a634b41728f2af8da54d9bf8cc14099) ROM_TYPE=0;; @@ -118,6 +171,9 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then # If an invalid rom was detected, let the user know ROMHASH="$(shasum "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')" + + remap_hashes + case "$ROMHASH" in cee6bc3c2a634b41728f2af8da54d9bf8cc14099) ROM=GC_NMQ_D diff --git a/soh/soh/CrashHandlerExt.cpp b/soh/soh/CrashHandlerExt.cpp index af8d4fbb3..14f0714ff 100644 --- a/soh/soh/CrashHandlerExt.cpp +++ b/soh/soh/CrashHandlerExt.cpp @@ -19,110 +19,14 @@ static std::array sCatToStrArray{ "SWITCH", "BG", "PLAYER", "EXPLOSIVE", "NPC", "ENEMY", "PROP", "ITEMACTION", "MISC", "BOSS", "DOOR", "CHEST", }; +#define DEFINE_SCENE(_1, _2, enumName, _4, _5, _6) #enumName + static std::array sSceneIdToStrArray{ - "SCENE_YDAN", - "SCENE_DDAN", - "SCENE_BDAN", - "SCENE_BMORI1", - "SCENE_HIDAN", - "SCENE_MIZUSIN", - "SCENE_JYASINZOU", - "SCENE_HAKADAN", - "SCENE_HAKADANCH", - "SCENE_ICE_DOUKUTO", - "SCENE_GANON", - "SCENE_MEN", - "SCENE_GERUDOWAY", - "SCENE_GANONTIKA", - "SCENE_GANON_SONOGO", - "SCENE_GANONTIKA_SONOGO", - "SCENE_TAKARAYA", - "SCENE_YDAN_BOSS", - "SCENE_DDAN_BOSS", - "SCENE_BDAN_BOSS", - "SCENE_MORIBOSSROOM", - "SCENE_FIRE_BS", - "SCENE_MIZUSIN_BS", - "SCENE_JYASINBOSS", - "SCENE_HAKADAN_BS", - "SCENE_GANON_BOSS", - "SCENE_GANON_FINAL", - "SCENE_ENTRA", - "SCENE_ENTRA_N", - "SCENE_ENRUI", - "SCENE_MARKET_ALLEY", - "SCENE_MARKET_ALLEY_N", - "SCENE_MARKET_DAY", - "SCENE_MARKET_NIGHT", - "SCENE_MARKET_RUINS", - "SCENE_SHRINE", - "SCENE_SHRINE_N", - "SCENE_SHRINE_R", - "SCENE_KOKIRI_HOME", - "SCENE_KOKIRI_HOME3", - "SCENE_KOKIRI_HOME4", - "SCENE_KOKIRI_HOME5", - "SCENE_KAKARIKO", - "SCENE_KAKARIKO3", - "SCENE_SHOP1", - "SCENE_KOKIRI_SHOP", - "SCENE_GOLON", - "SCENE_ZOORA", - "SCENE_DRAG", - "SCENE_ALLEY_SHOP", - "SCENE_NIGHT_SHOP", - "SCENE_FACE_SHOP", - "SCENE_LINK_HOME", - "SCENE_IMPA", - "SCENE_MALON_STABLE", - "SCENE_LABO", - "SCENE_HYLIA_LABO", - "SCENE_TENT", - "SCENE_HUT", - "SCENE_DAIYOUSEI_IZUMI", - "SCENE_YOUSEI_IZUMI_TATE", - "SCENE_YOUSEI_IZUMI_YOKO", - "SCENE_KAKUSIANA", - "SCENE_HAKAANA", - "SCENE_HAKAANA2", - "SCENE_HAKAANA_OUKE", - "SCENE_SYATEKIJYOU", - "SCENE_TOKINOMA", - "SCENE_KENJYANOMA", - "SCENE_HAIRAL_NIWA", - "SCENE_HAIRAL_NIWA_N", - "SCENE_HIRAL_DEMO", - "SCENE_HAKASITARELAY", - "SCENE_TURIBORI", - "SCENE_NAKANIWA", - "SCENE_BOWLING", - "SCENE_SOUKO", - "SCENE_MIHARIGOYA", - "SCENE_MAHOUYA", - "SCENE_GANON_DEMO", - "SCENE_KINSUTA", - "SCENE_SPOT00", - "SCENE_SPOT01", - "SCENE_SPOT02", - "SCENE_SPOT03", - "SCENE_SPOT04", - "SCENE_SPOT05", - "SCENE_SPOT06", - "SCENE_SPOT07", - "SCENE_SPOT08", - "SCENE_SPOT09", - "SCENE_SPOT10", - "SCENE_SPOT11", - "SCENE_SPOT12", - "SCENE_SPOT13", - "SCENE_SPOT15", - "SCENE_SPOT16", - "SCENE_SPOT17", - "SCENE_SPOT18", - "SCENE_SPOT20", - "SCENE_GANON_TOU", + #include "tables/scene_table.h" }; +#undef DEFINE_SCENE + static void append_str(char* buf, size_t* len, const char* str) { while (*str != '\0') buf[(*len)++] = *str++; diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp index fcf46a130..960627b34 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.cpp +++ b/soh/soh/Enhancements/audio/AudioCollection.cpp @@ -307,6 +307,14 @@ AudioCollection::AudioCollection() { } +std::string AudioCollection::GetCvarKey(std::string sfxKey) { + return "gAudioEditor.ReplacedSequences." + sfxKey + ".value"; +} + +std::string AudioCollection::GetCvarLockKey(std::string sfxKey) { + return "gAudioEditor.ReplacedSequences." + sfxKey + ".locked"; +} + void AudioCollection::AddToCollection(char* otrPath, uint16_t seqNum) { std::string fileName = std::filesystem::path(otrPath).filename().string(); std::vector splitFileName = StringHelper::Split(fileName, "_"); @@ -332,7 +340,7 @@ uint16_t AudioCollection::GetReplacementSequence(uint16_t seqId) { // for Hyrule Field instead. Otherwise, leave it alone, so that without any sfx editor modifications we will // play the normal track as usual. if (seqId == NA_BGM_FIELD_MORNING) { - if (CVarGetInteger("gAudioEditor.ReplacedSequences.NA_BGM_FIELD_LOGIC", NA_BGM_FIELD_LOGIC) != NA_BGM_FIELD_LOGIC) { + if (CVarGetInteger("gAudioEditor.ReplacedSequences.NA_BGM_FIELD_LOGIC.value", NA_BGM_FIELD_LOGIC) != NA_BGM_FIELD_LOGIC) { seqId = NA_BGM_FIELD_LOGIC; } } @@ -342,7 +350,7 @@ uint16_t AudioCollection::GetReplacementSequence(uint16_t seqId) { } const auto& sequenceInfo = sequenceMap.at(seqId); - const std::string cvarKey = "gAudioEditor.ReplacedSequences." + sequenceInfo.sfxKey; + const std::string cvarKey = GetCvarKey(sequenceInfo.sfxKey); int replacementSeq = CVarGetInteger(cvarKey.c_str(), seqId); if (!sequenceMap.contains(replacementSeq)) { replacementSeq = seqId; diff --git a/soh/soh/Enhancements/audio/AudioCollection.h b/soh/soh/Enhancements/audio/AudioCollection.h index 2140c4102..c60a7e739 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.h +++ b/soh/soh/Enhancements/audio/AudioCollection.h @@ -62,6 +62,8 @@ class AudioCollection { const char* GetSequenceName(uint16_t seqId); bool HasSequenceNum(uint16_t seqId); size_t SequenceMapSize(); + std::string GetCvarKey(std::string sfxKey); + std::string GetCvarLockKey(std::string sfxKey); }; #else void AudioCollection_AddToCollection(char *otrPath, uint16_t seqNum); diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index 92077afcb..fd47b8e25 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -54,8 +54,6 @@ size_t AuthenticCountBySequenceType(SeqType type) { } } - - // Grabs the current BGM sequence ID and replays it // which will lookup the proper override, or reset back to vanilla void ReplayCurrentBGM() { @@ -94,8 +92,10 @@ void RandomizeGroup(SeqType type) { } Shuffle(values); for (const auto& [seqId, seqData] : AudioCollection::Instance->GetAllSequences()) { - const std::string cvarKey = "gAudioEditor.ReplacedSequences." + seqData.sfxKey; - if (seqData.category & type) { + const std::string cvarKey = AudioCollection::Instance->GetCvarKey(seqData.sfxKey); + const std::string cvarLockKey = AudioCollection::Instance->GetCvarLockKey(seqData.sfxKey); + // don't randomize locked entries + if ((seqData.category & type) && CVarGetInteger(cvarLockKey.c_str(), 0) == 0) { // Only save authentic sequence CVars if (((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && seqData.sequenceId >= MAX_AUTHENTIC_SEQID) { continue; @@ -114,23 +114,27 @@ void ResetGroup(const std::map& map, SeqType type) { if (seqData.category == SEQ_FANFARE && defaultValue >= MAX_AUTHENTIC_SEQID) { continue; } - const std::string cvarKey = "gAudioEditor.ReplacedSequences." + seqData.sfxKey; - CVarSetInteger(cvarKey.c_str(), defaultValue); + const std::string cvarKey = AudioCollection::Instance->GetCvarKey(seqData.sfxKey); + const std::string cvarLockKey = AudioCollection::Instance->GetCvarLockKey(seqData.sfxKey); + if (CVarGetInteger(cvarLockKey.c_str(), 0) == 0) { + CVarClear(cvarKey.c_str()); + } } } } void DrawPreviewButton(uint16_t sequenceId, std::string sfxKey, SeqType sequenceType) { - const std::string cvarKey = "gAudioEditor.ReplacedSequences." + sfxKey; + const std::string cvarKey = AudioCollection::Instance->GetCvarKey(sfxKey); const std::string hiddenKey = "##" + cvarKey; - const std::string stopButton = " Stop " + hiddenKey; - const std::string previewButton = "Preview" + hiddenKey; + const std::string stopButton = ICON_FA_STOP + hiddenKey; + const std::string previewButton = ICON_FA_PLAY + hiddenKey; if (CVarGetInteger("gAudioEditor.Playing", 0) == sequenceId) { if (ImGui::Button(stopButton.c_str())) { func_800F5C2C(); CVarSetInteger("gAudioEditor.Playing", 0); } + UIWidgets::Tooltip("Stop Preview"); } else { if (ImGui::Button(previewButton.c_str())) { if (CVarGetInteger("gAudioEditor.Playing", 0) != 0) { @@ -149,6 +153,7 @@ void DrawPreviewButton(uint16_t sequenceId, std::string sfxKey, SeqType sequence } } } + UIWidgets::Tooltip("Play Preview"); } } @@ -159,17 +164,23 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { const std::string resetAllButton = "Reset All" + hiddenTabId; const std::string randomizeAllButton = "Randomize All" + hiddenTabId; if (ImGui::Button(resetAllButton.c_str())) { + auto currentBGM = func_800FA0B4(SEQ_PLAYER_BGM_MAIN); + auto prevReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM); ResetGroup(map, type); LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); - if (type == SEQ_BGM_WORLD) { + auto curReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM); + if (type == SEQ_BGM_WORLD && prevReplacement != curReplacement) { ReplayCurrentBGM(); } } ImGui::SameLine(); if (ImGui::Button(randomizeAllButton.c_str())) { + auto currentBGM = func_800FA0B4(SEQ_PLAYER_BGM_MAIN); + auto prevReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM); RandomizeGroup(type); LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); - if (type == SEQ_BGM_WORLD) { + auto curReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM); + if (type == SEQ_BGM_WORLD && prevReplacement != curReplacement) { ReplayCurrentBGM(); } } @@ -177,7 +188,7 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { ImGui::BeginTable(tabId.c_str(), 3, ImGuiTableFlags_SizingFixedFit); ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch); ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch); - ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, 190.0f); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, 100.0f); for (const auto& [defaultValue, seqData] : map) { if (~(seqData.category) & type) { continue; @@ -187,10 +198,13 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { continue; } - const std::string cvarKey = "gAudioEditor.ReplacedSequences." + seqData.sfxKey; + const std::string cvarKey = AudioCollection::Instance->GetCvarKey(seqData.sfxKey); + const std::string cvarLockKey = AudioCollection::Instance->GetCvarLockKey(seqData.sfxKey); const std::string hiddenKey = "##" + cvarKey; - const std::string resetButton = "Reset" + hiddenKey; - const std::string randomizeButton = "Randomize" + hiddenKey; + const std::string resetButton = ICON_FA_UNDO + hiddenKey; + const std::string randomizeButton = ICON_FA_RANDOM + hiddenKey; + const std::string lockedButton = ICON_FA_LOCK + hiddenKey; + const std::string unlockedButton = ICON_FA_UNLOCK + hiddenKey; const int currentValue = CVarGetInteger(cvarKey.c_str(), defaultValue); ImGui::TableNextRow(); @@ -221,13 +235,16 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { ImGui::TableNextColumn(); ImGui::PushItemWidth(-FLT_MIN); DrawPreviewButton((type == SEQ_SFX || type == SEQ_VOICE || type == SEQ_INSTRUMENT) ? defaultValue : currentValue, seqData.sfxKey, type); + auto locked = CVarGetInteger(cvarLockKey.c_str(), 0) == 1; ImGui::SameLine(); ImGui::PushItemWidth(-FLT_MIN); if (ImGui::Button(resetButton.c_str())) { - CVarSetInteger(cvarKey.c_str(), defaultValue); + CVarClear(cvarKey.c_str()); + CVarClear(cvarLockKey.c_str()); LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); UpdateCurrentBGM(defaultValue, seqData.category); } + UIWidgets::Tooltip("Reset to default"); ImGui::SameLine(); ImGui::PushItemWidth(-FLT_MIN); if (ImGui::Button(randomizeButton.c_str())) { @@ -242,10 +259,25 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { auto it = validSequences.begin(); const auto& seqData = *std::next(it, rand() % validSequences.size()); CVarSetInteger(cvarKey.c_str(), seqData->sequenceId); + if (locked) { + CVarClear(cvarLockKey.c_str()); + } LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); - UpdateCurrentBGM(seqData->sequenceId, type); + UpdateCurrentBGM(defaultValue, type); } } + UIWidgets::Tooltip("Randomize this sound"); + ImGui::SameLine(); + ImGui::PushItemWidth(-FLT_MIN); + if (ImGui::Button(locked ? lockedButton.c_str() : unlockedButton.c_str())) { + if (locked) { + CVarClear(cvarLockKey.c_str()); + } else { + CVarSetInteger(cvarLockKey.c_str(), 1); + } + LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); + } + UIWidgets::Tooltip(locked ? "Sound locked" : "Sound unlocked"); } ImGui::EndTable(); } diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp index 971183df6..a4952148f 100644 --- a/soh/soh/Enhancements/boss-rush/BossRush.cpp +++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp @@ -171,7 +171,7 @@ void BossRush_SpawnBlueWarps(PlayState* play) { void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) { // If warping from Chamber of Sages, choose the correct boss room to teleport to. - if (play->sceneNum == SCENE_KENJYANOMA) { + if (play->sceneNum == SCENE_CHAMBER_OF_THE_SAGES) { // Gohma & Phantom Ganon if (warpPosX == -100 && warpPosZ == -170) { if (gSaveContext.linkAge == LINK_AGE_CHILD) { @@ -241,28 +241,28 @@ void BossRush_HandleCompleteBoss(PlayState* play) { gSaveContext.isBossRushPaused = 1; switch (play->sceneNum) { - case SCENE_YDAN_BOSS: + case SCENE_DEKU_TREE_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE); break; - case SCENE_DDAN_BOSS: + case SCENE_DODONGOS_CAVERN_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN); break; - case SCENE_BDAN_BOSS: + case SCENE_JABU_JABU_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY); break; - case SCENE_MORIBOSSROOM: + case SCENE_FOREST_TEMPLE_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE); break; - case SCENE_FIRE_BS: + case SCENE_FIRE_TEMPLE_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE); break; - case SCENE_MIZUSIN_BS: + case SCENE_WATER_TEMPLE_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE); break; - case SCENE_JYASINBOSS: + case SCENE_SPIRIT_TEMPLE_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE); break; - case SCENE_HAKADAN_BS: + case SCENE_SHADOW_TEMPLE_BOSS: Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE); break; default: @@ -271,12 +271,12 @@ void BossRush_HandleCompleteBoss(PlayState* play) { // Fully heal the player after Ganondorf if (gSaveContext.bossRushOptions[BR_OPTIONS_HEAL] == BR_CHOICE_HEAL_EVERYBOSS && - play->sceneNum == SCENE_GANON_BOSS) { + play->sceneNum == SCENE_GANONDORF_BOSS) { Health_ChangeBy(play, 320); } if ((CheckDungeonCount() == 3 && gSaveContext.bossRushOptions[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_CHILD) || - play->sceneNum == SCENE_GANON_DEMO) { + play->sceneNum == SCENE_GANON_BOSS) { gSaveContext.sohStats.playTimer += 2; gSaveContext.sohStats.gameComplete = 1; gSaveContext.sohStats.itemTimestamp[TIMESTAMP_BOSSRUSH_FINISH] = GAMEPLAYSTAT_TOTAL_TIME; diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp index bbff1cbb1..97b2921c6 100644 --- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp +++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp @@ -659,8 +659,8 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) { PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL, "Swords_MasterBlade2", swordsMasterBlade.changedCvar, 17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); PATCH_GFX(object_toki_objects_DL_001BD0, "Swords_MasterBlade3", swordsMasterBlade.changedCvar, 13, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); PATCH_GFX(object_toki_objects_DL_001BD0, "Swords_MasterBlade4", swordsMasterBlade.changedCvar, 14, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255)); - PATCH_GFX(ovl_Boss_Ganon2_DL_0103A8, "Swords_MasterBlade5", swordsMasterBlade.changedCvar, 13, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); - PATCH_GFX(ovl_Boss_Ganon2_DL_0103A8, "Swords_MasterBlade6", swordsMasterBlade.changedCvar, 14, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255)); + PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterBlade5", swordsMasterBlade.changedCvar, 13, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); + PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterBlade6", swordsMasterBlade.changedCvar, 14, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255)); } // static CosmeticOption& swordsMasterHilt = cosmeticOptions.at("Swords_MasterHilt"); // if (manualChange || CVarGetInteger(swordsMasterHilt.rainbowCvar, 0)) { @@ -675,7 +675,7 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) { // PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL, "Swords_MasterHilt7", swordsMasterHilt.changedCvar, 4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); // PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathNearDL, "Swords_MasterHilt8", swordsMasterHilt.changedCvar, 4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); // PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL, "Swords_MasterHilt9", swordsMasterHilt.changedCvar, 4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); - // PATCH_GFX(ovl_Boss_Ganon2_DL_0103A8, "Swords_MasterHilt10", swordsMasterHilt.changedCvar, 16, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); + // PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterHilt10", swordsMasterHilt.changedCvar, 16, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); // if (manualChange) { // PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL, "Swords_MasterHilt11", swordsMasterHilt.changedCvar, 38, gsSPGrayscale(true)); @@ -704,9 +704,9 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) { // PATCH_GFX(object_toki_objects_DL_001BD0, "Swords_MasterHilt34", swordsMasterHilt.changedCvar, 112, gsSPGrayscale(true)); // PATCH_GFX(object_toki_objects_DL_001BD0, "Swords_MasterHilt35", swordsMasterHilt.changedCvar, 278, gsSPGrayscale(false)); // PATCH_GFX(object_toki_objects_DL_001BD0, "Swords_MasterHilt36", swordsMasterHilt.changedCvar, 280, gsSPEndDisplayList()); - // PATCH_GFX(ovl_Boss_Ganon2_DL_0103A8, "Swords_MasterHilt37", swordsMasterHilt.changedCvar, 112, gsSPGrayscale(true)); - // PATCH_GFX(ovl_Boss_Ganon2_DL_0103A8, "Swords_MasterHilt38", swordsMasterHilt.changedCvar, 278, gsSPGrayscale(false)); - // PATCH_GFX(ovl_Boss_Ganon2_DL_0103A8, "Swords_MasterHilt39", swordsMasterHilt.changedCvar, 280, gsSPEndDisplayList()); + // PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterHilt37", swordsMasterHilt.changedCvar, 112, gsSPGrayscale(true)); + // PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterHilt38", swordsMasterHilt.changedCvar, 278, gsSPGrayscale(false)); + // PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterHilt39", swordsMasterHilt.changedCvar, 280, gsSPEndDisplayList()); // } // } static CosmeticOption& swordsBiggoronBlade = cosmeticOptions.at("Swords_BiggoronBlade"); diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp index 55fbdad8d..4149e8dd0 100644 --- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp +++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp @@ -150,7 +150,7 @@ void PatchIronKnuckleTextureOverflow() { // Gfx instructions to fix authentic vanilla bug where the Iron Knuckle texture is read as the wrong format Gfx gIronKnuckleMetalTexFix[] = { - gsDPLoadTextureBlock(object_ik_Tex_00F7A0, G_IM_FMT_I, G_IM_SIZ_4b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(gIronKnuckleMetalTex, G_IM_FMT_I, G_IM_SIZ_4b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD) }; diff --git a/soh/soh/Enhancements/crowd-control/ShipOfHarkinian.cs b/soh/soh/Enhancements/crowd-control/ShipOfHarkinian.cs index e4cb6a6ca..54211aa6f 100644 --- a/soh/soh/Enhancements/crowd-control/ShipOfHarkinian.cs +++ b/soh/soh/Enhancements/crowd-control/ShipOfHarkinian.cs @@ -13,6 +13,8 @@ public class ShipOfHarkinian : SimpleTCPPack public override ISimpleTCPPack.MessageFormat MessageFormat => ISimpleTCPPack.MessageFormat.CrowdControlLegacy; + public override ISimpleTCPPack.QuantityFormat QuantityFormat => ISimpleTCPPack.QuantityFormat.ParameterAndField; + public ShipOfHarkinian(UserRecord player, Func responseHandler, Action statusUpdateHandler) : base(player, responseHandler, statusUpdateHandler) { } public override Game Game { get; } = new("Ship of Harkinian", "ShipOfHarkinian", "PC", ConnectorType.SimpleTCPServerConnector); diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h index df3938954..3f5f2454a 100644 --- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h +++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h @@ -46,7 +46,6 @@ typedef enum { TEXT_WARP_RANDOM_REPLACED_TEXT = 0x9200, TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN = 0x346, // 0x3yy for cuttable sign range TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI = 0x1B3, // 0x1yy for Navi msg range - TEXT_RANDO_SAVE_VERSION_WARNING = 0x9300, } TextIDs; #ifdef __cplusplus diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp index e46628305..135dcb0f0 100644 --- a/soh/soh/Enhancements/debugger/colViewer.cpp +++ b/soh/soh/Enhancements/debugger/colViewer.cpp @@ -641,7 +641,7 @@ void DrawWaterboxList() { } // Zora's Domain has a special, hard-coded waterbox with a bottom so you can go under the waterfall - if (gPlayState->sceneNum == SCENE_SPOT07) { + if (gPlayState->sceneNum == SCENE_ZORAS_DOMAIN) { DrawWaterbox(dl, &zdWaterBox, zdWaterBoxMinY); } } diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index bfcf44117..0f9c56669 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -197,18 +197,18 @@ typedef struct { // Maps quest items ids to info for use in ImGui std::map questMapping = { - QUEST_MAP_ENTRY(QUEST_MEDALLION_FOREST, dgForestMedallionIconTex), - QUEST_MAP_ENTRY(QUEST_MEDALLION_FIRE, dgFireMedallionIconTex), - QUEST_MAP_ENTRY(QUEST_MEDALLION_WATER, dgWaterMedallionIconTex), - QUEST_MAP_ENTRY(QUEST_MEDALLION_SPIRIT, dgSpiritMedallionIconTex), - QUEST_MAP_ENTRY(QUEST_MEDALLION_SHADOW, dgShadowMedallionIconTex), - QUEST_MAP_ENTRY(QUEST_MEDALLION_LIGHT, dgLightMedallionIconTex), - QUEST_MAP_ENTRY(QUEST_KOKIRI_EMERALD, dgKokiriEmeraldIconTex), - QUEST_MAP_ENTRY(QUEST_GORON_RUBY, dgGoronRubyIconTex), - QUEST_MAP_ENTRY(QUEST_ZORA_SAPPHIRE, dgZoraSapphireIconTex), - QUEST_MAP_ENTRY(QUEST_STONE_OF_AGONY, dgStoneOfAgonyIconTex), - QUEST_MAP_ENTRY(QUEST_GERUDO_CARD, dgGerudosCardIconTex), - QUEST_MAP_ENTRY(QUEST_SKULL_TOKEN, dgGoldSkulltulaIconTex), + QUEST_MAP_ENTRY(QUEST_MEDALLION_FOREST, dgQuestIconMedallionForestTex), + QUEST_MAP_ENTRY(QUEST_MEDALLION_FIRE, dgQuestIconMedallionFireTex), + QUEST_MAP_ENTRY(QUEST_MEDALLION_WATER, dgQuestIconMedallionWaterTex), + QUEST_MAP_ENTRY(QUEST_MEDALLION_SPIRIT, dgQuestIconMedallionSpiritTex), + QUEST_MAP_ENTRY(QUEST_MEDALLION_SHADOW, dgQuestIconMedallionShadowTex), + QUEST_MAP_ENTRY(QUEST_MEDALLION_LIGHT, dgQuestIconMedallionLightTex), + QUEST_MAP_ENTRY(QUEST_KOKIRI_EMERALD, dgQuestIconKokiriEmeraldTex), + QUEST_MAP_ENTRY(QUEST_GORON_RUBY, dgQuestIconGoronRubyTex), + QUEST_MAP_ENTRY(QUEST_ZORA_SAPPHIRE, dgQuestIconZoraSapphireTex), + QUEST_MAP_ENTRY(QUEST_STONE_OF_AGONY, dgQuestIconStoneOfAgonyTex), + QUEST_MAP_ENTRY(QUEST_GERUDO_CARD, dgQuestIconGerudosCardTex), + QUEST_MAP_ENTRY(QUEST_SKULL_TOKEN, dgQuestIconGoldSkulltulaTex), }; typedef struct { @@ -1418,10 +1418,10 @@ void DrawQuestStatusTab() { DrawGroupWithBorder([&]() { ImGui::Text("Dungeon Items"); - static int32_t dungeonItemsScene = SCENE_YDAN; + static int32_t dungeonItemsScene = SCENE_DEKU_TREE; ImGui::PushItemWidth(-ImGui::GetWindowWidth() * 0.35f); if (ImGui::BeginCombo("##DungeonSelect", SohUtils::GetSceneName(dungeonItemsScene).c_str())) { - for (int32_t dungeonIndex = SCENE_YDAN; dungeonIndex < SCENE_BDAN_BOSS + 1; dungeonIndex++) { + for (int32_t dungeonIndex = SCENE_DEKU_TREE; dungeonIndex < SCENE_JABU_JABU_BOSS + 1; dungeonIndex++) { if (ImGui::Selectable(SohUtils::GetSceneName(dungeonIndex).c_str(), dungeonIndex == dungeonItemsScene)) { dungeonItemsScene = dungeonIndex; @@ -1438,7 +1438,7 @@ void DrawQuestStatusTab() { ImGui::SameLine(); DrawDungeonItemButton(ITEM_DUNGEON_MAP, dungeonItemsScene); - if (dungeonItemsScene != SCENE_BDAN_BOSS) { + if (dungeonItemsScene != SCENE_JABU_JABU_BOSS) { float lineHeight = ImGui::GetTextLineHeightWithSpacing(); ImGui::Image(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(itemMapping[ITEM_KEY_SMALL].name), ImVec2(lineHeight, lineHeight)); ImGui::SameLine(); @@ -1620,7 +1620,7 @@ void DrawPlayerTab() { gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE; } - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_BGS); + Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_BIGGORON); } if (ImGui::Selectable("Fishing Pole")) { player->currentSwordItemId = ITEM_FISHING_POLE; @@ -1725,7 +1725,7 @@ void DrawPlayerTab() { } DrawGroupWithBorder([&]() { ImGui::Text("Sword"); - ImGui::Text(" %d", player->swordState); + ImGui::Text(" %d", player->meleeWeaponState); }); } else { diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp index 414f296cc..454fe43c1 100644 --- a/soh/soh/Enhancements/enemyrandomizer.cpp +++ b/soh/soh/Enhancements/enemyrandomizer.cpp @@ -125,8 +125,8 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po // This should probably be handled on OTR generation in the future when object dependency is fully removed. // Remove bats and skulltulas from graveyard. // Remove octorok in lost woods. - if (((*actorId == ACTOR_EN_FIREFLY || (*actorId == ACTOR_EN_SW && *params == 0)) && play->sceneNum == SCENE_SPOT02) || - (*actorId == ACTOR_EN_OKUTA && play->sceneNum == SCENE_SPOT10)) { + if (((*actorId == ACTOR_EN_FIREFLY || (*actorId == ACTOR_EN_SW && *params == 0)) && play->sceneNum == SCENE_GRAVEYARD) || + (*actorId == ACTOR_EN_OKUTA && play->sceneNum == SCENE_LOST_WOODS)) { return 0; } @@ -138,7 +138,7 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po } // Lengthen timer in non-MQ Jabu Jabu bubble room. - if (!isMQ && *actorId == ACTOR_OBJ_ROOMTIMER && *params == 30760 && play->sceneNum == SCENE_BDAN && + if (!isMQ && *actorId == ACTOR_OBJ_ROOMTIMER && *params == 30760 && play->sceneNum == SCENE_JABU_JABU && play->roomCtx.curRoom.num == 12) { *params = 92280; } @@ -147,7 +147,7 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po // When replacing Iron Knuckles in Spirit Temple, move them away from the throne because // some enemies can get stuck on the throne. - if (*actorId == ACTOR_EN_IK && play->sceneNum == SCENE_JYASINZOU) { + if (*actorId == ACTOR_EN_IK && play->sceneNum == SCENE_SPIRIT_TEMPLE) { if (*params == 6657) { *posX = *posX + 150; } else if (*params == 6401) { @@ -156,7 +156,7 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po } // Move like-likes in MQ Jabu Jabu down into the room as they otherwise get stuck on Song of Time blocks. - if (*actorId == ACTOR_EN_RR && play->sceneNum == SCENE_BDAN && play->roomCtx.curRoom.num == 11) { + if (*actorId == ACTOR_EN_RR && play->sceneNum == SCENE_JABU_JABU && play->roomCtx.curRoom.num == 11) { if (*posX == 1003) { *posX = *posX - 75; } else { @@ -234,7 +234,7 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po EnemyEntry GetRandomizedEnemyEntry(uint32_t seed) { if (CVarGetInteger("gRandomizedEnemies", ENEMY_RANDOMIZER_OFF) == ENEMY_RANDOMIZER_RANDOM_SEEDED) { - uint32_t finalSeed = seed + (gSaveContext.n64ddFlag ? (gSaveContext.seedIcons[0] + gSaveContext.seedIcons[1] + gSaveContext.seedIcons[2] + gSaveContext.seedIcons[3] + gSaveContext.seedIcons[4]) : gSaveContext.sohStats.fileCreatedAt); + uint32_t finalSeed = seed + (gSaveContext.n64ddFlag ? gSaveContext.finalSeed : gSaveContext.sohStats.fileCreatedAt); Random_Init(finalSeed); } @@ -260,7 +260,7 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, // Don't randomize the OoB wallmaster in the silver rupee room because it's only there to // not trigger unlocking the door after killing the other wallmaster in authentic gameplay. case ACTOR_EN_WALLMAS: - return (!(!isMQ && sceneNum == SCENE_MEN && roomNum == 2 && posX == -2345)); + return (!(!isMQ && sceneNum == SCENE_GERUDO_TRAINING_GROUND && roomNum == 2 && posX == -2345)); // Only randomize initial floormaster actor (it can split and does some spawning on init). case ACTOR_EN_FLOORMAS: return (params == 0 || params == -32768); @@ -274,7 +274,7 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, // Don't randomize Iron Knuckle in MQ Spirit Trial because it's needed to // break the thrones in the room to access a button. case ACTOR_EN_IK: - return (params != 1280 && !(isMQ && sceneNum == SCENE_GANONTIKA && roomNum == 17)); + return (params != 1280 && !(isMQ && sceneNum == SCENE_INSIDE_GANONS_CASTLE && roomNum == 17)); // Only randomize the intitial spawn of the huge jellyfish. It spawns another copy when hit with a sword. case ACTOR_EN_VALI: return (params == -1); @@ -288,16 +288,16 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, // Don't randomize the Stalfos spawning on the boat in Shadow Temple, as randomizing them places the new enemies // down in the river. case ACTOR_EN_TEST: - return (params != 1 && !(sceneNum == SCENE_HAKADAN && roomNum == 21)); + return (params != 1 && !(sceneNum == SCENE_SHADOW_TEMPLE && roomNum == 21)); // Only randomize the enemy variant of Armos Statue. // Leave one Armos unrandomized in the Spirit Temple room where an armos is needed to push down a button case ACTOR_EN_AM: - return ((params == -1 || params == 255) && !(sceneNum == SCENE_JYASINZOU && posX == 2141)); + return ((params == -1 || params == 255) && !(sceneNum == SCENE_SPIRIT_TEMPLE && posX == 2141)); // Don't randomize Shell Blades and Spikes in the underwater portion in Water Temple as it's impossible to kill // most other enemies underwater with just hookshot and they're required to be killed for a grate to open. case ACTOR_EN_SB: case ACTOR_EN_NY: - return (!(!isMQ && sceneNum == SCENE_MIZUSIN && roomNum == 2)); + return (!(!isMQ && sceneNum == SCENE_WATER_TEMPLE && roomNum == 2)); default: return 1; } @@ -328,54 +328,54 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) { switch (sceneNum) { // Deku Tree - case SCENE_YDAN: + case SCENE_DEKU_TREE: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 9)) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 4 || roomNum == 6 || roomNum == 9 || roomNum == 10))); // Dodongo's Cavern - case SCENE_DDAN: + case SCENE_DODONGOS_CAVERN: return (!(!isMQ && enemiesToExcludeClearRooms && roomNum == 15) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 5 || roomNum == 13 || roomNum == 14))); // Jabu Jabu - case SCENE_BDAN: + case SCENE_JABU_JABU: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 8 || roomNum == 9)) && !(!isMQ && enemiesToExcludeTimedRooms && roomNum == 12) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 11 || roomNum == 14))); // Forest Temple - case SCENE_BMORI1: + case SCENE_FOREST_TEMPLE: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 6 || roomNum == 10 || roomNum == 18 || roomNum == 21)) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 5 || roomNum == 6 || roomNum == 18 || roomNum == 21))); // Fire Temple - case SCENE_HIDAN: + case SCENE_FIRE_TEMPLE: return (!(!isMQ && enemiesToExcludeClearRooms && roomNum == 15) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 15 || roomNum == 17 || roomNum == 18))); // Water Temple - case SCENE_MIZUSIN: + case SCENE_WATER_TEMPLE: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 13 || roomNum == 18 || roomNum == 19)) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 13 || roomNum == 18))); // Spirit Temple - case SCENE_JYASINZOU: + case SCENE_SPIRIT_TEMPLE: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 10 || roomNum == 17 || roomNum == 20)) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 2 || roomNum == 4 || roomNum == 10 || roomNum == 15 || roomNum == 19 || roomNum == 20))); // Shadow Temple - case SCENE_HAKADAN: + case SCENE_SHADOW_TEMPLE: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 7 || roomNum == 11 || roomNum == 14 || roomNum == 16 || roomNum == 17 || roomNum == 19 || roomNum == 20)) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 6 || roomNum == 7 || roomNum == 11 || roomNum == 14 || roomNum == 20))); // Ganon's Castle Trials - case SCENE_GANONTIKA: + case SCENE_INSIDE_GANONS_CASTLE: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 2 || roomNum == 5 || roomNum == 9)) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 0 || roomNum == 2 || roomNum == 5 || roomNum == 9))); // Ice Caverns - case SCENE_ICE_DOUKUTO: + case SCENE_ICE_CAVERN: return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 7)) && !(isMQ && enemiesToExcludeClearRooms && (roomNum == 3 || roomNum == 7))); // Bottom of the Well // Exclude Dark Link from room with holes in the floor because it can pull you in a like-like making the player fall down. - case SCENE_HAKADANCH: + case SCENE_BOTTOM_OF_THE_WELL: return (!(!isMQ && enemy.id == ACTOR_EN_TORCH2 && roomNum == 3)); // Don't allow Dark Link in areas with lava void out zones as it voids out the player as well. // Gerudo Training Ground. - case SCENE_MEN: + case SCENE_GERUDO_TRAINING_GROUND: return (!(enemy.id == ACTOR_EN_TORCH2 && roomNum == 6) && !(!isMQ && enemiesToExcludeTimedRooms && (roomNum == 1 || roomNum == 7)) && !(!isMQ && enemiesToExcludeClearRooms && (roomNum == 3 || roomNum == 5 || roomNum == 10)) && @@ -384,25 +384,25 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) { // Don't allow certain enemies in Ganon's Tower because they would spawn up on the ceilling, // becoming impossible to kill. // Ganon's Tower. - case SCENE_GANON: + case SCENE_GANONS_TOWER: return (!(enemiesToExcludeClearRooms || enemy.id == ACTOR_EN_VALI || (enemy.id == ACTOR_EN_ZF && enemy.params == -1))); // Ganon's Tower Escape. - case SCENE_GANON_SONOGO: + case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR: return (!((enemiesToExcludeTimedRooms || (enemy.id == ACTOR_EN_ZF && enemy.params == -1)) && roomNum == 1)); // Don't allow big stalchildren, big peahats and the large Bari (jellyfish) during the Gohma fight because they can clip into Gohma // and it crashes the game. Likely because Gohma on the ceilling can't handle collision with other enemies. - case SCENE_YDAN_BOSS: + case SCENE_DEKU_TREE_BOSS: return (!enemiesToExcludeTimedRooms && !(enemy.id == ACTOR_EN_SKB && enemy.params == 20) && !(enemy.id == ACTOR_EN_PEEHAT && enemy.params == -1)); // Grottos. - case SCENE_KAKUSIANA: + case SCENE_GROTTOS: return (!(enemiesToExcludeClearRooms && (roomNum == 2 || roomNum == 7))); // Royal Grave. - case SCENE_HAKAANA_OUKE: + case SCENE_ROYAL_FAMILYS_TOMB: return (!(enemiesToExcludeClearRooms && roomNum == 0)); // Don't allow Dark Link in areas with lava void out zones as it voids out the player as well. // Death Mountain Crater. - case SCENE_SPOT17: + case SCENE_DEATH_MOUNTAIN_CRATER: return (enemy.id != ACTOR_EN_TORCH2); default: return 1; diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp index 0b8682ca6..7b725b487 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp @@ -211,7 +211,8 @@ namespace GameInteractionEffect { // MARK: - KnockbackPlayer GameInteractionEffectQueryResult KnockbackPlayer::CanBeApplied() { - if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) { + Player* player = GET_PLAYER(gPlayState); + if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || player->stateFlags2 & PLAYER_STATE2_CRAWLING) { return GameInteractionEffectQueryResult::TemporarilyNotPossible; } else { return GameInteractionEffectQueryResult::Possible; diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index a353f42d2..4123dbb85 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -154,7 +154,8 @@ public: DEFINE_HOOK(OnActorInit, void(void* actor)); DEFINE_HOOK(OnActorUpdate, void(void* actor)); DEFINE_HOOK(OnActorDestroy, void(void* actor)); - + DEFINE_HOOK(OnActorKill, void(void* actor)); + DEFINE_HOOK(OnEnemyDefeat, void(void* actor)); DEFINE_HOOK(OnPlayerBonk, void()); DEFINE_HOOK(OnPlayDestroy, void()); DEFINE_HOOK(OnPlayDrawEnd, void()); @@ -177,6 +178,7 @@ public: DEFINE_HOOK(OnUpdateFileEraseConfirmationSelection, void(uint16_t optionIndex)); DEFINE_HOOK(OnUpdateFileAudioSelection, void(uint8_t optionIndex)); DEFINE_HOOK(OnUpdateFileTargetSelection, void(uint8_t optionIndex)); + DEFINE_HOOK(OnUpdateFileLanguageSelection, void(uint8_t optionIndex)); DEFINE_HOOK(OnUpdateFileQuestSelection, void(uint8_t questIndex)); DEFINE_HOOK(OnUpdateFileBossRushOptionSelection, void(uint8_t optionIndex, uint8_t optionValue)); DEFINE_HOOK(OnUpdateFileNameSelection, void(int16_t charCode)); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp index 14de569cd..7704a8ffb 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp @@ -52,8 +52,15 @@ void GameInteractor_ExecuteOnActorUpdate(void* actor) { void GameInteractor_ExecuteOnActorDestroy(void* actor) { GameInteractor::Instance->ExecuteHooks(actor); } +void GameInteractor_ExecuteOnActorKill(void* actor) { + GameInteractor::Instance->ExecuteHooks(actor); +} - void GameInteractor_ExecuteOnPlayerBonk() { +void GameInteractor_ExecuteOnEnemyDefeat(void* actor) { + GameInteractor::Instance->ExecuteHooks(actor); +} + +void GameInteractor_ExecuteOnPlayerBonk() { GameInteractor::Instance->ExecuteHooks(); } @@ -135,6 +142,10 @@ void GameInteractor_ExecuteOnUpdateFileTargetSelection(uint8_t optionIndex) { GameInteractor::Instance->ExecuteHooks(optionIndex); } +void GameInteractor_ExecuteOnUpdateFileLanguageSelection(uint8_t optionIndex) { + GameInteractor::Instance->ExecuteHooks(optionIndex); +} + void GameInteractor_ExecuteOnUpdateFileQuestSelection(uint8_t questIndex) { GameInteractor::Instance->ExecuteHooks(questIndex); } diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h index 563c88ed8..8ed1ae195 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h @@ -18,7 +18,8 @@ void GameInteractor_ExecuteOnActorInit(void* actor); void GameInteractor_ExecuteOnActorInit(void* actor); void GameInteractor_ExecuteOnActorUpdate(void* actor); void GameInteractor_ExecuteOnActorDestroy(void* actor); - +void GameInteractor_ExecuteOnActorKill(void* actor); +void GameInteractor_ExecuteOnEnemyDefeat(void* actor); void GameInteractor_ExecuteOnPlayerBonk(); void GameInteractor_ExecuteOnOcarinaSongAction(); void GameInteractor_ExecuteOnPlayDestroy(); @@ -45,6 +46,7 @@ void GameInteractor_ExecuteOnUpdateFileEraseSelection(uint16_t optionIndex); void GameInteractor_ExecuteOnUpdateFileEraseConfirmationSelection(uint16_t optionIndex); void GameInteractor_ExecuteOnUpdateFileAudioSelection(uint8_t optionIndex); void GameInteractor_ExecuteOnUpdateFileTargetSelection(uint8_t optionIndex); +void GameInteractor_ExecuteOnUpdateFileLanguageSelection(uint8_t optionIndex); void GameInteractor_ExecuteOnUpdateFileQuestSelection(uint8_t questIndex); void GameInteractor_ExecuteOnUpdateFileBossRushOptionSelection(uint8_t optionIndex, uint8_t optionValue); void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp index 0cad9c718..e78da02e1 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp @@ -433,7 +433,7 @@ GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnEnemyWithOffset // Disallow enemy spawns in the painting Poe rooms in Forest Temple. // Killing a spawned enemy before the Poe can softlock the rooms entirely. - if (sceneNum == SCENE_BMORI1 && (roomNum == 12 || roomNum == 13 || roomNum == 16)) { + if (sceneNum == SCENE_FOREST_TEMPLE && (roomNum == 12 || roomNum == 13 || roomNum == 16)) { return GameInteractionEffectQueryResult::NotPossible; } @@ -449,8 +449,8 @@ GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnEnemyWithOffset // Don't allow Arwings in certain areas because they cause issues. // Locations: King dodongo room, Morpha room, Twinrova room, Ganondorf room, Fishing pond, Ganon's room // TODO: Swap this to disabling the option in CC options menu instead. - if (sceneNum == SCENE_DDAN_BOSS || sceneNum == SCENE_MIZUSIN_BS || sceneNum == SCENE_JYASINBOSS || - sceneNum == SCENE_GANON_BOSS || sceneNum == SCENE_TURIBORI || sceneNum == SCENE_GANON_DEMO) { + if (sceneNum == SCENE_DODONGOS_CAVERN_BOSS || sceneNum == SCENE_WATER_TEMPLE_BOSS || sceneNum == SCENE_SPIRIT_TEMPLE_BOSS || + sceneNum == SCENE_GANONDORF_BOSS || sceneNum == SCENE_FISHING_POND || sceneNum == SCENE_GANON_BOSS) { return GameInteractionEffectQueryResult::NotPossible; } } diff --git a/soh/soh/Enhancements/gameplaystats.cpp b/soh/soh/Enhancements/gameplaystats.cpp index 5b5b5a1a9..6276da8b2 100644 --- a/soh/soh/Enhancements/gameplaystats.cpp +++ b/soh/soh/Enhancements/gameplaystats.cpp @@ -398,7 +398,7 @@ bool compareTimestampInfoByTime(const TimestampInfo& a, const TimestampInfo& b) } const char* ResolveSceneID(int sceneID, int roomID){ - if (sceneID == SCENE_KAKUSIANA) { + if (sceneID == SCENE_GROTTOS) { switch (roomID) { case 0: return "Generic Grotto"; @@ -429,7 +429,7 @@ const char* ResolveSceneID(int sceneID, int roomID){ case 13: return "Big Skulltula Grotto"; }; - } else if (sceneID == SCENE_HAKASITARELAY) { + } else if (sceneID == SCENE_WINDMILL_AND_DAMPES_GRAVE) { //Only the last room of Dampe's Grave (rm 6) is considered the windmill return roomID == 6 ? "Windmill" : "Dampe's Grave"; } else if (sceneID < SCENE_ID_MAX) { @@ -573,7 +573,7 @@ void DrawGameplayStatsBreakdownTab() { for (int i = 0; i < gSaveContext.sohStats.tsIdx; i++) { std::string sceneName = ResolveSceneID(gSaveContext.sohStats.sceneTimestamps[i].scene, gSaveContext.sohStats.sceneTimestamps[i].room); std::string name; - if (CVarGetInteger("gGameplayStats.RoomBreakdown", 0) && gSaveContext.sohStats.sceneTimestamps[i].scene != SCENE_KAKUSIANA) { + if (CVarGetInteger("gGameplayStats.RoomBreakdown", 0) && gSaveContext.sohStats.sceneTimestamps[i].scene != SCENE_GROTTOS) { name = fmt::format("{:s} Room {:d}", sceneName, gSaveContext.sohStats.sceneTimestamps[i].room); } else { name = sceneName; @@ -596,7 +596,7 @@ void DrawGameplayStatsBreakdownTab() { } } std::string toPass; - if (CVarGetInteger("gGameplayStats.RoomBreakdown", 0) && gSaveContext.sohStats.sceneNum != SCENE_KAKUSIANA) { + if (CVarGetInteger("gGameplayStats.RoomBreakdown", 0) && gSaveContext.sohStats.sceneNum != SCENE_GROTTOS) { toPass = fmt::format("{:s} Room {:d}", ResolveSceneID(gSaveContext.sohStats.sceneNum, gSaveContext.sohStats.roomNum), gSaveContext.sohStats.roomNum); } else { toPass = ResolveSceneID(gSaveContext.sohStats.sceneNum, gSaveContext.sohStats.roomNum); diff --git a/soh/soh/Enhancements/gameplaystats.h b/soh/soh/Enhancements/gameplaystats.h index a043efdae..8bcf524d8 100644 --- a/soh/soh/Enhancements/gameplaystats.h +++ b/soh/soh/Enhancements/gameplaystats.h @@ -87,7 +87,7 @@ typedef enum { COUNT_ENEMIES_DEFEATED_PARASITIC_TENTACLE, // EN_BA COUNT_ENEMIES_DEFEATED_PEAHAT, // EN_PEEHAT COUNT_ENEMIES_DEFEATED_PEAHAT_LARVA, // EN_PEEHAT - COUNT_ENEMIES_DEFEATED_POE, // EN_POH + COUNT_ENEMIES_DEFEATED_POE, // EN_POH & EN_PO_FIELD COUNT_ENEMIES_DEFEATED_POE_BIG, // EN_PO_FIELD COUNT_ENEMIES_DEFEATED_POE_COMPOSER, // EN_POH COUNT_ENEMIES_DEFEATED_POE_SISTERS, // EN_PO_SISTERS diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index 078fbc2d0..2c647d80d 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -9,6 +9,19 @@ #include "soh/Enhancements/cosmetics/authenticGfxPatches.h" #include "soh/Enhancements/nametag.h" +#include "src/overlays/actors/ovl_En_Bb/z_en_bb.h" +#include "src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h" +#include "src/overlays/actors/ovl_En_Mb/z_en_mb.h" +#include "src/overlays/actors/ovl_En_Tite/z_en_tite.h" +#include "src/overlays/actors/ovl_En_Zf/z_en_zf.h" +#include "src/overlays/actors/ovl_En_Wf/z_en_wf.h" +#include "src/overlays/actors/ovl_En_Reeba/z_en_reeba.h" +#include "src/overlays/actors/ovl_En_Peehat/z_en_peehat.h" +#include "src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h" +#include "src/overlays/actors/ovl_En_Poh/z_en_poh.h" +#include "src/overlays/actors/ovl_En_Tp/z_en_tp.h" +#include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h" + extern "C" { #include #include "macros.h" @@ -127,7 +140,7 @@ void RegisterInfiniteISG() { if (CVarGetInteger("gEzISG", 0) != 0) { Player* player = GET_PLAYER(gPlayState); - player->swordState = 1; + player->meleeWeaponState = 1; } }); } @@ -235,7 +248,7 @@ void AutoSave(GetItemEntry itemEntry) { // Don't autosave during the Ganon fight when picking up the Master Sword // Don't autosave in grottos since resuming from grottos breaks the game. if ((CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF) && (gPlayState != NULL) && (gSaveContext.pendingSale == ITEM_NONE) && - (gPlayState->gameplayFrames > 60 && gSaveContext.cutsceneIndex < 0xFFF0) && (gPlayState->sceneNum != SCENE_GANON_DEMO)) { + (gPlayState->gameplayFrames > 60 && gSaveContext.cutsceneIndex < 0xFFF0) && (gPlayState->sceneNum != SCENE_GANON_BOSS)) { if (((CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_ALL_ITEMS) || (CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_ALL_ITEMS)) && (item != ITEM_NONE)) { // Autosave for all items performSave = true; @@ -296,8 +309,8 @@ void AutoSave(GetItemEntry itemEntry) { CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) { performSave = true; } - if ((gPlayState->sceneNum == SCENE_YOUSEI_IZUMI_TATE) || (gPlayState->sceneNum == SCENE_KAKUSIANA) || - (gPlayState->sceneNum == SCENE_KENJYANOMA)) { + if ((gPlayState->sceneNum == SCENE_FAIRYS_FOUNTAIN) || (gPlayState->sceneNum == SCENE_GROTTOS) || + (gPlayState->sceneNum == SCENE_CHAMBER_OF_THE_SAGES)) { if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_MAJOR_ITEMS || CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_ALL_ITEMS || CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) { @@ -392,15 +405,15 @@ void RegisterDaytimeGoldSkultullas() { // Actor values copied from the night time scene actor list static const DayTimeGoldSkulltulasList dayTimeGoldSkulltulas = { // Graveyard - { SCENE_SPOT02, 1, true, { { ACTOR_EN_SW, { 156, 315, 795 }, { 16384, -32768, 0 }, -20096 } } }, + { SCENE_GRAVEYARD, 1, true, { { ACTOR_EN_SW, { 156, 315, 795 }, { 16384, -32768, 0 }, -20096 } } }, // ZF - { SCENE_SPOT08, 0, true, { { ACTOR_EN_SW, { -1891, 187, 1911 }, { 16384, 18022, 0 }, -19964 } } }, + { SCENE_ZORAS_FOUNTAIN, 0, true, { { ACTOR_EN_SW, { -1891, 187, 1911 }, { 16384, 18022, 0 }, -19964 } } }, // GF - { SCENE_SPOT12, 0, false, { { ACTOR_EN_SW, { 1598, 999, -2008 }, { 16384, -16384, 0 }, -19198 } } }, - { SCENE_SPOT12, 1, false, { { ACTOR_EN_SW, { 3377, 1734, -4935 }, { 16384, 0, 0 }, -19199 } } }, + { SCENE_GERUDOS_FORTRESS, 0, false, { { ACTOR_EN_SW, { 1598, 999, -2008 }, { 16384, -16384, 0 }, -19198 } } }, + { SCENE_GERUDOS_FORTRESS, 1, false, { { ACTOR_EN_SW, { 3377, 1734, -4935 }, { 16384, 0, 0 }, -19199 } } }, // Kak - { SCENE_SPOT01, 0, false, { { ACTOR_EN_SW, { -18, 540, 1800 }, { 0, -32768, 0 }, -20160 } } }, - { SCENE_SPOT01, + { SCENE_KAKARIKO_VILLAGE, 0, false, { { ACTOR_EN_SW, { -18, 540, 1800 }, { 0, -32768, 0 }, -20160 } } }, + { SCENE_KAKARIKO_VILLAGE, 0, true, { { ACTOR_EN_SW, { -465, 377, -888 }, { 0, 28217, 0 }, -20222 }, @@ -408,7 +421,7 @@ void RegisterDaytimeGoldSkultullas() { { ACTOR_EN_SW, { 324, 270, 905 }, { 16384, 0, 0 }, -20216 }, { ACTOR_EN_SW, { -602, 120, 1120 }, { 16384, 0, 0 }, -20208 } } }, // LLR - { SCENE_SPOT20, + { SCENE_LON_LON_RANCH, 0, true, { { ACTOR_EN_SW, { -2344, 180, 672 }, { 16384, 22938, 0 }, -29695 }, @@ -540,9 +553,9 @@ void RegisterBonkDamage() { void UpdateDirtPathFixState(int32_t sceneNum) { switch (sceneNum) { - case SCENE_SPOT00: - case SCENE_SPOT04: - case SCENE_SPOT15: + case SCENE_HYRULE_FIELD: + case SCENE_KOKIRI_FOREST: + case SCENE_HYRULE_CASTLE: CVarSetInteger("gZFightingMode", CVarGetInteger("gSceneSpecificDirtPathFix", ZFIGHT_FIX_DISABLED)); return; default: @@ -561,13 +574,12 @@ void UpdateMirrorModeState(int32_t sceneNum) { bool nextMirroredWorld = false; int16_t mirroredMode = CVarGetInteger("gMirroredWorldMode", MIRRORED_WORLD_OFF); - int16_t inDungeon = (sceneNum >= SCENE_YDAN && sceneNum <= SCENE_GANONTIKA_SONOGO && sceneNum != SCENE_GERUDOWAY) || - (sceneNum >= SCENE_YDAN_BOSS && sceneNum <= SCENE_GANON_FINAL) || - (sceneNum == SCENE_GANON_DEMO); + int16_t inDungeon = (sceneNum >= SCENE_DEKU_TREE && sceneNum <= SCENE_INSIDE_GANONS_CASTLE_COLLAPSE && sceneNum != SCENE_THIEVES_HIDEOUT) || + (sceneNum >= SCENE_DEKU_TREE_BOSS && sceneNum <= SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) || + (sceneNum == SCENE_GANON_BOSS); if (mirroredMode == MIRRORED_WORLD_RANDOM_SEEDED || mirroredMode == MIRRORED_WORLD_DUNGEONS_RANDOM_SEEDED) { - uint32_t seed = sceneNum + (gSaveContext.n64ddFlag ? (gSaveContext.seedIcons[0] + gSaveContext.seedIcons[1] + - gSaveContext.seedIcons[2] + gSaveContext.seedIcons[3] + gSaveContext.seedIcons[4]) : gSaveContext.sohStats.fileCreatedAt); + uint32_t seed = sceneNum + (gSaveContext.n64ddFlag ? gSaveContext.finalSeed : gSaveContext.sohStats.fileCreatedAt); Random_Init(seed); } @@ -601,6 +613,197 @@ void RegisterMirrorModeHandler() { }); } +//this map is used for enemies that can be uniquely identified by their id +//and that are always counted +//enemies that can't be uniquely identified by their id +//or only sometimes count (like ACTOR_EN_TP) +//have to be manually handled in RegisterEnemyDefeatCounts +static std::unordered_map uniqueEnemyIdToStatCount = { + { ACTOR_EN_ANUBICE, COUNT_ENEMIES_DEFEATED_ANUBIS }, + { ACTOR_EN_AM, COUNT_ENEMIES_DEFEATED_ARMOS }, + { ACTOR_EN_CLEAR_TAG, COUNT_ENEMIES_DEFEATED_ARWING }, + { ACTOR_EN_VALI, COUNT_ENEMIES_DEFEATED_BARI }, + { ACTOR_EN_VM, COUNT_ENEMIES_DEFEATED_BEAMOS }, + { ACTOR_EN_BIGOKUTA, COUNT_ENEMIES_DEFEATED_BIG_OCTO }, + { ACTOR_EN_BILI, COUNT_ENEMIES_DEFEATED_BIRI }, + { ACTOR_EN_DNS, COUNT_ENEMIES_DEFEATED_BUSINESS_SCRUB }, + { ACTOR_EN_TORCH, COUNT_ENEMIES_DEFEATED_DARK_LINK }, + { ACTOR_EN_DH, COUNT_ENEMIES_DEFEATED_DEAD_HAND }, + { ACTOR_EN_HINTNUTS, COUNT_ENEMIES_DEFEATED_DEKU_SCRUB }, + { ACTOR_EN_DODONGO, COUNT_ENEMIES_DEFEATED_DODONGO }, + { ACTOR_EN_DODOJR, COUNT_ENEMIES_DEFEATED_DODONGO_BABY }, + { ACTOR_DOOR_KILLER, COUNT_ENEMIES_DEFEATED_DOOR_TRAP }, + { ACTOR_EN_FD, COUNT_ENEMIES_DEFEATED_FLARE_DANCER }, + { ACTOR_EN_FLOORMAS, COUNT_ENEMIES_DEFEATED_FLOORMASTER }, + { ACTOR_EN_TUBO_TRAP, COUNT_ENEMIES_DEFEATED_FLYING_POT }, + { ACTOR_EN_YUKABYUN, COUNT_ENEMIES_DEFEATED_FLOOR_TILE }, + { ACTOR_EN_FZ, COUNT_ENEMIES_DEFEATED_FREEZARD }, + { ACTOR_EN_GELDB, COUNT_ENEMIES_DEFEATED_GERUDO_THIEF }, + { ACTOR_EN_GOMA, COUNT_ENEMIES_DEFEATED_GOHMA_LARVA }, + { ACTOR_EN_CROW, COUNT_ENEMIES_DEFEATED_GUAY }, + { ACTOR_EN_RR, COUNT_ENEMIES_DEFEATED_LIKE_LIKE }, + { ACTOR_EN_DEKUNUTS, COUNT_ENEMIES_DEFEATED_MAD_SCRUB }, + { ACTOR_EN_OKUTA, COUNT_ENEMIES_DEFEATED_OCTOROK }, + { ACTOR_EN_BA, COUNT_ENEMIES_DEFEATED_PARASITIC_TENTACLE }, + { ACTOR_EN_PO_SISTERS, COUNT_ENEMIES_DEFEATED_POE_SISTERS }, + { ACTOR_EN_BUBBLE, COUNT_ENEMIES_DEFEATED_SHABOM }, + { ACTOR_EN_SB, COUNT_ENEMIES_DEFEATED_SHELLBLADE }, + { ACTOR_EN_SKJ, COUNT_ENEMIES_DEFEATED_SKULL_KID }, + { ACTOR_EN_NY, COUNT_ENEMIES_DEFEATED_SPIKE }, + { ACTOR_EN_SKB, COUNT_ENEMIES_DEFEATED_STALCHILD }, + { ACTOR_EN_TEST, COUNT_ENEMIES_DEFEATED_STALFOS }, + { ACTOR_EN_WEIYER, COUNT_ENEMIES_DEFEATED_STINGER }, + { ACTOR_EN_BW, COUNT_ENEMIES_DEFEATED_TORCH_SLUG }, + { ACTOR_EN_WALLMAS, COUNT_ENEMIES_DEFEATED_WALLMASTER }, + { ACTOR_EN_KAREBABA, COUNT_ENEMIES_DEFEATED_WITHERED_DEKU_BABA }, +}; + +void RegisterEnemyDefeatCounts() { + GameInteractor::Instance->RegisterGameHook([](void* refActor) { + Actor* actor = (Actor*)refActor; + if (uniqueEnemyIdToStatCount.contains(actor->id)) { + gSaveContext.sohStats.count[uniqueEnemyIdToStatCount[actor->id]]++; + } else { + switch (actor->id) { + case ACTOR_EN_BB: + if (actor->params == ENBB_GREEN || actor->params == ENBB_GREEN_BIG) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_BUBBLE_GREEN]++; + } else if (actor->params == ENBB_BLUE) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_BUBBLE_BLUE]++; + } else if (actor->params == ENBB_WHITE) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_BUBBLE_WHITE]++; + } else if (actor->params == ENBB_RED) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_BUBBLE_RED]++; + } + break; + + case ACTOR_EN_DEKUBABA: + if (actor->params == DEKUBABA_BIG) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_DEKU_BABA_BIG]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_DEKU_BABA]++; + } + break; + + case ACTOR_EN_ZF: + if (actor->params == ENZF_TYPE_DINOLFOS) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_DINOLFOS]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_LIZALFOS]++; + } + break; + + case ACTOR_EN_RD: + if (actor->params >= -1) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_REDEAD]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_GIBDO]++; + } + break; + + case ACTOR_EN_IK: + if (actor->params == 0) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_IRON_KNUCKLE_NABOORU]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_IRON_KNUCKLE]++; + } + break; + + case ACTOR_EN_FIREFLY: + if (actor->params == KEESE_NORMAL_FLY || actor->params == KEESE_NORMAL_PERCH) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_KEESE]++; + } else if (actor->params == KEESE_FIRE_FLY || actor->params == KEESE_FIRE_PERCH) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_KEESE_FIRE]++; + } else if (actor->params == KEESE_ICE_FLY) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_KEESE_ICE]++; + } + break; + + case ACTOR_EN_REEBA: + { + EnReeba* reeba = (EnReeba*)actor; + if (reeba->isBig) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_LEEVER_BIG]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_LEEVER]++; + } + } + break; + + case ACTOR_EN_MB: + if (actor->params == 0) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_MOBLIN_CLUB]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_MOBLIN]++; + } + break; + + case ACTOR_EN_PEEHAT: + if (actor->params == PEAHAT_TYPE_LARVA) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_PEAHAT_LARVA]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_PEAHAT]++; + } + break; + + case ACTOR_EN_POH: + if (actor->params == EN_POH_FLAT || actor->params == EN_POH_SHARP) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_POE_COMPOSER]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_POE]++; + } + break; + + case ACTOR_EN_PO_FIELD: + if (actor->params == EN_PO_FIELD_BIG) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_POE_BIG]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_POE]++; + } + break; + + case ACTOR_EN_ST: + if (actor->params == 1) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_SKULLTULA_BIG]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_SKULLTULA]++; + } + break; + + case ACTOR_EN_SW: + if (((actor->params & 0xE000) >> 0xD) != 0) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_SKULLTULA_GOLD]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_SKULLWALLTULA]++; + } + break; + + case ACTOR_EN_TP: + if (actor->params == TAILPASARAN_HEAD) { // Only count the head, otherwise each body segment will increment + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_TAILPASARAN]++; + } + break; + + case ACTOR_EN_TITE: + if (actor->params == TEKTITE_BLUE) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_TEKTITE_BLUE]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_TEKTITE_RED]++; + } + break; + + case ACTOR_EN_WF: + if (actor->params == WOLFOS_WHITE) { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_WOLFOS_WHITE]++; + } else { + gSaveContext.sohStats.count[COUNT_ENEMIES_DEFEATED_WOLFOS]++; + } + break; + } + } + }); +} + typedef enum { ADD_ICE_TRAP, ADD_BURN_TRAP, @@ -771,6 +974,7 @@ void InitMods() { RegisterBonkDamage(); RegisterMenuPathFix(); RegisterMirrorModeHandler(); + RegisterEnemyDefeatCounts(); RegisterAltTrapTypes(); NameTag_RegisterHooks(); } diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index 082e60b3b..a4a1a9d1a 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -28,6 +28,7 @@ enum EnhancementPreset { enum RandomizerPreset { RANDOMIZER_PRESET_DEFAULT, RANDOMIZER_PRESET_SPOCK_RACE, + RANDOMIZER_PRESET_SPOCK_RACE_NO_LOGIC, RANDOMIZER_PRESET_S6, RANDOMIZER_PRESET_HELL_MODE, }; @@ -740,6 +741,7 @@ const std::vector randomizerPresetEntries = { }; const std::vector spockRacePresetEntries = { + PRESET_ENTRY_S32("gRandomizeLogicRules", 0), PRESET_ENTRY_S32("gGameplayStats.RTATiming", 1), PRESET_ENTRY_S32("gTextSpeed", 5), PRESET_ENTRY_S32("gMweepSpeed", 5), @@ -832,6 +834,114 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1), }; +const std::vector spockRaceNoLogicPresetEntries = { + PRESET_ENTRY_S32("gAdultMinimumWeightFish", 6), + PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1), + PRESET_ENTRY_S32("gCheatEasyPauseBufferEnabled", 1), + PRESET_ENTRY_S32("gChildMinimumWeightFish", 3), + PRESET_ENTRY_S32("gClimbSpeed", 4), + PRESET_ENTRY_S32("gCosmetics.Goron_NeckLength", 1000), + PRESET_ENTRY_S32("gCreditsFix", 1), + PRESET_ENTRY_S32("gCustomizeFishing", 1), + PRESET_ENTRY_S32("gDampeAllNight", 1), + PRESET_ENTRY_S32("gDayGravePull", 1), + PRESET_ENTRY_S32("gDisableFirstPersonChus", 1), + PRESET_ENTRY_S32("gDisableLOD", 1), + PRESET_ENTRY_S32("gDisableNaviCallAudio", 1), + PRESET_ENTRY_S32("gDpadEquips", 1), + PRESET_ENTRY_S32("gDpadNoDropOcarinaInput", 1), + PRESET_ENTRY_S32("gDpadOcarina", 1), + PRESET_ENTRY_S32("gDpadText", 1), + PRESET_ENTRY_S32("gDrawLineupTick", 1), + PRESET_ENTRY_S32("gEquipmentCanBeRemoved", 1), + PRESET_ENTRY_S32("gFastBoomerang", 1), + PRESET_ENTRY_S32("gFastChests", 1), + PRESET_ENTRY_S32("gFastDrops", 1), + PRESET_ENTRY_S32("gFastFarores", 1), + PRESET_ENTRY_S32("gFastOcarinaPlayback", 1), + PRESET_ENTRY_S32("gFasterBlockPush", 5), + PRESET_ENTRY_S32("gFasterHeavyBlockLift", 1), + PRESET_ENTRY_S32("gFishNeverEscape", 1), + PRESET_ENTRY_S32("gForgeTime", 0), + PRESET_ENTRY_S32("gGameplayStats.RTATiming", 1), + PRESET_ENTRY_S32("gGameplayStats.ShowIngameTimer", 1), + PRESET_ENTRY_S32("gGoronPot", 1), + PRESET_ENTRY_S32("gGuaranteeFishingBite", 1), + PRESET_ENTRY_S32("gHideBuildInfo", 1), + PRESET_ENTRY_S32("gInjectItemCounts", 1), + PRESET_ENTRY_S32("gInstantFishing", 1), + PRESET_ENTRY_S32("gInstantPutaway", 1), + PRESET_ENTRY_S32("gMMBunnyHood", 2), + PRESET_ENTRY_S32("gMarketSneak", 1), + PRESET_ENTRY_S32("gMaskSelect", 1), + PRESET_ENTRY_S32("gMweepSpeed", 5), + PRESET_ENTRY_S32("gNewDrops", 1), + PRESET_ENTRY_S32("gNoForcedNavi", 1), + PRESET_ENTRY_S32("gNoInputForCredits", 1), + PRESET_ENTRY_S32("gOnFileSelectNameEntry", 0), + PRESET_ENTRY_S32("gOpenMenuBar", 1), + PRESET_ENTRY_S32("gPauseAnyCursor", 1), + PRESET_ENTRY_S32("gPreset1", 1), + PRESET_ENTRY_S32("gRStickOcarina", 1), + PRESET_ENTRY_S32("gRandomize10GSHint", 1), + PRESET_ENTRY_S32("gRandomize20GSHint", 1), + PRESET_ENTRY_S32("gRandomize30GSHint", 1), + PRESET_ENTRY_S32("gRandomize40GSHint", 1), + PRESET_ENTRY_S32("gRandomize50GSHint", 1), + PRESET_ENTRY_S32("gRandomizeAllLocationsReachable", 0), + PRESET_ENTRY_S32("gRandomizeBlueFireArrows", 1), + PRESET_ENTRY_S32("gRandomizeBombchusInLogic", 1), + PRESET_ENTRY_S32("gRandomizeBossKeysanity", 5), + PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1), + PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1), + PRESET_ENTRY_S32("gRandomizeDampeHint", 1), + PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2), + PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1), + PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"), + PRESET_ENTRY_S32("gRandomizeForest", 2), + PRESET_ENTRY_S32("gRandomizeFullWallets", 1), + PRESET_ENTRY_S32("gRandomizeGanonTrial", 0), + PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1), + PRESET_ENTRY_S32("gRandomizeGerudoKeys", 3), + PRESET_ENTRY_S32("gRandomizeGregHint", 1), + PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 0), + PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1), + PRESET_ENTRY_S32("gRandomizeKeysanity", 5), + PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5), + PRESET_ENTRY_S32("gRandomizeLogicRules", 1), + PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7), + PRESET_ENTRY_S32("gRandomizeScrubText", 1), + PRESET_ENTRY_S32("gRandomizeShopsanity", 6), + PRESET_ENTRY_S32("gRandomizeShuffleAdultTrade", 0), + PRESET_ENTRY_S32("gRandomizeShuffleBeans", 1), + PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9), + PRESET_ENTRY_S32("gRandomizeShuffleGerudoToken", 1), + PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2), + PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1), + PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1), + PRESET_ENTRY_S32("gRandomizeShuffleScrubs", 1), + PRESET_ENTRY_S32("gRandomizeShuffleSongs", 2), + PRESET_ENTRY_S32("gRandomizeShuffleTokens", 3), + PRESET_ENTRY_S32("gRandomizeSkipChildStealth", 1), + PRESET_ENTRY_S32("gRandomizeSkipChildZelda", 1), + PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1), + PRESET_ENTRY_S32("gRandomizeSkipScarecrowsSong", 1), + PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1), + PRESET_ENTRY_S32("gRandomizeStartingConsumables", 1), + PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 0), + PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1), + PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1), + PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1), + PRESET_ENTRY_S32("gSaveFileID", 4), + PRESET_ENTRY_S32("gSeparateArrows", 1), + PRESET_ENTRY_S32("gSkipLogoTitle", 1), + PRESET_ENTRY_S32("gSkipScarecrow", 1), + PRESET_ENTRY_S32("gSkipText", 1), + PRESET_ENTRY_S32("gSkulltulaFreeze", 1), + PRESET_ENTRY_S32("gTextSpeed", 5), + PRESET_ENTRY_S32("gZFightingMode", 0), +}; + const std::vector s6PresetEntries = { PRESET_ENTRY_S32("gChestSizeAndTextureMatchesContents", CSMC_BOTH), PRESET_ENTRY_S32("gFastChests", 1), @@ -964,6 +1074,16 @@ const std::map presetTypes = { "- All locations reachable is off\n", \ spockRacePresetEntries, } }, + { RANDOMIZER_PRESET_SPOCK_RACE_NO_LOGIC, { + "Spock Race - No Logic", + "No Logic Race preset used for official Ship of Harkinian No Logic races. The following settings are " + "notable:\n" + "- Rainbow Bridge is set to Greg\n" + "- Ganons Boss Key is 5 dungeon rewards\n" + "- Shopsanity and Scrubsanity enabled\n" + "- All locations reachable is off\n", + spockRaceNoLogicPresetEntries, + } }, { RANDOMIZER_PRESET_S6, { "S6 Tournament (Adapted)", "Matches OOTR S6 tournament settings as close as we can get with the options available in SoH. The following differences are notable:\n" \ diff --git a/soh/soh/Enhancements/randomizer/3drando/category.hpp b/soh/soh/Enhancements/randomizer/3drando/category.hpp index f49f06edc..f43b3ccba 100644 --- a/soh/soh/Enhancements/randomizer/3drando/category.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/category.hpp @@ -2,55 +2,10 @@ enum class Category { cNull, - cKokiriForest, - cForest, - cGrotto, - cMinigame, cChestMinigame, - cLostWoods, cDekuScrub, cDekuScrubUpgrades, - cNeedSpiritualStones, - cSacredForestMeadow, - cHyruleField, - cLakeHylia, - cGerudo, - cGerudoValley, - cGerudoFortress, - cHauntedWasteland, - cDesertColossus, - cInnerMarket, - cMarket, - cHyruleCastle, - cKakarikoVillage, - cKakariko, - cSkulltulaHouse, - cGraveyard, - cDeathMountainTrail, - cDeathMountain, - cGoronCity, - cDeathMountainCrater, - cZorasRiver, - cZorasDomain, - cZorasFountain, - cLonLonRanch, - cDekuTree, - cDodongosCavern, - cJabuJabusBelly, - cForestTemple, - cFireTemple, - cWaterTemple, - cSpiritTemple, - cShadowTemple, - cBottomOfTheWell, - cIceCavern, - cGerudoTrainingGrounds, - cGanonsCastle, cSkulltula, - cBossHeart, - cTempleOfTime, - cFairies, - cOutsideGanonsCastle, cSong, cSongDungeonReward, cCow, @@ -66,6 +21,5 @@ enum class Category { enum class OptionCategory { Setting, - Cosmetic, Toggle, -}; +}; \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/3drando/cosmetics.cpp b/soh/soh/Enhancements/randomizer/3drando/cosmetics.cpp deleted file mode 100644 index 227fb2161..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/cosmetics.cpp +++ /dev/null @@ -1,152 +0,0 @@ -#include "cosmetics.hpp" -#include "random.hpp" -#include - -namespace Cosmetics { - - bool ValidHexString(std::string_view hexStr) { - return hexStr.find_first_not_of("0123456789ABCDEFabcdef") == std::string_view::npos && hexStr.length() == 6; - } - - Color_RGBAf HexStrToColorRGBAf(const std::string& hexStr) { - uint32_t hex = std::stoi(hexStr, nullptr, 16); - - return Color_RGBAf{ - .r = ((hex & 0xFF0000) >> 16) / 255.0f, - .g = ((hex & 0x00FF00) >> 8) / 255.0f, - .b = (hex & 0x0000FF) / 255.0f, - .a = 1.0f, - }; - } - - Color_RGBA8 HexStrToColorRGBA8(const std::string& hexStr) { - uint32_t hex = std::stoi(hexStr, nullptr, 16); - - return Color_RGBA8{ - .r = (uint8_t)((hex & 0xFF0000) >> 16), - .g = (uint8_t)((hex & 0x00FF00) >> 8), - .b = (uint8_t)(hex & 0x0000FF), - .a = 0xFF, - }; - } - - std::string CustomColorOptionText(std::string_view color) { - return std::string(CUSTOM_COLOR_STR.substr(0, CUSTOM_COLOR_STR.length() - 6)).append(color); - } - - std::string GetCustomColor(const std::string& str) { - return str.substr(str.length() - 6); - } - - const std::array gauntletColors = { - "FFFFFF", //Silver - "FECF0F", //Gold - "000006", //Black - "025918", //Green - "06025A", //Blue - "600602", //Bronze - "FF0000", //Red - "025DB0", //Sky Blue - "FA6A90", //Pink - "FF00FF", //Magenta - "D83A00", //Orange - "5B8A06", //Lime - "800080", //Purple - }; - const std::array tunicColors = { - "168A0E", //Kokiri Green - "96000E", //Goron Red - "002A8E", //Zora Blue - "202020", //Black - "FFFFFF", //White - "FF4A0A", //Orange - "86FF23", //Yellow - "0094B0", //Cyan - "362076", //Indigo - "7B0080", //Purple - "F04F7D", //Pink - "323232", //Dark Gray - "E44B4B", //Salmon - "5A1A20", //Wine Red - "7E705B", //Beige - "583923", //Brown - "72602B", //Sand - "6b7E5D", //Tea Green - "3C5800", //Dark Green - "6CFFF8", //Powder Blue - "005A4B", //Teal - "0259FF", //Sky Blue - "33405E", //Faded Blue - "635AD2", //Lavender - "9C1B4B", //Magenta - "52314F", //Mauve - "505A59", //Silver - "F16F16", //Gold - }; - const std::array naviInnerColors = { - "FFFFFF", //White - "00FF00", //Green - "9696FF", //Light Blue - "FFFF00", //Yellow - "FF0000", //Red - "FF00FF", //Magenta - "FECC3C", //Gold - "000000", //Black - "FFFFFF", //Tatl - "49146C", //Tael - "2C9EC4", //Fi - "E6DE83", //Ciela - "D14902", //Epona - "629C5F", //Ezlo - "A83317", //KoRL - "032660", //Linebeck - "D62E31", //Loftwing - "192426", //Midna - "977A6C", //Phantom Zelda - "FF0000", //Rainbow (starts at red) - }; - const std::array naviOuterColors = { - "0000FF", //White - "00FF00", //Green - "9696FF", //Light Blue - "C89B00", //Yellow - "FF0000", //Red - "C8009B", //Magenta - "FEC007", //Gold - "000000", //Black - "C89800", //Tatl - "FF0000", //Tael - "2C1983", //Fi - "C6BE5B", //Ciela - "551F08", //Epona - "3F5D37", //Ezlo - "DED7C5", //KoRL - "EFFFFF", //Linebeck - "FDE6CC", //Loftwing - "D28330", //Midna - "6F4667", //Phantom Zelda - "FF0000", //Rainbow (starts at red) - }; - const std::array weaponTrailColors = { - "FFFFFF", //White - "000000", //Black - "FF0000", //Red - "00FF00", //Green - "0000FF", //Blue - "FFFF00", //Yellow - "00FFFF", //Cyan - "FF00FF", //Magenta - "FFA500", //Orange - "FFD700", //Gold - "800080", //Purple - "FF69B4", //Pink - "FF0000", //Rainbow (starts at red) - }; - - //Generate random hex color - std::string RandomColor() { - std::ostringstream color; - color << std::hex << (rand() % 0x1000000); //use default rand to not interfere with main settings - return color.str(); - } -} //namespace Cosmetics diff --git a/soh/soh/Enhancements/randomizer/3drando/cosmetics.hpp b/soh/soh/Enhancements/randomizer/3drando/cosmetics.hpp deleted file mode 100644 index 65125215a..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/cosmetics.hpp +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace Cosmetics { - constexpr std::string_view RANDOM_CHOICE_STR = "Random Choice"; - constexpr std::string_view RANDOM_COLOR_STR = "Random Color"; - constexpr std::string_view CUSTOM_COLOR_STR = "Custom #FFFFFF"; - constexpr std::string_view CUSTOM_COLOR_PREFIX = "Custom #"; - - constexpr std::string_view RANDOM_CHOICE_DESC = "A random color from the list of colors will be\nchosen."; - constexpr std::string_view RANDOM_COLOR_DESC = "A completely random color will be chosen."; - constexpr std::string_view CUSTOM_COLOR_DESC = "Press A and type in a custom 6 digit hex color."; - - enum CosmeticSettings { - RANDOM_CHOICE, - RANDOM_COLOR, - CUSTOM_COLOR, - NON_COLOR_COUNT, - }; - - struct Color_RGBAf { - float r; - float g; - float b; - float a; - }; - - struct Color_RGBA8 { - uint8_t r; - uint8_t g; - uint8_t b; - uint8_t a; - }; - - extern const std::array gauntletColors; - extern const std::array tunicColors; - extern const std::array naviInnerColors; - extern const std::array naviOuterColors; - extern const std::array weaponTrailColors; - - bool ValidHexString(std::string_view hexStr); - Color_RGBAf HexStrToColorRGBAf(const std::string& hexStr); - Color_RGBA8 HexStrToColorRGBA8(const std::string& hexStr); - std::string CustomColorOptionText(std::string_view color); - std::string GetCustomColor(const std::string& str); - std::string RandomColor(); -} //namespace Cosmetics diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp index 59f157d9e..b7dd96ca7 100644 --- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp @@ -1,5 +1,4 @@ #include "custom_messages.hpp" -#include "debug.hpp" #include "shops.hpp" #include "z64item.h" @@ -121,9 +120,7 @@ constexpr std::array DungeonColors = { }; std::set messageEntries; - std::vector arrangedMessageEntries; std::stringstream messageData; - std::string arrangedMessageData; //textBoxType and textBoxPosition are defined here: https://wiki.cloudmodding.com/oot/Text_Format#Message_Id void CreateMessage(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition, @@ -161,229 +158,6 @@ constexpr std::array DungeonColors = { CreateMessage(textId, unk_04, textBoxType, textBoxPosition, text.GetEnglish(), text.GetFrench(), text.GetSpanish()); } - uint32_t NumMessages() { - return messageEntries.size(); - } - - std::pair RawMessageEntryData() { - arrangedMessageEntries.assign(messageEntries.begin(), messageEntries.end()); - const char* data = (const char*)arrangedMessageEntries.data(); - uint32_t size = arrangedMessageEntries.size() * sizeof(MessageEntry); - return { data, size }; - } - - std::pair RawMessageData() { - arrangedMessageData = messageData.str(); - const char* data = arrangedMessageData.data(); - uint32_t size = arrangedMessageData.size(); - return { data, size }; - } - - void CreateAlwaysIncludedMessages() { - // Bombchu (10) Purchase Prompt - CreateMessage(0x8C, 0, 2, 3, - INSTANT_TEXT_ON()+"Bombchu (10): 99 Rupees"+INSTANT_TEXT_OFF()+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"Buy"+NEWLINE()+"Don't buy"+COLOR(QM_WHITE)+MESSAGE_END(), - INSTANT_TEXT_ON()+"Bombchus (10): 99 rubis"+INSTANT_TEXT_OFF()+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"Acheter"+NEWLINE()+"Ne pas acheter"+COLOR(QM_WHITE)+MESSAGE_END(), - INSTANT_TEXT_ON()+"Bombchus (10): 99 rupias"+INSTANT_TEXT_OFF()+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"Comprar"+NEWLINE()+"No comprar"+COLOR(QM_WHITE)+MESSAGE_END()); - //Gold Skulltula Tokens (there are two text IDs the game uses) - for (const uint32_t textId : {0xB4, 0xB5}) { - CreateMessage(textId, 0, 2, 3, - INSTANT_TEXT_ON()+"You destroyed a "+COLOR(QM_RED)+"Gold Skulltula"+COLOR(QM_WHITE)+". You got a"+NEWLINE()+"token proving you destroyed it!"+NEWLINE()+NEWLINE()+"You have "+COLOR(QM_RED)+SKULLTULAS_DESTROYED()+COLOR(QM_WHITE)+" tokens!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - INSTANT_TEXT_ON()+"Vous venez de détruire une "+COLOR(QM_RED)+"Skulltula d'or"+COLOR(QM_WHITE)+"!"+NEWLINE()+"Ce symbole prouve votre prouesse!"+NEWLINE()+NEWLINE()+"Vous avez "+COLOR(QM_RED)+SKULLTULAS_DESTROYED()+COLOR(QM_WHITE)+" jetons!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - INSTANT_TEXT_ON()+"¡Has eliminado una "+COLOR(QM_RED)+"skulltula dorada"+COLOR(QM_WHITE)+" y has"+NEWLINE()+"conseguido un símbolo para probarlo!"+NEWLINE()+NEWLINE()+"¡Tienes "+COLOR(QM_RED)+SKULLTULAS_DESTROYED()+COLOR(QM_WHITE)+" símbolos!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - - //Bombchu (10) Description - CreateMessage(0xBC, 0, 2, 3, - INSTANT_TEXT_ON()+COLOR(QM_RED)+"Bombchu (10): 99 Rupees"+NEWLINE()+COLOR(QM_WHITE)+"These look like toy mice, but they're"+NEWLINE()+"actually self-propelled time bombs!"+INSTANT_TEXT_OFF()+SHOP_MESSAGE_BOX()+MESSAGE_END(), - INSTANT_TEXT_ON()+COLOR(QM_RED)+"Bombchus (10): 99 rubis"+NEWLINE()+COLOR(QM_WHITE)+"Profilée comme une souris mécanique, il"+NEWLINE()+"s'agit en fait d'une bombe à retardement"+NEWLINE()+"autopropulsée!"+INSTANT_TEXT_OFF()+SHOP_MESSAGE_BOX()+MESSAGE_END(), - INSTANT_TEXT_ON()+COLOR(QM_RED)+"Bombchus (10): 99 rupias"+NEWLINE()+COLOR(QM_WHITE)+"Aunque parezcan ratoncitos de juguete,"+NEWLINE()+"¡son bombas de relojería autopropulsadas!"+INSTANT_TEXT_OFF()+SHOP_MESSAGE_BOX()+MESSAGE_END()); - //Boss Keys - for (uint32_t bossKey = 0; bossKey <= (DUNGEON_SHADOW_TEMPLE - DUNGEON_FOREST_TEMPLE); bossKey++) { - uint32_t dungeon = DUNGEON_FOREST_TEMPLE + bossKey; - CreateMessage(0x9D4 + bossKey, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_BOSS)+INSTANT_TEXT_ON()+"You got the "+COLOR(DungeonColors[dungeon])+EnglishDungeonNames[dungeon]+NEWLINE()+"Boss Key"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_BOSS)+INSTANT_TEXT_ON()+"Vous trouvez la "+COLOR(DungeonColors[dungeon])+"Clé d'Or "+NEWLINE()+FrenchDungeonArticles[dungeon]+" "+FrenchDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_BOSS)+INSTANT_TEXT_ON()+"¡Tienes la "+COLOR(DungeonColors[dungeon])+"gran llave "+SpanishDungeonArticles[dungeon]+NEWLINE()+SpanishDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - CreateMessage(0x9D9, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_BOSS)+INSTANT_TEXT_ON()+"You got the "+COLOR(DungeonColors[DUNGEON_GANONS_CASTLE_FIRST_PART])+EnglishDungeonNames[DUNGEON_GANONS_CASTLE_FIRST_PART]+NEWLINE()+"Boss Key"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_BOSS)+INSTANT_TEXT_ON()+"Vous trouvez la "+COLOR(DungeonColors[DUNGEON_GANONS_CASTLE_FIRST_PART])+"Clé d'Or "+NEWLINE()+FrenchDungeonArticles[DUNGEON_GANONS_CASTLE_FIRST_PART]+" "+FrenchDungeonNames[DUNGEON_GANONS_CASTLE_FIRST_PART]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_BOSS)+INSTANT_TEXT_ON()+"¡Tienes la "+COLOR(DungeonColors[DUNGEON_GANONS_CASTLE_FIRST_PART])+"gran llave "+SpanishDungeonArticles[DUNGEON_GANONS_CASTLE_FIRST_PART]+NEWLINE()+SpanishDungeonNames[DUNGEON_GANONS_CASTLE_FIRST_PART]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - //Compasses - for (uint32_t dungeon = DUNGEON_DEKU_TREE; dungeon <= DUNGEON_ICE_CAVERN; dungeon++) { - CreateMessage(0x9DA + dungeon, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_COMPASS)+INSTANT_TEXT_ON()+"You got the "+COLOR(DungeonColors[dungeon])+EnglishDungeonNames[dungeon]+NEWLINE()+"Compass"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_COMPASS)+INSTANT_TEXT_ON()+"Vous trouvez la "+COLOR(DungeonColors[dungeon])+"boussole "+NEWLINE()+FrenchDungeonArticles[dungeon]+FrenchDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_COMPASS)+INSTANT_TEXT_ON()+"¡Tienes la "+COLOR(DungeonColors[dungeon])+"brújula "+SpanishDungeonArticles[dungeon]+NEWLINE()+SpanishDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - //Maps - for (uint32_t dungeon = DUNGEON_DEKU_TREE; dungeon <= DUNGEON_ICE_CAVERN; dungeon++) { - CreateMessage(0x9E4 + dungeon, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_DUNGEON_MAP)+INSTANT_TEXT_ON()+"You got the "+COLOR(DungeonColors[dungeon])+EnglishDungeonNames[dungeon]+NEWLINE()+"Map"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_DUNGEON_MAP)+INSTANT_TEXT_ON()+"Vous trouvez la "+COLOR(DungeonColors[dungeon])+"carte "+NEWLINE()+FrenchDungeonArticles[dungeon]+FrenchDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_DUNGEON_MAP)+INSTANT_TEXT_ON()+"¡Has obtenido el "+COLOR(DungeonColors[dungeon])+"mapa "+SpanishDungeonArticles[dungeon]+NEWLINE()+SpanishDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - //Small Keys - for (uint32_t smallKey = 0; smallKey <= (DUNGEON_BOTTOM_OF_THE_WELL - DUNGEON_FOREST_TEMPLE); smallKey++) { - uint32_t dungeon = DUNGEON_FOREST_TEMPLE + smallKey; - CreateMessage(0x9EE + smallKey, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"You got a "+COLOR(DungeonColors[dungeon])+EnglishDungeonNames[dungeon]+NEWLINE()+"Small Key"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"Vous trouvez une "+COLOR(DungeonColors[dungeon])+"Petite Clé"+NEWLINE()+FrenchDungeonArticles[dungeon]+FrenchDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"¡Has obtenido una "+COLOR(DungeonColors[dungeon])+"llave pequeña "+SpanishDungeonArticles[dungeon]+NEWLINE()+SpanishDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - for (uint32_t smallKey = 0; smallKey <= (DUNGEON_GANONS_CASTLE_FIRST_PART - DUNGEON_GERUDO_TRAINING_GROUNDS); smallKey++) { - uint32_t dungeon = DUNGEON_GERUDO_TRAINING_GROUNDS + smallKey; - CreateMessage(0x9F4 + smallKey, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"You got a "+COLOR(DungeonColors[dungeon])+EnglishDungeonNames[dungeon]+NEWLINE()+"Small Key"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"Vous trouvez une "+COLOR(DungeonColors[dungeon])+"Petite Clé"+NEWLINE()+FrenchDungeonArticles[dungeon]+FrenchDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"¡Has obtenido una "+COLOR(DungeonColors[dungeon])+"llave pequeña "+SpanishDungeonArticles[dungeon]+NEWLINE()+SpanishDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - //Key Rings - for (uint32_t smallKey = 0; smallKey <= (DUNGEON_BOTTOM_OF_THE_WELL - DUNGEON_FOREST_TEMPLE); smallKey++) { - uint32_t dungeon = DUNGEON_FOREST_TEMPLE + smallKey; - CreateMessage(0x9300 + smallKey, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"You got a "+COLOR(DungeonColors[dungeon])+EnglishDungeonNames[dungeon]+NEWLINE()+"Key Ring"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"Vous trouvez un "+COLOR(DungeonColors[dungeon])+"trousseau"+NEWLINE()+FrenchDungeonArticles[dungeon]+FrenchDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"¡Has obtenido un "+COLOR(DungeonColors[dungeon])+"llavero "+SpanishDungeonArticles[dungeon]+NEWLINE()+SpanishDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - for (uint32_t smallKey = 0; smallKey <= (DUNGEON_GANONS_CASTLE_FIRST_PART - DUNGEON_GERUDO_TRAINING_GROUNDS); smallKey++) { - uint32_t dungeon = DUNGEON_GERUDO_TRAINING_GROUNDS + smallKey; - CreateMessage(0x9306 + smallKey, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"You got a "+COLOR(DungeonColors[dungeon])+EnglishDungeonNames[dungeon]+NEWLINE()+"Key Ring"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"Vous trouvez un "+COLOR(DungeonColors[dungeon])+"trousseau"+NEWLINE()+FrenchDungeonArticles[dungeon]+FrenchDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"¡Has obtenido un "+COLOR(DungeonColors[dungeon])+"llavero "+SpanishDungeonArticles[dungeon]+NEWLINE()+SpanishDungeonNames[dungeon]+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - //Tycoon's Wallet - CreateMessage(0x09F7, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_WALLET_GIANT)+INSTANT_TEXT_ON()+"You got a "+COLOR(QM_RED)+"Tycoon's Wallet"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+NEWLINE()+"It's gigantic! Now you can carry"+NEWLINE()+"up to "+COLOR(QM_YELLOW)+"999 "+COLOR(QM_WHITE)+COLOR(QM_YELLOW)+"Rupees"+COLOR(QM_WHITE)+"!"+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_WALLET_GIANT)+INSTANT_TEXT_ON()+"Vous obtenez la "+COLOR(QM_RED)+"Bourse de Magnat"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+NEWLINE()+"Elle peut contenir jusqu'à "+COLOR(QM_YELLOW)+"999 "+COLOR(QM_WHITE)+COLOR(QM_YELLOW)+"rubis"+COLOR(QM_WHITE)+"!"+NEWLINE()+"C'est gigantesque!"+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_WALLET_GIANT)+INSTANT_TEXT_ON()+"¡Has conseguido una "+COLOR(QM_RED)+"bolsa para ricachones"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+NEWLINE()+"¡Qué descomunal! Ya puedes llevar"+NEWLINE()+"hasta "+COLOR(QM_YELLOW)+"999 "+COLOR(QM_WHITE)+COLOR(QM_YELLOW)+"rupias"+COLOR(QM_WHITE)+"!"+MESSAGE_END()); - //Saria's Song Default Hint - CreateMessage(0x0A00, 0, 2, 3, - UNSKIPPABLE()+"Have you tried talking to the gossip"+NEWLINE()+ "stones around Hyrule? They might have"+NEWLINE()+"some good advice... Hee hee!"+WAIT_FOR_INPUT()+"If you learn something from the gossip stones,"+NEWLINE()+"I will remember it!"+EVENT_TRIGGER()+MESSAGE_END(), - UNSKIPPABLE()+"As-tu parlé aux pierres à potins"+NEWLINE()+ "dans Hyrule? Elles sont de bons conseils..."+NEWLINE()+"Hi hi!"+WAIT_FOR_INPUT()+"Si elles te révèlent quelque chose,"+NEWLINE()+"je m'en souviendrai!"+EVENT_TRIGGER()+MESSAGE_END(), - UNSKIPPABLE()+"¿Has probado a consultarle a las"+NEWLINE()+ "piedras chismosas esparcidas por Hyrule? Puede"+NEWLINE()+"que sean de ayuda a tu empresa... ¡Ji, ji!"+WAIT_FOR_INPUT()+"¡Puedo recordarte todo lo que aprendas de ellas,"+NEWLINE()+"si así lo deseas!"+EVENT_TRIGGER()+MESSAGE_END()); - //Poe Collector (when enough has been sold) - CreateMessage(0x70F8, 0, 0, 0, - UNSKIPPABLE()+"Wait a minute! WOW!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"You have earned enough points!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Young man, you are a genuine "+COLOR(QM_RED)+"ghost hunter"+COLOR(QM_WHITE)+"!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Is that what you expected me to say?"+NEWLINE()+"Heh heh heh!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Because of you, I have extra inventory of"+NEWLINE()+COLOR(QM_RED)+"Big Poes"+COLOR(QM_WHITE)+", so this will be the last time I can"+NEWLINE() - +"buy one of these ghosts."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"You're thinking about what I promised would"+NEWLINE()+"happen when you earned enough points."+NEWLINE()+"Heh heh."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Don't worry. I didn't forget. Just take this."+MESSAGE_END(), - UNSKIPPABLE()+"Ooooh! WHOA!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Tu as obtenu suffisamment de points!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Tu es un véritable "+COLOR(QM_RED)+"chasseur de fantômes"+COLOR(QM_WHITE)+"!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Il est content, hein?"+NEWLINE()+"Il est content le monsieur?"+NEWLINE()+"Hé hé hé!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Grâce à toi, mon stock d'"+COLOR(QM_RED)+"Âmes"+COLOR(QM_WHITE)+" est plein!"+NEWLINE()+"C'est donc la dernière fois que nous"+NEWLINE()+"faisons affaire."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Je sais, je sais..."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Nous avions passé un pacte..."+NEWLINE()+"Tu as eu tes points et je t'en félicite..."+NEWLINE()+"Hé hé hé!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Alors prends donc ceci, mon bon ami!"+MESSAGE_END(), - UNSKIPPABLE()+"¡Un momento! ¡OYE!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"¡Has conseguido los puntos suficientes!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"¡Jovencito, eres un auténtico "+COLOR(QM_RED)+"cazador de"+NEWLINE()+"fantasmas"+COLOR(QM_WHITE)+"!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"¿Era eso lo que esperabas que dijera?"+NEWLINE()+"¡Je, je je!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Gracias a ti, ya tengo la cantidad necesaria"+NEWLINE()+"de "+COLOR(QM_RED)+"grandes poes"+COLOR(QM_WHITE)+", así que esta será la"+NEWLINE() - +"última vez que te compre unos de ese tipo."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"¿Recuerdas lo que te dije que ocurriría"+NEWLINE()+"cuando tuvieses suficientes puntos?"+NEWLINE()+"Je, je, je."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Tranquilo, que no se me ha olvidado."+NEWLINE()+"Toma esto."+MESSAGE_END()); - //Ice Trap - CreateMessage(0x9002, 0, 2, 3, - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+COLOR(QM_RED)+"FOOL!"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+COLOR(QM_RED)+"IDIOT!"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+COLOR(QM_RED)+"¡TONTO!"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END()); - //Business Scrubs - //The less significant byte represents the price of the item - for (uint32_t price = 0; price <= 95; price += 5) { - CreateMessage(0x9000 + price, 0, 0, 0, - INSTANT_TEXT_ON()+"I'll sell you something good for "+COLOR(QM_RED)+std::to_string(price)+" Rupees"+COLOR(QM_WHITE)+"!"+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"OK"+NEWLINE()+"No way"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END(), - INSTANT_TEXT_ON()+"Je te vends un truc super pour "+COLOR(QM_RED)+std::to_string(price)+" Rubis"+COLOR(QM_WHITE)+"!"+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"D'accord"+NEWLINE()+"Hors de question"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END(), - INSTANT_TEXT_ON()+"¡Te puedo vender algo bueno por "+COLOR(QM_RED)+std::to_string(price)+" rupias"+COLOR(QM_WHITE)+"!"+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"Vale"+NEWLINE()+"Ni hablar"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - //Poe Collector - //The last digit represent the number of poes needed to collect - for (uint32_t poes = 1; poes <= 10; poes++) { - CreateMessage(0x9080 + poes, 0, 0, 0, - UNSKIPPABLE()+"Oh, you brought a Poe today!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Hmmmm!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Very interesting! This is a "+COLOR(QM_RED)+"Big Poe"+COLOR(QM_WHITE)+"!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"I'll buy it for "+COLOR(QM_RED)+"50 Rupees"+COLOR(QM_WHITE)+"."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"On top of that, I'll put "+COLOR(QM_RED)+"100 points "+COLOR(QM_WHITE)+"on"+NEWLINE()+"your card."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"If you earn "+COLOR(QM_RED)+std::to_string(poes * 100)+" points"+COLOR(QM_WHITE)+", you'll be a"+NEWLINE()+"happy man! Heh heh."+MESSAGE_END(), - - UNSKIPPABLE()+"Oh! Tu as apporté un fantôme!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Hmmmm!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Magnifique!"+NEWLINE()+"C'est une "+COLOR(QM_RED)+"Âme"+COLOR(QM_WHITE)+"!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Je t'en donne "+COLOR(QM_RED)+"50 Rubis"+COLOR(QM_WHITE)+"."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Et en plus, j'inscris "+COLOR(QM_RED)+"100 points "+COLOR(QM_WHITE)+NEWLINE()+"sur ta carte."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Obtiens "+COLOR(QM_RED)+std::to_string(poes * 100)+" points"+COLOR(QM_WHITE)+" et tu ne"+NEWLINE()+"seras pas déçu..."+NEWLINE()+"Hé hé hé."+MESSAGE_END(), - - UNSKIPPABLE()+"¡Vaya! ¡Traes un poe!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"¡Mmm! ¿A ver?"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"¡Qué interesante! ¡Es un "+COLOR(QM_RED)+"gran poe"+COLOR(QM_WHITE)+"!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"Te daré "+COLOR(QM_RED)+"50 rupias "+COLOR(QM_WHITE)+"por él."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Y además agregaré "+COLOR(QM_RED)+"100 puntos "+COLOR(QM_WHITE)+"a tu"+NEWLINE()+"tarjeta."+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE() - +"¡Si llegas a "+COLOR(QM_RED)+std::to_string(poes * 100)+" puntos"+COLOR(QM_WHITE)+", serás muy feliz!"+NEWLINE()+"Je, je, je..."+MESSAGE_END()); - } - - //Talon (this is to prevent accidentally skipping Malon in HC) - CreateMessage(0x9100, 0, 2, 0, - UNSKIPPABLE()+"You should go talk to my daughter Malon,"+NEWLINE()+"she has an item for you."+NEWLINE()+SET_SPEED(3)+"........."+SET_SPEED(0)+WAIT_FOR_INPUT()+"I have to think about some stuff now,"+NEWLINE()+"please don't distract me."+MESSAGE_END(), - UNSKIPPABLE()+"Zzzz... Muh... Malon..."+NEWLINE()+"Parler avec... Malon..."+NEWLINE()+SET_SPEED(3)+"........."+SET_SPEED(0)+WAIT_FOR_INPUT()+"Si fatigué..."+NEWLINE()+"Quelle vie..."+MESSAGE_END(), - UNSKIPPABLE()+"Habla con Malon, tiene algo que darte..."+SET_SPEED(3)+"........."+SET_SPEED(0)+MESSAGE_END()); - - //Bow Shooting Gallery reminder - CreateMessage(0x9140, 0, 0, 0, - UNSKIPPABLE()+"Wonderful! Bravo! Perfect!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Here's a fantastic present! But I have"+COLOR(QM_RED)+NEWLINE()+"something else "+COLOR(QM_WHITE)+"for you once you have a bow."+SET_SPEED(30)+" "+EVENT_TRIGGER()+MESSAGE_END(), - UNSKIPPABLE()+"Merveilleux! Bravo! C'est parfait!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"Voici un prix fantastique! J'aurai "+COLOR(QM_RED)+"autre chose"+COLOR(QM_WHITE)+NEWLINE()+"pour toi quand tu auras un arc."+SET_SPEED(30)+" "+EVENT_TRIGGER()+MESSAGE_END(), - UNSKIPPABLE()+"¡Espectacular! ¡Bravo! ¡Perfecto!"+WAIT_FOR_INPUT()+NEWLINE()+UNSKIPPABLE()+"¡Toma este sensacional regalo! Pero te tengo"+NEWLINE()+"guardado "+COLOR(QM_RED)+"algo más "+COLOR(QM_WHITE)+"para cuando traigas tu"+NEWLINE()+"propio arco."+SET_SPEED(30)+" "+EVENT_TRIGGER()+MESSAGE_END()); - - //Shopsanity items - //64 textboxes, 2 for each of 32 potential shopsanity items - for(uint32_t shopitems = 0; shopitems < NonShopItems.size(); shopitems++) { - Text name = NonShopItems[shopitems].Name; - std::string price = std::to_string(NonShopItems[shopitems].Price); - //Prevent names from being too long and overflowing textbox - if (name.GetEnglish() == "Piece of Heart (Treasure Chest Minigame)") { - name = Text{"Piece of Heart", "Quart de Coeur", "Pieza de corazón"}; - } else if (name.GetEnglish() == "Green Rupee (Treasure Chest Minigame)") { - name = Text{"Green Rupee", "Rubis Vert", "Rupia verde"}; - } - //Message to display when hovering over the item - if (NonShopItems[shopitems].Repurchaseable) { //Different checkbox for repurchaseable items - CreateMessage(0x9200+shopitems*2, 0, 0, 0, - INSTANT_TEXT_ON()+COLOR(QM_RED)+name.GetEnglish()+": "+price+" Rupees"+NEWLINE()+COLOR(QM_WHITE)+"Special deal!"+NEWLINE()+"Buy as many as you want!"+SHOP_MESSAGE_BOX()+MESSAGE_END(), - INSTANT_TEXT_ON()+COLOR(QM_RED)+name.GetFrench()+": "+price+" rubis"+NEWLINE()+COLOR(QM_WHITE)+"Offre spéciale!"+NEWLINE()+"Achetez-en à volonté!"+SHOP_MESSAGE_BOX()+MESSAGE_END(), - INSTANT_TEXT_ON()+COLOR(QM_RED)+name.GetSpanish()+": "+price+" rupias"+NEWLINE()+COLOR(QM_WHITE)+"¡Oferta especial!"+NEWLINE()+"¡Compra todo lo que quieras!"+SHOP_MESSAGE_BOX()+MESSAGE_END()); - } - else { //Normal textbox - CreateMessage(0x9200+shopitems*2, 0, 0, 0, - INSTANT_TEXT_ON()+COLOR(QM_RED)+name.GetEnglish()+": "+price+" Rupees"+NEWLINE()+COLOR(QM_WHITE)+"Special deal! ONE LEFT!"+NEWLINE()+"Get it while it lasts!"+SHOP_MESSAGE_BOX()+MESSAGE_END(), - INSTANT_TEXT_ON()+COLOR(QM_RED)+name.GetFrench()+": "+price+" rubis"+NEWLINE()+COLOR(QM_WHITE)+"Offre spéciale! DERNIER EN STOCK!"+NEWLINE()+"Faites vite!"+SHOP_MESSAGE_BOX()+MESSAGE_END(), - INSTANT_TEXT_ON()+COLOR(QM_RED)+name.GetSpanish()+": "+price+" rupias"+NEWLINE()+COLOR(QM_WHITE)+"¡Oferta especial! ¡SOLO QUEDA UNA UNIDAD!"+NEWLINE()+"¡Hazte con ella antes de que se agote!"+SHOP_MESSAGE_BOX()+MESSAGE_END()); - } - //Message to display when going to buy the item - CreateMessage(0x9200+shopitems*2+1, 0, 0, 0, - INSTANT_TEXT_ON()+name.GetEnglish()+": "+price+" Rupees"+INSTANT_TEXT_OFF()+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"Buy"+NEWLINE()+"Don't buy"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END(), - INSTANT_TEXT_ON()+name.GetFrench()+": "+price+" rubis"+INSTANT_TEXT_OFF()+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"Acheter"+NEWLINE()+"Ne pas acheter"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END(), - INSTANT_TEXT_ON()+name.GetSpanish()+": "+price+" rupias"+INSTANT_TEXT_OFF()+NEWLINE()+NEWLINE()+TWO_WAY_CHOICE()+COLOR(QM_GREEN)+"Comprar"+NEWLINE()+"No comprar"+COLOR(QM_WHITE)+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - //easter egg - CreateMessage(0x96F, 0, 2, 2, - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"Oh hey, you watched all the credits!"+NEWLINE()+CENTER_TEXT()+"Here's a prize for your patience."+NEWLINE()+CENTER_TEXT()+"Unlocking MQ and saving..."+NEWLINE()+NEWLINE()+CENTER_TEXT()+COLOR(QM_RED)+"Do not remove the Game Card"+NEWLINE()+CENTER_TEXT()+"or turn the power off."+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"The Legend of Zelda Ocarina of Time 3D"+NEWLINE()+CENTER_TEXT()+"Master Quest va être déverrouillé."+NEWLINE()+CENTER_TEXT()+"Sauvegarde... Veuillez patienter."+NEWLINE()+NEWLINE()+CENTER_TEXT()+COLOR(QM_RED)+"N'éteignez pas la console et"+NEWLINE()+CENTER_TEXT()+"ne retirez pas la carte de jeu"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"Desbloqueando The Legend of Zelda"+NEWLINE()+CENTER_TEXT()+"Ocarina of Time 3D Master Quest."+NEWLINE()+CENTER_TEXT()+"Guardando. Espera un momento..."+NEWLINE()+NEWLINE()+CENTER_TEXT()+COLOR(QM_RED)+"No saques la tarjeta de juego"+NEWLINE()+CENTER_TEXT()+"ni apagues la consola."+INSTANT_TEXT_OFF()+MESSAGE_END()); - CreateMessage(0x970, 0, 2, 3, - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"Master Quest doesn't affect the Randomizer,"+NEWLINE()+CENTER_TEXT()+"so you can use 3 more save slots now."+NEWLINE()+NEWLINE()+CENTER_TEXT()+"Thanks for playing!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"Vous pouvez désormais jouer à"+NEWLINE()+CENTER_TEXT()+"The Legend of Zelda Ocarina of Time 3D"+NEWLINE()+CENTER_TEXT()+"Master Quest!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"¡Ya puedes jugar The Legend of Zelda"+NEWLINE()+CENTER_TEXT()+"Ocarina of Time 3D Master Quest!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - - //Messages for the new Lake Hylia switch - CreateMessage(0x346, 0, 1, 3, - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"Water level control system."+NEWLINE()+CENTER_TEXT()+"Keep away!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"Contrôle du niveau d'eau."+NEWLINE()+CENTER_TEXT()+"Ne pas toucher!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+INSTANT_TEXT_ON()+CENTER_TEXT()+"Control del nivel del agua."+NEWLINE()+CENTER_TEXT()+"¡No te acerques!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - CreateMessage(0x1B3, 0, 0, 3, - UNSKIPPABLE()+"This switch is rustier than you think."+WAIT_FOR_INPUT()+"Something must be wrong with the pipe"+NEWLINE()+"system in the Water Temple."+MESSAGE_END(), - UNSKIPPABLE()+"Cet interrupteur est très rouillé."+WAIT_FOR_INPUT()+"Quelque chose ne va pas avec"+NEWLINE()+"la tuyauterie du Temple de l'Eau."+MESSAGE_END(), - UNSKIPPABLE()+"El interruptor está más oxidado de lo que"+NEWLINE()+"aparenta."+WAIT_FOR_INPUT()+"Algo debe andar mal en el sistema de"+NEWLINE()+"cañerías del Templo del Agua."+MESSAGE_END()); - - //Treasure chest shop keys. If they're not randomized leave the base game text - if (Settings::ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_SINGLE_KEYS)) { - CreateMessage(0x0F3, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"You got a "+COLOR(QM_RED)+"Treasure Chest Shop"+NEWLINE()+"Small Key"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"Vous trouvez une "+COLOR(QM_RED)+"Petite Clé"+NEWLINE()+"de la Chasse-aux-Trésors"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"¡Has obtenido una "+COLOR(QM_RED)+"llave pequeña del"+NEWLINE()+"Cofre del Tesoro"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } else if (Settings::ShuffleChestMinigame.Is(SHUFFLECHESTMINIGAME_PACK)) { - CreateMessage(0x0F3, 0, 2, 3, - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"You got all 6 "+COLOR(QM_RED)+"Treasure Chest Shop"+NEWLINE()+"Small Keys"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"Vous trouvez les "+COLOR(QM_RED)+"petites clés"+NEWLINE()+"de la Chasse-aux-Trésors"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END(), - UNSKIPPABLE()+ITEM_OBTAINED(ITEM_KEY_SMALL)+INSTANT_TEXT_ON()+"¡Has obtenido todas las 6 "+COLOR(QM_RED)+"llaves"+NEWLINE()+"pequeñas del Cofre del Tesoro"+COLOR(QM_WHITE)+"!"+INSTANT_TEXT_OFF()+MESSAGE_END()); - } - } - Text AddColorsAndFormat(Text text, const std::vector& colors /*= {}*/) { //for each language @@ -465,7 +239,7 @@ constexpr std::array DungeonColors = { textStr->replace(firstHashtag, 1, COLOR(color)); size_t secondHashtag = textStr->find('#'); if (secondHashtag == std::string::npos) { - CitraPrint("ERROR: Couldn't find second '#' in " + (*textStr)); + //CitraPrint("ERROR: Couldn't find second '#' in " + (*textStr)); } else { textStr->replace(secondHashtag, 1, COLOR(QM_WHITE)); } @@ -477,9 +251,7 @@ constexpr std::array DungeonColors = { void ClearMessages() { messageEntries.clear(); - arrangedMessageEntries.clear(); messageData.str(""); - arrangedMessageData = ""; } std::string MESSAGE_END() { return "\x7F\x00"s; } @@ -513,7 +285,7 @@ constexpr std::array DungeonColors = { std::string UNSKIPPABLE() { return "\x7F\x19"s; } std::string TWO_WAY_CHOICE() { return "\x7F\x1A\xFF\xFF\xFF\xFF"s; } std::string NEWLINE() { return "\x7F\x1C"s; } - std::string COLOR(uint8_t x) { return "\x7F\x1D"s + char(x); } + std::string COLOR(uint8_t x) { return "\x7F\x1D"s + char(x); } std::string CENTER_TEXT() { return "\x7F\x1E"s; } std::string IF_NOT_MQ() { return "\x7F\x29"s; } std::string MQ_ELSE() { return "\x7F\x2A"s; } diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp index b7a0b0061..c8029dc66 100644 --- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp @@ -47,23 +47,10 @@ typedef struct { MessageLanguageInfo info[10]; } MessageEntry; // size = 0x60 -typedef struct { - char magic[4]; //"QM\0\0" - uint32_t unk_04; - uint32_t numEntries; - uint32_t unk_0C; -} MessageFileHeader; - void CreateMessage(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition, std::string englishText, std::string frenchText, std::string spanishText); void CreateMessageFromTextObject(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition, const Text& text); - uint32_t NumMessages(); - - std::pair RawMessageEntryData(); - std::pair RawMessageData(); - - void CreateAlwaysIncludedMessages(); Text AddColorsAndFormat(Text text, const std::vector& colors = {}); void ClearMessages(); diff --git a/soh/soh/Enhancements/randomizer/3drando/debug.cpp b/soh/soh/Enhancements/randomizer/3drando/debug.cpp deleted file mode 100644 index a51181c1e..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/debug.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "debug.hpp" - -void CitraPrint (std::string_view str) { - -} diff --git a/soh/soh/Enhancements/randomizer/3drando/debug.hpp b/soh/soh/Enhancements/randomizer/3drando/debug.hpp deleted file mode 100644 index ebce65e0a..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/debug.hpp +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -void CitraPrint(std::string_view str); diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp index 71cba408b..bd308596e 100644 --- a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp @@ -5,7 +5,6 @@ #include "item_list.hpp" #include "item_pool.hpp" #include "item_location.hpp" -#include "debug.hpp" #include "spoiler_log.hpp" #include "hints.hpp" #include "location_access.hpp" diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.hpp b/soh/soh/Enhancements/randomizer/3drando/entrance.hpp index 6634820b1..b6a5cb432 100644 --- a/soh/soh/Enhancements/randomizer/3drando/entrance.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/entrance.hpp @@ -2,7 +2,6 @@ #include "keys.hpp" #include "location_access.hpp" -#include "debug.hpp" #include #include @@ -85,13 +84,13 @@ public: } void printAgeTimeAccess() { - CitraPrint("Name: "); - CitraPrint(name); + //CitraPrint("Name: "); + //CitraPrint(name); auto message = "Child Day: " + std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtDay)) + "\t" "Child Night: " + std::to_string(CheckConditionAtAgeTime(Logic::IsChild, Logic::AtNight)) + "\t" "Adult Day: " + std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtDay)) + "\t" "Adult Night: " + std::to_string(CheckConditionAtAgeTime(Logic::IsAdult, Logic::AtNight)); - CitraPrint(message); + //CitraPrint(message); } bool ConditionsMet(bool allAgeTimes = false) const { diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp index 8138339c8..49edb182a 100644 --- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp @@ -13,7 +13,6 @@ #include "hint_list.hpp" #include "entrance.hpp" #include "shops.hpp" -#include "debug.hpp" #include #include @@ -917,7 +916,6 @@ void VanillaFill() { //Finish up CreateItemOverrides(); CreateEntranceOverrides(); - CreateAlwaysIncludedMessages(); CreateWarpSongTexts(); } @@ -1072,7 +1070,6 @@ int Fill() { printf("Done"); CreateItemOverrides(); CreateEntranceOverrides(); - CreateAlwaysIncludedMessages(); if (GossipStoneHints.IsNot(HINTS_NO_HINTS)) { printf("\x1b[10;10HCreating Hints..."); CreateAllHints(); @@ -1081,7 +1078,7 @@ int Fill() { if (ShuffleMerchants.Is(SHUFFLEMERCHANTS_HINTS)) { CreateMerchantsHints(); } - //Always execute ganon hint generation for the funny line + //Always execute ganon hint generation for the funny line CreateGanonText(); CreateAltarText(); CreateDampesDiaryText(); diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp index ac7a16355..59a6dd454 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp @@ -266,12 +266,6 @@ static void AddHint(Text hint, const uint32_t gossipStone, const std::vectorSetHintedLocation(hintedLocation); Location(gossipStone)->SetHintType(hintType); Location(gossipStone)->SetHintedRegion(GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText().GetEnglish()); - - //create the in game message - // uint32_t messageId = 0x400 + Location(gossipStone)->GetFlag(); - // uint32_t sariaMessageId = 0xA00 + Location(gossipStone)->GetFlag(); - // CreateMessageFromTextObject(messageId, 0, 2, 3, AddColorsAndFormat(hint, colors)); - // CreateMessageFromTextObject(sariaMessageId, 0, 2, 3, AddColorsAndFormat(hint + EVENT_TRIGGER(), colors)); } static void CreateLocationHint(const std::vector& possibleHintLocations) { diff --git a/soh/soh/Enhancements/randomizer/3drando/item.cpp b/soh/soh/Enhancements/randomizer/3drando/item.cpp index 2643c89cb..3e10a165c 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item.cpp @@ -70,10 +70,10 @@ ItemOverride_Value Item::Value() const { if (getItemId == GI_ICE_TRAP) { val.looksLikeItemId = RandomElement(IceTrapModels); } - if (!Settings::ColoredBossKeys && (getItemId >= 0x95 && getItemId <= 0x9A)) { //Boss keys + if (getItemId >= 0x95 && getItemId <= 0x9A) { //Boss keys val.looksLikeItemId = GI_KEY_BOSS; } - if (!Settings::ColoredKeys && (getItemId >= 0xAF && getItemId <= 0xB7)) { //Small keys + if (getItemId >= 0xAF && getItemId <= 0xB7) { //Small keys val.looksLikeItemId = GI_KEY_SMALL; } if (type == ITEMTYPE_SHOP) { diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp index 7283635a3..0fd023d0b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp @@ -4,7 +4,6 @@ #include "settings.hpp" #include "spoiler_log.hpp" #include "shops.hpp" -#include "debug.hpp" #include "keys.hpp" #include #include "../randomizerTypes.h" @@ -14,784 +13,784 @@ static std::array locationTable; static std::unordered_map locationLookupTable; void LocationTable_Init() { - locationTable[NONE] = ItemLocation::Base (RC_UNKNOWN_CHECK, 0xFF, 0xFF, "Invalid Location", NONE, NONE, {}, SpoilerCollectionCheck::None()); - //Kokiri Forest scene flag name hint key (hint_list.cpp) vanilla item categories collection check (if needed) collection check group - locationTable[KF_KOKIRI_SWORD_CHEST] = ItemLocation::Chest (RC_KF_KOKIRI_SWORD_CHEST, 0x55, 0x00, "KF Kokiri Sword Chest", KF_KOKIRI_SWORD_CHEST, KOKIRI_SWORD, {Category::cKokiriForest, Category::cForest,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_MIDOS_TOP_LEFT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_TOP_LEFT_CHEST, 0x28, 0x00, "KF Mido Top Left Chest", KF_MIDOS_TOP_LEFT_CHEST, BLUE_RUPEE, {Category::cKokiriForest, Category::cForest,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_MIDOS_TOP_RIGHT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_TOP_RIGHT_CHEST, 0x28, 0x01, "KF Mido Top Right Chest", KF_MIDOS_TOP_RIGHT_CHEST, BLUE_RUPEE, {Category::cKokiriForest, Category::cForest,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_MIDOS_BOTTOM_LEFT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_BOTTOM_LEFT_CHEST, 0x28, 0x02, "KF Mido Bottom Left Chest", KF_MIDOS_BOTTOM_LEFT_CHEST, GREG_RUPEE, {Category::cKokiriForest, Category::cForest,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_MIDOS_BOTTOM_RIGHT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_BOTTOM_RIGHT_CHEST, 0x28, 0x03, "KF Mido Bottom Right Chest", KF_MIDOS_BOTTOM_RIGHT_CHEST, RECOVERY_HEART, {Category::cKokiriForest, Category::cForest,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_STORMS_GROTTO_CHEST] = ItemLocation::Chest (RC_KF_STORMS_GROTTO_CHEST, 0x3E, 0x0C, "KF Storms Grotto Chest", KF_STORMS_GROTTO_CHEST, RED_RUPEE, {Category::cKokiriForest, Category::cForest, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[NONE] = ItemLocation::Base (RC_UNKNOWN_CHECK, 0xFF, "Invalid Location", NONE, NONE, {}, SpoilerCollectionCheck::None()); + //Kokiri Forest scene flag name hint key (hint_list.cpp) vanilla item categories collection check (if needed) collection check group + locationTable[KF_KOKIRI_SWORD_CHEST] = ItemLocation::Chest (RC_KF_KOKIRI_SWORD_CHEST, 0x55, 0x00, "KF Kokiri Sword Chest", KF_KOKIRI_SWORD_CHEST, KOKIRI_SWORD, {}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_MIDOS_TOP_LEFT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_TOP_LEFT_CHEST, 0x28, 0x00, "KF Mido Top Left Chest", KF_MIDOS_TOP_LEFT_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_MIDOS_TOP_RIGHT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_TOP_RIGHT_CHEST, 0x28, 0x01, "KF Mido Top Right Chest", KF_MIDOS_TOP_RIGHT_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_MIDOS_BOTTOM_LEFT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_BOTTOM_LEFT_CHEST, 0x28, 0x02, "KF Mido Bottom Left Chest", KF_MIDOS_BOTTOM_LEFT_CHEST, GREG_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_MIDOS_BOTTOM_RIGHT_CHEST] = ItemLocation::Chest (RC_KF_MIDOS_BOTTOM_RIGHT_CHEST, 0x28, 0x03, "KF Mido Bottom Right Chest", KF_MIDOS_BOTTOM_RIGHT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_STORMS_GROTTO_CHEST] = ItemLocation::Chest (RC_KF_STORMS_GROTTO_CHEST, 0x3E, 0x0C, "KF Storms Grotto Chest", KF_STORMS_GROTTO_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); //Lost Woods - locationTable[LW_NEAR_SHORTCUTS_GROTTO_CHEST] = ItemLocation::Chest (RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST, 0x3E, 0x14, "LW Near Shortcuts Grotto Chest", LW_NEAR_SHORTCUTS_GROTTO_CHEST, BLUE_RUPEE, {Category::cLostWoods, Category::cForest, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_SKULL_KID] = ItemLocation::Base (RC_LW_SKULL_KID, 0x5B, 0x3E, "LW Skull Kid", LW_SKULL_KID, PIECE_OF_HEART, {Category::cLostWoods, Category::cForest,}, SpoilerCollectionCheck::ItemGetInf(30), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_TRADE_COJIRO] = ItemLocation::Base (RC_LW_TRADE_COJIRO, 0x5B, 0x1F, "LW Trade Cojiro", LW_TRADE_COJIRO, ODD_MUSHROOM, {Category::cLostWoods, Category::cForest, Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(0x5B, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_TRADE_ODD_POTION] = ItemLocation::Base (RC_LW_TRADE_ODD_POTION, 0x5B, 0x21, "LW Trade Odd Potion", LW_TRADE_ODD_POTION, ODD_POTION, {Category::cLostWoods, Category::cForest, Category::cAdultTrade}, SpoilerCollectionCheck::ItemGetInf(57), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_OCARINA_MEMORY_GAME] = ItemLocation::Base (RC_LW_OCARINA_MEMORY_GAME, 0x5B, 0x76, "LW Ocarina Memory Game", LW_OCARINA_MEMORY_GAME, PIECE_OF_HEART, {Category::cLostWoods, Category::cForest, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(31), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_TARGET_IN_WOODS] = ItemLocation::Base (RC_LW_TARGET_IN_WOODS, 0x5B, 0x60, "LW Target in Woods", LW_TARGET_IN_WOODS, PROGRESSIVE_SLINGSHOT, {Category::cLostWoods, Category::cForest,}, SpoilerCollectionCheck::ItemGetInf(21), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = ItemLocation::Base (RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, 0x5B, 0x30, "LW Deku Scrub Near Deku Theater Right",LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, BUY_DEKU_NUT_5, {Category::cLostWoods, Category::cForest, Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(0x5B, 0x01), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = ItemLocation::Base (RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, 0x5B, 0x31, "LW Deku Scrub Near Deku Theater Left", LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, BUY_DEKU_STICK_1, {Category::cLostWoods, Category::cForest, Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(0x5B, 0x02), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_DEKU_SCRUB_NEAR_BRIDGE] = ItemLocation::Base (RC_LW_DEKU_SCRUB_NEAR_BRIDGE, 0x5B, 0x77, "LW Deku Scrub Near Bridge", LW_DEKU_SCRUB_NEAR_BRIDGE, PROGRESSIVE_STICK_UPGRADE, {Category::cLostWoods, Category::cForest, Category::cDekuScrub, Category::cDekuScrubUpgrades}, SpoilerCollectionCheck::Scrub(0x5B, 0x0A), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR, 0xF5, 0x33, "LW Deku Scrub Grotto Rear", LW_DEKU_SCRUB_GROTTO_REAR, BUY_DEKU_SEEDS_30, {Category::cLostWoods, Category::cForest, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x1F, 0x04), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT, 0xF5, 0x79, "LW Deku Scrub Grotto Front", LW_DEKU_SCRUB_GROTTO_FRONT, PROGRESSIVE_NUT_UPGRADE, {Category::cLostWoods, Category::cForest, Category::cDekuScrub, Category::cDekuScrubUpgrades, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x1F, 0x0B), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[DEKU_THEATER_SKULL_MASK] = ItemLocation::Base (RC_DEKU_THEATER_SKULL_MASK, 0x3E, 0x77, "Deku Theater Skull Mask", DEKU_THEATER_SKULL_MASK, PROGRESSIVE_STICK_UPGRADE, {Category::cLostWoods, Category::cForest, Category::cGrotto}, SpoilerCollectionCheck::Chest(0x3E, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[DEKU_THEATER_MASK_OF_TRUTH] = ItemLocation::Base (RC_DEKU_THEATER_MASK_OF_TRUTH, 0x3E, 0x7A, "Deku Theater Mask of Truth", DEKU_THEATER_MASK_OF_TRUTH, PROGRESSIVE_NUT_UPGRADE, {Category::cLostWoods, Category::cForest, Category::cNeedSpiritualStones, Category::cGrotto}, SpoilerCollectionCheck::Chest(0x3E, 0x1E), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_NEAR_SHORTCUTS_GROTTO_CHEST] = ItemLocation::Chest (RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST, 0x3E, 0x14, "LW Near Shortcuts Grotto Chest", LW_NEAR_SHORTCUTS_GROTTO_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_SKULL_KID] = ItemLocation::Base (RC_LW_SKULL_KID, 0x5B, "LW Skull Kid", LW_SKULL_KID, PIECE_OF_HEART, {}, SpoilerCollectionCheck::ItemGetInf(30), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_TRADE_COJIRO] = ItemLocation::Base (RC_LW_TRADE_COJIRO, 0x5B, "LW Trade Cojiro", LW_TRADE_COJIRO, ODD_MUSHROOM, {Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_TRADE_ODD_POTION] = ItemLocation::Base (RC_LW_TRADE_ODD_POTION, 0x5B, "LW Trade Odd Potion", LW_TRADE_ODD_POTION, ODD_POTION, {Category::cAdultTrade}, SpoilerCollectionCheck::ItemGetInf(57), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_OCARINA_MEMORY_GAME] = ItemLocation::Base (RC_LW_OCARINA_MEMORY_GAME, 0x5B, "LW Ocarina Memory Game", LW_OCARINA_MEMORY_GAME, PIECE_OF_HEART, {}, SpoilerCollectionCheck::ItemGetInf(31), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_TARGET_IN_WOODS] = ItemLocation::Base (RC_LW_TARGET_IN_WOODS, 0x5B, "LW Target in Woods", LW_TARGET_IN_WOODS, PROGRESSIVE_SLINGSHOT, {}, SpoilerCollectionCheck::ItemGetInf(21), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = ItemLocation::Base (RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, 0x5B, "LW Deku Scrub Near Deku Theater Right",LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = ItemLocation::Base (RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, 0x5B, "LW Deku Scrub Near Deku Theater Left", LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, BUY_DEKU_STICK_1, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_DEKU_SCRUB_NEAR_BRIDGE] = ItemLocation::Base (RC_LW_DEKU_SCRUB_NEAR_BRIDGE, 0x5B, "LW Deku Scrub Near Bridge", LW_DEKU_SCRUB_NEAR_BRIDGE, PROGRESSIVE_STICK_UPGRADE, {Category::cDekuScrub, Category::cDekuScrubUpgrades}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_REAR, 0xF5, "LW Deku Scrub Grotto Rear", LW_DEKU_SCRUB_GROTTO_REAR, BUY_DEKU_SEEDS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_LW_DEKU_SCRUB_GROTTO_FRONT, 0xF5, "LW Deku Scrub Grotto Front", LW_DEKU_SCRUB_GROTTO_FRONT, PROGRESSIVE_NUT_UPGRADE, {Category::cDekuScrub, Category::cDekuScrubUpgrades}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[DEKU_THEATER_SKULL_MASK] = ItemLocation::Base (RC_DEKU_THEATER_SKULL_MASK, 0x3E, "Deku Theater Skull Mask", DEKU_THEATER_SKULL_MASK, PROGRESSIVE_STICK_UPGRADE, {}, SpoilerCollectionCheck::Chest(0x3E, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[DEKU_THEATER_MASK_OF_TRUTH] = ItemLocation::Base (RC_DEKU_THEATER_MASK_OF_TRUTH, 0x3E, "Deku Theater Mask of Truth", DEKU_THEATER_MASK_OF_TRUTH, PROGRESSIVE_NUT_UPGRADE, {}, SpoilerCollectionCheck::Chest(0x3E, 0x1E), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); //Sacred Forest Meadow - locationTable[SFM_WOLFOS_GROTTO_CHEST] = ItemLocation::Chest (RC_SFM_WOLFOS_GROTTO_CHEST, 0x3E, 0x11, "SFM Wolfos Grotto Chest", SFM_WOLFOS_GROTTO_CHEST, PURPLE_RUPEE, {Category::cSacredForestMeadow, Category::cForest, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[SFM_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR, 0xEE, 0x39, "SFM Deku Scrub Grotto Rear", SFM_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cSacredForestMeadow, Category::cForest, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x18, 0x08), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[SFM_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, 0xEE, 0x3A, "SFM Deku Scrub Grotto Front", SFM_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cSacredForestMeadow, Category::cForest, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x18, 0x09), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[SFM_WOLFOS_GROTTO_CHEST] = ItemLocation::Chest (RC_SFM_WOLFOS_GROTTO_CHEST, 0x3E, 0x11, "SFM Wolfos Grotto Chest", SFM_WOLFOS_GROTTO_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[SFM_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_REAR, 0xEE, "SFM Deku Scrub Grotto Rear", SFM_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[SFM_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, 0xEE, "SFM Deku Scrub Grotto Front", SFM_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); //Hyrule Field - locationTable[HF_SOUTHEAST_GROTTO_CHEST] = ItemLocation::Chest (RC_HF_SOUTHEAST_GROTTO_CHEST, 0x3E, 0x02, "HF Southeast Grotto Chest", HF_SOUTHEAST_GROTTO_CHEST, RED_RUPEE, {Category::cHyruleField, Category::cGrotto,}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[HF_OPEN_GROTTO_CHEST] = ItemLocation::Chest (RC_HF_OPEN_GROTTO_CHEST, 0x3E, 0x03, "HF Open Grotto Chest", HF_OPEN_GROTTO_CHEST, BLUE_RUPEE, {Category::cHyruleField, Category::cGrotto,}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[HF_NEAR_MARKET_GROTTO_CHEST] = ItemLocation::Chest (RC_HF_NEAR_MARKET_GROTTO_CHEST, 0x3E, 0x00, "HF Near Market Grotto Chest", HF_NEAR_MARKET_GROTTO_CHEST, BLUE_RUPEE, {Category::cHyruleField, Category::cGrotto,}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[HF_OCARINA_OF_TIME_ITEM] = ItemLocation::Base (RC_HF_OCARINA_OF_TIME_ITEM, 0x51, 0x0C, "HF Ocarina of Time Item", HF_OCARINA_OF_TIME_ITEM, PROGRESSIVE_OCARINA, {Category::cHyruleField, Category::cNeedSpiritualStones,}, SpoilerCollectionCheck::EventChkInf(0x43), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[HF_TEKTITE_GROTTO_FREESTANDING_POH] = ItemLocation::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, 0x3E, 0x01, "HF Tektite Grotto Freestanding PoH", HF_TEKTITE_GROTTO_FREESTANDING_POH, PIECE_OF_HEART, {Category::cHyruleField, Category::cGrotto,}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[HF_DEKU_SCRUB_GROTTO] = ItemLocation::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO, 0xE6, 0x3E, "HF Deku Scrub Grotto", HF_DEKU_SCRUB_GROTTO, PIECE_OF_HEART, {Category::cHyruleField, Category::cDekuScrub, Category::cDekuScrubUpgrades, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x10, 0x03), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_SOUTHEAST_GROTTO_CHEST] = ItemLocation::Chest (RC_HF_SOUTHEAST_GROTTO_CHEST, 0x3E, 0x02, "HF Southeast Grotto Chest", HF_SOUTHEAST_GROTTO_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_OPEN_GROTTO_CHEST] = ItemLocation::Chest (RC_HF_OPEN_GROTTO_CHEST, 0x3E, 0x03, "HF Open Grotto Chest", HF_OPEN_GROTTO_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_NEAR_MARKET_GROTTO_CHEST] = ItemLocation::Chest (RC_HF_NEAR_MARKET_GROTTO_CHEST, 0x3E, 0x00, "HF Near Market Grotto Chest", HF_NEAR_MARKET_GROTTO_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_OCARINA_OF_TIME_ITEM] = ItemLocation::Base (RC_HF_OCARINA_OF_TIME_ITEM, 0x51, "HF Ocarina of Time Item", HF_OCARINA_OF_TIME_ITEM, PROGRESSIVE_OCARINA, {}, SpoilerCollectionCheck::EventChkInf(0x43), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_TEKTITE_GROTTO_FREESTANDING_POH] = ItemLocation::Collectable(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, 0x3E, 0x01, "HF Tektite Grotto Freestanding PoH", HF_TEKTITE_GROTTO_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_DEKU_SCRUB_GROTTO] = ItemLocation::GrottoScrub(RC_HF_DEKU_SCRUB_GROTTO, 0xE6, "HF Deku Scrub Grotto", HF_DEKU_SCRUB_GROTTO, PIECE_OF_HEART, {Category::cDekuScrub, Category::cDekuScrubUpgrades}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); //Lake Hylia - locationTable[LH_CHILD_FISHING] = ItemLocation::Base (RC_LH_CHILD_FISHING, 0x49, 0x3E, "LH Child Fishing", LH_CHILD_FISHING, PIECE_OF_HEART, {Category::cLakeHylia, Category::cMinigame,}, SpoilerCollectionCheck::Fishing(0x02), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_ADULT_FISHING] = ItemLocation::Base (RC_LH_ADULT_FISHING, 0x49, 0x38, "LH Adult Fishing", LH_ADULT_FISHING, PROGRESSIVE_SCALE, {Category::cLakeHylia, Category::cMinigame,}, SpoilerCollectionCheck::Fishing(0x03), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_LAB_DIVE] = ItemLocation::Base (RC_LH_LAB_DIVE, 0x38, 0x3E, "LH Lab Dive", LH_LAB_DIVE, PIECE_OF_HEART, {Category::cLakeHylia,}, SpoilerCollectionCheck::ItemGetInf(24), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_TRADE_FROG] = ItemLocation::Base (RC_LH_TRADE_FROG, 0x38, 0x25, "LH Lab Trade Eyeball Frog", LH_TRADE_FROG, EYEDROPS, {Category::cLakeHylia, Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(0x38, 0x1F), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_UNDERWATER_ITEM] = ItemLocation::Base (RC_LH_UNDERWATER_ITEM, 0x57, 0x15, "LH Underwater Item", LH_UNDERWATER_ITEM, RUTOS_LETTER, {Category::cLakeHylia,}, SpoilerCollectionCheck::EventChkInf(0x31), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_SUN] = ItemLocation::Base (RC_LH_SUN, 0x57, 0x58, "LH Sun", LH_SUN, FIRE_ARROWS, {Category::cLakeHylia,}, SpoilerCollectionCheck::Chest(0x57, 0x1F), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_FREESTANDING_POH] = ItemLocation::Collectable(RC_LH_FREESTANDING_POH, 0x57, 0x1E, "LH Freestanding PoH", LH_FREESTANDING_POH, PIECE_OF_HEART, {Category::cLakeHylia,}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT, 0xEF, 0x30, "LH Deku Scrub Grotto Left", LH_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cLakeHylia, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x19, 0x01), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT, 0xEF, 0x37, "LH Deku Scrub Grotto Right", LH_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cLakeHylia, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x19, 0x06), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER, 0xEF, 0x33, "LH Deku Scrub Grotto Center", LH_DEKU_SCRUB_GROTTO_CENTER, BUY_DEKU_SEEDS_30, {Category::cLakeHylia, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x19, 0x04), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_CHILD_FISHING] = ItemLocation::Base (RC_LH_CHILD_FISHING, 0x49, "LH Child Fishing", LH_CHILD_FISHING, PIECE_OF_HEART, {}, SpoilerCollectionCheck::Fishing(), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_ADULT_FISHING] = ItemLocation::Base (RC_LH_ADULT_FISHING, 0x49, "LH Adult Fishing", LH_ADULT_FISHING, PROGRESSIVE_SCALE, {}, SpoilerCollectionCheck::Fishing(), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_LAB_DIVE] = ItemLocation::Base (RC_LH_LAB_DIVE, 0x38, "LH Lab Dive", LH_LAB_DIVE, PIECE_OF_HEART, {}, SpoilerCollectionCheck::ItemGetInf(24), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_TRADE_FROG] = ItemLocation::Base (RC_LH_TRADE_FROG, 0x38, "LH Lab Trade Eyeball Frog", LH_TRADE_FROG, EYEDROPS, {Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_UNDERWATER_ITEM] = ItemLocation::Base (RC_LH_UNDERWATER_ITEM, 0x57, "LH Underwater Item", LH_UNDERWATER_ITEM, RUTOS_LETTER, {}, SpoilerCollectionCheck::EventChkInf(0x31), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_SUN] = ItemLocation::Base (RC_LH_SUN, 0x57, "LH Sun", LH_SUN, FIRE_ARROWS, {}, SpoilerCollectionCheck::Chest(0x57, 0x1F), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_FREESTANDING_POH] = ItemLocation::Collectable(RC_LH_FREESTANDING_POH, 0x57, 0x1E, "LH Freestanding PoH", LH_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_LEFT, 0xEF, "LH Deku Scrub Grotto Left", LH_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_RIGHT, 0xEF, "LH Deku Scrub Grotto Right", LH_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_LH_DEKU_SCRUB_GROTTO_CENTER, 0xEF, "LH Deku Scrub Grotto Center", LH_DEKU_SCRUB_GROTTO_CENTER, BUY_DEKU_SEEDS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); //Gerudo Valley - locationTable[GV_CHEST] = ItemLocation::Chest (RC_GV_CHEST, 0x5A, 0x00, "GV Chest", GV_CHEST, PURPLE_RUPEE, {Category::cGerudoValley, Category::cGerudo,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_TRADE_SAW] = ItemLocation::Base (RC_GV_TRADE_SAW, 0x5A, 0x22, "GV Trade Saw", GV_TRADE_SAW, BROKEN_SWORD, {Category::cGerudoValley, Category::cGerudo, Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(0x5A, 0x1F), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_WATERFALL_FREESTANDING_POH] = ItemLocation::Collectable(RC_GV_WATERFALL_FREESTANDING_POH, 0x5A, 0x01, "GV Waterfall Freestanding PoH", GV_WATERFALL_FREESTANDING_POH, PIECE_OF_HEART, {Category::cGerudoValley, Category::cGerudo,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_CRATE_FREESTANDING_POH] = ItemLocation::Collectable(RC_GV_CRATE_FREESTANDING_POH, 0x5A, 0x02, "GV Crate Freestanding PoH", GV_CRATE_FREESTANDING_POH, PIECE_OF_HEART, {Category::cGerudoValley, Category::cGerudo,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR, 0xF0, 0x39, "GV Deku Scrub Grotto Rear", GV_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cGerudoValley, Category::cGerudo, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x1A, 0x08), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT, 0xF0, 0x3A, "GV Deku Scrub Grotto Front", GV_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cGerudoValley, Category::cGerudo, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x1A, 0x09), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_CHEST] = ItemLocation::Chest (RC_GV_CHEST, 0x5A, 0x00, "GV Chest", GV_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_TRADE_SAW] = ItemLocation::Base (RC_GV_TRADE_SAW, 0x5A, "GV Trade Saw", GV_TRADE_SAW, BROKEN_SWORD, {Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_WATERFALL_FREESTANDING_POH] = ItemLocation::Collectable(RC_GV_WATERFALL_FREESTANDING_POH, 0x5A, 0x01, "GV Waterfall Freestanding PoH", GV_WATERFALL_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_CRATE_FREESTANDING_POH] = ItemLocation::Collectable(RC_GV_CRATE_FREESTANDING_POH, 0x5A, 0x02, "GV Crate Freestanding PoH", GV_CRATE_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_REAR, 0xF0, "GV Deku Scrub Grotto Rear", GV_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_GV_DEKU_SCRUB_GROTTO_FRONT, 0xF0, "GV Deku Scrub Grotto Front", GV_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); //Gerudo Fortress - locationTable[GF_CHEST] = ItemLocation::Chest (RC_GF_CHEST, 0x5D, 0x00, "GF Chest", GF_CHEST, PIECE_OF_HEART, {Category::cGerudoFortress, Category::cGerudo,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_HBA_1000_POINTS] = ItemLocation::Base (RC_GF_HBA_1000_POINTS, 0x5D, 0x3E, "GF HBA 1000 Points", GF_HBA_1000_POINTS, PIECE_OF_HEART, {Category::cGerudoFortress, Category::cGerudo, Category::cMinigame}, SpoilerCollectionCheck::InfTable(0x19, 0x08), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_HBA_1500_POINTS] = ItemLocation::Base (RC_GF_HBA_1500_POINTS, 0x5D, 0x30, "GF HBA 1500 Points", GF_HBA_1500_POINTS, PROGRESSIVE_BOW, {Category::cGerudoFortress, Category::cGerudo, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(7), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_GERUDO_MEMBERSHIP_CARD] = ItemLocation::Base (RC_GF_GERUDO_MEMBERSHIP_CARD, 0x0C, 0x3A, "GF Gerudo Membership Card", GF_GERUDO_MEMBERSHIP_CARD, GERUDO_MEMBERSHIP_CARD, {Category::cGerudoFortress, Category::cGerudo,}, SpoilerCollectionCheck::GerudoToken(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_NORTH_F1_CARPENTER] = ItemLocation::Collectable(RC_GF_NORTH_F1_CARPENTER, 0x0C, 0x0C, "GF North F1 Carpenter", GF_NORTH_F1_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cGerudoFortress, Category::cGerudo, Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_NORTH_F2_CARPENTER] = ItemLocation::Collectable(RC_GF_NORTH_F2_CARPENTER, 0x0C, 0x0A, "GF North F2 Carpenter", GF_NORTH_F2_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cGerudoFortress, Category::cGerudo, Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_SOUTH_F1_CARPENTER] = ItemLocation::Collectable(RC_GF_SOUTH_F1_CARPENTER, 0x0C, 0x0E, "GF South F1 Carpenter", GF_SOUTH_F1_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cGerudoFortress, Category::cGerudo, Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_SOUTH_F2_CARPENTER] = ItemLocation::Collectable(RC_GF_SOUTH_F2_CARPENTER, 0x0C, 0x0F, "GF South F2 Carpenter", GF_SOUTH_F2_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cGerudoFortress, Category::cGerudo, Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_CHEST] = ItemLocation::Chest (RC_GF_CHEST, 0x5D, 0x00, "GF Chest", GF_CHEST, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_HBA_1000_POINTS] = ItemLocation::Base (RC_GF_HBA_1000_POINTS, 0x5D, "GF HBA 1000 Points", GF_HBA_1000_POINTS, PIECE_OF_HEART, {}, SpoilerCollectionCheck::InfTable(0x19, 0x08), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_HBA_1500_POINTS] = ItemLocation::Base (RC_GF_HBA_1500_POINTS, 0x5D, "GF HBA 1500 Points", GF_HBA_1500_POINTS, PROGRESSIVE_BOW, {}, SpoilerCollectionCheck::ItemGetInf(7), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_GERUDO_MEMBERSHIP_CARD] = ItemLocation::Base (RC_GF_GERUDO_MEMBERSHIP_CARD, 0x0C, "GF Gerudo Membership Card", GF_GERUDO_MEMBERSHIP_CARD, GERUDO_MEMBERSHIP_CARD, {}, SpoilerCollectionCheck::GerudoToken(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_NORTH_F1_CARPENTER] = ItemLocation::Collectable(RC_GF_NORTH_F1_CARPENTER, 0x0C, 0x0C, "GF North F1 Carpenter", GF_NORTH_F1_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_NORTH_F2_CARPENTER] = ItemLocation::Collectable(RC_GF_NORTH_F2_CARPENTER, 0x0C, 0x0A, "GF North F2 Carpenter", GF_NORTH_F2_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_SOUTH_F1_CARPENTER] = ItemLocation::Collectable(RC_GF_SOUTH_F1_CARPENTER, 0x0C, 0x0E, "GF South F1 Carpenter", GF_SOUTH_F1_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_SOUTH_F2_CARPENTER] = ItemLocation::Collectable(RC_GF_SOUTH_F2_CARPENTER, 0x0C, 0x0F, "GF South F2 Carpenter", GF_SOUTH_F2_CARPENTER, GERUDO_FORTRESS_SMALL_KEY, {Category::cVanillaGFSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); //Haunted Wasteland - locationTable[WASTELAND_CHEST] = ItemLocation::Chest (RC_WASTELAND_CHEST, 0x5E, 0x00, "Wasteland Chest", WASTELAND_CHEST, PURPLE_RUPEE, {Category::cHauntedWasteland,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[WASTELAND_BOMBCHU_SALESMAN] = ItemLocation::Base (RC_WASTELAND_BOMBCHU_SALESMAN, 0x5E, 0x03, "Wasteland Carpet Salesman", WASTELAND_BOMBCHU_SALESMAN, BOMBCHU_10, {Category::cHauntedWasteland, Category::cMerchant,}, SpoilerCollectionCheck::Merchant(0x5E, 0x86), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[WASTELAND_CHEST] = ItemLocation::Chest (RC_WASTELAND_CHEST, 0x5E, 0x00, "Wasteland Chest", WASTELAND_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[WASTELAND_BOMBCHU_SALESMAN] = ItemLocation::Base (RC_WASTELAND_BOMBCHU_SALESMAN, 0x5E, "Wasteland Carpet Salesman", WASTELAND_BOMBCHU_SALESMAN, BOMBCHU_10, {Category::cMerchant}, SpoilerCollectionCheck::Merchant(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); //Desert Colossus - locationTable[COLOSSUS_FREESTANDING_POH] = ItemLocation::Collectable(RC_COLOSSUS_FREESTANDING_POH, 0x5C, 0x0D, "Colossus Freestanding PoH", COLOSSUS_FREESTANDING_POH, PIECE_OF_HEART, {Category::cDesertColossus,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR, 0xFD, 0x39, "Colossus Deku Scrub Grotto Rear", COLOSSUS_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cDesertColossus, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x27, 0x08), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, 0xFD, 0x3A, "Colossus Deku Scrub Grotto Front", COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cDesertColossus, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x27, 0x09), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[COLOSSUS_FREESTANDING_POH] = ItemLocation::Collectable(RC_COLOSSUS_FREESTANDING_POH, 0x5C, 0x0D, "Colossus Freestanding PoH", COLOSSUS_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR, 0xFD, "Colossus Deku Scrub Grotto Rear", COLOSSUS_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, 0xFD, "Colossus Deku Scrub Grotto Front", COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); //Market - locationTable[MARKET_TREASURE_CHEST_GAME_REWARD] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_REWARD, 0x10, 0x0A, "MK Treasure Chest Game Reward", MARKET_TREASURE_CHEST_GAME_REWARD, TREASURE_GAME_HEART, {Category::cInnerMarket, Category::cMarket, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(19), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = ItemLocation::Base (RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, 0x4B, 0x33, "MK Bombchu Bowling First Prize", MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, PROGRESSIVE_BOMB_BAG, {Category::cInnerMarket, Category::cMarket, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(25), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = ItemLocation::Base (RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, 0x4B, 0x3E, "MK Bombchu Bowling Second Prize", MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, PIECE_OF_HEART, {Category::cInnerMarket, Category::cMarket, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(26), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_BOWLING_BOMBCHUS] = ItemLocation::Base (RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, 0x4B, 0xFF, "MK Bombchu Bowling Bombchus", NONE, BOMBCHU_DROP, {Category::cInnerMarket, Category::cMarket, Category::cMinigame}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_LOST_DOG] = ItemLocation::Base (RC_MARKET_LOST_DOG, 0x35, 0x3E, "MK Lost Dog", MARKET_LOST_DOG, PIECE_OF_HEART, {Category::cInnerMarket, Category::cMarket,}, SpoilerCollectionCheck::InfTable(0x19, 0x09), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_SHOOTING_GALLERY_REWARD] = ItemLocation::Base (RC_MARKET_SHOOTING_GALLERY_REWARD, 0x42, 0x60, "MK Shooting Gallery", MARKET_SHOOTING_GALLERY_REWARD, PROGRESSIVE_SLINGSHOT, {Category::cInnerMarket, Category::cMarket, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_10_BIG_POES] = ItemLocation::Base (RC_MARKET_10_BIG_POES, 0x4D, 0x0F, "MK 10 Big Poes", MARKET_10_BIG_POES, EMPTY_BOTTLE, {Category::cInnerMarket, Category::cMarket,}, SpoilerCollectionCheck::BigPoePoints(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_1] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, 0x10, 0x01, "MK Chest Game First Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_1, TREASURE_GAME_SMALL_KEY, {Category::cInnerMarket, Category::cMarket, Category::cMinigame, Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_2] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, 0x10, 0x03, "MK Chest Game Second Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_2, TREASURE_GAME_SMALL_KEY, {Category::cInnerMarket, Category::cMarket, Category::cMinigame, Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_3] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, 0x10, 0x05, "MK Chest Game Third Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_3, TREASURE_GAME_SMALL_KEY, {Category::cInnerMarket, Category::cMarket, Category::cMinigame, Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_4] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, 0x10, 0x07, "MK Chest Game Fourth Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_4, TREASURE_GAME_SMALL_KEY, {Category::cInnerMarket, Category::cMarket, Category::cMinigame, Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_5] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, 0x10, 0x09, "MK Chest Game Fifth Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_5, TREASURE_GAME_SMALL_KEY, {Category::cInnerMarket, Category::cMarket, Category::cMinigame, Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_TREASURE_CHEST_GAME_REWARD] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_REWARD, 0x10, "MK Treasure Chest Game Reward", MARKET_TREASURE_CHEST_GAME_REWARD, TREASURE_GAME_HEART, {}, SpoilerCollectionCheck::ItemGetInf(19), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = ItemLocation::Base (RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, 0x4B, "MK Bombchu Bowling First Prize", MARKET_BOMBCHU_BOWLING_FIRST_PRIZE, PROGRESSIVE_BOMB_BAG, {}, SpoilerCollectionCheck::ItemGetInf(25), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = ItemLocation::Base (RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, 0x4B, "MK Bombchu Bowling Second Prize", MARKET_BOMBCHU_BOWLING_SECOND_PRIZE, PIECE_OF_HEART, {}, SpoilerCollectionCheck::ItemGetInf(26), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_BOWLING_BOMBCHUS] = ItemLocation::Base (RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS, 0x4B, "MK Bombchu Bowling Bombchus", NONE, BOMBCHU_DROP, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_LOST_DOG] = ItemLocation::Base (RC_MARKET_LOST_DOG, 0x35, "MK Lost Dog", MARKET_LOST_DOG, PIECE_OF_HEART, {}, SpoilerCollectionCheck::InfTable(0x19, 0x09), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_SHOOTING_GALLERY_REWARD] = ItemLocation::Base (RC_MARKET_SHOOTING_GALLERY_REWARD, 0x42, "MK Shooting Gallery", MARKET_SHOOTING_GALLERY_REWARD, PROGRESSIVE_SLINGSHOT, {}, SpoilerCollectionCheck::ItemGetInf(5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_10_BIG_POES] = ItemLocation::Base (RC_MARKET_10_BIG_POES, 0x4D, "MK 10 Big Poes", MARKET_10_BIG_POES, EMPTY_BOTTLE, {}, SpoilerCollectionCheck::BigPoePoints(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_1] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, 0x10, 0x01, "MK Chest Game First Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_1, TREASURE_GAME_SMALL_KEY, {Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_2] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, 0x10, 0x03, "MK Chest Game Second Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_2, TREASURE_GAME_SMALL_KEY, {Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_3] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, 0x10, 0x05, "MK Chest Game Third Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_3, TREASURE_GAME_SMALL_KEY, {Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_4] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, 0x10, 0x07, "MK Chest Game Fourth Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_4, TREASURE_GAME_SMALL_KEY, {Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_TREASURE_CHEST_GAME_ITEM_5] = ItemLocation::Chest (RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, 0x10, 0x09, "MK Chest Game Fifth Room Chest", MARKET_TREASURE_CHEST_GAME_ITEM_5, TREASURE_GAME_SMALL_KEY, {Category::cChestMinigame}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); //Hyrule Castle - locationTable[HC_MALON_EGG] = ItemLocation::Base (RC_HC_MALON_EGG, 0x5F, 0x47, "HC Malon Egg", HC_MALON_EGG, WEIRD_EGG, {Category::cHyruleCastle, Category::cMarket,}, SpoilerCollectionCheck::EventChkInf(0x12), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[HC_ZELDAS_LETTER] = ItemLocation::Base (RC_HC_ZELDAS_LETTER, 0x4A, 0x0B, "HC Zeldas Letter", HC_ZELDAS_LETTER, ZELDAS_LETTER, {Category::cHyruleCastle, Category::cMarket,}, SpoilerCollectionCheck::EventChkInf(0x40), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[HC_MALON_EGG] = ItemLocation::Base (RC_HC_MALON_EGG, 0x5F, "HC Malon Egg", HC_MALON_EGG, WEIRD_EGG, {}, SpoilerCollectionCheck::EventChkInf(0x12), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[HC_ZELDAS_LETTER] = ItemLocation::Base (RC_HC_ZELDAS_LETTER, 0x4A, "HC Zeldas Letter", HC_ZELDAS_LETTER, ZELDAS_LETTER, {}, SpoilerCollectionCheck::EventChkInf(0x40), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); //Kakariko - locationTable[KAK_REDEAD_GROTTO_CHEST] = ItemLocation::Chest (RC_KAK_REDEAD_GROTTO_CHEST, 0x3E, 0x0A, "Kak Redead Grotto Chest", KAK_REDEAD_GROTTO_CHEST, HUGE_RUPEE, {Category::cKakarikoVillage, Category::cKakariko, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_OPEN_GROTTO_CHEST] = ItemLocation::Chest (RC_KAK_OPEN_GROTTO_CHEST, 0x3E, 0x08, "Kak Open Grotto Chest", KAK_OPEN_GROTTO_CHEST, RED_RUPEE, {Category::cKakarikoVillage, Category::cKakariko, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_10_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_10_GOLD_SKULLTULA_REWARD, 0x50, 0x45, "Kak 10 Gold Skulltula Reward", KAK_10_GOLD_SKULLTULA_REWARD, PROGRESSIVE_WALLET, {Category::cKakarikoVillage, Category::cKakariko, Category::cSkulltulaHouse}, SpoilerCollectionCheck::EventChkInf(0xDA), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_20_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_20_GOLD_SKULLTULA_REWARD, 0x50, 0x39, "Kak 20 Gold Skulltula Reward", KAK_20_GOLD_SKULLTULA_REWARD, STONE_OF_AGONY, {Category::cKakarikoVillage, Category::cKakariko, Category::cSkulltulaHouse}, SpoilerCollectionCheck::EventChkInf(0xDB), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_30_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_30_GOLD_SKULLTULA_REWARD, 0x50, 0x46, "Kak 30 Gold Skulltula Reward", KAK_30_GOLD_SKULLTULA_REWARD, PROGRESSIVE_WALLET, {Category::cKakarikoVillage, Category::cKakariko, Category::cSkulltulaHouse}, SpoilerCollectionCheck::EventChkInf(0xDC), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_40_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_40_GOLD_SKULLTULA_REWARD, 0x50, 0x03, "Kak 40 Gold Skulltula Reward", KAK_40_GOLD_SKULLTULA_REWARD, BOMBCHU_10, {Category::cKakarikoVillage, Category::cKakariko, Category::cSkulltulaHouse}, SpoilerCollectionCheck::EventChkInf(0xDD), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_50_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_50_GOLD_SKULLTULA_REWARD, 0x50, 0x3E, "Kak 50 Gold Skulltula Reward", KAK_50_GOLD_SKULLTULA_REWARD, PIECE_OF_HEART, {Category::cKakarikoVillage, Category::cKakariko, Category::cSkulltulaHouse}, SpoilerCollectionCheck::EventChkInf(0xDE), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_100_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_100_GOLD_SKULLTULA_REWARD, 0x50, 0x3E, "Kak 100 Gold Skulltula Reward", KAK_100_GOLD_SKULLTULA_REWARD, HUGE_RUPEE, {Category::cKakarikoVillage, Category::cKakariko, Category::cSkulltulaHouse}, SpoilerCollectionCheck::EventChkInf(0xDF), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_MAN_ON_ROOF] = ItemLocation::Base (RC_KAK_MAN_ON_ROOF, 0x52, 0x3E, "Kak Man on Roof", KAK_MAN_ON_ROOF, PIECE_OF_HEART, {Category::cKakarikoVillage, Category::cKakariko,}, SpoilerCollectionCheck::ItemGetInf(29), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_SHOOTING_GALLERY_REWARD] = ItemLocation::Base (RC_KAK_SHOOTING_GALLERY_REWARD, 0x42, 0x30, "Kak Shooting Gallery Reward", KAK_SHOOTING_GALLERY_REWARD, PROGRESSIVE_BOW, {Category::cKakarikoVillage, Category::cKakariko, Category::cMinigame}, SpoilerCollectionCheck::Chest(0x42, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_TRADE_ODD_MUSHROOM] = ItemLocation::Base (RC_KAK_TRADE_ODD_MUSHROOM, 0x4E, 0x20, "Kak Trade Odd Mushroom", KAK_TRADE_ODD_MUSHROOM, ODD_POTION, {Category::cKakarikoVillage, Category::cKakariko, Category::cAdultTrade}, SpoilerCollectionCheck::ItemGetInf(56), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_GRANNYS_SHOP] = ItemLocation::Base (RC_KAK_GRANNYS_SHOP, 0x4E, 0x10, "Kak Granny's Shop", KAK_GRANNYS_SHOP, BLUE_POTION_REFILL, {Category::cKakarikoVillage, Category::cKakariko, Category::cMerchant}, SpoilerCollectionCheck::RandomizerInf(0x4E, 0x88), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_ANJU_AS_ADULT] = ItemLocation::Base (RC_KAK_ANJU_AS_ADULT, 0x52, 0x1D, "Kak Anju as Adult", KAK_ANJU_AS_ADULT, CLAIM_CHECK, {Category::cKakarikoVillage, Category::cKakariko,}, SpoilerCollectionCheck::ItemGetInf(36), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_ANJU_AS_CHILD] = ItemLocation::Base (RC_KAK_ANJU_AS_CHILD, 0x52, 0x0F, "Kak Anju as Child", KAK_ANJU_AS_CHILD, EMPTY_BOTTLE, {Category::cKakarikoVillage, Category::cKakariko, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_TRADE_POCKET_CUCCO] = ItemLocation::Base (RC_KAK_TRADE_POCKET_CUCCO, 0x52, 0x0E, "Kak Trade Pocket Cucco", KAK_TRADE_POCKET_CUCCO, COJIRO, {Category::cKakarikoVillage, Category::cKakariko, Category::cAdultTrade}, SpoilerCollectionCheck::ItemGetInf(38), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_IMPAS_HOUSE_FREESTANDING_POH] = ItemLocation::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, 0x37, 0x01, "Kak Impas House Freestanding PoH", KAK_IMPAS_HOUSE_FREESTANDING_POH, PIECE_OF_HEART, {Category::cKakarikoVillage, Category::cKakariko,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_WINDMILL_FREESTANDING_POH] = ItemLocation::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH, 0x48, 0x01, "Kak Windmill Freestanding PoH", KAK_WINDMILL_FREESTANDING_POH, PIECE_OF_HEART, {Category::cKakarikoVillage, Category::cKakariko,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_REDEAD_GROTTO_CHEST] = ItemLocation::Chest (RC_KAK_REDEAD_GROTTO_CHEST, 0x3E, 0x0A, "Kak Redead Grotto Chest", KAK_REDEAD_GROTTO_CHEST, HUGE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_OPEN_GROTTO_CHEST] = ItemLocation::Chest (RC_KAK_OPEN_GROTTO_CHEST, 0x3E, 0x08, "Kak Open Grotto Chest", KAK_OPEN_GROTTO_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_10_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_10_GOLD_SKULLTULA_REWARD, 0x50, "Kak 10 Gold Skulltula Reward", KAK_10_GOLD_SKULLTULA_REWARD, PROGRESSIVE_WALLET, {}, SpoilerCollectionCheck::EventChkInf(0xDA), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_20_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_20_GOLD_SKULLTULA_REWARD, 0x50, "Kak 20 Gold Skulltula Reward", KAK_20_GOLD_SKULLTULA_REWARD, STONE_OF_AGONY, {}, SpoilerCollectionCheck::EventChkInf(0xDB), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_30_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_30_GOLD_SKULLTULA_REWARD, 0x50, "Kak 30 Gold Skulltula Reward", KAK_30_GOLD_SKULLTULA_REWARD, PROGRESSIVE_WALLET, {}, SpoilerCollectionCheck::EventChkInf(0xDC), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_40_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_40_GOLD_SKULLTULA_REWARD, 0x50, "Kak 40 Gold Skulltula Reward", KAK_40_GOLD_SKULLTULA_REWARD, BOMBCHU_10, {}, SpoilerCollectionCheck::EventChkInf(0xDD), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_50_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_50_GOLD_SKULLTULA_REWARD, 0x50, "Kak 50 Gold Skulltula Reward", KAK_50_GOLD_SKULLTULA_REWARD, PIECE_OF_HEART, {}, SpoilerCollectionCheck::EventChkInf(0xDE), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_100_GOLD_SKULLTULA_REWARD] = ItemLocation::Base (RC_KAK_100_GOLD_SKULLTULA_REWARD, 0x50, "Kak 100 Gold Skulltula Reward", KAK_100_GOLD_SKULLTULA_REWARD, HUGE_RUPEE, {}, SpoilerCollectionCheck::EventChkInf(0xDF), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_MAN_ON_ROOF] = ItemLocation::Base (RC_KAK_MAN_ON_ROOF, 0x52, "Kak Man on Roof", KAK_MAN_ON_ROOF, PIECE_OF_HEART, {}, SpoilerCollectionCheck::ItemGetInf(29), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_SHOOTING_GALLERY_REWARD] = ItemLocation::Base (RC_KAK_SHOOTING_GALLERY_REWARD, 0x42, "Kak Shooting Gallery Reward", KAK_SHOOTING_GALLERY_REWARD, PROGRESSIVE_BOW, {}, SpoilerCollectionCheck::Chest(0x42, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_TRADE_ODD_MUSHROOM] = ItemLocation::Base (RC_KAK_TRADE_ODD_MUSHROOM, 0x4E, "Kak Trade Odd Mushroom", KAK_TRADE_ODD_MUSHROOM, ODD_POTION, {Category::cAdultTrade}, SpoilerCollectionCheck::ItemGetInf(56), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_GRANNYS_SHOP] = ItemLocation::Base (RC_KAK_GRANNYS_SHOP, 0x4E, "Kak Granny's Shop", KAK_GRANNYS_SHOP, BLUE_POTION_REFILL, {Category::cMerchant}, SpoilerCollectionCheck::RandomizerInf(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_ANJU_AS_ADULT] = ItemLocation::Base (RC_KAK_ANJU_AS_ADULT, 0x52, "Kak Anju as Adult", KAK_ANJU_AS_ADULT, CLAIM_CHECK, {}, SpoilerCollectionCheck::ItemGetInf(36), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_ANJU_AS_CHILD] = ItemLocation::Base (RC_KAK_ANJU_AS_CHILD, 0x52, "Kak Anju as Child", KAK_ANJU_AS_CHILD, EMPTY_BOTTLE, {}, SpoilerCollectionCheck::ItemGetInf(4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_TRADE_POCKET_CUCCO] = ItemLocation::Base (RC_KAK_TRADE_POCKET_CUCCO, 0x52, "Kak Trade Pocket Cucco", KAK_TRADE_POCKET_CUCCO, COJIRO, {Category::cAdultTrade}, SpoilerCollectionCheck::ItemGetInf(38), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_IMPAS_HOUSE_FREESTANDING_POH] = ItemLocation::Collectable(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, 0x37, 0x01, "Kak Impas House Freestanding PoH", KAK_IMPAS_HOUSE_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_WINDMILL_FREESTANDING_POH] = ItemLocation::Collectable(RC_KAK_WINDMILL_FREESTANDING_POH, 0x48, 0x01, "Kak Windmill Freestanding PoH", KAK_WINDMILL_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); //Graveyard - locationTable[GRAVEYARD_SHIELD_GRAVE_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_SHIELD_GRAVE_CHEST, 0x40, 0x00, "GY Shield Grave Chest", GRAVEYARD_SHIELD_GRAVE_CHEST, HYLIAN_SHIELD, {Category::cGraveyard, Category::cKakariko,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, 0x3F, 0x00, "GY Heart Piece Grave Chest", GRAVEYARD_HEART_PIECE_GRAVE_CHEST, PIECE_OF_HEART, {Category::cGraveyard, Category::cKakariko,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_COMPOSERS_GRAVE_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, 0x41, 0x00, "GY Composers Grave Chest", GRAVEYARD_COMPOSERS_GRAVE_CHEST, BOMBS_5, {Category::cGraveyard, Category::cKakariko,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_HOOKSHOT_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_HOOKSHOT_CHEST, 0x48, 0x00, "GY Hookshot Chest", GRAVEYARD_HOOKSHOT_CHEST, PROGRESSIVE_HOOKSHOT, {Category::cGraveyard, Category::cKakariko,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = ItemLocation::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, 0x48, 0x07, "GY Dampe Race Freestanding PoH", GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, PIECE_OF_HEART, {Category::cGraveyard, Category::cKakariko, Category::cMinigame}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_FREESTANDING_POH] = ItemLocation::Collectable(RC_GRAVEYARD_FREESTANDING_POH, 0x53, 0x04, "GY Freestanding PoH", GRAVEYARD_FREESTANDING_POH, PIECE_OF_HEART, {Category::cGraveyard, Category::cKakariko,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] = ItemLocation::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, 0x53, 0x08, "GY Dampe Gravedigging Tour", GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, PIECE_OF_HEART, {Category::cGraveyard, Category::cKakariko,}, SpoilerCollectionCheck::Gravedigger(0x53, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_SHIELD_GRAVE_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_SHIELD_GRAVE_CHEST, 0x40, 0x00, "GY Shield Grave Chest", GRAVEYARD_SHIELD_GRAVE_CHEST, HYLIAN_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, 0x3F, 0x00, "GY Heart Piece Grave Chest", GRAVEYARD_HEART_PIECE_GRAVE_CHEST, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_COMPOSERS_GRAVE_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST, 0x41, 0x00, "GY Composers Grave Chest", GRAVEYARD_COMPOSERS_GRAVE_CHEST, BOMBS_5, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_HOOKSHOT_CHEST] = ItemLocation::Chest (RC_GRAVEYARD_HOOKSHOT_CHEST, 0x48, 0x00, "GY Hookshot Chest", GRAVEYARD_HOOKSHOT_CHEST, PROGRESSIVE_HOOKSHOT, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = ItemLocation::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, 0x48, 0x07, "GY Dampe Race Freestanding PoH", GRAVEYARD_DAMPE_RACE_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_FREESTANDING_POH] = ItemLocation::Collectable(RC_GRAVEYARD_FREESTANDING_POH, 0x53, 0x04, "GY Freestanding PoH", GRAVEYARD_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR] = ItemLocation::Collectable(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, 0x53, "GY Dampe Gravedigging Tour", GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, PIECE_OF_HEART, {}, SpoilerCollectionCheck::Gravedigger(0x53, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); //Death Mountain - locationTable[DMT_CHEST] = ItemLocation::Chest (RC_DMT_CHEST, 0x60, 0x01, "DMT Chest", DMT_CHEST, PURPLE_RUPEE, {Category::cDeathMountainTrail, Category::cDeathMountain,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_STORMS_GROTTO_CHEST] = ItemLocation::Chest (RC_DMT_STORMS_GROTTO_CHEST, 0x3E, 0x17, "DMT Storms Grotto Chest", DMT_STORMS_GROTTO_CHEST, HUGE_RUPEE, {Category::cDeathMountainTrail, Category::cDeathMountain, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_TRADE_BROKEN_SWORD] = ItemLocation::Base (RC_DMT_TRADE_BROKEN_SWORD, 0x60, 0x23, "DMT Trade Broken Sword", DMT_TRADE_BROKEN_SWORD, PRESCRIPTION, {Category::cDeathMountainTrail, Category::cDeathMountain, Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1D), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_TRADE_EYEDROPS] = ItemLocation::Base (RC_DMT_TRADE_EYEDROPS, 0x60, 0x26, "DMT Trade Eyedrops", DMT_TRADE_EYEDROPS, CLAIM_CHECK, {Category::cDeathMountainTrail, Category::cDeathMountain, Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(0x60, 0x1E), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_TRADE_CLAIM_CHECK] = ItemLocation::Base (RC_DMT_TRADE_CLAIM_CHECK, 0x60, 0x57, "DMT Trade Claim Check", DMT_TRADE_CLAIM_CHECK, BIGGORON_SWORD, {Category::cDeathMountainTrail, Category::cDeathMountain}, SpoilerCollectionCheck::Chest(0x60, 0x1F), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_FREESTANDING_POH] = ItemLocation::Collectable(RC_DMT_FREESTANDING_POH, 0x60, 0x1E, "DMT Freestanding PoH", DMT_FREESTANDING_POH, PIECE_OF_HEART, {Category::cDeathMountainTrail, Category::cDeathMountain,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_CHEST] = ItemLocation::Chest (RC_DMT_CHEST, 0x60, 0x01, "DMT Chest", DMT_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_STORMS_GROTTO_CHEST] = ItemLocation::Chest (RC_DMT_STORMS_GROTTO_CHEST, 0x3E, 0x17, "DMT Storms Grotto Chest", DMT_STORMS_GROTTO_CHEST, HUGE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_TRADE_BROKEN_SWORD] = ItemLocation::Base (RC_DMT_TRADE_BROKEN_SWORD, 0x60, "DMT Trade Broken Sword", DMT_TRADE_BROKEN_SWORD, PRESCRIPTION, {Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_TRADE_EYEDROPS] = ItemLocation::Base (RC_DMT_TRADE_EYEDROPS, 0x60, "DMT Trade Eyedrops", DMT_TRADE_EYEDROPS, CLAIM_CHECK, {Category::cAdultTrade}, SpoilerCollectionCheck::RandomizerInf(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_TRADE_CLAIM_CHECK] = ItemLocation::Base (RC_DMT_TRADE_CLAIM_CHECK, 0x60, "DMT Trade Claim Check", DMT_TRADE_CLAIM_CHECK, BIGGORON_SWORD, {}, SpoilerCollectionCheck::Chest(0x60, 0x1F), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_FREESTANDING_POH] = ItemLocation::Collectable(RC_DMT_FREESTANDING_POH, 0x60, 0x1E, "DMT Freestanding PoH", DMT_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); //Goron City - locationTable[GC_MAZE_LEFT_CHEST] = ItemLocation::Chest (RC_GC_MAZE_LEFT_CHEST, 0x62, 0x00, "GC Maze Left Chest", GC_MAZE_LEFT_CHEST, HUGE_RUPEE, {Category::cGoronCity,}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_MAZE_RIGHT_CHEST] = ItemLocation::Chest (RC_GC_MAZE_RIGHT_CHEST, 0x62, 0x01, "GC Maze Right Chest", GC_MAZE_RIGHT_CHEST, PURPLE_RUPEE, {Category::cGoronCity,}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_MAZE_CENTER_CHEST] = ItemLocation::Chest (RC_GC_MAZE_CENTER_CHEST, 0x62, 0x02, "GC Maze Center Chest", GC_MAZE_CENTER_CHEST, PURPLE_RUPEE, {Category::cGoronCity,}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_ROLLING_GORON_AS_CHILD] = ItemLocation::Base (RC_GC_ROLLING_GORON_AS_CHILD, 0x62, 0x34, "GC Rolling Goron as Child", GC_ROLLING_GORON_AS_CHILD, PROGRESSIVE_BOMB_BAG, {Category::cGoronCity,}, SpoilerCollectionCheck::InfTable(0x11, 0x06), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_ROLLING_GORON_AS_ADULT] = ItemLocation::Base (RC_GC_ROLLING_GORON_AS_ADULT, 0x62, 0x2C, "GC Rolling Goron as Adult", GC_ROLLING_GORON_AS_ADULT, GORON_TUNIC, {Category::cGoronCity,}, SpoilerCollectionCheck::InfTable(0x10, 0x01), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_DARUNIAS_JOY] = ItemLocation::Base (RC_GC_DARUNIAS_JOY, 0x62, 0x54, "GC Darunias Joy", GC_DARUNIAS_JOY, PROGRESSIVE_STRENGTH, {Category::cGoronCity,}, SpoilerCollectionCheck::Chest(0x62, 0x1E), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_POT_FREESTANDING_POH] = ItemLocation::Collectable(RC_GC_POT_FREESTANDING_POH, 0x62, 0x1F, "GC Pot Freestanding PoH", GC_POT_FREESTANDING_POH, PIECE_OF_HEART, {Category::cGoronCity,}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT, 0xFB, 0x30, "GC Deku Scrub Grotto Left", GC_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cGoronCity, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x25, 0x01), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT, 0xFB, 0x37, "GC Deku Scrub Grotto Right", GC_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cGoronCity, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x25, 0x06), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER, 0xFB, 0x33, "GC Deku Scrub Grotto Center", GC_DEKU_SCRUB_GROTTO_CENTER, BUY_ARROWS_30, {Category::cGoronCity, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x25, 0x04), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_MEDIGORON] = ItemLocation::Base (RC_GC_MEDIGORON, 0x62, 0x51, "GC Medigoron", GC_MEDIGORON, GIANTS_KNIFE, {Category::cGoronCity, Category::cMerchant,}, SpoilerCollectionCheck::Merchant(0x62, 0x87), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_MAZE_LEFT_CHEST] = ItemLocation::Chest (RC_GC_MAZE_LEFT_CHEST, 0x62, 0x00, "GC Maze Left Chest", GC_MAZE_LEFT_CHEST, HUGE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_MAZE_RIGHT_CHEST] = ItemLocation::Chest (RC_GC_MAZE_RIGHT_CHEST, 0x62, 0x01, "GC Maze Right Chest", GC_MAZE_RIGHT_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_MAZE_CENTER_CHEST] = ItemLocation::Chest (RC_GC_MAZE_CENTER_CHEST, 0x62, 0x02, "GC Maze Center Chest", GC_MAZE_CENTER_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_ROLLING_GORON_AS_CHILD] = ItemLocation::Base (RC_GC_ROLLING_GORON_AS_CHILD, 0x62, "GC Rolling Goron as Child", GC_ROLLING_GORON_AS_CHILD, PROGRESSIVE_BOMB_BAG, {}, SpoilerCollectionCheck::InfTable(0x11, 0x06), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_ROLLING_GORON_AS_ADULT] = ItemLocation::Base (RC_GC_ROLLING_GORON_AS_ADULT, 0x62, "GC Rolling Goron as Adult", GC_ROLLING_GORON_AS_ADULT, GORON_TUNIC, {}, SpoilerCollectionCheck::InfTable(0x10, 0x01), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_DARUNIAS_JOY] = ItemLocation::Base (RC_GC_DARUNIAS_JOY, 0x62, "GC Darunias Joy", GC_DARUNIAS_JOY, PROGRESSIVE_STRENGTH, {}, SpoilerCollectionCheck::Chest(0x62, 0x1E), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_POT_FREESTANDING_POH] = ItemLocation::Collectable(RC_GC_POT_FREESTANDING_POH, 0x62, 0x1F, "GC Pot Freestanding PoH", GC_POT_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_LEFT, 0xFB, "GC Deku Scrub Grotto Left", GC_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_RIGHT, 0xFB, "GC Deku Scrub Grotto Right", GC_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_GC_DEKU_SCRUB_GROTTO_CENTER, 0xFB, "GC Deku Scrub Grotto Center", GC_DEKU_SCRUB_GROTTO_CENTER, BUY_ARROWS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_MEDIGORON] = ItemLocation::Base (RC_GC_MEDIGORON, 0x62, "GC Medigoron", GC_MEDIGORON, GIANTS_KNIFE, {Category::cMerchant}, SpoilerCollectionCheck::Merchant(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); //Death Mountain Crater - locationTable[DMC_UPPER_GROTTO_CHEST] = ItemLocation::Chest (RC_DMC_UPPER_GROTTO_CHEST, 0x3E, 0x1A, "DMC Upper Grotto Chest", DMC_UPPER_GROTTO_CHEST, BOMBS_20, {Category::cDeathMountainCrater, Category::cDeathMountain, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_WALL_FREESTANDING_POH] = ItemLocation::Collectable(RC_DMC_WALL_FREESTANDING_POH, 0x61, 0x02, "DMC Wall Freestanding PoH", DMC_WALL_FREESTANDING_POH, PIECE_OF_HEART, {Category::cDeathMountainCrater, Category::cDeathMountain,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_VOLCANO_FREESTANDING_POH] = ItemLocation::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH, 0x61, 0x08, "DMC Volcano Freestanding PoH", DMC_VOLCANO_FREESTANDING_POH, PIECE_OF_HEART, {Category::cDeathMountainCrater, Category::cDeathMountain,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_DEKU_SCRUB] = ItemLocation::Base (RC_DMC_DEKU_SCRUB, 0x61, 0x37, "DMC Deku Scrub", DMC_DEKU_SCRUB, BUY_BOMBS_535, {Category::cDeathMountainCrater, Category::cDeathMountain, Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(0x61, 0x06), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT, 0xF9, 0x30, "DMC Deku Scrub Grotto Left", DMC_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cDeathMountainCrater, Category::cDeathMountain, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x23, 0x01), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT, 0xF9, 0x37, "DMC Deku Scrub Grotto Right", DMC_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cDeathMountainCrater, Category::cDeathMountain, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x23, 0x06), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, 0xF9, 0x33, "DMC Deku Scrub Grotto Center", DMC_DEKU_SCRUB_GROTTO_CENTER, BUY_ARROWS_30, {Category::cDeathMountainCrater, Category::cDeathMountain, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x23, 0x04), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_UPPER_GROTTO_CHEST] = ItemLocation::Chest (RC_DMC_UPPER_GROTTO_CHEST, 0x3E, 0x1A, "DMC Upper Grotto Chest", DMC_UPPER_GROTTO_CHEST, BOMBS_20, {}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_WALL_FREESTANDING_POH] = ItemLocation::Collectable(RC_DMC_WALL_FREESTANDING_POH, 0x61, 0x02, "DMC Wall Freestanding PoH", DMC_WALL_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_VOLCANO_FREESTANDING_POH] = ItemLocation::Collectable(RC_DMC_VOLCANO_FREESTANDING_POH, 0x61, 0x08, "DMC Volcano Freestanding PoH", DMC_VOLCANO_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_DEKU_SCRUB] = ItemLocation::Base (RC_DMC_DEKU_SCRUB, 0x61, "DMC Deku Scrub", DMC_DEKU_SCRUB, BUY_BOMBS_535, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_LEFT, 0xF9, "DMC Deku Scrub Grotto Left", DMC_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT, 0xF9, "DMC Deku Scrub Grotto Right", DMC_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_DMC_DEKU_SCRUB_GROTTO_CENTER, 0xF9, "DMC Deku Scrub Grotto Center", DMC_DEKU_SCRUB_GROTTO_CENTER, BUY_ARROWS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); //Zoras River - locationTable[ZR_OPEN_GROTTO_CHEST] = ItemLocation::Chest (RC_ZR_OPEN_GROTTO_CHEST, 0x3E, 0x09, "ZR Open Grotto Chest", ZR_OPEN_GROTTO_CHEST, RED_RUPEE, {Category::cZorasRiver, Category::cGrotto,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_MAGIC_BEAN_SALESMAN] = ItemLocation::Base (RC_ZR_MAGIC_BEAN_SALESMAN, 0x54, 0x16, "ZR Magic Bean Salesman", ZR_MAGIC_BEAN_SALESMAN, MAGIC_BEAN, {Category::cZorasRiver,}, SpoilerCollectionCheck::MagicBeans(0x54, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_FROGS_ZELDAS_LULLABY] = ItemLocation::Base (RC_ZR_FROGS_ZELDAS_LULLABY, 0x54, 0x3E, "ZR Frogs Zelda's Lullaby", ZR_FROGS_ZELDAS_LULLABY, PURPLE_RUPEE, {Category::cZorasRiver,}, SpoilerCollectionCheck::EventChkInf(0xD1), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_FROGS_EPONAS_SONG] = ItemLocation::Base (RC_ZR_FROGS_EPONAS_SONG, 0x54, 0x3E, "ZR Frogs Epona's Song", ZR_FROGS_EPONAS_SONG, PURPLE_RUPEE, {Category::cZorasRiver,}, SpoilerCollectionCheck::EventChkInf(0xD2), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_FROGS_SARIAS_SONG] = ItemLocation::Base (RC_ZR_FROGS_SARIAS_SONG, 0x54, 0x3E, "ZR Frogs Saria's Song", ZR_FROGS_SARIAS_SONG, PURPLE_RUPEE, {Category::cZorasRiver,}, SpoilerCollectionCheck::EventChkInf(0xD4), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_FROGS_SUNS_SONG] = ItemLocation::Base (RC_ZR_FROGS_SUNS_SONG, 0x54, 0x3E, "ZR Frogs Sun's Song", ZR_FROGS_SUNS_SONG, PURPLE_RUPEE, {Category::cZorasRiver,}, SpoilerCollectionCheck::EventChkInf(0xD3), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_FROGS_SONG_OF_TIME] = ItemLocation::Base (RC_ZR_FROGS_SONG_OF_TIME, 0x54, 0x3E, "ZR Frogs Song of Time", ZR_FROGS_SONG_OF_TIME, PURPLE_RUPEE, {Category::cZorasRiver,}, SpoilerCollectionCheck::EventChkInf(0xD5), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_FROGS_IN_THE_RAIN] = ItemLocation::Base (RC_ZR_FROGS_IN_THE_RAIN, 0x54, 0x3E, "ZR Frogs in the Rain", ZR_FROGS_IN_THE_RAIN, PIECE_OF_HEART, {Category::cZorasRiver,}, SpoilerCollectionCheck::EventChkInf(0xD6), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_FROGS_OCARINA_GAME] = ItemLocation::Base (RC_ZR_FROGS_OCARINA_GAME, 0x54, 0x76, "ZR Frogs Ocarina Game", ZR_FROGS_OCARINA_GAME, PIECE_OF_HEART, {Category::cZorasRiver, Category::cMinigame,}, SpoilerCollectionCheck::EventChkInf(0xD0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, 0x54, 0x04, "ZR Near Open Grotto Freestanding PoH", ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, PIECE_OF_HEART, {Category::cZorasRiver,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_NEAR_DOMAIN_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH, 0x54, 0x0B, "ZR Near Domain Freestanding PoH", ZR_NEAR_DOMAIN_FREESTANDING_POH, PIECE_OF_HEART, {Category::cZorasRiver,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR, 0xEB, 0x39, "ZR Deku Scrub Grotto Rear", ZR_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cZorasRiver, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x15, 0x08), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, 0xEB, 0x3A, "ZR Deku Scrub Grotto Front", ZR_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cZorasRiver, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x15, 0x09), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_OPEN_GROTTO_CHEST] = ItemLocation::Chest (RC_ZR_OPEN_GROTTO_CHEST, 0x3E, 0x09, "ZR Open Grotto Chest", ZR_OPEN_GROTTO_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_MAGIC_BEAN_SALESMAN] = ItemLocation::Base (RC_ZR_MAGIC_BEAN_SALESMAN, 0x54, "ZR Magic Bean Salesman", ZR_MAGIC_BEAN_SALESMAN, MAGIC_BEAN, {}, SpoilerCollectionCheck::MagicBeans(), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_FROGS_ZELDAS_LULLABY] = ItemLocation::Base (RC_ZR_FROGS_ZELDAS_LULLABY, 0x54, "ZR Frogs Zelda's Lullaby", ZR_FROGS_ZELDAS_LULLABY, PURPLE_RUPEE, {}, SpoilerCollectionCheck::EventChkInf(0xD1), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_FROGS_EPONAS_SONG] = ItemLocation::Base (RC_ZR_FROGS_EPONAS_SONG, 0x54, "ZR Frogs Epona's Song", ZR_FROGS_EPONAS_SONG, PURPLE_RUPEE, {}, SpoilerCollectionCheck::EventChkInf(0xD2), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_FROGS_SARIAS_SONG] = ItemLocation::Base (RC_ZR_FROGS_SARIAS_SONG, 0x54, "ZR Frogs Saria's Song", ZR_FROGS_SARIAS_SONG, PURPLE_RUPEE, {}, SpoilerCollectionCheck::EventChkInf(0xD4), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_FROGS_SUNS_SONG] = ItemLocation::Base (RC_ZR_FROGS_SUNS_SONG, 0x54, "ZR Frogs Sun's Song", ZR_FROGS_SUNS_SONG, PURPLE_RUPEE, {}, SpoilerCollectionCheck::EventChkInf(0xD3), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_FROGS_SONG_OF_TIME] = ItemLocation::Base (RC_ZR_FROGS_SONG_OF_TIME, 0x54, "ZR Frogs Song of Time", ZR_FROGS_SONG_OF_TIME, PURPLE_RUPEE, {}, SpoilerCollectionCheck::EventChkInf(0xD5), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_FROGS_IN_THE_RAIN] = ItemLocation::Base (RC_ZR_FROGS_IN_THE_RAIN, 0x54, "ZR Frogs in the Rain", ZR_FROGS_IN_THE_RAIN, PIECE_OF_HEART, {}, SpoilerCollectionCheck::EventChkInf(0xD6), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_FROGS_OCARINA_GAME] = ItemLocation::Base (RC_ZR_FROGS_OCARINA_GAME, 0x54, "ZR Frogs Ocarina Game", ZR_FROGS_OCARINA_GAME, PIECE_OF_HEART, {}, SpoilerCollectionCheck::EventChkInf(0xD0), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, 0x54, 0x04, "ZR Near Open Grotto Freestanding PoH", ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_NEAR_DOMAIN_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZR_NEAR_DOMAIN_FREESTANDING_POH, 0x54, 0x0B, "ZR Near Domain Freestanding PoH", ZR_NEAR_DOMAIN_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_DEKU_SCRUB_GROTTO_REAR] = ItemLocation::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_REAR, 0xEB, "ZR Deku Scrub Grotto Rear", ZR_DEKU_SCRUB_GROTTO_REAR, BUY_RED_POTION_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_DEKU_SCRUB_GROTTO_FRONT] = ItemLocation::GrottoScrub(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, 0xEB, "ZR Deku Scrub Grotto Front", ZR_DEKU_SCRUB_GROTTO_FRONT, BUY_GREEN_POTION, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); //Zoras Domain - locationTable[ZD_CHEST] = ItemLocation::Chest (RC_ZD_CHEST, 0x58, 0x00, "ZD Chest", ZD_CHEST, PIECE_OF_HEART, {Category::cZorasDomain,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_DIVING_MINIGAME] = ItemLocation::Base (RC_ZD_DIVING_MINIGAME, 0x58, 0x37, "ZD Diving Minigame", ZD_DIVING_MINIGAME, PROGRESSIVE_SCALE, {Category::cZorasDomain, Category::cMinigame,}, SpoilerCollectionCheck::EventChkInf(0x38), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_KING_ZORA_THAWED] = ItemLocation::Base (RC_ZD_KING_ZORA_THAWED, 0x58, 0x2D, "ZD King Zora Thawed", ZD_KING_ZORA_THAWED, ZORA_TUNIC, {Category::cZorasDomain,}, SpoilerCollectionCheck::InfTable(0x13, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_TRADE_PRESCRIPTION] = ItemLocation::Base (RC_ZD_TRADE_PRESCRIPTION, 0x58, 0x24, "ZD Trade Prescription", ZD_TRADE_PRESCRIPTION, EYEBALL_FROG, {Category::cZorasDomain, Category::cAdultTrade}, SpoilerCollectionCheck::Chest(0x58, 0x1F), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_CHEST] = ItemLocation::Chest (RC_ZD_CHEST, 0x58, 0x00, "ZD Chest", ZD_CHEST, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_DIVING_MINIGAME] = ItemLocation::Base (RC_ZD_DIVING_MINIGAME, 0x58, "ZD Diving Minigame", ZD_DIVING_MINIGAME, PROGRESSIVE_SCALE, {}, SpoilerCollectionCheck::EventChkInf(0x38), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_KING_ZORA_THAWED] = ItemLocation::Base (RC_ZD_KING_ZORA_THAWED, 0x58, "ZD King Zora Thawed", ZD_KING_ZORA_THAWED, ZORA_TUNIC, {}, SpoilerCollectionCheck::InfTable(0x13, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_TRADE_PRESCRIPTION] = ItemLocation::Base (RC_ZD_TRADE_PRESCRIPTION, 0x58, "ZD Trade Prescription", ZD_TRADE_PRESCRIPTION, EYEBALL_FROG, {Category::cAdultTrade}, SpoilerCollectionCheck::Chest(0x58, 0x1F), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); //Zoras Fountain - locationTable[ZF_ICEBERG_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH, 0x59, 0x01, "ZF Iceberg Freestanding PoH", ZF_ICEBERG_FREESTANDING_POH, PIECE_OF_HEART, {Category::cZorasFountain,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZF_BOTTOM_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH, 0x59, 0x14, "ZF Bottom Freestanding PoH", ZF_BOTTOM_FREESTANDING_POH, PIECE_OF_HEART, {Category::cZorasFountain,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZF_ICEBERG_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZF_ICEBERC_FREESTANDING_POH, 0x59, 0x01, "ZF Iceberg Freestanding PoH", ZF_ICEBERG_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZF_BOTTOM_FREESTANDING_POH] = ItemLocation::Collectable(RC_ZF_BOTTOM_FREESTANDING_POH, 0x59, 0x14, "ZF Bottom Freestanding PoH", ZF_BOTTOM_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); //Lon Lon Ranch - locationTable[LLR_TALONS_CHICKENS] = ItemLocation::Base (RC_LLR_TALONS_CHICKENS, 0x4C, 0x14, "LLR Talons Chickens", LLR_TALONS_CHICKENS, BOTTLE_WITH_MILK, {Category::cLonLonRanch, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(10), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_FREESTANDING_POH] = ItemLocation::Collectable(RC_LLR_FREESTANDING_POH, 0x4C, 0x01, "LLR Freestanding PoH", LLR_FREESTANDING_POH, PIECE_OF_HEART, {Category::cLonLonRanch,}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT, 0xFC, 0x30, "LLR Deku Scrub Grotto Left", LLR_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cLonLonRanch, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x26, 0x01), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT, 0xFC, 0x37, "LLR Deku Scrub Grotto Right", LLR_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cLonLonRanch, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x26, 0x06), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, 0xFC, 0x33, "LLR Deku Scrub Grotto Center", LLR_DEKU_SCRUB_GROTTO_CENTER, BUY_DEKU_SEEDS_30, {Category::cLonLonRanch, Category::cDekuScrub, Category::cGrotto}, SpoilerCollectionCheck::Scrub(0x26, 0x04), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_TALONS_CHICKENS] = ItemLocation::Base (RC_LLR_TALONS_CHICKENS, 0x4C, "LLR Talons Chickens", LLR_TALONS_CHICKENS, BOTTLE_WITH_MILK, {}, SpoilerCollectionCheck::ItemGetInf(10), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_FREESTANDING_POH] = ItemLocation::Collectable(RC_LLR_FREESTANDING_POH, 0x4C, 0x01, "LLR Freestanding PoH", LLR_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_DEKU_SCRUB_GROTTO_LEFT] = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_LEFT, 0xFC, "LLR Deku Scrub Grotto Left", LLR_DEKU_SCRUB_GROTTO_LEFT, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_DEKU_SCRUB_GROTTO_RIGHT] = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT, 0xFC, "LLR Deku Scrub Grotto Right", LLR_DEKU_SCRUB_GROTTO_RIGHT, BUY_BOMBS_535, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_DEKU_SCRUB_GROTTO_CENTER] = ItemLocation::GrottoScrub(RC_LLR_DEKU_SCRUB_GROTTO_CENTER, 0xFC, "LLR Deku Scrub Grotto Center", LLR_DEKU_SCRUB_GROTTO_CENTER, BUY_DEKU_SEEDS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); /*------------------- --- DUNGEONS --- -------------------*/ //Deku Tree Vanilla - locationTable[DEKU_TREE_MAP_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MAP_CHEST, 0x00, 0x03, "Deku Tree Map Chest", DEKU_TREE_MAP_CHEST, DEKU_TREE_MAP, {Category::cDekuTree, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_COMPASS_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_COMPASS_CHEST, 0x00, 0x02, "Deku Tree Compass Chest", DEKU_TREE_COMPASS_CHEST, DEKU_TREE_COMPASS, {Category::cDekuTree, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, 0x00, 0x06, "Deku Tree Compass Room Side Chest", DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, RECOVERY_HEART, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_BASEMENT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_BASEMENT_CHEST, 0x00, 0x04, "Deku Tree Basement Chest", DEKU_TREE_BASEMENT_CHEST, RECOVERY_HEART, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_SLINGSHOT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_SLINGSHOT_CHEST, 0x00, 0x01, "Deku Tree Slingshot Chest", DEKU_TREE_SLINGSHOT_CHEST, PROGRESSIVE_SLINGSHOT, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, 0x00, 0x05, "Deku Tree Slingshot Room Side Chest", DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, RECOVERY_HEART, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MAP_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MAP_CHEST, 0x00, 0x03, "Deku Tree Map Chest", DEKU_TREE_MAP_CHEST, DEKU_TREE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_COMPASS_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_COMPASS_CHEST, 0x00, 0x02, "Deku Tree Compass Chest", DEKU_TREE_COMPASS_CHEST, DEKU_TREE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, 0x00, 0x06, "Deku Tree Compass Room Side Chest", DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_BASEMENT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_BASEMENT_CHEST, 0x00, 0x04, "Deku Tree Basement Chest", DEKU_TREE_BASEMENT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_SLINGSHOT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_SLINGSHOT_CHEST, 0x00, 0x01, "Deku Tree Slingshot Chest", DEKU_TREE_SLINGSHOT_CHEST, PROGRESSIVE_SLINGSHOT, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, 0x00, 0x05, "Deku Tree Slingshot Room Side Chest", DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); //Deku Tree MQ - locationTable[DEKU_TREE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_MAP_CHEST, 0x00, 0x03, "Deku Tree MQ Map Chest", DEKU_TREE_MQ_MAP_CHEST, DEKU_TREE_MAP, {Category::cDekuTree, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_COMPASS_CHEST, 0x00, 0x01, "Deku Tree MQ Compass Chest", DEKU_TREE_MQ_COMPASS_CHEST, DEKU_TREE_COMPASS, {Category::cDekuTree, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_SLINGSHOT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_SLINGSHOT_CHEST, 0x00, 0x06, "Deku Tree MQ Slingshot Chest", DEKU_TREE_MQ_SLINGSHOT_CHEST, PROGRESSIVE_SLINGSHOT, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, 0x00, 0x02, "Deku Tree MQ Slingshot Room Back Chest", DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, DEKU_SHIELD, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_BASEMENT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_BASEMENT_CHEST, 0x00, 0x04, "Deku Tree MQ Basement Chest", DEKU_TREE_MQ_BASEMENT_CHEST, DEKU_SHIELD, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, 0x00, 0x05, "Deku Tree MQ Before Spinning Log Chest", DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, RECOVERY_HEART, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, 0x00, 0x00, "Deku Tree MQ After Spinning Log Chest", DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, PURPLE_RUPEE, {Category::cDekuTree,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_DEKU_SCRUB] = ItemLocation::Base (RC_DEKU_TREE_MQ_DEKU_SCRUB, 0x00, 0x34, "Deku Tree MQ Deku Scrub", DEKU_TREE_MQ_DEKU_SCRUB, BUY_DEKU_SHIELD, {Category::cDekuTree, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x00, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_MAP_CHEST, 0x00, 0x03, "Deku Tree MQ Map Chest", DEKU_TREE_MQ_MAP_CHEST, DEKU_TREE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_COMPASS_CHEST, 0x00, 0x01, "Deku Tree MQ Compass Chest", DEKU_TREE_MQ_COMPASS_CHEST, DEKU_TREE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_SLINGSHOT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_SLINGSHOT_CHEST, 0x00, 0x06, "Deku Tree MQ Slingshot Chest", DEKU_TREE_MQ_SLINGSHOT_CHEST, PROGRESSIVE_SLINGSHOT, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, 0x00, 0x02, "Deku Tree MQ Slingshot Room Back Chest", DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_BASEMENT_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_BASEMENT_CHEST, 0x00, 0x04, "Deku Tree MQ Basement Chest", DEKU_TREE_MQ_BASEMENT_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, 0x00, 0x05, "Deku Tree MQ Before Spinning Log Chest", DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = ItemLocation::Chest (RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, 0x00, 0x00, "Deku Tree MQ After Spinning Log Chest", DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_DEKU_SCRUB] = ItemLocation::Base (RC_DEKU_TREE_MQ_DEKU_SCRUB, 0x00, "Deku Tree MQ Deku Scrub", DEKU_TREE_MQ_DEKU_SCRUB, BUY_DEKU_SHIELD, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); //Dodongos Cavern Shared - locationTable[DODONGOS_CAVERN_BOSS_ROOM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST, 0x12, 0x00, "Dodongos Cavern Boss Room Chest", DODONGOS_CAVERN_BOSS_ROOM_CHEST, BOMBS_5, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_BOSS_ROOM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST, 0x12, 0x00, "Dodongos Cavern Boss Room Chest", DODONGOS_CAVERN_BOSS_ROOM_CHEST, BOMBS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); //Dodongos Cavern Vanilla - locationTable[DODONGOS_CAVERN_MAP_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MAP_CHEST, 0x01, 0x08, "Dodongos Cavern Map Chest", DODONGOS_CAVERN_MAP_CHEST, DODONGOS_CAVERN_MAP, {Category::cDodongosCavern, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_COMPASS_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_COMPASS_CHEST, 0x01, 0x05, "Dodongos Cavern Compass Chest", DODONGOS_CAVERN_COMPASS_CHEST, DODONGOS_CAVERN_COMPASS, {Category::cDodongosCavern, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, 0x01, 0x06, "Dodongos Cavern Bomb Flower Platform Chest", DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, RED_RUPEE, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_BOMB_BAG_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, 0x01, 0x04, "Dodongos Cavern Bomb Bag Chest", DODONGOS_CAVERN_BOMB_BAG_CHEST, PROGRESSIVE_BOMB_BAG, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, 0x01, 0x0A, "Dodongos Cavern End Of Bridge Chest", DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, DEKU_SHIELD, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT, 0x01, 0x30, "Dodongos Cavern Deku Scrub Near Bomb Bag Left", DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT, BUY_DEKU_NUT_5, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, 0x01, 0x31, "Dodongos Cavern Deku Scrub Side Room Near Dodongos", DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, BUY_DEKU_STICK_1, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x02), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, 0x01, 0x33, "Dodongos Cavern Deku Scrub Near Bomb Bag Right", DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, BUY_DEKU_SEEDS_30, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, 0x01, 0x34, "Dodongos Cavern Deku Scrub Lobby", DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, BUY_DEKU_SHIELD, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MAP_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MAP_CHEST, 0x01, 0x08, "Dodongos Cavern Map Chest", DODONGOS_CAVERN_MAP_CHEST, DODONGOS_CAVERN_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_COMPASS_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_COMPASS_CHEST, 0x01, 0x05, "Dodongos Cavern Compass Chest", DODONGOS_CAVERN_COMPASS_CHEST, DODONGOS_CAVERN_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, 0x01, 0x06, "Dodongos Cavern Bomb Flower Platform Chest", DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_BOMB_BAG_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, 0x01, 0x04, "Dodongos Cavern Bomb Bag Chest", DODONGOS_CAVERN_BOMB_BAG_CHEST, PROGRESSIVE_BOMB_BAG, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, 0x01, 0x0A, "Dodongos Cavern End Of Bridge Chest", DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT, 0x01, "Dodongos Cavern Deku Scrub Near Bomb Bag Left", DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, 0x01, "Dodongos Cavern Deku Scrub Side Room Near Dodongos", DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, BUY_DEKU_STICK_1, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, 0x01, "Dodongos Cavern Deku Scrub Near Bomb Bag Right", DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, BUY_DEKU_SEEDS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = ItemLocation::Base (RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, 0x01, "Dodongos Cavern Deku Scrub Lobby", DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, BUY_DEKU_SHIELD, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); //Dodongos Cavern MQ - locationTable[DODONGOS_CAVERN_MQ_MAP_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_MAP_CHEST, 0x01, 0x00, "Dodongos Cavern MQ Map Chest", DODONGOS_CAVERN_MQ_MAP_CHEST, DODONGOS_CAVERN_MAP, {Category::cDodongosCavern, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, 0x01, 0x04, "Dodongos Cavern MQ Bomb Bag Chest", DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, PROGRESSIVE_BOMB_BAG, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST, 0x01, 0x05, "Dodongos Cavern MQ Compass Chest", DODONGOS_CAVERN_MQ_COMPASS_CHEST, DODONGOS_CAVERN_COMPASS, {Category::cDodongosCavern, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, 0x01, 0x02, "Dodongos Cavern MQ Larvae Room Chest", DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, DEKU_SHIELD, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST, 0x01, 0x03, "Dodongos Cavern MQ Torch Puzzle Room Chest", DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST, BLUE_RUPEE, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, 0x01, 0x01, "Dodongos Cavern MQ Under Grave Chest", DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, HYLIAN_SHIELD, {Category::cDodongosCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, 0x01, 0x31, "Dodongos Cavern Deku Scrub Lobby Rear", DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, BUY_DEKU_STICK_1, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x02), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, 0x01, 0x33, "Dodongos Cavern Deku Scrub Lobby Front", DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, BUY_DEKU_SEEDS_30, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, 0x01, 0x34, "Dodongos Cavern Deku Scrub Staircase", DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, BUY_DEKU_SHIELD, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x05), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, 0x01, 0x39, "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos",DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, BUY_RED_POTION_30, {Category::cDodongosCavern, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x01, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_MAP_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_MAP_CHEST, 0x01, 0x00, "Dodongos Cavern MQ Map Chest", DODONGOS_CAVERN_MQ_MAP_CHEST, DODONGOS_CAVERN_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, 0x01, 0x04, "Dodongos Cavern MQ Bomb Bag Chest", DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, PROGRESSIVE_BOMB_BAG, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST, 0x01, 0x05, "Dodongos Cavern MQ Compass Chest", DODONGOS_CAVERN_MQ_COMPASS_CHEST, DODONGOS_CAVERN_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, 0x01, 0x02, "Dodongos Cavern MQ Larvae Room Chest", DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST, 0x01, 0x03, "Dodongos Cavern MQ Torch Puzzle Room Chest", DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = ItemLocation::Chest (RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, 0x01, 0x01, "Dodongos Cavern MQ Under Grave Chest", DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, HYLIAN_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, 0x01, "Dodongos Cavern Deku Scrub Lobby Rear", DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, BUY_DEKU_STICK_1, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, 0x01, "Dodongos Cavern Deku Scrub Lobby Front", DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, BUY_DEKU_SEEDS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, 0x01, "Dodongos Cavern Deku Scrub Staircase", DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, BUY_DEKU_SHIELD, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = ItemLocation::Base (RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, 0x01, "Dodongos Cavern Deku Scrub Side Room Near Lower Lizalfos",DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, BUY_RED_POTION_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); //Jabu Jabus Belly Vanilla - locationTable[JABU_JABUS_BELLY_MAP_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MAP_CHEST, 0x02, 0x02, "Jabu Jabus Belly Map Chest", JABU_JABUS_BELLY_MAP_CHEST, JABU_JABUS_BELLY_MAP, {Category::cJabuJabusBelly, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_COMPASS_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_COMPASS_CHEST, 0x02, 0x04, "Jabu Jabus Belly Compass Chest", JABU_JABUS_BELLY_COMPASS_CHEST, JABU_JABUS_BELLY_COMPASS, {Category::cJabuJabusBelly, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_BOOMERANG_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, 0x02, 0x01, "Jabu Jabus Belly Boomerang Chest", JABU_JABUS_BELLY_BOOMERANG_CHEST, BOOMERANG, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_DEKU_SCRUB] = ItemLocation::Base (RC_JABU_JABUS_BELLY_DEKU_SCRUB, 0x02, 0x30, "Jabu Jabus Belly Deku Scrub", JABU_JABUS_BELLY_DEKU_SCRUB, BUY_DEKU_NUT_5, {Category::cJabuJabusBelly, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x02, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MAP_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MAP_CHEST, 0x02, 0x02, "Jabu Jabus Belly Map Chest", JABU_JABUS_BELLY_MAP_CHEST, JABU_JABUS_BELLY_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_COMPASS_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_COMPASS_CHEST, 0x02, 0x04, "Jabu Jabus Belly Compass Chest", JABU_JABUS_BELLY_COMPASS_CHEST, JABU_JABUS_BELLY_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_BOOMERANG_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, 0x02, 0x01, "Jabu Jabus Belly Boomerang Chest", JABU_JABUS_BELLY_BOOMERANG_CHEST, BOOMERANG, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_DEKU_SCRUB] = ItemLocation::Base (RC_JABU_JABUS_BELLY_DEKU_SCRUB, 0x02, "Jabu Jabus Belly Deku Scrub", JABU_JABUS_BELLY_DEKU_SCRUB, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); //Jabu Jabus Belly MQ - locationTable[JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, 0x02, 0x05, "Jabu Jabus Belly MQ First Room Side Chest", JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, DEKU_NUTS_5, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_MAP_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_MAP_CHEST, 0x02, 0x03, "Jabu Jabus Belly MQ Map Chest", JABU_JABUS_BELLY_MQ_MAP_CHEST, JABU_JABUS_BELLY_MAP, {Category::cJabuJabusBelly, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST, 0x02, 0x02, "Jabu Jabus Belly MQ Second Room Lower Chest", JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST, DEKU_NUTS_5, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST, 0x02, 0x00, "Jabu Jabus Belly MQ Compass Chest", JABU_JABUS_BELLY_MQ_COMPASS_CHEST, JABU_JABUS_BELLY_COMPASS, {Category::cJabuJabusBelly, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST, 0x02, 0x07, "Jabu Jabus Belly MQ Second Room Upper Chest", JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST, RECOVERY_HEART, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, 0x02, 0x08, "Jabu Jabus Belly MQ Basement Near Switches Chest", JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, DEKU_NUTS_5, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST, 0x02, 0x04, "Jabu Jabus Belly MQ Basement Near Vines Chest", JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST, BOMBCHU_10, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, 0x02, 0x0A, "Jabu Jabus Belly MQ Near Boss Chest", JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, DEKU_SHIELD, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, 0x02, 0x09, "Jabu Jabus Belly MQ Falling Like Like Room Chest", JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, DEKU_STICK_1, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST, 0x02, 0x01, "Jabu Jabus Belly MQ Boomerang Room Small Chest", JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST, DEKU_NUTS_5, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST, 0x02, 0x06, "Jabu Jabus Belly MQ Boomerang Chest", JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST, BOOMERANG, {Category::cJabuJabusBelly,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, 0x02, 0x05, "Jabu Jabus Belly MQ First Room Side Chest", JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, DEKU_NUTS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_MAP_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_MAP_CHEST, 0x02, 0x03, "Jabu Jabus Belly MQ Map Chest", JABU_JABUS_BELLY_MQ_MAP_CHEST, JABU_JABUS_BELLY_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST, 0x02, 0x02, "Jabu Jabus Belly MQ Second Room Lower Chest", JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST, DEKU_NUTS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST, 0x02, 0x00, "Jabu Jabus Belly MQ Compass Chest", JABU_JABUS_BELLY_MQ_COMPASS_CHEST, JABU_JABUS_BELLY_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST, 0x02, 0x07, "Jabu Jabus Belly MQ Second Room Upper Chest", JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, 0x02, 0x08, "Jabu Jabus Belly MQ Basement Near Switches Chest", JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, DEKU_NUTS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST, 0x02, 0x04, "Jabu Jabus Belly MQ Basement Near Vines Chest", JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, 0x02, 0x0A, "Jabu Jabus Belly MQ Near Boss Chest", JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, 0x02, 0x09, "Jabu Jabus Belly MQ Falling Like Like Room Chest", JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, DEKU_STICK_1, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST, 0x02, 0x01, "Jabu Jabus Belly MQ Boomerang Room Small Chest", JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST, DEKU_NUTS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST] = ItemLocation::Chest (RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST, 0x02, 0x06, "Jabu Jabus Belly MQ Boomerang Chest", JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST, BOOMERANG, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); //COW //Forest Temple Vanilla - locationTable[FOREST_TEMPLE_FIRST_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, 0x03, 0x03, "Forest Temple First Room Chest", FOREST_TEMPLE_FIRST_ROOM_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_FIRST_STALFOS_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST, 0x03, 0x00, "Forest Temple First Stalfos Chest", FOREST_TEMPLE_FIRST_STALFOS_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, 0x03, 0x05, "Forest Temple Raised Island Courtyard Chest", FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, RECOVERY_HEART, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MAP_CHEST, 0x03, 0x01, "Forest Temple Map Chest", FOREST_TEMPLE_MAP_CHEST, FOREST_TEMPLE_MAP, {Category::cForestTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_WELL_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_WELL_CHEST, 0x03, 0x09, "Forest Temple Well Chest", FOREST_TEMPLE_WELL_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, 0x03, 0x07, "Forest Temple Falling Ceiling Room Chest", FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, ARROWS_10, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, 0x03, 0x04, "Forest Temple Eye Switch Chest", FOREST_TEMPLE_EYE_SWITCH_CHEST, ARROWS_30, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BOSS_KEY_CHEST, 0x03, 0x0E, "Forest Temple Boss Key Chest", FOREST_TEMPLE_BOSS_KEY_CHEST, FOREST_TEMPLE_BOSS_KEY, {Category::cForestTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_FLOORMASTER_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FLOORMASTER_CHEST, 0x03, 0x02, "Forest Temple Floormaster Chest", FOREST_TEMPLE_FLOORMASTER_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_BOW_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BOW_CHEST, 0x03, 0x0C, "Forest Temple Bow Chest", FOREST_TEMPLE_BOW_CHEST, PROGRESSIVE_BOW, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_RED_POE_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_RED_POE_CHEST, 0x03, 0x0D, "Forest Temple Red Poe Chest", FOREST_TEMPLE_RED_POE_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_BLUE_POE_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BLUE_POE_CHEST, 0x03, 0x0F, "Forest Temple Blue Poe Chest", FOREST_TEMPLE_BLUE_POE_CHEST, FOREST_TEMPLE_COMPASS, {Category::cForestTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_BASEMENT_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BASEMENT_CHEST, 0x03, 0x0B, "Forest Temple Basement Chest", FOREST_TEMPLE_BASEMENT_CHEST, ARROWS_5, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_FIRST_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, 0x03, 0x03, "Forest Temple First Room Chest", FOREST_TEMPLE_FIRST_ROOM_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_FIRST_STALFOS_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FIRST_STALFOS_CHEST, 0x03, 0x00, "Forest Temple First Stalfos Chest", FOREST_TEMPLE_FIRST_STALFOS_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, 0x03, 0x05, "Forest Temple Raised Island Courtyard Chest", FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MAP_CHEST, 0x03, 0x01, "Forest Temple Map Chest", FOREST_TEMPLE_MAP_CHEST, FOREST_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_WELL_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_WELL_CHEST, 0x03, 0x09, "Forest Temple Well Chest", FOREST_TEMPLE_WELL_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, 0x03, 0x07, "Forest Temple Falling Ceiling Room Chest", FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, 0x03, 0x04, "Forest Temple Eye Switch Chest", FOREST_TEMPLE_EYE_SWITCH_CHEST, ARROWS_30, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BOSS_KEY_CHEST, 0x03, 0x0E, "Forest Temple Boss Key Chest", FOREST_TEMPLE_BOSS_KEY_CHEST, FOREST_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_FLOORMASTER_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_FLOORMASTER_CHEST, 0x03, 0x02, "Forest Temple Floormaster Chest", FOREST_TEMPLE_FLOORMASTER_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_BOW_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BOW_CHEST, 0x03, 0x0C, "Forest Temple Bow Chest", FOREST_TEMPLE_BOW_CHEST, PROGRESSIVE_BOW, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_RED_POE_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_RED_POE_CHEST, 0x03, 0x0D, "Forest Temple Red Poe Chest", FOREST_TEMPLE_RED_POE_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_BLUE_POE_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BLUE_POE_CHEST, 0x03, 0x0F, "Forest Temple Blue Poe Chest", FOREST_TEMPLE_BLUE_POE_CHEST, FOREST_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_BASEMENT_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_BASEMENT_CHEST, 0x03, 0x0B, "Forest Temple Basement Chest", FOREST_TEMPLE_BASEMENT_CHEST, ARROWS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); //Forest Temple MQ - locationTable[FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, 0x03, 0x03, "Forest Temple MQ First Room Chest", FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_WOLFOS_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST, 0x03, 0x00, "Forest Temple MQ Wolfos Chest", FOREST_TEMPLE_MQ_WOLFOS_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_BOW_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_BOW_CHEST, 0x03, 0x0C, "Forest Temple MQ Bow Chest", FOREST_TEMPLE_MQ_BOW_CHEST, PROGRESSIVE_BOW, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, 0x03, 0x01, "Forest Temple MQ Raised Island Courtyard Lower Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, 0x03, 0x05, "Forest Temple MQ Raised Island Courtyard Upper Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_WELL_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_WELL_CHEST, 0x03, 0x09, "Forest Temple MQ Well Chest", FOREST_TEMPLE_MQ_WELL_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_MAP_CHEST, 0x03, 0x0D, "Forest Temple MQ Map Chest", FOREST_TEMPLE_MQ_MAP_CHEST, FOREST_TEMPLE_MAP, {Category::cForestTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_COMPASS_CHEST, 0x03, 0x0F, "Forest Temple MQ Compass Chest", FOREST_TEMPLE_MQ_COMPASS_CHEST, FOREST_TEMPLE_COMPASS, {Category::cForestTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, 0x03, 0x06, "Forest Temple MQ Falling Ceiling Room Chest", FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, ARROWS_5, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_BASEMENT_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST, 0x03, 0x0B, "Forest Temple MQ Basement Chest", FOREST_TEMPLE_MQ_BASEMENT_CHEST, ARROWS_5, {Category::cForestTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_REDEAD_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, 0x03, 0x02, "Forest Temple MQ Redead Chest", FOREST_TEMPLE_MQ_REDEAD_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cForestTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, 0x03, 0x0E, "Forest Temple MQ Boss Key Chest", FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, FOREST_TEMPLE_BOSS_KEY, {Category::cForestTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, 0x03, 0x03, "Forest Temple MQ First Room Chest", FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_WOLFOS_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_WOLFOS_CHEST, 0x03, 0x00, "Forest Temple MQ Wolfos Chest", FOREST_TEMPLE_MQ_WOLFOS_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_BOW_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_BOW_CHEST, 0x03, 0x0C, "Forest Temple MQ Bow Chest", FOREST_TEMPLE_MQ_BOW_CHEST, PROGRESSIVE_BOW, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, 0x03, 0x01, "Forest Temple MQ Raised Island Courtyard Lower Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, 0x03, 0x05, "Forest Temple MQ Raised Island Courtyard Upper Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_WELL_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_WELL_CHEST, 0x03, 0x09, "Forest Temple MQ Well Chest", FOREST_TEMPLE_MQ_WELL_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_MAP_CHEST, 0x03, 0x0D, "Forest Temple MQ Map Chest", FOREST_TEMPLE_MQ_MAP_CHEST, FOREST_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_COMPASS_CHEST, 0x03, 0x0F, "Forest Temple MQ Compass Chest", FOREST_TEMPLE_MQ_COMPASS_CHEST, FOREST_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, 0x03, 0x06, "Forest Temple MQ Falling Ceiling Room Chest", FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, ARROWS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_BASEMENT_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_BASEMENT_CHEST, 0x03, 0x0B, "Forest Temple MQ Basement Chest", FOREST_TEMPLE_MQ_BASEMENT_CHEST, ARROWS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_REDEAD_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_REDEAD_CHEST, 0x03, 0x02, "Forest Temple MQ Redead Chest", FOREST_TEMPLE_MQ_REDEAD_CHEST, FOREST_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, 0x03, 0x0E, "Forest Temple MQ Boss Key Chest", FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, FOREST_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); //Fire Temple Vanilla - locationTable[FIRE_TEMPLE_NEAR_BOSS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_NEAR_BOSS_CHEST, 0x04, 0x01, "Fire Temple Near Boss Chest", FIRE_TEMPLE_NEAR_BOSS_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_FLARE_DANCER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, 0x04, 0x00, "Fire Temple Flare Dancer Chest", FIRE_TEMPLE_FLARE_DANCER_CHEST, BOMBS_10, {Category::cFireTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOSS_KEY_CHEST, 0x04, 0x0C, "Fire Temple Boss Key Chest", FIRE_TEMPLE_BOSS_KEY_CHEST, FIRE_TEMPLE_BOSS_KEY, {Category::cFireTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, 0x04, 0x02, "Fire Temple Big Lava Room Blocked Door Chest", FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, 0x04, 0x04, "Fire Temple Big Lava Room Lower Open Door Chest", FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, 0x04, 0x03, "Fire Temple Boulder Maze Lower Chest", FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, 0x04, 0x06, "Fire Temple Boulder Maze Upper Chest", FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, 0x04, 0x08, "Fire Temple Boulder Maze Side Room Chest", FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, 0x04, 0x0B, "Fire Temple Boulder Maze Shortcut Chest", FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_SCARECROW_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_SCARECROW_CHEST, 0x04, 0x0D, "Fire Temple Scarecrow Chest", FIRE_TEMPLE_SCARECROW_CHEST, HUGE_RUPEE, {Category::cFireTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MAP_CHEST, 0x04, 0x0A, "Fire Temple Map Chest", FIRE_TEMPLE_MAP_CHEST, FIRE_TEMPLE_MAP, {Category::cFireTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_COMPASS_CHEST, 0x04, 0x07, "Fire Temple Compass Chest", FIRE_TEMPLE_COMPASS_CHEST, FIRE_TEMPLE_COMPASS, {Category::cFireTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_HIGHEST_GORON_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, 0x04, 0x09, "Fire Temple Highest Goron Chest", FIRE_TEMPLE_HIGHEST_GORON_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, 0x04, 0x05, "Fire Temple Megaton Hammer Chest", FIRE_TEMPLE_MEGATON_HAMMER_CHEST, MEGATON_HAMMER, {Category::cFireTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_NEAR_BOSS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_NEAR_BOSS_CHEST, 0x04, 0x01, "Fire Temple Near Boss Chest", FIRE_TEMPLE_NEAR_BOSS_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_FLARE_DANCER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, 0x04, 0x00, "Fire Temple Flare Dancer Chest", FIRE_TEMPLE_FLARE_DANCER_CHEST, BOMBS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOSS_KEY_CHEST, 0x04, 0x0C, "Fire Temple Boss Key Chest", FIRE_TEMPLE_BOSS_KEY_CHEST, FIRE_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, 0x04, 0x02, "Fire Temple Big Lava Room Blocked Door Chest", FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, 0x04, 0x04, "Fire Temple Big Lava Room Lower Open Door Chest", FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, 0x04, 0x03, "Fire Temple Boulder Maze Lower Chest", FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, 0x04, 0x06, "Fire Temple Boulder Maze Upper Chest", FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, 0x04, 0x08, "Fire Temple Boulder Maze Side Room Chest", FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, 0x04, 0x0B, "Fire Temple Boulder Maze Shortcut Chest", FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_SCARECROW_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_SCARECROW_CHEST, 0x04, 0x0D, "Fire Temple Scarecrow Chest", FIRE_TEMPLE_SCARECROW_CHEST, HUGE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MAP_CHEST, 0x04, 0x0A, "Fire Temple Map Chest", FIRE_TEMPLE_MAP_CHEST, FIRE_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_COMPASS_CHEST, 0x04, 0x07, "Fire Temple Compass Chest", FIRE_TEMPLE_COMPASS_CHEST, FIRE_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_HIGHEST_GORON_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, 0x04, 0x09, "Fire Temple Highest Goron Chest", FIRE_TEMPLE_HIGHEST_GORON_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, 0x04, 0x05, "Fire Temple Megaton Hammer Chest", FIRE_TEMPLE_MEGATON_HAMMER_CHEST, MEGATON_HAMMER, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); //Fire Temple MQ - locationTable[FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST, 0x04, 0x07, "Fire Temple MQ Near Boss Chest", FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, 0x04, 0x00, "Fire Temple MQ Megaton Hammer Chest", FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, MEGATON_HAMMER, {Category::cFireTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_COMPASS_CHEST, 0x04, 0x0B, "Fire Temple MQ Compass Chest", FIRE_TEMPLE_MQ_COMPASS_CHEST, FIRE_TEMPLE_COMPASS, {Category::cFireTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, 0x04, 0x03, "Fire Temple MQ Lizalfos Maze Lower Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, BOMBS_10, {Category::cFireTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, 0x04, 0x06, "Fire Temple MQ Lizalfos Maze Upper Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, BOMBS_10, {Category::cFireTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE, 0x04, 0x05, "Fire Temple MQ Chest on Fire", FIRE_TEMPLE_MQ_CHEST_ON_FIRE, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, 0x04, 0x02, "Fire Temple MQ Map Room Side Chest", FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, HYLIAN_SHIELD, {Category::cFireTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_MAP_CHEST, 0x04, 0x0C, "Fire Temple MQ Map Chest", FIRE_TEMPLE_MQ_MAP_CHEST, FIRE_TEMPLE_MAP, {Category::cFireTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST, 0x04, 0x04, "Fire Temple MQ Boss Key Chest", FIRE_TEMPLE_MQ_BOSS_KEY_CHEST, FIRE_TEMPLE_BOSS_KEY, {Category::cFireTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, 0x04, 0x01, "Fire Temple MQ Big Lava Room Blocked Door Chest", FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, 0x04, 0x08, "Fire Temple MQ Lizalfos Maze Side Room Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_FREESTANDING_KEY] = ItemLocation::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY, 0x04, 0x1C, "Fire Temple MQ Freestanding Key", FIRE_TEMPLE_MQ_FREESTANDING_KEY, FIRE_TEMPLE_SMALL_KEY, {Category::cFireTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST, 0x04, 0x07, "Fire Temple MQ Near Boss Chest", FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, 0x04, 0x00, "Fire Temple MQ Megaton Hammer Chest", FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, MEGATON_HAMMER, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_COMPASS_CHEST, 0x04, 0x0B, "Fire Temple MQ Compass Chest", FIRE_TEMPLE_MQ_COMPASS_CHEST, FIRE_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, 0x04, 0x03, "Fire Temple MQ Lizalfos Maze Lower Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, BOMBS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, 0x04, 0x06, "Fire Temple MQ Lizalfos Maze Upper Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST, BOMBS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_CHEST_ON_FIRE, 0x04, 0x05, "Fire Temple MQ Chest on Fire", FIRE_TEMPLE_MQ_CHEST_ON_FIRE, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, 0x04, 0x02, "Fire Temple MQ Map Room Side Chest", FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, HYLIAN_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_MAP_CHEST, 0x04, 0x0C, "Fire Temple MQ Map Chest", FIRE_TEMPLE_MQ_MAP_CHEST, FIRE_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST, 0x04, 0x04, "Fire Temple MQ Boss Key Chest", FIRE_TEMPLE_MQ_BOSS_KEY_CHEST, FIRE_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, 0x04, 0x01, "Fire Temple MQ Big Lava Room Blocked Door Chest", FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST] = ItemLocation::Chest (RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, 0x04, 0x08, "Fire Temple MQ Lizalfos Maze Side Room Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_FREESTANDING_KEY] = ItemLocation::Collectable(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY, 0x04, 0x1C, "Fire Temple MQ Freestanding Key", FIRE_TEMPLE_MQ_FREESTANDING_KEY, FIRE_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); //Water Temple Vanilla - locationTable[WATER_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MAP_CHEST, 0x05, 0x02, "Water Temple Map Chest", WATER_TEMPLE_MAP_CHEST, WATER_TEMPLE_MAP, {Category::cWaterTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_COMPASS_CHEST, 0x05, 0x09, "Water Temple Compass Chest", WATER_TEMPLE_COMPASS_CHEST, WATER_TEMPLE_COMPASS, {Category::cWaterTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_TORCHES_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_TORCHES_CHEST, 0x05, 0x01, "Water Temple Torches Chest", WATER_TEMPLE_TORCHES_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_DRAGON_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_DRAGON_CHEST, 0x05, 0x0A, "Water Temple Dragon Chest", WATER_TEMPLE_DRAGON_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, 0x05, 0x08, "Water Temple Central Bow Target Chest", WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, 0x05, 0x06, "Water Temple Central Pillar Chest", WATER_TEMPLE_CENTRAL_PILLAR_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_CRACKED_WALL_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_CRACKED_WALL_CHEST, 0x05, 0x00, "Water Temple Cracked Wall Chest", WATER_TEMPLE_CRACKED_WALL_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_BOSS_KEY_CHEST, 0x05, 0x05, "Water Temple Boss Key Chest", WATER_TEMPLE_BOSS_KEY_CHEST, WATER_TEMPLE_BOSS_KEY, {Category::cWaterTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_LONGSHOT_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_LONGSHOT_CHEST, 0x05, 0x07, "Water Temple Longshot Chest", WATER_TEMPLE_LONGSHOT_CHEST, PROGRESSIVE_HOOKSHOT, {Category::cWaterTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_RIVER_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_RIVER_CHEST, 0x05, 0x03, "Water Temple River Chest", WATER_TEMPLE_RIVER_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MAP_CHEST, 0x05, 0x02, "Water Temple Map Chest", WATER_TEMPLE_MAP_CHEST, WATER_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_COMPASS_CHEST, 0x05, 0x09, "Water Temple Compass Chest", WATER_TEMPLE_COMPASS_CHEST, WATER_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_TORCHES_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_TORCHES_CHEST, 0x05, 0x01, "Water Temple Torches Chest", WATER_TEMPLE_TORCHES_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_DRAGON_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_DRAGON_CHEST, 0x05, 0x0A, "Water Temple Dragon Chest", WATER_TEMPLE_DRAGON_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, 0x05, 0x08, "Water Temple Central Bow Target Chest", WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, 0x05, 0x06, "Water Temple Central Pillar Chest", WATER_TEMPLE_CENTRAL_PILLAR_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_CRACKED_WALL_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_CRACKED_WALL_CHEST, 0x05, 0x00, "Water Temple Cracked Wall Chest", WATER_TEMPLE_CRACKED_WALL_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_BOSS_KEY_CHEST, 0x05, 0x05, "Water Temple Boss Key Chest", WATER_TEMPLE_BOSS_KEY_CHEST, WATER_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_LONGSHOT_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_LONGSHOT_CHEST, 0x05, 0x07, "Water Temple Longshot Chest", WATER_TEMPLE_LONGSHOT_CHEST, PROGRESSIVE_HOOKSHOT, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_RIVER_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_RIVER_CHEST, 0x05, 0x03, "Water Temple River Chest", WATER_TEMPLE_RIVER_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); //Water Temple MQ - locationTable[WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, 0x05, 0x06, "Water Temple MQ Central Pillar Chest", WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, 0x05, 0x05, "Water Temple MQ Boss Key Chest", WATER_TEMPLE_MQ_BOSS_KEY_CHEST, WATER_TEMPLE_BOSS_KEY, {Category::cWaterTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_LONGSHOT_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST, 0x05, 0x00, "Water Temple MQ Longshot Chest", WATER_TEMPLE_MQ_LONGSHOT_CHEST, PROGRESSIVE_HOOKSHOT, {Category::cWaterTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_COMPASS_CHEST, 0x05, 0x01, "Water Temple MQ Compass Chest", WATER_TEMPLE_MQ_COMPASS_CHEST, WATER_TEMPLE_COMPASS, {Category::cWaterTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_MAP_CHEST, 0x05, 0x02, "Water Temple MQ Map Chest", WATER_TEMPLE_MQ_MAP_CHEST, WATER_TEMPLE_MAP, {Category::cWaterTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_FREESTANDING_KEY] = ItemLocation::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY, 0x05, 0x01, "Water Temple MQ Freestanding Key", WATER_TEMPLE_MQ_FREESTANDING_KEY, WATER_TEMPLE_SMALL_KEY, {Category::cWaterTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, 0x05, 0x06, "Water Temple MQ Central Pillar Chest", WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, 0x05, 0x05, "Water Temple MQ Boss Key Chest", WATER_TEMPLE_MQ_BOSS_KEY_CHEST, WATER_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_LONGSHOT_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST, 0x05, 0x00, "Water Temple MQ Longshot Chest", WATER_TEMPLE_MQ_LONGSHOT_CHEST, PROGRESSIVE_HOOKSHOT, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_COMPASS_CHEST, 0x05, 0x01, "Water Temple MQ Compass Chest", WATER_TEMPLE_MQ_COMPASS_CHEST, WATER_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_WATER_TEMPLE_MQ_MAP_CHEST, 0x05, 0x02, "Water Temple MQ Map Chest", WATER_TEMPLE_MQ_MAP_CHEST, WATER_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_FREESTANDING_KEY] = ItemLocation::Collectable(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY, 0x05, 0x01, "Water Temple MQ Freestanding Key", WATER_TEMPLE_MQ_FREESTANDING_KEY, WATER_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); //Spirit Temple Shared - locationTable[SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, 0x5C, 0x0B, "Spirit Temple Silver Gauntlets Chest", SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, PROGRESSIVE_STRENGTH, {Category::cSpiritTemple, Category::cDesertColossus}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, 0x5C, 0x09, "Spirit Temple Mirror Shield Chest", SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, MIRROR_SHIELD, {Category::cSpiritTemple, Category::cDesertColossus}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, 0x5C, 0x0B, "Spirit Temple Silver Gauntlets Chest", SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, PROGRESSIVE_STRENGTH, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, 0x5C, 0x09, "Spirit Temple Mirror Shield Chest", SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, MIRROR_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); //Spirit Temple Vanilla - locationTable[SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST, 0x06, 0x08, "Spirit Temple Child Bridge Chest", SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST, DEKU_SHIELD, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, 0x06, 0x00, "Spirit Temple Child Early Torches Chest", SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_COMPASS_CHEST, 0x06, 0x04, "Spirit Temple Compass Chest", SPIRIT_TEMPLE_COMPASS_CHEST, SPIRIT_TEMPLE_COMPASS, {Category::cSpiritTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, 0x06, 0x07, "Spirit Temple Early Adult Right Chest", SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST, 0x06, 0x0D, "Spirit Temple First Mirror Left Chest", SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST, ICE_TRAP, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, 0x06, 0x0E, "Spirit Temple First Mirror Right Chest", SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, RECOVERY_HEART, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MAP_CHEST, 0x06, 0x03, "Spirit Temple Map Chest", SPIRIT_TEMPLE_MAP_CHEST, SPIRIT_TEMPLE_MAP, {Category::cSpiritTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, 0x06, 0x06, "Spirit Temple Child Climb North Chest", SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, BOMBCHU_10, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, 0x06, 0x0C, "Spirit Temple Child Climb East Chest", SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, DEKU_SHIELD, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, 0x06, 0x01, "Spirit Temple Sun Block Room Chest", SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST, 0x06, 0x02, "Spirit Temple Statue Room Hand Chest", SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST, 0x06, 0x0F, "Spirit Temple Statue Room Northeast Chest", SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST, BLUE_RUPEE, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST, 0x06, 0x05, "Spirit Temple Near Four Armos Chest", SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, 0x06, 0x14, "Spirit Temple Hallway Right Invisible Chest", SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, RECOVERY_HEART, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST, 0x06, 0x15, "Spirit Temple Hallway Left Invisible Chest", SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST, RECOVERY_HEART, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, 0x06, 0x0A, "Spirit Temple Boss Key Chest", SPIRIT_TEMPLE_BOSS_KEY_CHEST, SPIRIT_TEMPLE_BOSS_KEY, {Category::cSpiritTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_TOPMOST_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_TOPMOST_CHEST, 0x06, 0x12, "Spirit Temple Topmost Chest", SPIRIT_TEMPLE_TOPMOST_CHEST, BOMBS_20, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST, 0x06, 0x08, "Spirit Temple Child Bridge Chest", SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, 0x06, 0x00, "Spirit Temple Child Early Torches Chest", SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_COMPASS_CHEST, 0x06, 0x04, "Spirit Temple Compass Chest", SPIRIT_TEMPLE_COMPASS_CHEST, SPIRIT_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, 0x06, 0x07, "Spirit Temple Early Adult Right Chest", SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST, 0x06, 0x0D, "Spirit Temple First Mirror Left Chest", SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST, ICE_TRAP, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, 0x06, 0x0E, "Spirit Temple First Mirror Right Chest", SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MAP_CHEST, 0x06, 0x03, "Spirit Temple Map Chest", SPIRIT_TEMPLE_MAP_CHEST, SPIRIT_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, 0x06, 0x06, "Spirit Temple Child Climb North Chest", SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, 0x06, 0x0C, "Spirit Temple Child Climb East Chest", SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, 0x06, 0x01, "Spirit Temple Sun Block Room Chest", SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST, 0x06, 0x02, "Spirit Temple Statue Room Hand Chest", SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST, 0x06, 0x0F, "Spirit Temple Statue Room Northeast Chest", SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST, 0x06, 0x05, "Spirit Temple Near Four Armos Chest", SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, 0x06, 0x14, "Spirit Temple Hallway Right Invisible Chest", SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST, 0x06, 0x15, "Spirit Temple Hallway Left Invisible Chest", SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST, 0x06, 0x0A, "Spirit Temple Boss Key Chest", SPIRIT_TEMPLE_BOSS_KEY_CHEST, SPIRIT_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_TOPMOST_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_TOPMOST_CHEST, 0x06, 0x12, "Spirit Temple Topmost Chest", SPIRIT_TEMPLE_TOPMOST_CHEST, BOMBS_20, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); //Spirit Temple MQ - locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, 0x06, 0x1A, "Spirit Temple MQ Entrance Front Left Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, BOMBCHU_10, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, 0x06, 0x1F, "Spirit Temple MQ Entrance Back Right Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, BOMBCHU_10, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, 0x06, 0x1B, "Spirit Temple MQ Entrance Front Right Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST, 0x06, 0x1E, "Spirit Temple MQ Entrance Back Left Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST, 0x06, 0x1D, "Spirit Temple MQ Child Hammer Switch Chest", SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_MAP_CHEST, 0x06, 0x00, "Spirit Temple MQ Map Chest", SPIRIT_TEMPLE_MQ_MAP_CHEST, SPIRIT_TEMPLE_MAP, {Category::cSpiritTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST, 0x06, 0x08, "Spirit Temple MQ Map Room Enemy Chest", SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, 0x06, 0x06, "Spirit Temple MQ Child Climb North Chest", SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, BOMBCHU_10, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST, 0x06, 0x0C, "Spirit Temple MQ Child Climb South Chest", SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST, 0x06, 0x03, "Spirit Temple MQ Compass Chest", SPIRIT_TEMPLE_MQ_COMPASS_CHEST, SPIRIT_TEMPLE_COMPASS, {Category::cSpiritTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, 0x06, 0x0F, "Spirit Temple MQ Statue Room Lullaby Chest", SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, BLUE_RUPEE, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, 0x06, 0x02, "Spirit Temple MQ Statue Room Invisible Chest", SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, RECOVERY_HEART, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, 0x06, 0x1C, "Spirit Temple MQ Silver Block Hallway Chest", SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST, 0x06, 0x01, "Spirit Temple MQ Sun Block Room Chest", SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST, RECOVERY_HEART, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST, 0x06, 0x07, "Spirit Temple MQ Symphony Room Chest", SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST, PURPLE_RUPEE, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST, 0x06, 0x04, "Spirit Temple MQ Leever Room Chest", SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST, PURPLE_RUPEE, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST, 0x06, 0x19, "Spirit Temple MQ Beamos Room Chest", SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST, RECOVERY_HEART, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST, 0x06, 0x18, "Spirit Temple MQ Chest Switch Chest", SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST, ICE_TRAP, {Category::cSpiritTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST, 0x06, 0x05, "Spirit Temple MQ Boss Key Chest", SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST, SPIRIT_TEMPLE_BOSS_KEY, {Category::cSpiritTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, 0x06, 0x12, "Spirit Temple MQ Mirror Puzzle Invisible Chest", SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cSpiritTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, 0x06, 0x1A, "Spirit Temple MQ Entrance Front Left Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, 0x06, 0x1F, "Spirit Temple MQ Entrance Back Right Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, 0x06, 0x1B, "Spirit Temple MQ Entrance Front Right Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST, 0x06, 0x1E, "Spirit Temple MQ Entrance Back Left Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST, 0x06, 0x1D, "Spirit Temple MQ Child Hammer Switch Chest", SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_MAP_CHEST, 0x06, 0x00, "Spirit Temple MQ Map Chest", SPIRIT_TEMPLE_MQ_MAP_CHEST, SPIRIT_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST, 0x06, 0x08, "Spirit Temple MQ Map Room Enemy Chest", SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, 0x06, 0x06, "Spirit Temple MQ Child Climb North Chest", SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST, 0x06, 0x0C, "Spirit Temple MQ Child Climb South Chest", SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST, 0x06, 0x03, "Spirit Temple MQ Compass Chest", SPIRIT_TEMPLE_MQ_COMPASS_CHEST, SPIRIT_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, 0x06, 0x0F, "Spirit Temple MQ Statue Room Lullaby Chest", SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, 0x06, 0x02, "Spirit Temple MQ Statue Room Invisible Chest", SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, 0x06, 0x1C, "Spirit Temple MQ Silver Block Hallway Chest", SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST, 0x06, 0x01, "Spirit Temple MQ Sun Block Room Chest", SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST, 0x06, 0x07, "Spirit Temple MQ Symphony Room Chest", SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST, 0x06, 0x04, "Spirit Temple MQ Leever Room Chest", SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST, 0x06, 0x19, "Spirit Temple MQ Beamos Room Chest", SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST, 0x06, 0x18, "Spirit Temple MQ Chest Switch Chest", SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST, ICE_TRAP, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST, 0x06, 0x05, "Spirit Temple MQ Boss Key Chest", SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST, SPIRIT_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, 0x06, 0x12, "Spirit Temple MQ Mirror Puzzle Invisible Chest", SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, SPIRIT_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); //Shadow Temple Vanilla - locationTable[SHADOW_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MAP_CHEST, 0x07, 0x01, "Shadow Temple Map Chest", SHADOW_TEMPLE_MAP_CHEST, SHADOW_TEMPLE_MAP, {Category::cShadowTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, 0x07, 0x07, "Shadow Temple Hover Boots Chest", SHADOW_TEMPLE_HOVER_BOOTS_CHEST, HOVER_BOOTS, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_COMPASS_CHEST, 0x07, 0x03, "Shadow Temple Compass Chest", SHADOW_TEMPLE_COMPASS_CHEST, SHADOW_TEMPLE_COMPASS, {Category::cShadowTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, 0x07, 0x02, "Shadow Temple Early Silver Rupee Chest", SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, 0x07, 0x0C, "Shadow Temple Invisible Blades Visible Chest", SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, 0x07, 0x16, "Shadow Temple Invisible Blades Invisible Chest", SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, ARROWS_30, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST, 0x07, 0x05, "Shadow Temple Falling Spikes Lower Chest", SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST, ARROWS_10, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST, 0x07, 0x06, "Shadow Temple Falling Spikes Upper Chest", SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST, 0x07, 0x04, "Shadow Temple Falling Spikes Switch Chest", SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, 0x07, 0x09, "Shadow Temple Invisible Spikes Chest", SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_WIND_HINT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_WIND_HINT_CHEST, 0x07, 0x15, "Shadow Temple Wind Hint Chest", SHADOW_TEMPLE_WIND_HINT_CHEST, ARROWS_10, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, 0x07, 0x08, "Shadow Temple After Wind Enemy Chest", SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, 0x07, 0x14, "Shadow Temple After Wind Hidden Chest", SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST, 0x07, 0x0A, "Shadow Temple Spike Walls Left Chest", SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_BOSS_KEY_CHEST, 0x07, 0x0B, "Shadow Temple Boss Key Chest", SHADOW_TEMPLE_BOSS_KEY_CHEST, SHADOW_TEMPLE_BOSS_KEY, {Category::cShadowTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, 0x07, 0x0D, "Shadow Temple Invisible Floormaster Chest", SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_FREESTANDING_KEY] = ItemLocation::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY, 0x07, 0x01, "Shadow Temple Freestanding Key", SHADOW_TEMPLE_FREESTANDING_KEY, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MAP_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MAP_CHEST, 0x07, 0x01, "Shadow Temple Map Chest", SHADOW_TEMPLE_MAP_CHEST, SHADOW_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_HOVER_BOOTS_CHEST, 0x07, 0x07, "Shadow Temple Hover Boots Chest", SHADOW_TEMPLE_HOVER_BOOTS_CHEST, HOVER_BOOTS, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_COMPASS_CHEST, 0x07, 0x03, "Shadow Temple Compass Chest", SHADOW_TEMPLE_COMPASS_CHEST, SHADOW_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, 0x07, 0x02, "Shadow Temple Early Silver Rupee Chest", SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, 0x07, 0x0C, "Shadow Temple Invisible Blades Visible Chest", SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, 0x07, 0x16, "Shadow Temple Invisible Blades Invisible Chest", SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, ARROWS_30, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST, 0x07, 0x05, "Shadow Temple Falling Spikes Lower Chest", SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST, 0x07, 0x06, "Shadow Temple Falling Spikes Upper Chest", SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST, 0x07, 0x04, "Shadow Temple Falling Spikes Switch Chest", SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, 0x07, 0x09, "Shadow Temple Invisible Spikes Chest", SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_WIND_HINT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_WIND_HINT_CHEST, 0x07, 0x15, "Shadow Temple Wind Hint Chest", SHADOW_TEMPLE_WIND_HINT_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, 0x07, 0x08, "Shadow Temple After Wind Enemy Chest", SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, 0x07, 0x14, "Shadow Temple After Wind Hidden Chest", SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST, 0x07, 0x0A, "Shadow Temple Spike Walls Left Chest", SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_BOSS_KEY_CHEST, 0x07, 0x0B, "Shadow Temple Boss Key Chest", SHADOW_TEMPLE_BOSS_KEY_CHEST, SHADOW_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, 0x07, 0x0D, "Shadow Temple Invisible Floormaster Chest", SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_FREESTANDING_KEY] = ItemLocation::Collectable(RC_SHADOW_TEMPLE_FREESTANDING_KEY, 0x07, 0x01, "Shadow Temple Freestanding Key", SHADOW_TEMPLE_FREESTANDING_KEY, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); //Shadow Temple MQ - locationTable[SHADOW_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST, 0x07, 0x01, "Shadow Temple MQ Compass Chest", SHADOW_TEMPLE_MQ_COMPASS_CHEST, SHADOW_TEMPLE_COMPASS, {Category::cShadowTemple, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, 0x07, 0x07, "Shadow Temple MQ Hover Boots Chest", SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, HOVER_BOOTS, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, 0x07, 0x03, "Shadow Temple MQ Early Gibdos Chest", SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_MAP_CHEST, 0x07, 0x02, "Shadow Temple MQ Map Chest", SHADOW_TEMPLE_MQ_MAP_CHEST, SHADOW_TEMPLE_MAP, {Category::cShadowTemple, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST, 0x07, 0x0F, "Shadow Temple MQ Beamos Silver Rupees Chest", SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST, ARROWS_5, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, 0x07, 0x04, "Shadow Temple MQ Falling Spikes Switch Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST, 0x07, 0x05, "Shadow Temple MQ Falling Spikes Lower Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST, ARROWS_10, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST, 0x07, 0x06, "Shadow Temple MQ Falling Spikes Upper Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST, ARROWS_5, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, 0x07, 0x09, "Shadow Temple MQ Invisible Spikes Chest", SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST, 0x07, 0x0B, "Shadow Temple MQ Boss Key Chest", SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST, SHADOW_TEMPLE_BOSS_KEY, {Category::cShadowTemple, Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, 0x07, 0x0A, "Shadow Temple MQ Spike Walls Left Chest", SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, 0x07, 0x10, "Shadow Temple MQ Stalfos Room Chest", SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, RED_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, 0x07, 0x16, "Shadow Temple MQ Invisible Blades Invisible Chest", SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST, 0x07, 0x0C, "Shadow Temple MQ Invisible Blades Visible Chest", SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST, 0x07, 0x0D, "Shadow Temple MQ Bomb Flower Chest", SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST, ARROWS_10, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST, 0x07, 0x15, "Shadow Temple MQ Wind Hint Chest", SHADOW_TEMPLE_MQ_WIND_HINT_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, 0x07, 0x14, "Shadow Temple MQ After Wind Hidden Chest", SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, ARROWS_5, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, 0x07, 0x08, "Shadow Temple MQ After Wind Enemy Chest", SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, BLUE_RUPEE, {Category::cShadowTemple,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, 0x07, 0x0E, "Shadow Temple MQ Near Ship Invisible Chest", SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = ItemLocation::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY, 0x07, 0x06, "Shadow Temple MQ Freestanding Key", SHADOW_TEMPLE_MQ_FREESTANDING_KEY, SHADOW_TEMPLE_SMALL_KEY, {Category::cShadowTemple, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST, 0x07, 0x01, "Shadow Temple MQ Compass Chest", SHADOW_TEMPLE_MQ_COMPASS_CHEST, SHADOW_TEMPLE_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, 0x07, 0x07, "Shadow Temple MQ Hover Boots Chest", SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, HOVER_BOOTS, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, 0x07, 0x03, "Shadow Temple MQ Early Gibdos Chest", SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_MAP_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_MAP_CHEST, 0x07, 0x02, "Shadow Temple MQ Map Chest", SHADOW_TEMPLE_MQ_MAP_CHEST, SHADOW_TEMPLE_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST, 0x07, 0x0F, "Shadow Temple MQ Beamos Silver Rupees Chest", SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST, ARROWS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, 0x07, 0x04, "Shadow Temple MQ Falling Spikes Switch Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST, 0x07, 0x05, "Shadow Temple MQ Falling Spikes Lower Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST, 0x07, 0x06, "Shadow Temple MQ Falling Spikes Upper Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST, ARROWS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, 0x07, 0x09, "Shadow Temple MQ Invisible Spikes Chest", SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST, 0x07, 0x0B, "Shadow Temple MQ Boss Key Chest", SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST, SHADOW_TEMPLE_BOSS_KEY, {Category::cVanillaBossKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, 0x07, 0x0A, "Shadow Temple MQ Spike Walls Left Chest", SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, 0x07, 0x10, "Shadow Temple MQ Stalfos Room Chest", SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, 0x07, 0x16, "Shadow Temple MQ Invisible Blades Invisible Chest", SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST, 0x07, 0x0C, "Shadow Temple MQ Invisible Blades Visible Chest", SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST, 0x07, 0x0D, "Shadow Temple MQ Bomb Flower Chest", SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_WIND_HINT_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST, 0x07, 0x15, "Shadow Temple MQ Wind Hint Chest", SHADOW_TEMPLE_MQ_WIND_HINT_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, 0x07, 0x14, "Shadow Temple MQ After Wind Hidden Chest", SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, ARROWS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, 0x07, 0x08, "Shadow Temple MQ After Wind Enemy Chest", SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = ItemLocation::Chest (RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, 0x07, 0x0E, "Shadow Temple MQ Near Ship Invisible Chest", SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = ItemLocation::Collectable(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY, 0x07, 0x06, "Shadow Temple MQ Freestanding Key", SHADOW_TEMPLE_MQ_FREESTANDING_KEY, SHADOW_TEMPLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); //Bottom of the Well Vanilla - locationTable[BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST, 0x08, 0x08, "Bottom of the Well Front Left Fake Wall Chest", BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cBottomOfTheWell, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST, 0x08, 0x02, "Bottom of the Well Front Center Bombable Chest", BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST, BOMBCHU_10, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, 0x08, 0x05, "Bottom of the Well Right Bottom Fake Wall Chest", BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cBottomOfTheWell, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_COMPASS_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST, 0x08, 0x01, "Bottom of the Well Compass Chest", BOTTOM_OF_THE_WELL_COMPASS_CHEST, BOTTOM_OF_THE_WELL_COMPASS, {Category::cBottomOfTheWell, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST, 0x08, 0x0E, "Bottom of the Well Center Skulltula Chest", BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST, DEKU_NUTS_5, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST, 0x08, 0x04, "Bottom of the Well Back Left Bombable Chest", BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST, DEKU_NUTS_10, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST, 0x08, 0x03, "Bottom of the Well Lens of Truth Chest", BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST, LENS_OF_TRUTH, {Category::cBottomOfTheWell, Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST, 0x08, 0x14, "Bottom of the Well Invisible Chest", BOTTOM_OF_THE_WELL_INVISIBLE_CHEST, HUGE_RUPEE, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST, 0x08, 0x10, "Bottom of the Well Underwater Front Chest", BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST, BOMBS_10, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST, 0x08, 0x09, "Bottom of the Well Underwater Left Chest", BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST, RECOVERY_HEART, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MAP_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MAP_CHEST, 0x08, 0x07, "Bottom of the Well Map Chest", BOTTOM_OF_THE_WELL_MAP_CHEST, BOTTOM_OF_THE_WELL_MAP, {Category::cBottomOfTheWell, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST, 0x08, 0x0A, "Bottom of the Well Fire Keese Chest", BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST, DEKU_SHIELD, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST, 0x08, 0x0C, "Bottom of the Well Like Like Chest", BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST, HYLIAN_SHIELD, {Category::cBottomOfTheWell,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY, 0x08, 0x01, "Bottom of the Well Freestanding Key", BOTTOM_OF_THE_WELL_FREESTANDING_KEY, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cBottomOfTheWell, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST, 0x08, 0x08, "Bottom of the Well Front Left Fake Wall Chest", BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST, 0x08, 0x02, "Bottom of the Well Front Center Bombable Chest", BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, 0x08, 0x05, "Bottom of the Well Right Bottom Fake Wall Chest", BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_COMPASS_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST, 0x08, 0x01, "Bottom of the Well Compass Chest", BOTTOM_OF_THE_WELL_COMPASS_CHEST, BOTTOM_OF_THE_WELL_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST, 0x08, 0x0E, "Bottom of the Well Center Skulltula Chest", BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST, DEKU_NUTS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST, 0x08, 0x04, "Bottom of the Well Back Left Bombable Chest", BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST, DEKU_NUTS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST, 0x08, 0x03, "Bottom of the Well Lens of Truth Chest", BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST, LENS_OF_TRUTH, {Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST, 0x08, 0x14, "Bottom of the Well Invisible Chest", BOTTOM_OF_THE_WELL_INVISIBLE_CHEST, HUGE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST, 0x08, 0x10, "Bottom of the Well Underwater Front Chest", BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST, BOMBS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST, 0x08, 0x09, "Bottom of the Well Underwater Left Chest", BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MAP_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MAP_CHEST, 0x08, 0x07, "Bottom of the Well Map Chest", BOTTOM_OF_THE_WELL_MAP_CHEST, BOTTOM_OF_THE_WELL_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST, 0x08, 0x0A, "Bottom of the Well Fire Keese Chest", BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST, DEKU_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST, 0x08, 0x0C, "Bottom of the Well Like Like Chest", BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST, HYLIAN_SHIELD, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY, 0x08, 0x01, "Bottom of the Well Freestanding Key", BOTTOM_OF_THE_WELL_FREESTANDING_KEY, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); //Bottom of the Well MQBottomOfTheWell] - locationTable[BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST, 0x08, 0x03, "Bottom of the Well MQ Map Chest", BOTTOM_OF_THE_WELL_MQ_MAP_CHEST, BOTTOM_OF_THE_WELL_MAP, {Category::cBottomOfTheWell, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST, 0x08, 0x01, "Bottom of the Well MQ Lens of Truth Chest", BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST, LENS_OF_TRUTH, {Category::cBottomOfTheWell, Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST, 0x08, 0x02, "Bottom of the Well MQ Compass Chest", BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST, BOTTOM_OF_THE_WELL_COMPASS, {Category::cBottomOfTheWell, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, 0x08, 0x02, "Bottom of the Well MQ Dead Hand Freestanding Key", BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cBottomOfTheWell, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, 0x08, 0x01, "Bottom of the Well MQ East Inner Room Freestanding Key",BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cBottomOfTheWell, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST, 0x08, 0x03, "Bottom of the Well MQ Map Chest", BOTTOM_OF_THE_WELL_MQ_MAP_CHEST, BOTTOM_OF_THE_WELL_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST, 0x08, 0x01, "Bottom of the Well MQ Lens of Truth Chest", BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST, LENS_OF_TRUTH, {Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST, 0x08, 0x02, "Bottom of the Well MQ Compass Chest", BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST, BOTTOM_OF_THE_WELL_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, 0x08, 0x02, "Bottom of the Well MQ Dead Hand Freestanding Key", BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = ItemLocation::Collectable(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, 0x08, 0x01, "Bottom of the Well MQ East Inner Room Freestanding Key",BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY, BOTTOM_OF_THE_WELL_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); //Ice Cavern Vanilla - locationTable[ICE_CAVERN_MAP_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MAP_CHEST, 0x09, 0x00, "Ice Cavern Map Chest", ICE_CAVERN_MAP_CHEST, ICE_CAVERN_MAP, {Category::cIceCavern, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_COMPASS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_COMPASS_CHEST, 0x09, 0x01, "Ice Cavern Compass Chest", ICE_CAVERN_COMPASS_CHEST, ICE_CAVERN_COMPASS, {Category::cIceCavern, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_IRON_BOOTS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_IRON_BOOTS_CHEST, 0x09, 0x02, "Ice Cavern Iron Boots Chest", ICE_CAVERN_IRON_BOOTS_CHEST, IRON_BOOTS, {Category::cIceCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_FREESTANDING_POH] = ItemLocation::Collectable(RC_ICE_CAVERN_FREESTANDING_POH, 0x09, 0x01, "Ice Cavern Freestanding PoH", ICE_CAVERN_FREESTANDING_POH, PIECE_OF_HEART, {Category::cIceCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MAP_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MAP_CHEST, 0x09, 0x00, "Ice Cavern Map Chest", ICE_CAVERN_MAP_CHEST, ICE_CAVERN_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_COMPASS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_COMPASS_CHEST, 0x09, 0x01, "Ice Cavern Compass Chest", ICE_CAVERN_COMPASS_CHEST, ICE_CAVERN_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_IRON_BOOTS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_IRON_BOOTS_CHEST, 0x09, 0x02, "Ice Cavern Iron Boots Chest", ICE_CAVERN_IRON_BOOTS_CHEST, IRON_BOOTS, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_FREESTANDING_POH] = ItemLocation::Collectable(RC_ICE_CAVERN_FREESTANDING_POH, 0x09, 0x01, "Ice Cavern Freestanding PoH", ICE_CAVERN_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); //Ice Cavern MQIceCavern] - locationTable[ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, 0x09, 0x02, "Ice Cavern MQ Iron Boots Chest", ICE_CAVERN_MQ_IRON_BOOTS_CHEST, IRON_BOOTS, {Category::cIceCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MQ_COMPASS_CHEST, 0x09, 0x00, "Ice Cavern MQ Compass Chest", ICE_CAVERN_MQ_COMPASS_CHEST, ICE_CAVERN_COMPASS, {Category::cIceCavern, Category::cVanillaCompass,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_MQ_MAP_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MQ_MAP_CHEST, 0x09, 0x01, "Ice Cavern MQ Map Chest", ICE_CAVERN_MQ_MAP_CHEST, ICE_CAVERN_MAP, {Category::cIceCavern, Category::cVanillaMap,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_MQ_FREESTANDING_POH] = ItemLocation::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH, 0x09, 0x01, "Ice Cavern MQ Freestanding PoH", ICE_CAVERN_MQ_FREESTANDING_POH, PIECE_OF_HEART, {Category::cIceCavern,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MQ_IRON_BOOTS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, 0x09, 0x02, "Ice Cavern MQ Iron Boots Chest", ICE_CAVERN_MQ_IRON_BOOTS_CHEST, IRON_BOOTS, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MQ_COMPASS_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MQ_COMPASS_CHEST, 0x09, 0x00, "Ice Cavern MQ Compass Chest", ICE_CAVERN_MQ_COMPASS_CHEST, ICE_CAVERN_COMPASS, {Category::cVanillaCompass}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MQ_MAP_CHEST] = ItemLocation::Chest (RC_ICE_CAVERN_MQ_MAP_CHEST, 0x09, 0x01, "Ice Cavern MQ Map Chest", ICE_CAVERN_MQ_MAP_CHEST, ICE_CAVERN_MAP, {Category::cVanillaMap}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MQ_FREESTANDING_POH] = ItemLocation::Collectable(RC_ICE_CAVERN_MQ_FREESTANDING_POH, 0x09, 0x01, "Ice Cavern MQ Freestanding PoH", ICE_CAVERN_MQ_FREESTANDING_POH, PIECE_OF_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); //Gerudo Training Ground Vanilla - locationTable[GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST, 0x0B, 0x13, "Gerudo Training Grounds Lobby Left Chest", GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST, BLUE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, 0x0B, 0x07, "Gerudo Training Grounds Lobby Right Chest", GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST, ARROWS_10, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_STALFOS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST, 0x0B, 0x00, "Gerudo Training Grounds Stalfos Chest", GERUDO_TRAINING_GROUNDS_STALFOS_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST, 0x0B, 0x01, "Gerudo Training Grounds Beamos Chest", GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST, 0x0B, 0x0B, "Gerudo Training Grounds Hidden Ceiling Chest", GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST, 0x0B, 0x06, "Gerudo Training Grounds Maze Path First Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST, PURPLE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, 0x0B, 0x0A, "Gerudo Training Grounds Maze Path Second Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST, RED_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST, 0x0B, 0x09, "Gerudo Training Grounds Maze Path Third Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST, ARROWS_30, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST, 0x0B, 0x0C, "Gerudo Training Grounds Maze Path Final Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST, ICE_ARROWS, {Category::cGerudoTrainingGrounds, Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, 0x0B, 0x05, "Gerudo Training Grounds Maze Right Central Chest", GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST, BOMBCHU_5, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST, 0x0B, 0x08, "Gerudo Training Grounds Maze Right Side Chest", GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST, ARROWS_30, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, 0x0B, 0x0D, "Gerudo Training Grounds Underwater Silver Rupee Chest", GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST, 0x0B, 0x12, "Gerudo Training Grounds Hammer Room Clear Chest", GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST, ARROWS_10, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, 0x0B, 0x10, "Gerudo Training Grounds Hammer Room Switch Chest", GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, 0x0B, 0x03, "Gerudo Training Grounds Eye Statue Chest", GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, 0x0B, 0x04, "Gerudo Training Grounds Near Scarecrow Chest", GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, 0x0B, 0x11, "Gerudo Training Grounds Before Heavy Block Chest", GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST, ARROWS_30, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST, 0x0B, 0x0F, "Gerudo Training Grounds Heavy Block First Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST, HUGE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, 0x0B, 0x0E, "Gerudo Training Grounds Heavy Block Second Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST, BLUE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST, 0x0B, 0x14, "Gerudo Training Grounds Heavy Block Third Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, 0x0B, 0x02, "Gerudo Training Grounds Heavy Block Fourth Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST, ICE_TRAP, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY] = ItemLocation::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY, 0x0B, 0x01, "Gerudo Training Grounds Freestanding Key", GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST, 0x0B, 0x13, "Gerudo Training Grounds Lobby Left Chest", GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST, 0x0B, 0x07, "Gerudo Training Grounds Lobby Right Chest", GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_STALFOS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST, 0x0B, 0x00, "Gerudo Training Grounds Stalfos Chest", GERUDO_TRAINING_GROUNDS_STALFOS_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST, 0x0B, 0x01, "Gerudo Training Grounds Beamos Chest", GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST, 0x0B, 0x0B, "Gerudo Training Grounds Hidden Ceiling Chest", GERUDO_TRAINING_GROUNDS_HIDDEN_CEILING_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST, 0x0B, 0x06, "Gerudo Training Grounds Maze Path First Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_FIRST_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST, 0x0B, 0x0A, "Gerudo Training Grounds Maze Path Second Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_SECOND_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST, 0x0B, 0x09, "Gerudo Training Grounds Maze Path Third Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_THIRD_CHEST, ARROWS_30, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST, 0x0B, 0x0C, "Gerudo Training Grounds Maze Path Final Chest", GERUDO_TRAINING_GROUNDS_MAZE_PATH_FINAL_CHEST, ICE_ARROWS, {Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, 0x0B, 0x05, "Gerudo Training Grounds Maze Right Central Chest", GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_CENTRAL_CHEST, BOMBCHU_5, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST, 0x0B, 0x08, "Gerudo Training Grounds Maze Right Side Chest", GERUDO_TRAINING_GROUNDS_MAZE_RIGHT_SIDE_CHEST, ARROWS_30, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, 0x0B, 0x0D, "Gerudo Training Grounds Underwater Silver Rupee Chest", GERUDO_TRAINING_GROUNDS_UNDERWATER_SILVER_RUPEE_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST, 0x0B, 0x12, "Gerudo Training Grounds Hammer Room Clear Chest", GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, 0x0B, 0x10, "Gerudo Training Grounds Hammer Room Switch Chest", GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, 0x0B, 0x03, "Gerudo Training Grounds Eye Statue Chest", GERUDO_TRAINING_GROUNDS_EYE_STATUE_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, 0x0B, 0x04, "Gerudo Training Grounds Near Scarecrow Chest", GERUDO_TRAINING_GROUNDS_NEAR_SCARECROW_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, 0x0B, 0x11, "Gerudo Training Grounds Before Heavy Block Chest", GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST, ARROWS_30, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST, 0x0B, 0x0F, "Gerudo Training Grounds Heavy Block First Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST, HUGE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, 0x0B, 0x0E, "Gerudo Training Grounds Heavy Block Second Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST, 0x0B, 0x14, "Gerudo Training Grounds Heavy Block Third Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST, 0x0B, 0x02, "Gerudo Training Grounds Heavy Block Fourth Chest", GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST, ICE_TRAP, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY] = ItemLocation::Collectable(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY, 0x0B, 0x01, "Gerudo Training Grounds Freestanding Key", GERUDO_TRAINING_GROUNDS_FREESTANDING_KEY, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); //Gerudo Training Grounds MQ - locationTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST, 0x0B, 0x07, "Gerudo Training Grounds MQ Lobby Right Chest", GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST, BOMBCHU_5, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST, 0x0B, 0x13, "Gerudo Training Grounds MQ Lobby Left Chest", GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST, ARROWS_10, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, 0x0B, 0x00, "Gerudo Training Grounds MQ First Iron Knuckle Chest", GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST, BLUE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, 0x0B, 0x11, "Gerudo Training Grounds MQ Before Heavy Block Chest", GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST, ARROWS_10, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST, 0x0B, 0x03, "Gerudo Training Grounds MQ Eye Statue Chest", GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST, BOMBCHU_10, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST, 0x0B, 0x0E, "Gerudo Training Grounds MQ Flame Circle Chest", GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, 0x0B, 0x12, "Gerudo Training Grounds MQ Second Iron Knuckle Chest", GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST, ARROWS_10, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, 0x0B, 0x01, "Gerudo Training Grounds MQ Dinolfos Chest", GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST, 0x0B, 0x04, "Gerudo Training Grounds MQ Ice Arrows Chest", GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST, ICE_ARROWS, {Category::cGerudoTrainingGrounds, Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, 0x0B, 0x05, "Gerudo Training Grounds MQ Maze Right Central Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST, BLUE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST, 0x0B, 0x06, "Gerudo Training Grounds MQ Maze Path First Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST, GREEN_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST, 0x0B, 0x08, "Gerudo Training Grounds MQ Maze Right Side Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST, TREASURE_GAME_GREEN_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST, 0x0B, 0x09, "Gerudo Training Grounds MQ Maze Path Third Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST, TREASURE_GAME_GREEN_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, 0x0B, 0x0A, "Gerudo Training Grounds MQ Maze Path Second Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST, RED_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST, 0x0B, 0x0B, "Gerudo Training Grounds MQ Hidden Ceiling Chest", GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST, PURPLE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, 0x0B, 0x0D, "Gerudo Training Grounds MQ Underwater Silver Rupee Chest",GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST, TREASURE_GAME_GREEN_RUPEE, {Category::cGerudoTrainingGrounds, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); - locationTable[GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST, 0x0B, 0x02, "Gerudo Training Grounds MQ Heavy Block Chest", GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST, PURPLE_RUPEE, {Category::cGerudoTrainingGrounds,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST, 0x0B, 0x07, "Gerudo Training Grounds MQ Lobby Right Chest", GERUDO_TRAINING_GROUNDS_MQ_LOBBY_RIGHT_CHEST, BOMBCHU_5, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST, 0x0B, 0x13, "Gerudo Training Grounds MQ Lobby Left Chest", GERUDO_TRAINING_GROUNDS_MQ_LOBBY_LEFT_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, 0x0B, 0x00, "Gerudo Training Grounds MQ First Iron Knuckle Chest", GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST, 0x0B, 0x11, "Gerudo Training Grounds MQ Before Heavy Block Chest", GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST, 0x0B, 0x03, "Gerudo Training Grounds MQ Eye Statue Chest", GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST, 0x0B, 0x0E, "Gerudo Training Grounds MQ Flame Circle Chest", GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, 0x0B, 0x12, "Gerudo Training Grounds MQ Second Iron Knuckle Chest", GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST, 0x0B, 0x01, "Gerudo Training Grounds MQ Dinolfos Chest", GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST, GERUDO_TRAINING_GROUNDS_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST, 0x0B, 0x04, "Gerudo Training Grounds MQ Ice Arrows Chest", GERUDO_TRAINING_GROUNDS_MQ_ICE_ARROWS_CHEST, ICE_ARROWS, {Category::cSongDungeonReward}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, 0x0B, 0x05, "Gerudo Training Grounds MQ Maze Right Central Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_CENTRAL_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST, 0x0B, 0x06, "Gerudo Training Grounds MQ Maze Path First Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_FIRST_CHEST, GREEN_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST, 0x0B, 0x08, "Gerudo Training Grounds MQ Maze Right Side Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_RIGHT_SIDE_CHEST, TREASURE_GAME_GREEN_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST, 0x0B, 0x09, "Gerudo Training Grounds MQ Maze Path Third Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_THIRD_CHEST, TREASURE_GAME_GREEN_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST, 0x0B, 0x0A, "Gerudo Training Grounds MQ Maze Path Second Chest", GERUDO_TRAINING_GROUNDS_MQ_MAZE_PATH_SECOND_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST, 0x0B, 0x0B, "Gerudo Training Grounds MQ Hidden Ceiling Chest", GERUDO_TRAINING_GROUNDS_MQ_HIDDEN_CEILING_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, 0x0B, 0x0D, "Gerudo Training Grounds MQ Underwater Silver Rupee Chest",GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER_SILVER_RUPEE_CHEST, TREASURE_GAME_GREEN_RUPEE, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); + locationTable[GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST] = ItemLocation::Chest (RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST, 0x0B, 0x02, "Gerudo Training Grounds MQ Heavy Block Chest", GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST, PURPLE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_GERUDO_TRAINING_GROUND); //Ganons Castle Shared - locationTable[GANONS_TOWER_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_GANONS_TOWER_BOSS_KEY_CHEST, 0x0A, 0x0B, "Ganon's Tower Boss Key Chest", GANONS_TOWER_BOSS_KEY_CHEST, GANONS_CASTLE_BOSS_KEY, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_TOWER_BOSS_KEY_CHEST] = ItemLocation::Chest (RC_GANONS_TOWER_BOSS_KEY_CHEST, 0x0A, 0x0B, "Ganon's Tower Boss Key Chest", GANONS_TOWER_BOSS_KEY_CHEST, GANONS_CASTLE_BOSS_KEY, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); //Ganons Castle Vanilla - locationTable[GANONS_CASTLE_FOREST_TRIAL_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, 0x0D, 0x09, "Ganon's Castle Forest Trial Chest", GANONS_CASTLE_FOREST_TRIAL_CHEST, BLUE_RUPEE, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST, 0x0D, 0x07, "Ganon's Castle Water Trial Left Chest", GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST, ICE_TRAP, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, 0x0D, 0x06, "Ganon's Castle Water Trial Right Chest", GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, RECOVERY_HEART, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST, 0x0D, 0x08, "Ganon's Castle Shadow Trial Front Chest", GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST, BLUE_RUPEE, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, 0x0D, 0x05, "Ganon's Castle Shadow Trial Golden Gauntlets Chest", GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, PROGRESSIVE_STRENGTH, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, 0x0D, 0x12, "Ganon's Castle Spirit Trial Crystal Switch Chest", GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, BOMBCHU_20, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST, 0x0D, 0x14, "Ganon's Castle Spirit Trial Invisible Chest", GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST, ARROWS_10, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST, 0x0D, 0x0C, "Ganon's Castle Light Trial First Left Chest", GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST, BLUE_RUPEE, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST, 0x0D, 0x0B, "Ganon's Castle Light Trial Second Left Chest", GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST, ICE_TRAP, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST, 0x0D, 0x0D, "Ganon's Castle Light Trial Third Left Chest", GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST, RECOVERY_HEART, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST, 0x0D, 0x0E, "Ganon's Castle Light Trial First Right Chest", GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST, ICE_TRAP, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST, 0x0D, 0x0A, "Ganon's Castle Light Trial Second Right Chest", GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST, ARROWS_30, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST, 0x0D, 0x0F, "Ganon's Castle Light Trial Third Right Chest", GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST, ICE_TRAP, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, 0x0D, 0x10, "Ganon's Castle Light Trial Invisible Enemies Chest", GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cGanonsCastle, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST, 0x0D, 0x11, "Ganon's Castle Light Trial Lullaby Chest", GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cGanonsCastle, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT, 0x0D, 0x37, "Ganon's Castle Deku Scrub Center-Left", GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT, BUY_BOMBS_535, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x06), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, 0x0D, 0x33, "Ganon's Castle Deku Scrub Center-Right", GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, BUY_ARROWS_30, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_DEKU_SCRUB_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT, 0x0D, 0x39, "Ganon's Castle Deku Scrub Right", GANONS_CASTLE_DEKU_SCRUB_RIGHT, BUY_RED_POTION_30, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_DEKU_SCRUB_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_LEFT, 0x0D, 0x3A, "Ganon's Castle Deku Scrub Left", GANONS_CASTLE_DEKU_SCRUB_LEFT, BUY_GREEN_POTION, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x09), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_FOREST_TRIAL_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, 0x0D, 0x09, "Ganon's Castle Forest Trial Chest", GANONS_CASTLE_FOREST_TRIAL_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST, 0x0D, 0x07, "Ganon's Castle Water Trial Left Chest", GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST, ICE_TRAP, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, 0x0D, 0x06, "Ganon's Castle Water Trial Right Chest", GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST, 0x0D, 0x08, "Ganon's Castle Shadow Trial Front Chest", GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, 0x0D, 0x05, "Ganon's Castle Shadow Trial Golden Gauntlets Chest", GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST, PROGRESSIVE_STRENGTH, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, 0x0D, 0x12, "Ganon's Castle Spirit Trial Crystal Switch Chest", GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, BOMBCHU_20, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST, 0x0D, 0x14, "Ganon's Castle Spirit Trial Invisible Chest", GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST, 0x0D, 0x0C, "Ganon's Castle Light Trial First Left Chest", GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST, BLUE_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST, 0x0D, 0x0B, "Ganon's Castle Light Trial Second Left Chest", GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST, ICE_TRAP, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST, 0x0D, 0x0D, "Ganon's Castle Light Trial Third Left Chest", GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST, 0x0D, 0x0E, "Ganon's Castle Light Trial First Right Chest", GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST, ICE_TRAP, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST, 0x0D, 0x0A, "Ganon's Castle Light Trial Second Right Chest", GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST, ARROWS_30, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST, 0x0D, 0x0F, "Ganon's Castle Light Trial Third Right Chest", GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST, ICE_TRAP, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, 0x0D, 0x10, "Ganon's Castle Light Trial Invisible Enemies Chest", GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST, 0x0D, 0x11, "Ganon's Castle Light Trial Lullaby Chest", GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT, 0x0D, "Ganon's Castle Deku Scrub Center-Left", GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT, BUY_BOMBS_535, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, 0x0D, "Ganon's Castle Deku Scrub Center-Right", GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, BUY_ARROWS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_DEKU_SCRUB_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT, 0x0D, "Ganon's Castle Deku Scrub Right", GANONS_CASTLE_DEKU_SCRUB_RIGHT, BUY_RED_POTION_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_DEKU_SCRUB_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_DEKU_SCRUB_LEFT, 0x0D, "Ganon's Castle Deku Scrub Left", GANONS_CASTLE_DEKU_SCRUB_LEFT, BUY_GREEN_POTION, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); //Ganons Castle MQ - locationTable[GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, 0x0D, 0x01, "Ganon's Castle MQ Water Trial Chest", GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, RED_RUPEE, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, 0x0D, 0x02, "Ganon's Castle MQ Forest Trial Eye Switch Chest", GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, ARROWS_10, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, 0x0D, 0x03, "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest",GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, BOMBS_5, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, 0x0D, 0x04, "Ganon's Castle MQ Light Trial Lullaby Chest", GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, RECOVERY_HEART, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, 0x0D, 0x00, "Ganon's Castle MQ Shadow Trial Bomb Flower Chest", GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, ARROWS_10, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST, 0x0D, 0x05, "Ganon's Castle MQ Shadow Trial Eye Switch Chest", GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cGanonsCastle, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST, 0x0D, 0x06, "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST, PROGRESSIVE_STRENGTH, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST, 0x0D, 0x07, "Ganon's Castle MQ Spirit Trial Sun Back Right Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST, RECOVERY_HEART, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST, 0x0D, 0x08, "Ganon's Castle MQ Spirit Trial Sun Back Left Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cGanonsCastle, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST, 0x0D, 0x09, "Ganon's Castle MQ Spirit Trial Sun Front Left Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST, RECOVERY_HEART, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST, 0x0D, 0x0A, "Ganon's Castle MQ Spirit Trial First Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST, BOMBCHU_10, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST, 0x0D, 0x14, "Ganon's Castle MQ Spirit Trial Invisible Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST, ARROWS_10, {Category::cGanonsCastle,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] = ItemLocation::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, 0x0D, 0x01, "Ganon's Castle MQ Forest Trial Freestanding Key", GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, GANONS_CASTLE_SMALL_KEY, {Category::cGanonsCastle, Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT, 0x0D, 0x30, "Ganon's Castle MQ Deku Scrub Right", GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT, BUY_DEKU_NUT_5, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x01), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT, 0x0D, 0x37, "Ganon's Castle MQ Deku Scrub Center-Left", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT, BUY_BOMBS_535, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x06), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER, 0x0D, 0x33, "Ganon's Castle MQ Deku Scrub Center", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER, BUY_ARROWS_30, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x04), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, 0x0D, 0x39, "Ganon's Castle MQ Deku Scrub Center-Right", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, BUY_RED_POTION_30, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x08), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT, 0x0D, 0x3A, "Ganon's Castle MQ Deku Scrub Left", GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT, BUY_GREEN_POTION, {Category::cGanonsCastle, Category::cDekuScrub,}, SpoilerCollectionCheck::Scrub(0x0D, 0x09), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, 0x0D, 0x01, "Ganon's Castle MQ Water Trial Chest", GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, RED_RUPEE, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, 0x0D, 0x02, "Ganon's Castle MQ Forest Trial Eye Switch Chest", GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, 0x0D, 0x03, "Ganon's Castle MQ Forest Trial Frozen Eye Switch Chest",GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, BOMBS_5, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, 0x0D, 0x04, "Ganon's Castle MQ Light Trial Lullaby Chest", GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, 0x0D, 0x00, "Ganon's Castle MQ Shadow Trial Bomb Flower Chest", GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST, 0x0D, 0x05, "Ganon's Castle MQ Shadow Trial Eye Switch Chest", GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST, 0x0D, 0x06, "Ganon's Castle MQ Spirit Trial Golden Gauntlets Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST, PROGRESSIVE_STRENGTH, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST, 0x0D, 0x07, "Ganon's Castle MQ Spirit Trial Sun Back Right Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST, 0x0D, 0x08, "Ganon's Castle MQ Spirit Trial Sun Back Left Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST, GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST, 0x0D, 0x09, "Ganon's Castle MQ Spirit Trial Sun Front Left Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST, RECOVERY_HEART, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST, 0x0D, 0x0A, "Ganon's Castle MQ Spirit Trial First Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST, BOMBCHU_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST] = ItemLocation::Chest (RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST, 0x0D, 0x14, "Ganon's Castle MQ Spirit Trial Invisible Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST, ARROWS_10, {}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY] = ItemLocation::Collectable(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, 0x0D, 0x01, "Ganon's Castle MQ Forest Trial Freestanding Key", GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, GANONS_CASTLE_SMALL_KEY, {Category::cVanillaSmallKey}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT, 0x0D, "Ganon's Castle MQ Deku Scrub Right", GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT, BUY_DEKU_NUT_5, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT, 0x0D, "Ganon's Castle MQ Deku Scrub Center-Left", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT, BUY_BOMBS_535, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER, 0x0D, "Ganon's Castle MQ Deku Scrub Center", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER, BUY_ARROWS_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, 0x0D, "Ganon's Castle MQ Deku Scrub Center-Right", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, BUY_RED_POTION_30, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = ItemLocation::Base (RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT, 0x0D, "Ganon's Castle MQ Deku Scrub Left", GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT, BUY_GREEN_POTION, {Category::cDekuScrub}, SpoilerCollectionCheck::Scrub(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); /*------------------------------- --- GOLD SKULLTULA TOKENS --- -------------------------------*/ //Dungeons - locationTable[DEKU_TREE_GS_BASEMENT_BACK_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, 0x00, 0x01, "Deku Tree GS Basement Back Room", DEKU_TREE_GS_BASEMENT_BACK_ROOM, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_GS_BASEMENT_GATE] = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE, 0x00, 0x02, "Deku Tree GS Basement Gate", DEKU_TREE_GS_BASEMENT_GATE, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_GS_BASEMENT_VINES] = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES, 0x00, 0x04, "Deku Tree GS Basement Vines", DEKU_TREE_GS_BASEMENT_VINES, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_GS_COMPASS_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM, 0x00, 0x08, "Deku Tree GS Compass Room", DEKU_TREE_GS_COMPASS_ROOM, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_GS_BASEMENT_BACK_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, 0x00, 0x01, "Deku Tree GS Basement Back Room", DEKU_TREE_GS_BASEMENT_BACK_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_GS_BASEMENT_GATE] = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_GATE, 0x00, 0x02, "Deku Tree GS Basement Gate", DEKU_TREE_GS_BASEMENT_GATE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_GS_BASEMENT_VINES] = ItemLocation::GSToken(RC_DEKU_TREE_GS_BASEMENT_VINES, 0x00, 0x04, "Deku Tree GS Basement Vines", DEKU_TREE_GS_BASEMENT_VINES, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_GS_COMPASS_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_GS_COMPASS_ROOM, 0x00, 0x08, "Deku Tree GS Compass Room", DEKU_TREE_GS_COMPASS_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_GS_LOBBY] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY, 0x00, 0x02, "Deku Tree MQ GS Lobby", DEKU_TREE_MQ_GS_LOBBY, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_GS_COMPASS_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, 0x00, 0x08, "Deku Tree MQ GS Compass Room", DEKU_TREE_MQ_GS_COMPASS_ROOM, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, 0x00, 0x04, "Deku Tree MQ GS Basement Graves Room", DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM, 0x00, 0x01, "Deku Tree MQ GS Basement Back Room", DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM, {Category::cDekuTree, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_GS_LOBBY] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_LOBBY, 0x00, 0x02, "Deku Tree MQ GS Lobby", DEKU_TREE_MQ_GS_LOBBY, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_GS_COMPASS_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_COMPASS_ROOM, 0x00, 0x08, "Deku Tree MQ GS Compass Room", DEKU_TREE_MQ_GS_COMPASS_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, 0x00, 0x04, "Deku Tree MQ GS Basement Graves Room", DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = ItemLocation::GSToken(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM, 0x00, 0x01, "Deku Tree MQ GS Basement Back Room", DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS, 0x01, 0x01, "Dodongos Cavern GS Vines Above Stairs", DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_GS_SCARECROW] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW, 0x01, 0x02, "Dodongos Cavern GS Scarecrow", DODONGOS_CAVERN_GS_SCARECROW, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, 0x01, 0x04, "Dodongos Cavern GS Alcove Above Stairs", DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_GS_BACK_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM, 0x01, 0x08, "Dodongos Cavern GS Back Room", DODONGOS_CAVERN_GS_BACK_ROOM, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, 0x01, 0x10, "Dodongos Cavern GS Side Room Near Lower Lizalfos", DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS, 0x01, 0x01, "Dodongos Cavern GS Vines Above Stairs", DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_GS_SCARECROW] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_SCARECROW, 0x01, 0x02, "Dodongos Cavern GS Scarecrow", DODONGOS_CAVERN_GS_SCARECROW, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, 0x01, 0x04, "Dodongos Cavern GS Alcove Above Stairs", DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_GS_BACK_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_BACK_ROOM, 0x01, 0x08, "Dodongos Cavern GS Back Room", DODONGOS_CAVERN_GS_BACK_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, 0x01, 0x10, "Dodongos Cavern GS Side Room Near Lower Lizalfos", DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM, 0x01, 0x02, "Dodongos Cavern MQ GS Scrub Room", DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, 0x01, 0x08, "Dodongos Cavern MQ GS Song of Time Block Room", DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM, 0x01, 0x04, "Dodongos Cavern MQ GS Lizalfos Room", DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM, 0x01, 0x10, "Dodongos Cavern MQ GS Larvae Room", DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[DODONGOS_CAVERN_MQ_GS_BACK_AREA] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA, 0x01, 0x01, "Dodongos Cavern MQ GS Back Room", DODONGOS_CAVERN_MQ_GS_BACK_AREA, {Category::cDodongosCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM, 0x01, 0x02, "Dodongos Cavern MQ GS Scrub Room", DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, 0x01, 0x08, "Dodongos Cavern MQ GS Song of Time Block Room", DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM, 0x01, 0x04, "Dodongos Cavern MQ GS Lizalfos Room", DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM, 0x01, 0x10, "Dodongos Cavern MQ GS Larvae Room", DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[DODONGOS_CAVERN_MQ_GS_BACK_AREA] = ItemLocation::GSToken(RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA, 0x01, 0x01, "Dodongos Cavern MQ GS Back Room", DODONGOS_CAVERN_MQ_GS_BACK_AREA, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, 0x02, 0x01, "Jabu Jabus Belly GS Lobby Basement Lower", JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, 0x02, 0x02, "Jabu Jabus Belly GS Lobby Basement Upper", JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_GS_NEAR_BOSS] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, 0x02, 0x04, "Jabu Jabus Belly GS Near Boss", JABU_JABUS_BELLY_GS_NEAR_BOSS, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, 0x02, 0x08, "Jabu Jabus Belly GS Water Switch Room", JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, 0x02, 0x01, "Jabu Jabus Belly GS Lobby Basement Lower", JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, 0x02, 0x02, "Jabu Jabus Belly GS Lobby Basement Upper", JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_GS_NEAR_BOSS] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, 0x02, 0x04, "Jabu Jabus Belly GS Near Boss", JABU_JABUS_BELLY_GS_NEAR_BOSS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, 0x02, 0x08, "Jabu Jabus Belly GS Water Switch Room", JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM, 0x02, 0x04, "Jabu Jabus Belly MQ GS Tail Parasan Room", JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM, 0x02, 0x08, "Jabu Jabus Belly MQ GS Invisible Enemies Room", JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM, 0x02, 0x01, "Jabu Jabus Belly MQ GS Boomerang Chest Room", JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS, 0x02, 0x02, "Jabu Jabus Belly MQ GS Near Boss", JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS, {Category::cJabuJabusBelly, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM, 0x02, 0x04, "Jabu Jabus Belly MQ GS Tail Parasan Room", JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM, 0x02, 0x08, "Jabu Jabus Belly MQ GS Invisible Enemies Room", JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM, 0x02, 0x01, "Jabu Jabus Belly MQ GS Boomerang Chest Room", JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = ItemLocation::GSToken(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS, 0x02, 0x02, "Jabu Jabus Belly MQ GS Near Boss", JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD, 0x03, 0x01, "Forest Temple GS Raised Island Courtyard", FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_GS_FIRST_ROOM] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM, 0x03, 0x02, "Forest Temple GS First Room", FOREST_TEMPLE_GS_FIRST_ROOM, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, 0x03, 0x04, "Forest Temple GS Level Island Courtyard", FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_GS_LOBBY] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_LOBBY, 0x03, 0x08, "Forest Temple GS Lobby", FOREST_TEMPLE_GS_LOBBY, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_GS_BASEMENT] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT, 0x03, 0x10, "Forest Temple GS Basement", FOREST_TEMPLE_GS_BASEMENT, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD, 0x03, 0x01, "Forest Temple GS Raised Island Courtyard", FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_GS_FIRST_ROOM] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_FIRST_ROOM, 0x03, 0x02, "Forest Temple GS First Room", FOREST_TEMPLE_GS_FIRST_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, 0x03, 0x04, "Forest Temple GS Level Island Courtyard", FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_GS_LOBBY] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_LOBBY, 0x03, 0x08, "Forest Temple GS Lobby", FOREST_TEMPLE_GS_LOBBY, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_GS_BASEMENT] = ItemLocation::GSToken(RC_FOREST_TEMPLE_GS_BASEMENT, 0x03, 0x10, "Forest Temple GS Basement", FOREST_TEMPLE_GS_BASEMENT, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, 0x03, 0x02, "Forest Temple MQ GS First Hallway", FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, 0x03, 0x10, "Forest Temple MQ GS Block Push Room", FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, 0x03, 0x01, "Forest Temple MQ GS Raised Island Courtyard", FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, 0x03, 0x04, "Forest Temple MQ GS Level Island Courtyard", FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FOREST_TEMPLE_MQ_GS_WELL] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL, 0x03, 0x08, "Forest Temple MQ GS Well", FOREST_TEMPLE_MQ_GS_WELL, {Category::cForestTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, 0x03, 0x02, "Forest Temple MQ GS First Hallway", FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, 0x03, 0x10, "Forest Temple MQ GS Block Push Room", FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, 0x03, 0x01, "Forest Temple MQ GS Raised Island Courtyard", FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, 0x03, 0x04, "Forest Temple MQ GS Level Island Courtyard", FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FOREST_TEMPLE_MQ_GS_WELL] = ItemLocation::GSToken(RC_FOREST_TEMPLE_MQ_GS_WELL, 0x03, 0x08, "Forest Temple MQ GS Well", FOREST_TEMPLE_MQ_GS_WELL, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, 0x04, 0x01, "Fire Temple GS Song of Time Room", FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, 0x04, 0x02, "Fire Temple GS Boss Key Loop", FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_GS_BOULDER_MAZE] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE, 0x04, 0x04, "Fire Temple GS Boulder Maze", FIRE_TEMPLE_GS_BOULDER_MAZE, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_GS_SCARECROW_TOP] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, 0x04, 0x08, "Fire Temple GS Scarecrow Top", FIRE_TEMPLE_GS_SCARECROW_TOP, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_GS_SCARECROW_CLIMB] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, 0x04, 0x10, "Fire Temple GS Scarecrow Climb", FIRE_TEMPLE_GS_SCARECROW_CLIMB, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, 0x04, 0x01, "Fire Temple GS Song of Time Room", FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, 0x04, 0x02, "Fire Temple GS Boss Key Loop", FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_GS_BOULDER_MAZE] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_BOULDER_MAZE, 0x04, 0x04, "Fire Temple GS Boulder Maze", FIRE_TEMPLE_GS_BOULDER_MAZE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_GS_SCARECROW_TOP] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, 0x04, 0x08, "Fire Temple GS Scarecrow Top", FIRE_TEMPLE_GS_SCARECROW_TOP, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_GS_SCARECROW_CLIMB] = ItemLocation::GSToken(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, 0x04, 0x10, "Fire Temple GS Scarecrow Climb", FIRE_TEMPLE_GS_SCARECROW_CLIMB, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE, 0x04, 0x02, "Fire Temple MQ GS Above Fire Wall Maze", FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER, 0x04, 0x08, "Fire Temple MQ GS Fire Wall Maze Center", FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR, 0x04, 0x01, "Fire Temple MQ GS Big Lava Room Open Door", FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, 0x04, 0x10, "Fire Temple MQ GS Fire Wall Maze Side Room", FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE, 0x04, 0x04, "Fire Temple MQ GS Skull on Fire", FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE, {Category::cFireTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE, 0x04, 0x02, "Fire Temple MQ GS Above Fire Wall Maze", FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER, 0x04, 0x08, "Fire Temple MQ GS Fire Wall Maze Center", FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR, 0x04, 0x01, "Fire Temple MQ GS Big Lava Room Open Door", FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, 0x04, 0x10, "Fire Temple MQ GS Fire Wall Maze Side Room", FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE] = ItemLocation::GSToken(RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE, 0x04, 0x04, "Fire Temple MQ GS Skull on Fire", FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[WATER_TEMPLE_GS_BEHIND_GATE] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE, 0x05, 0x01, "Water Temple GS Behind Gate", WATER_TEMPLE_GS_BEHIND_GATE, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, 0x05, 0x02, "Water Temple GS Falling Platform Room", WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_GS_CENTRAL_PILLAR] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, 0x05, 0x04, "Water Temple GS Central Pillar", WATER_TEMPLE_GS_CENTRAL_PILLAR, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, 0x05, 0x08, "Water Temple GS Near Boss Key Chest", WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_GS_RIVER] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_RIVER, 0x05, 0x10, "Water Temple GS River", WATER_TEMPLE_GS_RIVER, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_GS_BEHIND_GATE] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_BEHIND_GATE, 0x05, 0x01, "Water Temple GS Behind Gate", WATER_TEMPLE_GS_BEHIND_GATE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, 0x05, 0x02, "Water Temple GS Falling Platform Room", WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_GS_CENTRAL_PILLAR] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, 0x05, 0x04, "Water Temple GS Central Pillar", WATER_TEMPLE_GS_CENTRAL_PILLAR, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, 0x05, 0x08, "Water Temple GS Near Boss Key Chest", WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_GS_RIVER] = ItemLocation::GSToken(RC_WATER_TEMPLE_GS_RIVER, 0x05, 0x10, "Water Temple GS River", WATER_TEMPLE_GS_RIVER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, 0x05, 0x04, "Water Temple MQ GS Before Upper Water Switch", WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, 0x05, 0x08, "Water Temple MQ GS Freestanding Key Area", WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY, 0x05, 0x01, "Water Temple MQ GS Lizalfos Hallway", WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_GS_RIVER] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER, 0x05, 0x02, "Water Temple MQ GS River", WATER_TEMPLE_MQ_GS_RIVER, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH, 0x05, 0x10, "Water Temple MQ GS Triple Wall Torch", WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH, {Category::cWaterTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, 0x05, 0x04, "Water Temple MQ GS Before Upper Water Switch", WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, 0x05, 0x08, "Water Temple MQ GS Freestanding Key Area", WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY, 0x05, 0x01, "Water Temple MQ GS Lizalfos Hallway", WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_GS_RIVER] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_RIVER, 0x05, 0x02, "Water Temple MQ GS River", WATER_TEMPLE_MQ_GS_RIVER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH] = ItemLocation::GSToken(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH, 0x05, 0x10, "Water Temple MQ GS Triple Wall Torch", WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, 0x06, 0x01, "Spirit Temple GS Hall After Sun Block Room", SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_GS_BOULDER_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM, 0x06, 0x02, "Spirit Temple GS Boulder Room", SPIRIT_TEMPLE_GS_BOULDER_ROOM, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_GS_LOBBY] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY, 0x06, 0x04, "Spirit Temple GS Lobby", SPIRIT_TEMPLE_GS_LOBBY, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, 0x06, 0x08, "Spirit Temple GS Sun on Floor Room", SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_GS_METAL_FENCE] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE, 0x06, 0x10, "Spirit Temple GS Metal Fence", SPIRIT_TEMPLE_GS_METAL_FENCE, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, 0x06, 0x01, "Spirit Temple GS Hall After Sun Block Room", SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_GS_BOULDER_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM, 0x06, 0x02, "Spirit Temple GS Boulder Room", SPIRIT_TEMPLE_GS_BOULDER_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_GS_LOBBY] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_LOBBY, 0x06, 0x04, "Spirit Temple GS Lobby", SPIRIT_TEMPLE_GS_LOBBY, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, 0x06, 0x08, "Spirit Temple GS Sun on Floor Room", SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_GS_METAL_FENCE] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_GS_METAL_FENCE, 0x06, 0x10, "Spirit Temple GS Metal Fence", SPIRIT_TEMPLE_GS_METAL_FENCE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM, 0x06, 0x08, "Spirit Temple MQ GS Symphony Room", SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM, 0x06, 0x02, "Spirit Temple MQ GS Leever Room", SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST, 0x06, 0x04, "Spirit Temple MQ GS Nine Thrones Room West", SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH, 0x06, 0x10, "Spirit Temple MQ GS Nine Thrones Room North", SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM, 0x06, 0x01, "Spirit Temple MQ GS Sun Block Room", SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM, {Category::cSpiritTemple, Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM, 0x06, 0x08, "Spirit Temple MQ GS Symphony Room", SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM, 0x06, 0x02, "Spirit Temple MQ GS Leever Room", SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST, 0x06, 0x04, "Spirit Temple MQ GS Nine Thrones Room West", SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH, 0x06, 0x10, "Spirit Temple MQ GS Nine Thrones Room North", SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = ItemLocation::GSToken(RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM, 0x06, 0x01, "Spirit Temple MQ GS Sun Block Room", SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT, 0x07, 0x01, "Shadow Temple GS Single Giant Pot", SHADOW_TEMPLE_GS_SINGLE_GIANT_POT, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM, 0x07, 0x02, "Shadow Temple GS Falling Spikes Room", SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, 0x07, 0x04, "Shadow Temple GS Triple Giant Pot", SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, 0x07, 0x08, "Shadow Temple GS Like Like Room", SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_GS_NEAR_SHIP] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP, 0x07, 0x10, "Shadow Temple GS Near Ship", SHADOW_TEMPLE_GS_NEAR_SHIP, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_GS_SINGLE_GIANT_POT] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT, 0x07, 0x01, "Shadow Temple GS Single Giant Pot", SHADOW_TEMPLE_GS_SINGLE_GIANT_POT, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM, 0x07, 0x02, "Shadow Temple GS Falling Spikes Room", SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, 0x07, 0x04, "Shadow Temple GS Triple Giant Pot", SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, 0x07, 0x08, "Shadow Temple GS Like Like Room", SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_GS_NEAR_SHIP] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_GS_NEAR_SHIP, 0x07, 0x10, "Shadow Temple GS Near Ship", SHADOW_TEMPLE_GS_NEAR_SHIP, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM, 0x07, 0x02, "Shadow Temple MQ GS Falling Spikes Room", SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM, 0x07, 0x01, "Shadow Temple MQ GS Wind Hint Room", SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND, 0x07, 0x08, "Shadow Temple MQ GS After Wind", SHADOW_TEMPLE_MQ_GS_AFTER_WIND, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP, 0x07, 0x10, "Shadow Temple MQ GS After Ship", SHADOW_TEMPLE_MQ_GS_AFTER_SHIP, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS, 0x07, 0x04, "Shadow Temple MQ GS Near Boss", SHADOW_TEMPLE_MQ_GS_NEAR_BOSS, {Category::cShadowTemple, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM, 0x07, 0x02, "Shadow Temple MQ GS Falling Spikes Room", SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM, 0x07, 0x01, "Shadow Temple MQ GS Wind Hint Room", SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND, 0x07, 0x08, "Shadow Temple MQ GS After Wind", SHADOW_TEMPLE_MQ_GS_AFTER_WIND, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_GS_AFTER_SHIP] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP, 0x07, 0x10, "Shadow Temple MQ GS After Ship", SHADOW_TEMPLE_MQ_GS_AFTER_SHIP, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = ItemLocation::GSToken(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS, 0x07, 0x04, "Shadow Temple MQ GS Near Boss", SHADOW_TEMPLE_MQ_GS_NEAR_BOSS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE, 0x08, 0x01, "Bottom of the Well GS Like Like Cage", BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE, {Category::cBottomOfTheWell, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM, 0x08, 0x02, "Bottom of the Well GS East Inner Room", BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM, {Category::cBottomOfTheWell, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM, 0x08, 0x04, "Bottom of the Well GS West Inner Room", BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM, {Category::cBottomOfTheWell, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE, 0x08, 0x01, "Bottom of the Well GS Like Like Cage", BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM, 0x08, 0x02, "Bottom of the Well GS East Inner Room", BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM, 0x08, 0x04, "Bottom of the Well GS West Inner Room", BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT, 0x08, 0x01, "Bottom of the Well MQ GS Basement", BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT, {Category::cBottomOfTheWell, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM, 0x08, 0x04, "Bottom of the Well MQ GS Coffin Room", BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM, {Category::cBottomOfTheWell, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM, 0x08, 0x02, "Bottom of the Well MQ GS West Inner Room", BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM, {Category::cBottomOfTheWell, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT, 0x08, 0x01, "Bottom of the Well MQ GS Basement", BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM, 0x08, 0x04, "Bottom of the Well MQ GS Coffin Room", BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); + locationTable[BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = ItemLocation::GSToken(RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM, 0x08, 0x02, "Bottom of the Well MQ GS West Inner Room", BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL); - locationTable[ICE_CAVERN_GS_PUSH_BLOCK_ROOM] = ItemLocation::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM, 0x09, 0x01, "Ice Cavern GS Push Block Room", ICE_CAVERN_GS_PUSH_BLOCK_ROOM, {Category::cIceCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] = ItemLocation::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, 0x09, 0x02, "Ice Cavern GS Spinning Scythe Room", ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {Category::cIceCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_GS_HEART_PIECE_ROOM] = ItemLocation::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM, 0x09, 0x04, "Ice Cavern GS Heart Piece Room", ICE_CAVERN_GS_HEART_PIECE_ROOM, {Category::cIceCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_GS_PUSH_BLOCK_ROOM] = ItemLocation::GSToken(RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM, 0x09, 0x01, "Ice Cavern GS Push Block Room", ICE_CAVERN_GS_PUSH_BLOCK_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM] = ItemLocation::GSToken(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, 0x09, 0x02, "Ice Cavern GS Spinning Scythe Room", ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_GS_HEART_PIECE_ROOM] = ItemLocation::GSToken(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM, 0x09, 0x04, "Ice Cavern GS Heart Piece Room", ICE_CAVERN_GS_HEART_PIECE_ROOM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_MQ_GS_SCARECROW] = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW, 0x09, 0x01, "Ice Cavern MQ GS Scarecrow", ICE_CAVERN_MQ_GS_SCARECROW, {Category::cIceCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_MQ_GS_ICE_BLOCK] = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK, 0x09, 0x04, "Ice Cavern MQ GS Ice Block", ICE_CAVERN_MQ_GS_ICE_BLOCK, {Category::cIceCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[ICE_CAVERN_MQ_GS_RED_ICE] = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE, 0x09, 0x02, "Ice Cavern MQ GS Red Ice", ICE_CAVERN_MQ_GS_RED_ICE, {Category::cIceCavern, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MQ_GS_SCARECROW] = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_SCARECROW, 0x09, 0x01, "Ice Cavern MQ GS Scarecrow", ICE_CAVERN_MQ_GS_SCARECROW, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MQ_GS_ICE_BLOCK] = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK, 0x09, 0x04, "Ice Cavern MQ GS Ice Block", ICE_CAVERN_MQ_GS_ICE_BLOCK, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[ICE_CAVERN_MQ_GS_RED_ICE] = ItemLocation::GSToken(RC_ICE_CAVERN_MQ_GS_RED_ICE, 0x09, 0x02, "Ice Cavern MQ GS Red Ice", ICE_CAVERN_MQ_GS_RED_ICE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - //Overworld - locationTable[KF_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_KF_GS_BEAN_PATCH, 0x0C, 0x01, "KF GS Bean Patch", KF_GS_BEAN_PATCH, {Category::cKokiriForest, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_GS_KNOW_IT_ALL_HOUSE] = ItemLocation::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE, 0x0C, 0x02, "KF GS Know It All House", KF_GS_KNOW_IT_ALL_HOUSE, {Category::cKokiriForest, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_GS_HOUSE_OF_TWINS] = ItemLocation::GSToken(RC_KF_GS_HOUSE_OF_TWINS, 0x0C, 0x04, "KF GS House of Twins", KF_GS_HOUSE_OF_TWINS, {Category::cKokiriForest, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + //Overworld + locationTable[KF_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_KF_GS_BEAN_PATCH, 0x0C, 0x01, "KF GS Bean Patch", KF_GS_BEAN_PATCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_GS_KNOW_IT_ALL_HOUSE] = ItemLocation::GSToken(RC_KF_GS_KNOW_IT_ALL_HOUSE, 0x0C, 0x02, "KF GS Know It All House", KF_GS_KNOW_IT_ALL_HOUSE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_GS_HOUSE_OF_TWINS] = ItemLocation::GSToken(RC_KF_GS_HOUSE_OF_TWINS, 0x0C, 0x04, "KF GS House of Twins", KF_GS_HOUSE_OF_TWINS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[LW_GS_BEAN_PATCH_NEAR_BRIDGE] = ItemLocation::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, 0x0D, 0x01, "LW GS Bean Patch Near Bridge", LW_GS_BEAN_PATCH_NEAR_BRIDGE, {Category::cLostWoods, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_GS_BEAN_PATCH_NEAR_THEATER] = ItemLocation::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER, 0x0D, 0x02, "LW GS Bean Patch Near Theater", LW_GS_BEAN_PATCH_NEAR_THEATER, {Category::cLostWoods, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[LW_GS_ABOVE_THEATER] = ItemLocation::GSToken(RC_LW_GS_ABOVE_THEATER, 0x0D, 0x04, "LW GS Above Theater", LW_GS_ABOVE_THEATER, {Category::cLostWoods, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[SFM_GS] = ItemLocation::GSToken(RC_SFM_GS, 0x0D, 0x08, "SFM GS", SFM_GS, {Category::cSacredForestMeadow, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_GS_BEAN_PATCH_NEAR_BRIDGE] = ItemLocation::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_BRIDGE, 0x0D, 0x01, "LW GS Bean Patch Near Bridge", LW_GS_BEAN_PATCH_NEAR_BRIDGE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_GS_BEAN_PATCH_NEAR_THEATER] = ItemLocation::GSToken(RC_LW_GS_BEAN_PATCH_NEAR_THEATER, 0x0D, 0x02, "LW GS Bean Patch Near Theater", LW_GS_BEAN_PATCH_NEAR_THEATER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[LW_GS_ABOVE_THEATER] = ItemLocation::GSToken(RC_LW_GS_ABOVE_THEATER, 0x0D, 0x04, "LW GS Above Theater", LW_GS_ABOVE_THEATER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[SFM_GS] = ItemLocation::GSToken(RC_SFM_GS, 0x0D, 0x08, "SFM GS", SFM_GS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[HF_GS_COW_GROTTO] = ItemLocation::GSToken(RC_HF_GS_COW_GROTTO, 0x0A, 0x01, "HF GS Cow Grotto", HF_GS_COW_GROTTO, {Category::cHyruleField, Category::cSkulltula, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[HF_GS_NEAR_KAK_GROTTO] = ItemLocation::GSToken(RC_HF_GS_NEAR_KAK_GROTTO, 0x0A, 0x02, "HF GS Near Kak Grotto", HF_GS_NEAR_KAK_GROTTO, {Category::cHyruleField, Category::cSkulltula, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_GS_COW_GROTTO] = ItemLocation::GSToken(RC_HF_GS_COW_GROTTO, 0x0A, 0x01, "HF GS Cow Grotto", HF_GS_COW_GROTTO, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[HF_GS_NEAR_KAK_GROTTO] = ItemLocation::GSToken(RC_HF_GS_NEAR_KAK_GROTTO, 0x0A, 0x02, "HF GS Near Kak Grotto", HF_GS_NEAR_KAK_GROTTO, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[LH_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_LH_GS_BEAN_PATCH, 0x12, 0x01, "LH GS Bean Patch", LH_GS_BEAN_PATCH, {Category::cLakeHylia, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_GS_SMALL_ISLAND] = ItemLocation::GSToken(RC_LH_GS_SMALL_ISLAND, 0x12, 0x02, "LH GS Small Island", LH_GS_SMALL_ISLAND, {Category::cLakeHylia, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_GS_LAB_WALL] = ItemLocation::GSToken(RC_LH_GS_LAB_WALL, 0x12, 0x04, "LH GS Lab Wall", LH_GS_LAB_WALL, {Category::cLakeHylia, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_GS_LAB_CRATE] = ItemLocation::GSToken(RC_LH_GS_LAB_CRATE, 0x12, 0x08, "LH GS Lab Crate", LH_GS_LAB_CRATE, {Category::cLakeHylia, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[LH_GS_TREE] = ItemLocation::GSToken(RC_LH_GS_TREE, 0x12, 0x10, "LH GS Tree", LH_GS_TREE, {Category::cLakeHylia, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_LH_GS_BEAN_PATCH, 0x12, 0x01, "LH GS Bean Patch", LH_GS_BEAN_PATCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_GS_SMALL_ISLAND] = ItemLocation::GSToken(RC_LH_GS_SMALL_ISLAND, 0x12, 0x02, "LH GS Small Island", LH_GS_SMALL_ISLAND, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_GS_LAB_WALL] = ItemLocation::GSToken(RC_LH_GS_LAB_WALL, 0x12, 0x04, "LH GS Lab Wall", LH_GS_LAB_WALL, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_GS_LAB_CRATE] = ItemLocation::GSToken(RC_LH_GS_LAB_CRATE, 0x12, 0x08, "LH GS Lab Crate", LH_GS_LAB_CRATE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); + locationTable[LH_GS_TREE] = ItemLocation::GSToken(RC_LH_GS_TREE, 0x12, 0x10, "LH GS Tree", LH_GS_TREE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LAKE_HYLIA); - locationTable[GV_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_GV_GS_BEAN_PATCH, 0x13, 0x01, "GV GS Bean Patch", GV_GS_BEAN_PATCH, {Category::cGerudoValley, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_GS_SMALL_BRIDGE] = ItemLocation::GSToken(RC_GV_GS_SMALL_BRIDGE, 0x13, 0x02, "GV GS Small Bridge", GV_GS_SMALL_BRIDGE, {Category::cGerudoValley, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_GS_PILLAR] = ItemLocation::GSToken(RC_GV_GS_PILLAR, 0x13, 0x04, "GV GS Pillar", GV_GS_PILLAR, {Category::cGerudoValley, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GV_GS_BEHIND_TENT] = ItemLocation::GSToken(RC_GV_GS_BEHIND_TENT, 0x13, 0x08, "GV GS Behind Tent", GV_GS_BEHIND_TENT, {Category::cGerudoValley, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_GV_GS_BEAN_PATCH, 0x13, 0x01, "GV GS Bean Patch", GV_GS_BEAN_PATCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_GS_SMALL_BRIDGE] = ItemLocation::GSToken(RC_GV_GS_SMALL_BRIDGE, 0x13, 0x02, "GV GS Small Bridge", GV_GS_SMALL_BRIDGE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_GS_PILLAR] = ItemLocation::GSToken(RC_GV_GS_PILLAR, 0x13, 0x04, "GV GS Pillar", GV_GS_PILLAR, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GV_GS_BEHIND_TENT] = ItemLocation::GSToken(RC_GV_GS_BEHIND_TENT, 0x13, 0x08, "GV GS Behind Tent", GV_GS_BEHIND_TENT, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_GS_ARCHERY_RANGE] = ItemLocation::GSToken(RC_GF_GS_ARCHERY_RANGE, 0x14, 0x01, "GF GS Archery Range", GF_GS_ARCHERY_RANGE, {Category::cGerudoFortress, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[GF_GS_TOP_FLOOR] = ItemLocation::GSToken(RC_GF_GS_TOP_FLOOR, 0x14, 0x02, "GF GS Top Floor", GF_GS_TOP_FLOOR, {Category::cGerudoFortress, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_GS_ARCHERY_RANGE] = ItemLocation::GSToken(RC_GF_GS_ARCHERY_RANGE, 0x14, 0x01, "GF GS Archery Range", GF_GS_ARCHERY_RANGE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[GF_GS_TOP_FLOOR] = ItemLocation::GSToken(RC_GF_GS_TOP_FLOOR, 0x14, 0x02, "GF GS Top Floor", GF_GS_TOP_FLOOR, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[WASTELAND_GS] = ItemLocation::GSToken(RC_WASTELAND_GS, 0x15, 0x02, "Wasteland GS", WASTELAND_GS, {Category::cHauntedWasteland, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[COLOSSUS_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_COLOSSUS_GS_BEAN_PATCH, 0x15, 0x01, "Colossus GS Bean Patch", COLOSSUS_GS_BEAN_PATCH, {Category::cDesertColossus, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[COLOSSUS_GS_HILL] = ItemLocation::GSToken(RC_COLOSSUS_GS_HILL, 0x15, 0x04, "Colossus GS Hill", COLOSSUS_GS_HILL, {Category::cDesertColossus, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[COLOSSUS_GS_TREE] = ItemLocation::GSToken(RC_COLOSSUS_GS_TREE, 0x15, 0x08, "Colossus GS Tree", COLOSSUS_GS_TREE, {Category::cDesertColossus, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[WASTELAND_GS] = ItemLocation::GSToken(RC_WASTELAND_GS, 0x15, 0x02, "Wasteland GS", WASTELAND_GS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[COLOSSUS_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_COLOSSUS_GS_BEAN_PATCH, 0x15, 0x01, "Colossus GS Bean Patch", COLOSSUS_GS_BEAN_PATCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[COLOSSUS_GS_HILL] = ItemLocation::GSToken(RC_COLOSSUS_GS_HILL, 0x15, 0x04, "Colossus GS Hill", COLOSSUS_GS_HILL, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[COLOSSUS_GS_TREE] = ItemLocation::GSToken(RC_COLOSSUS_GS_TREE, 0x15, 0x08, "Colossus GS Tree", COLOSSUS_GS_TREE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[OGC_GS] = ItemLocation::GSToken(RC_OGC_GS, 0x0E, 0x01, "OGC GS", OGC_GS, {Category::cOutsideGanonsCastle, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[HC_GS_STORMS_GROTTO] = ItemLocation::GSToken(RC_HC_GS_STORMS_GROTTO, 0x0E, 0x02, "HC GS Storms Grotto", HC_GS_STORMS_GROTTO, {Category::cHyruleCastle, Category::cSkulltula, Category::cGrotto}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[HC_GS_TREE] = ItemLocation::GSToken(RC_HC_GS_TREE, 0x0E, 0x04, "HC GS Tree", HC_GS_TREE, {Category::cHyruleCastle, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_GS_GUARD_HOUSE] = ItemLocation::GSToken(RC_MARKET_GS_GUARD_HOUSE, 0x0E, 0x08, "Market GS Guard House", MARKET_GS_GUARD_HOUSE, {Category::cInnerMarket, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[OGC_GS] = ItemLocation::GSToken(RC_OGC_GS, 0x0E, 0x01, "OGC GS", OGC_GS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[HC_GS_STORMS_GROTTO] = ItemLocation::GSToken(RC_HC_GS_STORMS_GROTTO, 0x0E, 0x02, "HC GS Storms Grotto", HC_GS_STORMS_GROTTO, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[HC_GS_TREE] = ItemLocation::GSToken(RC_HC_GS_TREE, 0x0E, 0x04, "HC GS Tree", HC_GS_TREE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_GS_GUARD_HOUSE] = ItemLocation::GSToken(RC_MARKET_GS_GUARD_HOUSE, 0x0E, 0x08, "Market GS Guard House", MARKET_GS_GUARD_HOUSE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[KAK_GS_HOUSE_UNDER_CONSTRUCTION] = ItemLocation::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, 0x10, 0x08, "Kak GS House Under Construction", KAK_GS_HOUSE_UNDER_CONSTRUCTION, {Category::cKakarikoVillage, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_GS_SKULLTULA_HOUSE] = ItemLocation::GSToken(RC_KAK_GS_SKULLTULA_HOUSE, 0x10, 0x10, "Kak GS Skulltula House", KAK_GS_SKULLTULA_HOUSE, {Category::cKakarikoVillage, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_GS_GUARDS_HOUSE] = ItemLocation::GSToken(RC_KAK_GS_GUARDS_HOUSE, 0x10, 0x02, "Kak GS Guards House", KAK_GS_GUARDS_HOUSE, {Category::cKakarikoVillage, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_GS_TREE] = ItemLocation::GSToken(RC_KAK_GS_TREE, 0x10, 0x20, "Kak GS Tree", KAK_GS_TREE, {Category::cKakarikoVillage, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_GS_WATCHTOWER] = ItemLocation::GSToken(RC_KAK_GS_WATCHTOWER, 0x10, 0x04, "Kak GS Watchtower", KAK_GS_WATCHTOWER, {Category::cKakarikoVillage, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_GS_ABOVE_IMPAS_HOUSE] = ItemLocation::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE, 0x10, 0x40, "Kak GS Above Impas House", KAK_GS_ABOVE_IMPAS_HOUSE, {Category::cKakarikoVillage, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_GS_HOUSE_UNDER_CONSTRUCTION] = ItemLocation::GSToken(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, 0x10, 0x08, "Kak GS House Under Construction", KAK_GS_HOUSE_UNDER_CONSTRUCTION, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_GS_SKULLTULA_HOUSE] = ItemLocation::GSToken(RC_KAK_GS_SKULLTULA_HOUSE, 0x10, 0x10, "Kak GS Skulltula House", KAK_GS_SKULLTULA_HOUSE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_GS_GUARDS_HOUSE] = ItemLocation::GSToken(RC_KAK_GS_GUARDS_HOUSE, 0x10, 0x02, "Kak GS Guards House", KAK_GS_GUARDS_HOUSE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_GS_TREE] = ItemLocation::GSToken(RC_KAK_GS_TREE, 0x10, 0x20, "Kak GS Tree", KAK_GS_TREE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_GS_WATCHTOWER] = ItemLocation::GSToken(RC_KAK_GS_WATCHTOWER, 0x10, 0x04, "Kak GS Watchtower", KAK_GS_WATCHTOWER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_GS_ABOVE_IMPAS_HOUSE] = ItemLocation::GSToken(RC_KAK_GS_ABOVE_IMPAS_HOUSE, 0x10, 0x40, "Kak GS Above Impas House", KAK_GS_ABOVE_IMPAS_HOUSE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_GS_WALL] = ItemLocation::GSToken(RC_GRAVEYARD_GS_WALL, 0x10, 0x80, "Graveyard GS Wall", GRAVEYARD_GS_WALL, {Category::cGraveyard, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[GRAVEYARD_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH, 0x10, 0x01, "Graveyard GS Bean Patch", GRAVEYARD_GS_BEAN_PATCH, {Category::cGraveyard, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_GS_WALL] = ItemLocation::GSToken(RC_GRAVEYARD_GS_WALL, 0x10, 0x80, "Graveyard GS Wall", GRAVEYARD_GS_WALL, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[GRAVEYARD_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_GRAVEYARD_GS_BEAN_PATCH, 0x10, 0x01, "Graveyard GS Bean Patch", GRAVEYARD_GS_BEAN_PATCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[DMC_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_DMC_GS_BEAN_PATCH, 0x0F, 0x01, "DMC GS Bean Patch", DMC_GS_BEAN_PATCH, {Category::cDeathMountainCrater, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_GS_CRATE] = ItemLocation::GSToken(RC_DMC_GS_CRATE, 0x0F, 0x80, "DMC GS Crate", DMC_GS_CRATE, {Category::cDeathMountainCrater, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_DMC_GS_BEAN_PATCH, 0x0F, 0x01, "DMC GS Bean Patch", DMC_GS_BEAN_PATCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_GS_CRATE] = ItemLocation::GSToken(RC_DMC_GS_CRATE, 0x0F, 0x80, "DMC GS Crate", DMC_GS_CRATE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_DMT_GS_BEAN_PATCH, 0x0F, 0x02, "DMT GS Bean Patch", DMT_GS_BEAN_PATCH, {Category::cDeathMountainTrail, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_GS_NEAR_KAK] = ItemLocation::GSToken(RC_DMT_GS_NEAR_KAK, 0x0F, 0x04, "DMT GS Near Kak", DMT_GS_NEAR_KAK, {Category::cDeathMountainTrail, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_GS_ABOVE_DODONGOS_CAVERN] = ItemLocation::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, 0x0F, 0x08, "DMT GS Above Dodongos Cavern", DMT_GS_ABOVE_DODONGOS_CAVERN, {Category::cDeathMountainTrail, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMT_GS_FALLING_ROCKS_PATH] = ItemLocation::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH, 0x0F, 0x10, "DMT GS Falling Rocks Path", DMT_GS_FALLING_ROCKS_PATH, {Category::cDeathMountainTrail, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_GS_BEAN_PATCH] = ItemLocation::GSToken(RC_DMT_GS_BEAN_PATCH, 0x0F, 0x02, "DMT GS Bean Patch", DMT_GS_BEAN_PATCH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_GS_NEAR_KAK] = ItemLocation::GSToken(RC_DMT_GS_NEAR_KAK, 0x0F, 0x04, "DMT GS Near Kak", DMT_GS_NEAR_KAK, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_GS_ABOVE_DODONGOS_CAVERN] = ItemLocation::GSToken(RC_DMT_GS_ABOVE_DODONGOS_CAVERN, 0x0F, 0x08, "DMT GS Above Dodongos Cavern", DMT_GS_ABOVE_DODONGOS_CAVERN, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMT_GS_FALLING_ROCKS_PATH] = ItemLocation::GSToken(RC_DMT_GS_FALLING_ROCKS_PATH, 0x0F, 0x10, "DMT GS Falling Rocks Path", DMT_GS_FALLING_ROCKS_PATH, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[GC_GS_CENTER_PLATFORM] = ItemLocation::GSToken(RC_GC_GS_CENTER_PLATFORM, 0x0F, 0x20, "GC GS Center Platform", GC_GS_CENTER_PLATFORM, {Category::cGoronCity, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_GS_BOULDER_MAZE] = ItemLocation::GSToken(RC_GC_GS_BOULDER_MAZE, 0x0F, 0x40, "GC GS Boulder Maze", GC_GS_BOULDER_MAZE, {Category::cGoronCity, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_GS_CENTER_PLATFORM] = ItemLocation::GSToken(RC_GC_GS_CENTER_PLATFORM, 0x0F, 0x20, "GC GS Center Platform", GC_GS_CENTER_PLATFORM, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_GS_BOULDER_MAZE] = ItemLocation::GSToken(RC_GC_GS_BOULDER_MAZE, 0x0F, 0x40, "GC GS Boulder Maze", GC_GS_BOULDER_MAZE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[ZR_GS_LADDER] = ItemLocation::GSToken(RC_ZR_GS_LADDER, 0x11, 0x01, "ZR GS Ladder", ZR_GS_LADDER, {Category::cZorasRiver, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_GS_TREE] = ItemLocation::GSToken(RC_ZR_GS_TREE, 0x11, 0x02, "ZR GS Tree", ZR_GS_TREE, {Category::cZorasRiver, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_GS_ABOVE_BRIDGE] = ItemLocation::GSToken(RC_ZR_GS_ABOVE_BRIDGE, 0x11, 0x08, "ZR GS Above Bridge", ZR_GS_ABOVE_BRIDGE, {Category::cZorasRiver, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZR_GS_NEAR_RAISED_GROTTOS] = ItemLocation::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS, 0x11, 0x10, "ZR GS Near Raised Grottos", ZR_GS_NEAR_RAISED_GROTTOS, {Category::cZorasRiver, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_GS_LADDER] = ItemLocation::GSToken(RC_ZR_GS_LADDER, 0x11, 0x01, "ZR GS Ladder", ZR_GS_LADDER, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_GS_TREE] = ItemLocation::GSToken(RC_ZR_GS_TREE, 0x11, 0x02, "ZR GS Tree", ZR_GS_TREE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_GS_ABOVE_BRIDGE] = ItemLocation::GSToken(RC_ZR_GS_ABOVE_BRIDGE, 0x11, 0x08, "ZR GS Above Bridge", ZR_GS_ABOVE_BRIDGE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); + locationTable[ZR_GS_NEAR_RAISED_GROTTOS] = ItemLocation::GSToken(RC_ZR_GS_NEAR_RAISED_GROTTOS, 0x11, 0x10, "ZR GS Near Raised Grottos", ZR_GS_NEAR_RAISED_GROTTOS, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_RIVER); - locationTable[ZD_GS_FROZEN_WATERFALL] = ItemLocation::GSToken(RC_ZD_GS_FROZEN_WATERFALL, 0x11, 0x40, "ZD GS Frozen Waterfall", ZD_GS_FROZEN_WATERFALL, {Category::cZorasDomain, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZF_GS_ABOVE_THE_LOG] = ItemLocation::GSToken(RC_ZF_GS_ABOVE_THE_LOG, 0x11, 0x04, "ZF GS Above The Log", ZF_GS_ABOVE_THE_LOG, {Category::cZorasFountain, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZF_GS_HIDDEN_CAVE] = ItemLocation::GSToken(RC_ZF_GS_HIDDEN_CAVE, 0x11, 0x20, "ZF GS Hidden Cave", ZF_GS_HIDDEN_CAVE, {Category::cZorasFountain, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZF_GS_TREE] = ItemLocation::GSToken(RC_ZF_GS_TREE, 0x11, 0x80, "ZF GS Tree", ZF_GS_TREE, {Category::cZorasFountain, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_GS_FROZEN_WATERFALL] = ItemLocation::GSToken(RC_ZD_GS_FROZEN_WATERFALL, 0x11, 0x40, "ZD GS Frozen Waterfall", ZD_GS_FROZEN_WATERFALL, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZF_GS_ABOVE_THE_LOG] = ItemLocation::GSToken(RC_ZF_GS_ABOVE_THE_LOG, 0x11, 0x04, "ZF GS Above The Log", ZF_GS_ABOVE_THE_LOG, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZF_GS_HIDDEN_CAVE] = ItemLocation::GSToken(RC_ZF_GS_HIDDEN_CAVE, 0x11, 0x20, "ZF GS Hidden Cave", ZF_GS_HIDDEN_CAVE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZF_GS_TREE] = ItemLocation::GSToken(RC_ZF_GS_TREE, 0x11, 0x80, "ZF GS Tree", ZF_GS_TREE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[LLR_GS_BACK_WALL] = ItemLocation::GSToken(RC_LLR_GS_BACK_WALL, 0x0B, 0x01, "LLR GS Back Wall", LLR_GS_BACK_WALL, {Category::cLonLonRanch, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_GS_RAIN_SHED] = ItemLocation::GSToken(RC_LLR_GS_RAIN_SHED, 0x0B, 0x02, "LLR GS Rain Shed", LLR_GS_RAIN_SHED, {Category::cLonLonRanch, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_GS_HOUSE_WINDOW] = ItemLocation::GSToken(RC_LLR_GS_HOUSE_WINDOW, 0x0B, 0x04, "LLR GS House Window", LLR_GS_HOUSE_WINDOW, {Category::cLonLonRanch, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_GS_TREE] = ItemLocation::GSToken(RC_LLR_GS_TREE, 0x0B, 0x08, "LLR GS Tree", LLR_GS_TREE, {Category::cLonLonRanch, Category::cSkulltula,}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_GS_BACK_WALL] = ItemLocation::GSToken(RC_LLR_GS_BACK_WALL, 0x0B, 0x01, "LLR GS Back Wall", LLR_GS_BACK_WALL, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_GS_RAIN_SHED] = ItemLocation::GSToken(RC_LLR_GS_RAIN_SHED, 0x0B, 0x02, "LLR GS Rain Shed", LLR_GS_RAIN_SHED, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_GS_HOUSE_WINDOW] = ItemLocation::GSToken(RC_LLR_GS_HOUSE_WINDOW, 0x0B, 0x04, "LLR GS House Window", LLR_GS_HOUSE_WINDOW, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_GS_TREE] = ItemLocation::GSToken(RC_LLR_GS_TREE, 0x0B, 0x08, "LLR GS Tree", LLR_GS_TREE, {Category::cSkulltula}, SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); /*------------------------------- --- BOSSES --- -------------------------------*/ - locationTable[LINKS_POCKET] = ItemLocation::Reward (RC_LINKS_POCKET, 0xFF, 0xFF, "Link's Pocket", LINKS_POCKET, LIGHT_MEDALLION, {}, SpoilerCollectionCheck::AlwaysCollected(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[QUEEN_GOHMA] = ItemLocation::Reward (RC_QUEEN_GOHMA, 0xFF, DUNGEON_DEKU_TREE, "Queen Gohma", QUEEN_GOHMA, KOKIRI_EMERALD, {}, SpoilerCollectionCheck::Chest(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[KING_DODONGO] = ItemLocation::Reward (RC_KING_DODONGO, 0xFF, DUNGEON_DODONGOS_CAVERN, "King Dodongo", KING_DODONGO, GORON_RUBY, {}, SpoilerCollectionCheck::Chest(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[BARINADE] = ItemLocation::Reward (RC_BARINADE, 0xFF, DUNGEON_JABUJABUS_BELLY, "Barinade", BARINADE, ZORA_SAPPHIRE, {}, SpoilerCollectionCheck::Chest(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[PHANTOM_GANON] = ItemLocation::Reward (RC_PHANTOM_GANON, 0xFF, DUNGEON_FOREST_TEMPLE, "Phantom Ganon", PHANTOM_GANON, FOREST_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[VOLVAGIA] = ItemLocation::Reward (RC_VOLVAGIA, 0xFF, DUNGEON_FIRE_TEMPLE, "Volvagia", VOLVAGIA, FIRE_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[MORPHA] = ItemLocation::Reward (RC_MORPHA, 0xFF, DUNGEON_WATER_TEMPLE, "Morpha", MORPHA, WATER_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[TWINROVA] = ItemLocation::Reward (RC_TWINROVA, 0xFF, DUNGEON_SPIRIT_TEMPLE, "Twinrova", TWINROVA, SPIRIT_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[BONGO_BONGO] = ItemLocation::Reward (RC_BONGO_BONGO, 0xFF, DUNGEON_SHADOW_TEMPLE, "Bongo Bongo", BONGO_BONGO, SHADOW_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); - locationTable[GANON] = ItemLocation::Reward (RC_GANON, 0xFF, 0xF0, "Ganon", NONE, TRIFORCE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[LINKS_POCKET] = ItemLocation::Reward (RC_LINKS_POCKET, 0xFF, "Link's Pocket", LINKS_POCKET, LIGHT_MEDALLION, {}, SpoilerCollectionCheck::AlwaysCollected(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[QUEEN_GOHMA] = ItemLocation::Reward (RC_QUEEN_GOHMA, 0xFF, "Queen Gohma", QUEEN_GOHMA, KOKIRI_EMERALD, {}, SpoilerCollectionCheck::Chest(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[KING_DODONGO] = ItemLocation::Reward (RC_KING_DODONGO, 0xFF, "King Dodongo", KING_DODONGO, GORON_RUBY, {}, SpoilerCollectionCheck::Chest(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[BARINADE] = ItemLocation::Reward (RC_BARINADE, 0xFF, "Barinade", BARINADE, ZORA_SAPPHIRE, {}, SpoilerCollectionCheck::Chest(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[PHANTOM_GANON] = ItemLocation::Reward (RC_PHANTOM_GANON, 0xFF, "Phantom Ganon", PHANTOM_GANON, FOREST_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[VOLVAGIA] = ItemLocation::Reward (RC_VOLVAGIA, 0xFF, "Volvagia", VOLVAGIA, FIRE_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[MORPHA] = ItemLocation::Reward (RC_MORPHA, 0xFF, "Morpha", MORPHA, WATER_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[TWINROVA] = ItemLocation::Reward (RC_TWINROVA, 0xFF, "Twinrova", TWINROVA, SPIRIT_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[BONGO_BONGO] = ItemLocation::Reward (RC_BONGO_BONGO, 0xFF, "Bongo Bongo", BONGO_BONGO, SHADOW_MEDALLION, {}, SpoilerCollectionCheck::Chest(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[GANON] = ItemLocation::Reward (RC_GANON, 0xFF, "Ganon", NONE, TRIFORCE, {}, SpoilerCollectionCheck::None(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); /*------------------------------- ---HEART CONTAINERS --- -------------------------------*/ - locationTable[DEKU_TREE_QUEEN_GOHMA_HEART] = ItemLocation::Base (RC_DEKU_TREE_QUEEN_GOHMA_HEART, 0x11, 0x4F, "Deku Tree Queen Gohma Heart Container", DEKU_TREE_QUEEN_GOHMA_HEART, HEART_CONTAINER, {Category::cDekuTree, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); - locationTable[DODONGOS_CAVERN_KING_DODONGO_HEART] = ItemLocation::Base (RC_DODONGOS_CAVERN_KING_DODONGO_HEART, 0x12, 0x4F, "Dodongos Cavern King Dodongo Heart Container", DODONGOS_CAVERN_KING_DODONGO_HEART, HEART_CONTAINER, {Category::cDodongosCavern, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[JABU_JABUS_BELLY_BARINADE_HEART] = ItemLocation::Base (RC_JABU_JABUS_BELLY_BARINADE_HEART, 0x13, 0x4F, "Jabu Jabus Belly Barinade Heart Container", JABU_JABUS_BELLY_BARINADE_HEART, HEART_CONTAINER, {Category::cJabuJabusBelly, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); - locationTable[FOREST_TEMPLE_PHANTOM_GANON_HEART] = ItemLocation::Base (RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, 0x14, 0x4F, "Forest Temple Phantom Ganon Heart Container", FOREST_TEMPLE_PHANTOM_GANON_HEART, HEART_CONTAINER, {Category::cForestTemple, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); - locationTable[FIRE_TEMPLE_VOLVAGIA_HEART] = ItemLocation::Base (RC_FIRE_TEMPLE_VOLVAGIA_HEART, 0x15, 0x4F, "Fire Temple Volvagia Heart Container", FIRE_TEMPLE_VOLVAGIA_HEART, HEART_CONTAINER, {Category::cFireTemple, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); - locationTable[WATER_TEMPLE_MORPHA_HEART] = ItemLocation::Base (RC_WATER_TEMPLE_MORPHA_HEART, 0x16, 0x4F, "Water Temple Morpha Heart Container", WATER_TEMPLE_MORPHA_HEART, HEART_CONTAINER, {Category::cWaterTemple, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); - locationTable[SPIRIT_TEMPLE_TWINROVA_HEART] = ItemLocation::Base (RC_SPIRIT_TEMPLE_TWINROVA_HEART, 0x17, 0x4F, "Spirit Temple Twinrova Heart Container", SPIRIT_TEMPLE_TWINROVA_HEART, HEART_CONTAINER, {Category::cSpiritTemple, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); - locationTable[SHADOW_TEMPLE_BONGO_BONGO_HEART] = ItemLocation::Base (RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, 0x18, 0x4F, "Shadow Temple Bongo Bongo Heart Container", SHADOW_TEMPLE_BONGO_BONGO_HEART, HEART_CONTAINER, {Category::cShadowTemple, Category::cBossHeart, Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); + locationTable[DEKU_TREE_QUEEN_GOHMA_HEART] = ItemLocation::Base (RC_DEKU_TREE_QUEEN_GOHMA_HEART, 0x11, "Deku Tree Queen Gohma Heart Container", DEKU_TREE_QUEEN_GOHMA_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x11, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DEKU_TREE); + locationTable[DODONGOS_CAVERN_KING_DODONGO_HEART] = ItemLocation::Base (RC_DODONGOS_CAVERN_KING_DODONGO_HEART, 0x12, "Dodongos Cavern King Dodongo Heart Container", DODONGOS_CAVERN_KING_DODONGO_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x12, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[JABU_JABUS_BELLY_BARINADE_HEART] = ItemLocation::Base (RC_JABU_JABUS_BELLY_BARINADE_HEART, 0x13, "Jabu Jabus Belly Barinade Heart Container", JABU_JABUS_BELLY_BARINADE_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x13, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[FOREST_TEMPLE_PHANTOM_GANON_HEART] = ItemLocation::Base (RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, 0x14, "Forest Temple Phantom Ganon Heart Container", FOREST_TEMPLE_PHANTOM_GANON_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x14, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FOREST_TEMPLE); + locationTable[FIRE_TEMPLE_VOLVAGIA_HEART] = ItemLocation::Base (RC_FIRE_TEMPLE_VOLVAGIA_HEART, 0x15, "Fire Temple Volvagia Heart Container", FIRE_TEMPLE_VOLVAGIA_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x15, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_FIRE_TEMPLE); + locationTable[WATER_TEMPLE_MORPHA_HEART] = ItemLocation::Base (RC_WATER_TEMPLE_MORPHA_HEART, 0x16, "Water Temple Morpha Heart Container", WATER_TEMPLE_MORPHA_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x16, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WATER_TEMPLE); + locationTable[SPIRIT_TEMPLE_TWINROVA_HEART] = ItemLocation::Base (RC_SPIRIT_TEMPLE_TWINROVA_HEART, 0x17, "Spirit Temple Twinrova Heart Container", SPIRIT_TEMPLE_TWINROVA_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x17, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SPIRIT_TEMPLE); + locationTable[SHADOW_TEMPLE_BONGO_BONGO_HEART] = ItemLocation::Base (RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, 0x18, "Shadow Temple Bongo Bongo Heart Container", SHADOW_TEMPLE_BONGO_BONGO_HEART, HEART_CONTAINER, {Category::cSongDungeonReward}, SpoilerCollectionCheck::Collectable(0x18, 0x1F), SpoilerCollectionCheckGroup::GROUP_DUNGEON_SHADOW_TEMPLE); /*------------------------------- --- CUTSCENES --- -------------------------------*/ - locationTable[TOT_LIGHT_ARROWS_CUTSCENE] = ItemLocation::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE, 0xFF, 0x01, "ToT Light Arrow Cutscene", TOT_LIGHT_ARROWS_CUTSCENE, LIGHT_ARROWS, {Category::cTempleOfTime, Category::cMarket}, SpoilerCollectionCheck::Chest(0x43, 0x1E), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[LW_GIFT_FROM_SARIA] = ItemLocation::Delayed(RC_LW_GIFT_FROM_SARIA, 0xFF, 0x02, "LW Gift From Saria", LW_GIFT_FROM_SARIA, PROGRESSIVE_OCARINA, {Category::cLostWoods, Category::cForest}, SpoilerCollectionCheck::EventChkInf(0xC1), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[ZF_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_ZF_GREAT_FAIRY_REWARD, 0xFF, 0x10, "ZF Great Fairy Reward", ZF_GREAT_FAIRY_REWARD, FARORES_WIND, {Category::cZorasFountain, Category::cFairies}, SpoilerCollectionCheck::Chest(0x3D, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[HC_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_HC_GREAT_FAIRY_REWARD, 0xFF, 0x11, "HC Great Fairy Reward", HC_GREAT_FAIRY_REWARD, DINS_FIRE, {Category::cHyruleCastle, Category::cMarket, Category::cFairies}, SpoilerCollectionCheck::Chest(0x3D, 0x02), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[COLOSSUS_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD, 0xFF, 0x12, "Colossus Great Fairy Reward", COLOSSUS_GREAT_FAIRY_REWARD, NAYRUS_LOVE, {Category::cDesertColossus, Category::cFairies}, SpoilerCollectionCheck::Chest(0x3D, 0x03), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[DMT_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_DMT_GREAT_FAIRY_REWARD, 0xFF, 0x13, "DMT Great Fairy Reward", DMT_GREAT_FAIRY_REWARD, PROGRESSIVE_MAGIC_METER, {Category::cDeathMountainTrail, Category::cDeathMountain, Category::cFairies}, SpoilerCollectionCheck::Chest(0x3B, 0x01), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[DMC_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_DMC_GREAT_FAIRY_REWARD, 0xFF, 0x14, "DMC Great Fairy Reward", DMC_GREAT_FAIRY_REWARD, PROGRESSIVE_MAGIC_METER, {Category::cDeathMountainCrater, Category::cDeathMountain, Category::cFairies}, SpoilerCollectionCheck::Chest(0x3B, 0x02), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[OGC_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_OGC_GREAT_FAIRY_REWARD, 0xFF, 0x15, "OGC Great Fairy Reward", OGC_GREAT_FAIRY_REWARD, DOUBLE_DEFENSE, {Category::cOutsideGanonsCastle, Category::cFairies}, SpoilerCollectionCheck::Chest(0x3B, 0x03), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); + locationTable[TOT_LIGHT_ARROWS_CUTSCENE] = ItemLocation::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE, 0xFF, "ToT Light Arrow Cutscene", TOT_LIGHT_ARROWS_CUTSCENE, LIGHT_ARROWS, {}, SpoilerCollectionCheck::Chest(0x43, 0x1E), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[LW_GIFT_FROM_SARIA] = ItemLocation::Delayed(RC_LW_GIFT_FROM_SARIA, 0xFF, "LW Gift From Saria", LW_GIFT_FROM_SARIA, PROGRESSIVE_OCARINA, {}, SpoilerCollectionCheck::EventChkInf(0xC1), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[ZF_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_ZF_GREAT_FAIRY_REWARD, 0xFF, "ZF Great Fairy Reward", ZF_GREAT_FAIRY_REWARD, FARORES_WIND, {}, SpoilerCollectionCheck::Chest(0x3D, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[HC_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_HC_GREAT_FAIRY_REWARD, 0xFF, "HC Great Fairy Reward", HC_GREAT_FAIRY_REWARD, DINS_FIRE, {}, SpoilerCollectionCheck::Chest(0x3D, 0x02), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[COLOSSUS_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_COLOSSUS_GREAT_FAIRY_REWARD, 0xFF, "Colossus Great Fairy Reward", COLOSSUS_GREAT_FAIRY_REWARD, NAYRUS_LOVE, {}, SpoilerCollectionCheck::Chest(0x3D, 0x03), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[DMT_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_DMT_GREAT_FAIRY_REWARD, 0xFF, "DMT Great Fairy Reward", DMT_GREAT_FAIRY_REWARD, PROGRESSIVE_MAGIC_METER, {}, SpoilerCollectionCheck::Chest(0x3B, 0x01), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[DMC_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_DMC_GREAT_FAIRY_REWARD, 0xFF, "DMC Great Fairy Reward", DMC_GREAT_FAIRY_REWARD, PROGRESSIVE_MAGIC_METER, {}, SpoilerCollectionCheck::Chest(0x3B, 0x02), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[OGC_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_OGC_GREAT_FAIRY_REWARD, 0xFF, "OGC Great Fairy Reward", OGC_GREAT_FAIRY_REWARD, DOUBLE_DEFENSE, {}, SpoilerCollectionCheck::Chest(0x3B, 0x03), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE); - locationTable[SHEIK_IN_FOREST] = ItemLocation::Delayed(RC_SHEIK_IN_FOREST, 0xFF, 0x20, "Sheik in Forest", SHEIK_IN_FOREST, MINUET_OF_FOREST, {Category::cSacredForestMeadow, Category::cForest, Category::cSong,}, SpoilerCollectionCheck::EventChkInf(0x50), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[SHEIK_IN_CRATER] = ItemLocation::Delayed(RC_SHEIK_IN_CRATER, 0xFF, 0x21, "Sheik in Crater", SHEIK_IN_CRATER, BOLERO_OF_FIRE, {Category::cDeathMountainCrater, Category::cDeathMountain, Category::cSong,}, SpoilerCollectionCheck::EventChkInf(0x51), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[SHEIK_IN_ICE_CAVERN] = ItemLocation::Delayed(RC_SHEIK_IN_ICE_CAVERN, 0xFF, 0x22, "Sheik in Ice Cavern", SHEIK_IN_ICE_CAVERN, SERENADE_OF_WATER, {Category::cIceCavern, Category::cSong, Category::cSongDungeonReward}, SpoilerCollectionCheck::EventChkInf(0x52), SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); - locationTable[SHEIK_AT_COLOSSUS] = ItemLocation::Delayed(RC_SHEIK_AT_COLOSSUS, 0xFF, 0x23, "Sheik at Colossus", SHEIK_AT_COLOSSUS, REQUIEM_OF_SPIRIT, {Category::cDesertColossus, Category::cSong,}, SpoilerCollectionCheck::EventChkInf(0xAC), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[SHEIK_IN_KAKARIKO] = ItemLocation::Delayed(RC_SHEIK_IN_KAKARIKO, 0xFF, 0x24, "Sheik in Kakariko", SHEIK_IN_KAKARIKO, NOCTURNE_OF_SHADOW, {Category::cKakarikoVillage, Category::cKakariko, Category::cSong,}, SpoilerCollectionCheck::EventChkInf(0xAA), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[SHEIK_AT_TEMPLE] = ItemLocation::Delayed(RC_SHEIK_AT_TEMPLE, 0xFF, 0x25, "Sheik at Temple", SHEIK_AT_TEMPLE, PRELUDE_OF_LIGHT, {Category::cTempleOfTime, Category::cMarket, Category::cSong,}, SpoilerCollectionCheck::Chest(0x43, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[SONG_FROM_IMPA] = ItemLocation::Delayed(RC_SONG_FROM_IMPA, 0xFF, 0x26, "Song from Impa", SONG_FROM_IMPA, ZELDAS_LULLABY, {Category::cHyruleCastle, Category::cMarket, Category::cSong, Category::cSongDungeonReward}, SpoilerCollectionCheck::EventChkInf(0x59), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[SONG_FROM_MALON] = ItemLocation::Delayed(RC_SONG_FROM_MALON, 0xFF, 0x27, "Song from Malon", SONG_FROM_MALON, EPONAS_SONG, {Category::cLonLonRanch, Category::cSong,}, SpoilerCollectionCheck::Chest(0x63, 0x1F), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[SONG_FROM_SARIA] = ItemLocation::Delayed(RC_SONG_FROM_SARIA, 0xFF, 0x28, "Song from Saria", SONG_FROM_SARIA, SARIAS_SONG, {Category::cSacredForestMeadow, Category::cForest, Category::cSong,}, SpoilerCollectionCheck::Chest(0x56, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); - locationTable[SONG_FROM_COMPOSERS_GRAVE] = ItemLocation::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB, 0xFF, 0x29, "Song from Composers Grave", SONG_FROM_COMPOSERS_GRAVE, SUNS_SONG, {Category::cGraveyard, Category::cKakariko, Category::cSong,}, SpoilerCollectionCheck::Chest(0x41, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[SONG_FROM_OCARINA_OF_TIME] = ItemLocation::Delayed(RC_SONG_FROM_OCARINA_OF_TIME, 0xFF, 0x2A, "Song from Ocarina of Time", SONG_FROM_OCARINA_OF_TIME, SONG_OF_TIME, {Category::cHyruleField, Category::cSong, Category::cNeedSpiritualStones,}, SpoilerCollectionCheck::Chest(0x51, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[SONG_FROM_WINDMILL] = ItemLocation::Delayed(RC_SONG_FROM_WINDMILL, 0xFF, 0x2B, "Song from Windmill", SONG_FROM_WINDMILL, SONG_OF_STORMS, {Category::cKakarikoVillage, Category::cKakariko, Category::cSong,}, SpoilerCollectionCheck::EventChkInf(0x5B), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[SHEIK_IN_FOREST] = ItemLocation::Delayed(RC_SHEIK_IN_FOREST, 0xFF, "Sheik in Forest", SHEIK_IN_FOREST, MINUET_OF_FOREST, {Category::cSong}, SpoilerCollectionCheck::EventChkInf(0x50), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[SHEIK_IN_CRATER] = ItemLocation::Delayed(RC_SHEIK_IN_CRATER, 0xFF, "Sheik in Crater", SHEIK_IN_CRATER, BOLERO_OF_FIRE, {Category::cSong}, SpoilerCollectionCheck::EventChkInf(0x51), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[SHEIK_IN_ICE_CAVERN] = ItemLocation::Delayed(RC_SHEIK_IN_ICE_CAVERN, 0xFF, "Sheik in Ice Cavern", SHEIK_IN_ICE_CAVERN, SERENADE_OF_WATER, {Category::cSong, Category::cSongDungeonReward}, SpoilerCollectionCheck::EventChkInf(0x52), SpoilerCollectionCheckGroup::GROUP_DUNGEON_ICE_CAVERN); + locationTable[SHEIK_AT_COLOSSUS] = ItemLocation::Delayed(RC_SHEIK_AT_COLOSSUS, 0xFF, "Sheik at Colossus", SHEIK_AT_COLOSSUS, REQUIEM_OF_SPIRIT, {Category::cSong}, SpoilerCollectionCheck::EventChkInf(0xAC), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[SHEIK_IN_KAKARIKO] = ItemLocation::Delayed(RC_SHEIK_IN_KAKARIKO, 0xFF, "Sheik in Kakariko", SHEIK_IN_KAKARIKO, NOCTURNE_OF_SHADOW, {Category::cSong}, SpoilerCollectionCheck::EventChkInf(0xAA), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[SHEIK_AT_TEMPLE] = ItemLocation::Delayed(RC_SHEIK_AT_TEMPLE, 0xFF, "Sheik at Temple", SHEIK_AT_TEMPLE, PRELUDE_OF_LIGHT, {Category::cSong}, SpoilerCollectionCheck::Chest(0x43, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[SONG_FROM_IMPA] = ItemLocation::Delayed(RC_SONG_FROM_IMPA, 0xFF, "Song from Impa", SONG_FROM_IMPA, ZELDAS_LULLABY, {Category::cSong, Category::cSongDungeonReward}, SpoilerCollectionCheck::EventChkInf(0x59), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[SONG_FROM_MALON] = ItemLocation::Delayed(RC_SONG_FROM_MALON, 0xFF, "Song from Malon", SONG_FROM_MALON, EPONAS_SONG, {Category::cSong}, SpoilerCollectionCheck::Chest(0x63, 0x1F), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[SONG_FROM_SARIA] = ItemLocation::Delayed(RC_SONG_FROM_SARIA, 0xFF, "Song from Saria", SONG_FROM_SARIA, SARIAS_SONG, {Category::cSong}, SpoilerCollectionCheck::Chest(0x56, 0x1F), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); + locationTable[SONG_FROM_COMPOSERS_GRAVE] = ItemLocation::Delayed(RC_SONG_FROM_ROYAL_FAMILYS_TOMB, 0xFF, "Song from Composers Grave", SONG_FROM_COMPOSERS_GRAVE, SUNS_SONG, {Category::cSong}, SpoilerCollectionCheck::Chest(0x41, 0x1F), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[SONG_FROM_OCARINA_OF_TIME] = ItemLocation::Delayed(RC_SONG_FROM_OCARINA_OF_TIME, 0xFF, "Song from Ocarina of Time", SONG_FROM_OCARINA_OF_TIME, SONG_OF_TIME, {Category::cSong}, SpoilerCollectionCheck::Chest(0x51, 0x1F), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[SONG_FROM_WINDMILL] = ItemLocation::Delayed(RC_SONG_FROM_WINDMILL, 0xFF, "Song from Windmill", SONG_FROM_WINDMILL, SONG_OF_STORMS, {Category::cSong}, SpoilerCollectionCheck::EventChkInf(0x5B), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); /*------------------------------- --- COWS --- -------------------------------*/ - locationTable[KF_LINKS_HOUSE_COW] = ItemLocation::Base (RC_KF_LINKS_HOUSE_COW, 0x34, 0x15, "KF Links House Cow", KF_LINKS_HOUSE_COW, MILK, {Category::cForest, Category::cCow, Category::cMinigame}, SpoilerCollectionCheck::Cow(0x34, 0x15), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[HF_COW_GROTTO_COW] = ItemLocation::Base (RC_HF_COW_GROTTO_COW, 0x3E, 0x16, "HF Cow Grotto Cow", HF_COW_GROTTO_COW, MILK, {Category::cHyruleField, Category::cCow, Category::cGrotto}, SpoilerCollectionCheck::Cow(0x3E, 0x16), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); - locationTable[LLR_STABLES_LEFT_COW] = ItemLocation::Base (RC_LLR_STABLES_LEFT_COW, 0x36, 0x16, "LLR Stables Left Cow", LLR_STABLES_LEFT_COW, MILK, {Category::cLonLonRanch, Category::cCow}, SpoilerCollectionCheck::Cow(0x36, 0x16), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_STABLES_RIGHT_COW] = ItemLocation::Base (RC_LLR_STABLES_RIGHT_COW, 0x36, 0x15, "LLR Stables Right Cow", LLR_STABLES_RIGHT_COW, MILK, {Category::cLonLonRanch, Category::cCow}, SpoilerCollectionCheck::Cow(0x36, 0x15), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_TOWER_LEFT_COW] = ItemLocation::Base (RC_LLR_TOWER_LEFT_COW, 0x4C, 0x15, "LLR Tower Left Cow", LLR_TOWER_LEFT_COW, MILK, {Category::cLonLonRanch, Category::cCow}, SpoilerCollectionCheck::Cow(0x4C, 0x16), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[LLR_TOWER_RIGHT_COW] = ItemLocation::Base (RC_LLR_TOWER_RIGHT_COW, 0x4C, 0x16, "LLR Tower Right Cow", LLR_TOWER_RIGHT_COW, MILK, {Category::cLonLonRanch, Category::cCow}, SpoilerCollectionCheck::Cow(0x4C, 0x15), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); - locationTable[KAK_IMPAS_HOUSE_COW] = ItemLocation::Base (RC_KAK_IMPAS_HOUSE_COW, 0x37, 0x15, "Kak Impas House Cow", KAK_IMPAS_HOUSE_COW, MILK, {Category::cKakarikoVillage, Category::cKakariko, Category::cCow}, SpoilerCollectionCheck::Cow(0x37, 0x15), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[DMT_COW_GROTTO_COW] = ItemLocation::Base (RC_DMT_COW_GROTTO_COW, 0x3E, 0x15, "DMT Cow Grotto Cow", DMT_COW_GROTTO_COW, MILK, {Category::cDeathMountainTrail, Category::cDeathMountain, Category::cCow, Category::cGrotto}, SpoilerCollectionCheck::Cow(0x3E, 0x15), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); - locationTable[GV_COW] = ItemLocation::Base (RC_GV_COW, 0x5A, 0x15, "GV Cow", GV_COW, MILK, {Category::cGerudoValley, Category::cGerudo, Category::cCow}, SpoilerCollectionCheck::Cow(0x5A, 0x15), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); - locationTable[JABU_JABUS_BELLY_MQ_COW] = ItemLocation::Base (RC_JABU_JABUS_BELLY_MQ_COW, 0x02, 0x15, "Jabu Jabus Belly MQ Cow", JABU_JABUS_BELLY_MQ_COW, MILK, {Category::cJabuJabusBelly, Category::cCow}, SpoilerCollectionCheck::Cow(0x02, 0x15), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); + locationTable[KF_LINKS_HOUSE_COW] = ItemLocation::Base (RC_KF_LINKS_HOUSE_COW, 0x34, "KF Links House Cow", KF_LINKS_HOUSE_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[HF_COW_GROTTO_COW] = ItemLocation::Base (RC_HF_COW_GROTTO_COW, 0x3E, "HF Cow Grotto Cow", HF_COW_GROTTO_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_HYRULE_FIELD); + locationTable[LLR_STABLES_LEFT_COW] = ItemLocation::Base (RC_LLR_STABLES_LEFT_COW, 0x36, "LLR Stables Left Cow", LLR_STABLES_LEFT_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_STABLES_RIGHT_COW] = ItemLocation::Base (RC_LLR_STABLES_RIGHT_COW, 0x36, "LLR Stables Right Cow", LLR_STABLES_RIGHT_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_TOWER_LEFT_COW] = ItemLocation::Base (RC_LLR_TOWER_LEFT_COW, 0x4C, "LLR Tower Left Cow", LLR_TOWER_LEFT_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[LLR_TOWER_RIGHT_COW] = ItemLocation::Base (RC_LLR_TOWER_RIGHT_COW, 0x4C, "LLR Tower Right Cow", LLR_TOWER_RIGHT_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_LON_LON_RANCH); + locationTable[KAK_IMPAS_HOUSE_COW] = ItemLocation::Base (RC_KAK_IMPAS_HOUSE_COW, 0x37, "Kak Impas House Cow", KAK_IMPAS_HOUSE_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[DMT_COW_GROTTO_COW] = ItemLocation::Base (RC_DMT_COW_GROTTO_COW, 0x3E, "DMT Cow Grotto Cow", DMT_COW_GROTTO_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_DEATH_MOUNTAIN); + locationTable[GV_COW] = ItemLocation::Base (RC_GV_COW, 0x5A, "GV Cow", GV_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY); + locationTable[JABU_JABUS_BELLY_MQ_COW] = ItemLocation::Base (RC_JABU_JABUS_BELLY_MQ_COW, 0x02, "Jabu Jabus Belly MQ Cow", JABU_JABUS_BELLY_MQ_COW, MILK, {Category::cCow}, SpoilerCollectionCheck::Cow(), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY); /*------------------------------- --- SHOPS --- @@ -800,126 +799,125 @@ void LocationTable_Init() { 7 5 1 3 -------------------------------*/ - locationTable[KF_SHOP_ITEM_1] = ItemLocation::Base(RC_KF_SHOP_ITEM_1, 0x2D, 0x30, "KF Shop Item 1", KF_SHOP_ITEM_1, BUY_DEKU_SHIELD, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 0), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_SHOP_ITEM_2] = ItemLocation::Base(RC_KF_SHOP_ITEM_2, 0x2D, 0x31, "KF Shop Item 2", KF_SHOP_ITEM_2, BUY_DEKU_NUT_5, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 1), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_SHOP_ITEM_3] = ItemLocation::Base(RC_KF_SHOP_ITEM_3, 0x2D, 0x32, "KF Shop Item 3", KF_SHOP_ITEM_3, BUY_DEKU_NUT_10, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 2), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_SHOP_ITEM_4] = ItemLocation::Base(RC_KF_SHOP_ITEM_4, 0x2D, 0x33, "KF Shop Item 4", KF_SHOP_ITEM_4, BUY_DEKU_STICK_1, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 3), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_SHOP_ITEM_5] = ItemLocation::Base(RC_KF_SHOP_ITEM_5, 0x2D, 0x34, "KF Shop Item 5", KF_SHOP_ITEM_5, BUY_DEKU_SEEDS_30, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 4), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_SHOP_ITEM_6] = ItemLocation::Base(RC_KF_SHOP_ITEM_6, 0x2D, 0x35, "KF Shop Item 6", KF_SHOP_ITEM_6, BUY_ARROWS_10, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 5), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_SHOP_ITEM_7] = ItemLocation::Base(RC_KF_SHOP_ITEM_7, 0x2D, 0x36, "KF Shop Item 7", KF_SHOP_ITEM_7, BUY_ARROWS_30, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 6), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KF_SHOP_ITEM_8] = ItemLocation::Base(RC_KF_SHOP_ITEM_8, 0x2D, 0x37, "KF Shop Item 8", KF_SHOP_ITEM_8, BUY_HEART, {Category::cKokiriForest, Category::cForest, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2D, 7), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_1] = ItemLocation::Base(RC_KF_SHOP_ITEM_1, 0x2D, "KF Shop Item 1", KF_SHOP_ITEM_1, BUY_DEKU_SHIELD, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_2] = ItemLocation::Base(RC_KF_SHOP_ITEM_2, 0x2D, "KF Shop Item 2", KF_SHOP_ITEM_2, BUY_DEKU_NUT_5, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_3] = ItemLocation::Base(RC_KF_SHOP_ITEM_3, 0x2D, "KF Shop Item 3", KF_SHOP_ITEM_3, BUY_DEKU_NUT_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_4] = ItemLocation::Base(RC_KF_SHOP_ITEM_4, 0x2D, "KF Shop Item 4", KF_SHOP_ITEM_4, BUY_DEKU_STICK_1, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_5] = ItemLocation::Base(RC_KF_SHOP_ITEM_5, 0x2D, "KF Shop Item 5", KF_SHOP_ITEM_5, BUY_DEKU_SEEDS_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_6] = ItemLocation::Base(RC_KF_SHOP_ITEM_6, 0x2D, "KF Shop Item 6", KF_SHOP_ITEM_6, BUY_ARROWS_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_7] = ItemLocation::Base(RC_KF_SHOP_ITEM_7, 0x2D, "KF Shop Item 7", KF_SHOP_ITEM_7, BUY_ARROWS_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); + locationTable[KF_SHOP_ITEM_8] = ItemLocation::Base(RC_KF_SHOP_ITEM_8, 0x2D, "KF Shop Item 8", KF_SHOP_ITEM_8, BUY_HEART, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST); - locationTable[KAK_POTION_SHOP_ITEM_1] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_1, 0x30, 0x30, "Kak Potion Shop Item 1", KAK_POTION_SHOP_ITEM_1, BUY_GREEN_POTION, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_POTION_SHOP_ITEM_2] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_2, 0x30, 0x31, "Kak Potion Shop Item 2", KAK_POTION_SHOP_ITEM_2, BUY_BLUE_FIRE, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_POTION_SHOP_ITEM_3] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_3, 0x30, 0x32, "Kak Potion Shop Item 3", KAK_POTION_SHOP_ITEM_3, BUY_RED_POTION_30, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_POTION_SHOP_ITEM_4] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_4, 0x30, 0x33, "Kak Potion Shop Item 4", KAK_POTION_SHOP_ITEM_4, BUY_FAIRYS_SPIRIT, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_POTION_SHOP_ITEM_5] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_5, 0x30, 0x34, "Kak Potion Shop Item 5", KAK_POTION_SHOP_ITEM_5, BUY_DEKU_NUT_5, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_POTION_SHOP_ITEM_6] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_6, 0x30, 0x35, "Kak Potion Shop Item 6", KAK_POTION_SHOP_ITEM_6, BUY_BOTTLE_BUG, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_POTION_SHOP_ITEM_7] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_7, 0x30, 0x36, "Kak Potion Shop Item 7", KAK_POTION_SHOP_ITEM_7, BUY_POE, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_POTION_SHOP_ITEM_8] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_8, 0x30, 0x37, "Kak Potion Shop Item 8", KAK_POTION_SHOP_ITEM_8, BUY_FISH, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_1] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_1, 0x30, "Kak Potion Shop Item 1", KAK_POTION_SHOP_ITEM_1, BUY_GREEN_POTION, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_2] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_2, 0x30, "Kak Potion Shop Item 2", KAK_POTION_SHOP_ITEM_2, BUY_BLUE_FIRE, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_3] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_3, 0x30, "Kak Potion Shop Item 3", KAK_POTION_SHOP_ITEM_3, BUY_RED_POTION_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_4] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_4, 0x30, "Kak Potion Shop Item 4", KAK_POTION_SHOP_ITEM_4, BUY_FAIRYS_SPIRIT, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_5] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_5, 0x30, "Kak Potion Shop Item 5", KAK_POTION_SHOP_ITEM_5, BUY_DEKU_NUT_5, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_6] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_6, 0x30, "Kak Potion Shop Item 6", KAK_POTION_SHOP_ITEM_6, BUY_BOTTLE_BUG, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_7] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_7, 0x30, "Kak Potion Shop Item 7", KAK_POTION_SHOP_ITEM_7, BUY_POE, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_POTION_SHOP_ITEM_8] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_8, 0x30, "Kak Potion Shop Item 8", KAK_POTION_SHOP_ITEM_8, BUY_FISH, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_1] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1, 0x32, 0x30, "MK Bombchu Shop Item 1", MARKET_BOMBCHU_SHOP_ITEM_1, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_2] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2, 0x32, 0x31, "MK Bombchu Shop Item 2", MARKET_BOMBCHU_SHOP_ITEM_2, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_3] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3, 0x32, 0x32, "MK Bombchu Shop Item 3", MARKET_BOMBCHU_SHOP_ITEM_3, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_4] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4, 0x32, 0x33, "MK Bombchu Shop Item 4", MARKET_BOMBCHU_SHOP_ITEM_4, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_5] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5, 0x32, 0x34, "MK Bombchu Shop Item 5", MARKET_BOMBCHU_SHOP_ITEM_5, BUY_BOMBCHU_20, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_6] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6, 0x32, 0x35, "MK Bombchu Shop Item 6", MARKET_BOMBCHU_SHOP_ITEM_6, BUY_BOMBCHU_20, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_7] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7, 0x32, 0x36, "MK Bombchu Shop Item 7", MARKET_BOMBCHU_SHOP_ITEM_7, BUY_BOMBCHU_20, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BOMBCHU_SHOP_ITEM_8] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8, 0x32, 0x37, "MK Bombchu Shop Item 8", MARKET_BOMBCHU_SHOP_ITEM_8, BUY_BOMBCHU_20, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_1] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1, 0x32, "MK Bombchu Shop Item 1", MARKET_BOMBCHU_SHOP_ITEM_1, BUY_BOMBCHU_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_2] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2, 0x32, "MK Bombchu Shop Item 2", MARKET_BOMBCHU_SHOP_ITEM_2, BUY_BOMBCHU_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_3] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3, 0x32, "MK Bombchu Shop Item 3", MARKET_BOMBCHU_SHOP_ITEM_3, BUY_BOMBCHU_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_4] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4, 0x32, "MK Bombchu Shop Item 4", MARKET_BOMBCHU_SHOP_ITEM_4, BUY_BOMBCHU_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_5] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_5, 0x32, "MK Bombchu Shop Item 5", MARKET_BOMBCHU_SHOP_ITEM_5, BUY_BOMBCHU_20, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_6] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_6, 0x32, "MK Bombchu Shop Item 6", MARKET_BOMBCHU_SHOP_ITEM_6, BUY_BOMBCHU_20, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_7] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_7, 0x32, "MK Bombchu Shop Item 7", MARKET_BOMBCHU_SHOP_ITEM_7, BUY_BOMBCHU_20, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BOMBCHU_SHOP_ITEM_8] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_8, 0x32, "MK Bombchu Shop Item 8", MARKET_BOMBCHU_SHOP_ITEM_8, BUY_BOMBCHU_20, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_1] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_1, 0x31, 0x30, "MK Potion Shop Item 1", MARKET_POTION_SHOP_ITEM_1, BUY_GREEN_POTION, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_2] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_2, 0x31, 0x31, "MK Potion Shop Item 2", MARKET_POTION_SHOP_ITEM_2, BUY_BLUE_FIRE, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_3] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_3, 0x31, 0x32, "MK Potion Shop Item 3", MARKET_POTION_SHOP_ITEM_3, BUY_RED_POTION_30, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_4] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_4, 0x31, 0x33, "MK Potion Shop Item 4", MARKET_POTION_SHOP_ITEM_4, BUY_FAIRYS_SPIRIT, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_5] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_5, 0x31, 0x34, "MK Potion Shop Item 5", MARKET_POTION_SHOP_ITEM_5, BUY_DEKU_NUT_5, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_6] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_6, 0x31, 0x35, "MK Potion Shop Item 6", MARKET_POTION_SHOP_ITEM_6, BUY_BOTTLE_BUG, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_7] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_7, 0x31, 0x36, "MK Potion Shop Item 7", MARKET_POTION_SHOP_ITEM_7, BUY_POE, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_POTION_SHOP_ITEM_8] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_8, 0x31, 0x37, "MK Potion Shop Item 8", MARKET_POTION_SHOP_ITEM_8, BUY_FISH, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x31, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_1] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_1, 0x31, "MK Potion Shop Item 1", MARKET_POTION_SHOP_ITEM_1, BUY_GREEN_POTION, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_2] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_2, 0x31, "MK Potion Shop Item 2", MARKET_POTION_SHOP_ITEM_2, BUY_BLUE_FIRE, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_3] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_3, 0x31, "MK Potion Shop Item 3", MARKET_POTION_SHOP_ITEM_3, BUY_RED_POTION_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_4] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_4, 0x31, "MK Potion Shop Item 4", MARKET_POTION_SHOP_ITEM_4, BUY_FAIRYS_SPIRIT, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_5] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_5, 0x31, "MK Potion Shop Item 5", MARKET_POTION_SHOP_ITEM_5, BUY_DEKU_NUT_5, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_6] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_6, 0x31, "MK Potion Shop Item 6", MARKET_POTION_SHOP_ITEM_6, BUY_BOTTLE_BUG, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_7] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_7, 0x31, "MK Potion Shop Item 7", MARKET_POTION_SHOP_ITEM_7, BUY_POE, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_POTION_SHOP_ITEM_8] = ItemLocation::Base(RC_MARKET_POTION_SHOP_ITEM_8, 0x31, "MK Potion Shop Item 8", MARKET_POTION_SHOP_ITEM_8, BUY_FISH, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_1] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_1, 0x2C, 0x30, "MK Bazaar Item 1", MARKET_BAZAAR_ITEM_1, BUY_HYLIAN_SHIELD, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_2] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_2, 0x2C, 0x31, "MK Bazaar Item 2", MARKET_BAZAAR_ITEM_2, BUY_BOMBS_535, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_3] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_3, 0x2C, 0x32, "MK Bazaar Item 3", MARKET_BAZAAR_ITEM_3, BUY_DEKU_NUT_5, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_4] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_4, 0x2C, 0x33, "MK Bazaar Item 4", MARKET_BAZAAR_ITEM_4, BUY_HEART, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_5] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_5, 0x2C, 0x34, "MK Bazaar Item 5", MARKET_BAZAAR_ITEM_5, BUY_ARROWS_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 4), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_6] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_6, 0x2C, 0x35, "MK Bazaar Item 6", MARKET_BAZAAR_ITEM_6, BUY_ARROWS_50, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 5), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_7] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_7, 0x2C, 0x36, "MK Bazaar Item 7", MARKET_BAZAAR_ITEM_7, BUY_DEKU_STICK_1, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 6), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[MARKET_BAZAAR_ITEM_8] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_8, 0x2C, 0x37, "MK Bazaar Item 8", MARKET_BAZAAR_ITEM_8, BUY_ARROWS_30, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2C, 7), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_1] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_1, 0x2C, "MK Bazaar Item 1", MARKET_BAZAAR_ITEM_1, BUY_HYLIAN_SHIELD, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_2] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_2, 0x2C, "MK Bazaar Item 2", MARKET_BAZAAR_ITEM_2, BUY_BOMBS_535, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_3] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_3, 0x2C, "MK Bazaar Item 3", MARKET_BAZAAR_ITEM_3, BUY_DEKU_NUT_5, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_4] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_4, 0x2C, "MK Bazaar Item 4", MARKET_BAZAAR_ITEM_4, BUY_HEART, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_5] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_5, 0x2C, "MK Bazaar Item 5", MARKET_BAZAAR_ITEM_5, BUY_ARROWS_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_6] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_6, 0x2C, "MK Bazaar Item 6", MARKET_BAZAAR_ITEM_6, BUY_ARROWS_50, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_7] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_7, 0x2C, "MK Bazaar Item 7", MARKET_BAZAAR_ITEM_7, BUY_DEKU_STICK_1, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); + locationTable[MARKET_BAZAAR_ITEM_8] = ItemLocation::Base(RC_MARKET_BAZAAR_ITEM_8, 0x2C, "MK Bazaar Item 8", MARKET_BAZAAR_ITEM_8, BUY_ARROWS_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); - locationTable[KAK_BAZAAR_ITEM_1] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_1, 0x2C, 0x38, "Kak Bazaar Item 1", KAK_BAZAAR_ITEM_1, BUY_HYLIAN_SHIELD, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 0), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_BAZAAR_ITEM_2] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_2, 0x2C, 0x39, "Kak Bazaar Item 2", KAK_BAZAAR_ITEM_2, BUY_BOMBS_535, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 1), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_BAZAAR_ITEM_3] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_3, 0x2C, 0x3A, "Kak Bazaar Item 3", KAK_BAZAAR_ITEM_3, BUY_DEKU_NUT_5, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 2), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_BAZAAR_ITEM_4] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_4, 0x2C, 0x3B, "Kak Bazaar Item 4", KAK_BAZAAR_ITEM_4, BUY_HEART, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 3), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_BAZAAR_ITEM_5] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_5, 0x2C, 0x3C, "Kak Bazaar Item 5", KAK_BAZAAR_ITEM_5, BUY_ARROWS_10, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 4), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_BAZAAR_ITEM_6] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_6, 0x2C, 0x3D, "Kak Bazaar Item 6", KAK_BAZAAR_ITEM_6, BUY_ARROWS_50, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 5), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_BAZAAR_ITEM_7] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_7, 0x2C, 0x3E, "Kak Bazaar Item 7", KAK_BAZAAR_ITEM_7, BUY_DEKU_STICK_1, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[KAK_BAZAAR_ITEM_8] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_8, 0x2C, 0x3F, "Kak Bazaar Item 8", KAK_BAZAAR_ITEM_8, BUY_ARROWS_30, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x33, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_1] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_1, 0x2C, "Kak Bazaar Item 1", KAK_BAZAAR_ITEM_1, BUY_HYLIAN_SHIELD, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_2] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_2, 0x2C, "Kak Bazaar Item 2", KAK_BAZAAR_ITEM_2, BUY_BOMBS_535, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_3] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_3, 0x2C, "Kak Bazaar Item 3", KAK_BAZAAR_ITEM_3, BUY_DEKU_NUT_5, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_4] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_4, 0x2C, "Kak Bazaar Item 4", KAK_BAZAAR_ITEM_4, BUY_HEART, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_5] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_5, 0x2C, "Kak Bazaar Item 5", KAK_BAZAAR_ITEM_5, BUY_ARROWS_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_6] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_6, 0x2C, "Kak Bazaar Item 6", KAK_BAZAAR_ITEM_6, BUY_ARROWS_50, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_7] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_7, 0x2C, "Kak Bazaar Item 7", KAK_BAZAAR_ITEM_7, BUY_DEKU_STICK_1, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); + locationTable[KAK_BAZAAR_ITEM_8] = ItemLocation::Base(RC_KAK_BAZAAR_ITEM_8, 0x2C, "Kak Bazaar Item 8", KAK_BAZAAR_ITEM_8, BUY_ARROWS_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); - locationTable[ZD_SHOP_ITEM_1] = ItemLocation::Base(RC_ZD_SHOP_ITEM_1, 0x2F, 0x30, "ZD Shop Item 1", ZD_SHOP_ITEM_1, BUY_ZORA_TUNIC, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 0), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_SHOP_ITEM_2] = ItemLocation::Base(RC_ZD_SHOP_ITEM_2, 0x2F, 0x31, "ZD Shop Item 2", ZD_SHOP_ITEM_2, BUY_ARROWS_10, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 1), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_SHOP_ITEM_3] = ItemLocation::Base(RC_ZD_SHOP_ITEM_3, 0x2F, 0x32, "ZD Shop Item 3", ZD_SHOP_ITEM_3, BUY_HEART, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 2), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_SHOP_ITEM_4] = ItemLocation::Base(RC_ZD_SHOP_ITEM_4, 0x2F, 0x33, "ZD Shop Item 4", ZD_SHOP_ITEM_4, BUY_ARROWS_30, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 3), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_SHOP_ITEM_5] = ItemLocation::Base(RC_ZD_SHOP_ITEM_5, 0x2F, 0x34, "ZD Shop Item 5", ZD_SHOP_ITEM_5, BUY_DEKU_NUT_5, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 4), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_SHOP_ITEM_6] = ItemLocation::Base(RC_ZD_SHOP_ITEM_6, 0x2F, 0x35, "ZD Shop Item 6", ZD_SHOP_ITEM_6, BUY_ARROWS_50, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 5), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_SHOP_ITEM_7] = ItemLocation::Base(RC_ZD_SHOP_ITEM_7, 0x2F, 0x36, "ZD Shop Item 7", ZD_SHOP_ITEM_7, BUY_FISH, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 6), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[ZD_SHOP_ITEM_8] = ItemLocation::Base(RC_ZD_SHOP_ITEM_8, 0x2F, 0x37, "ZD Shop Item 8", ZD_SHOP_ITEM_8, BUY_RED_POTION_50, {Category::cZorasDomain, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2F, 7), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_1] = ItemLocation::Base(RC_ZD_SHOP_ITEM_1, 0x2F, "ZD Shop Item 1", ZD_SHOP_ITEM_1, BUY_ZORA_TUNIC, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_2] = ItemLocation::Base(RC_ZD_SHOP_ITEM_2, 0x2F, "ZD Shop Item 2", ZD_SHOP_ITEM_2, BUY_ARROWS_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_3] = ItemLocation::Base(RC_ZD_SHOP_ITEM_3, 0x2F, "ZD Shop Item 3", ZD_SHOP_ITEM_3, BUY_HEART, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_4] = ItemLocation::Base(RC_ZD_SHOP_ITEM_4, 0x2F, "ZD Shop Item 4", ZD_SHOP_ITEM_4, BUY_ARROWS_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_5] = ItemLocation::Base(RC_ZD_SHOP_ITEM_5, 0x2F, "ZD Shop Item 5", ZD_SHOP_ITEM_5, BUY_DEKU_NUT_5, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_6] = ItemLocation::Base(RC_ZD_SHOP_ITEM_6, 0x2F, "ZD Shop Item 6", ZD_SHOP_ITEM_6, BUY_ARROWS_50, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_7] = ItemLocation::Base(RC_ZD_SHOP_ITEM_7, 0x2F, "ZD Shop Item 7", ZD_SHOP_ITEM_7, BUY_FISH, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); + locationTable[ZD_SHOP_ITEM_8] = ItemLocation::Base(RC_ZD_SHOP_ITEM_8, 0x2F, "ZD Shop Item 8", ZD_SHOP_ITEM_8, BUY_RED_POTION_50, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); - locationTable[GC_SHOP_ITEM_1] = ItemLocation::Base(RC_GC_SHOP_ITEM_1, 0x2E, 0x30, "GC Shop Item 1", GC_SHOP_ITEM_1, BUY_BOMBS_525, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 0), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_SHOP_ITEM_2] = ItemLocation::Base(RC_GC_SHOP_ITEM_2, 0x2E, 0x31, "GC Shop Item 2", GC_SHOP_ITEM_2, BUY_BOMBS_10, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 1), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_SHOP_ITEM_3] = ItemLocation::Base(RC_GC_SHOP_ITEM_3, 0x2E, 0x32, "GC Shop Item 3", GC_SHOP_ITEM_3, BUY_BOMBS_20, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 2), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_SHOP_ITEM_4] = ItemLocation::Base(RC_GC_SHOP_ITEM_4, 0x2E, 0x33, "GC Shop Item 4", GC_SHOP_ITEM_4, BUY_BOMBS_30, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 3), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_SHOP_ITEM_5] = ItemLocation::Base(RC_GC_SHOP_ITEM_5, 0x2E, 0x34, "GC Shop Item 5", GC_SHOP_ITEM_5, BUY_GORON_TUNIC, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 4), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_SHOP_ITEM_6] = ItemLocation::Base(RC_GC_SHOP_ITEM_6, 0x2E, 0x35, "GC Shop Item 6", GC_SHOP_ITEM_6, BUY_HEART, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 5), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_SHOP_ITEM_7] = ItemLocation::Base(RC_GC_SHOP_ITEM_7, 0x2E, 0x36, "GC Shop Item 7", GC_SHOP_ITEM_7, BUY_RED_POTION_40, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 6), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); - locationTable[GC_SHOP_ITEM_8] = ItemLocation::Base(RC_GC_SHOP_ITEM_8, 0x2E, 0x37, "GC Shop Item 8", GC_SHOP_ITEM_8, BUY_HEART, {Category::cGoronCity, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x2E, 7), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_1] = ItemLocation::Base(RC_GC_SHOP_ITEM_1, 0x2E, "GC Shop Item 1", GC_SHOP_ITEM_1, BUY_BOMBS_525, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_2] = ItemLocation::Base(RC_GC_SHOP_ITEM_2, 0x2E, "GC Shop Item 2", GC_SHOP_ITEM_2, BUY_BOMBS_10, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_3] = ItemLocation::Base(RC_GC_SHOP_ITEM_3, 0x2E, "GC Shop Item 3", GC_SHOP_ITEM_3, BUY_BOMBS_20, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_4] = ItemLocation::Base(RC_GC_SHOP_ITEM_4, 0x2E, "GC Shop Item 4", GC_SHOP_ITEM_4, BUY_BOMBS_30, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_5] = ItemLocation::Base(RC_GC_SHOP_ITEM_5, 0x2E, "GC Shop Item 5", GC_SHOP_ITEM_5, BUY_GORON_TUNIC, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_6] = ItemLocation::Base(RC_GC_SHOP_ITEM_6, 0x2E, "GC Shop Item 6", GC_SHOP_ITEM_6, BUY_HEART, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_7] = ItemLocation::Base(RC_GC_SHOP_ITEM_7, 0x2E, "GC Shop Item 7", GC_SHOP_ITEM_7, BUY_RED_POTION_40, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); + locationTable[GC_SHOP_ITEM_8] = ItemLocation::Base(RC_GC_SHOP_ITEM_8, 0x2E, "GC Shop Item 8", GC_SHOP_ITEM_8, BUY_HEART, {Category::cShop}, SpoilerCollectionCheck::ShopItem(), SpoilerCollectionCheckGroup::GROUP_GORON_CITY); /*------------------------------- --- GOSSIP STONES --- -------------------------------*/ // These are not actual locations, but are filler spots used for hint reachability. - OoT Randomizer - // flag + 0x400 = message ID - locationTable[DMC_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMC_GOSSIP_STONE, 0x00, 0x05, "DMC Gossip Stone", {}); - locationTable[DMT_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMT_GOSSIP_STONE, 0x00, 0x04, "DMT Gossip Stone", {}); - locationTable[COLOSSUS_GOSSIP_STONE] = ItemLocation::HintStone(RC_COLOSSUS_GOSSIP_STONE, 0x00, 0x1A, "Colossus Gossip Stone", {}); - locationTable[DODONGOS_CAVERN_GOSSIP_STONE] = ItemLocation::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE, 0x00, 0x14, "Dodongo's Cavern Gossip Stone", {}); - locationTable[GV_GOSSIP_STONE] = ItemLocation::HintStone(RC_GV_GOSSIP_STONE, 0x00, 0x11, "GV Gossip Stone", {}); - locationTable[GC_MAZE_GOSSIP_STONE] = ItemLocation::HintStone(RC_GC_MAZE_GOSSIP_STONE, 0x00, 0x15, "GC Maze Gossip Stone", {}); - locationTable[GC_MEDIGORON_GOSSIP_STONE] = ItemLocation::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE, 0x00, 0x19, "GC Medigoron Gossip Stone", {}); - locationTable[GRAVEYARD_GOSSIP_STONE] = ItemLocation::HintStone(RC_GY_GOSSIP_STONE, 0x00, 0x0A, "GY Gossip Stone", {}); - locationTable[HC_MALON_GOSSIP_STONE] = ItemLocation::HintStone(RC_HC_MALON_GOSSIP_STONE, 0x00, 0x12, "HC Malon Gossip Stone", {}); - locationTable[HC_ROCK_WALL_GOSSIP_STONE] = ItemLocation::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE, 0x00, 0x0B, "HC Rock Wall Gossip Stone", {}); - locationTable[HC_STORMS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE, 0x00, 0x13, "HC Storms Grotto Gossip Stone", {}); - locationTable[KF_DEKU_TREE_GOSSIP_STONE_LEFT] = ItemLocation::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE, 0x00, 0x1F, "KF Deku Tree Left Gossip Stone", {}); - locationTable[KF_DEKU_TREE_GOSSIP_STONE_RIGHT] = ItemLocation::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, 0x00, 0x20, "KF Deku Tree Right Gossip Stone", {}); - locationTable[KF_GOSSIP_STONE] = ItemLocation::HintStone(RC_KF_GOSSIP_STONE, 0x00, 0x1E, "KF Gossip Stone", {}); - locationTable[LH_LAB_GOSSIP_STONE] = ItemLocation::HintStone(RC_LH_LAB_GOSSIP_STONE, 0x00, 0x03, "LH Lab Gossip Stone", {}); - locationTable[LH_GOSSIP_STONE_SOUTHEAST] = ItemLocation::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE, 0x00, 0x0F, "LH Southeast Gossip Stone", {}); - locationTable[LH_GOSSIP_STONE_SOUTHWEST] = ItemLocation::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE, 0x00, 0x08, "LH Southwest Gossip Stone", {}); - locationTable[LW_GOSSIP_STONE] = ItemLocation::HintStone(RC_LW_GOSSIP_STONE, 0x00, 0x1D, "LW Gossip Stone", {}); - locationTable[SFM_MAZE_GOSSIP_STONE_LOWER] = ItemLocation::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE, 0x00, 0x16, "SFM Maze Lower Gossip Stone", {}); - locationTable[SFM_MAZE_GOSSIP_STONE_UPPER] = ItemLocation::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE, 0x00, 0x17, "SFM Maze Upper Gossip Stone", {}); - locationTable[SFM_SARIA_GOSSIP_STONE] = ItemLocation::HintStone(RC_SFM_SARIA_GOSSIP_STONE, 0x00, 0x1C, "SFM Saria Gossip Stone", {}); - locationTable[TOT_GOSSIP_STONE_LEFT] = ItemLocation::HintStone(RC_TOT_LEFT_GOSSIP_STONE, 0x00, 0x06, "ToT Left Gossip Stone", {}); - locationTable[TOT_GOSSIP_STONE_RIGHT] = ItemLocation::HintStone(RC_TOT_RIGHT_GOSSIP_STONE, 0x00, 0x07, "ToT Left Center Gossip Stone", {}); - locationTable[TOT_GOSSIP_STONE_RIGHT_CENTER] = ItemLocation::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE, 0x00, 0x10, "ToT Right Center Gossip Stone", {}); - locationTable[TOT_GOSSIP_STONE_LEFT_CENTER] = ItemLocation::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE, 0x00, 0x0E, "ToT Right Gossip Stone", {}); - locationTable[ZD_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZD_GOSSIP_STONE, 0x00, 0x09, "ZD Gossip Stone", {}); - locationTable[ZF_FAIRY_GOSSIP_STONE] = ItemLocation::HintStone(RC_FAIRY_GOSSIP_STONE, 0x00, 0x01, "Fairy Gossip Stone", {}); - locationTable[ZF_JABU_GOSSIP_STONE] = ItemLocation::HintStone(RC_JABU_GOSSIP_STONE, 0x00, 0x02, "Jabu Gossip Stone", {}); - locationTable[ZR_NEAR_GROTTOS_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE, 0x00, 0x0D, "ZR Near Grottos Gossip Stone", {}); - locationTable[ZR_NEAR_DOMAIN_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE, 0x00, 0x0C, "ZR Near Domain Gossip Stone", {}); - locationTable[HF_COW_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE, 0x00, 0x1B, "HF Cow Grotto Gossip Stone", {}); + locationTable[DMC_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMC_GOSSIP_STONE, "DMC Gossip Stone"); + locationTable[DMT_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMT_GOSSIP_STONE, "DMT Gossip Stone"); + locationTable[COLOSSUS_GOSSIP_STONE] = ItemLocation::HintStone(RC_COLOSSUS_GOSSIP_STONE, "Colossus Gossip Stone"); + locationTable[DODONGOS_CAVERN_GOSSIP_STONE] = ItemLocation::HintStone(RC_DODONGOS_CAVERN_GOSSIP_STONE, "Dodongo's Cavern Gossip Stone"); + locationTable[GV_GOSSIP_STONE] = ItemLocation::HintStone(RC_GV_GOSSIP_STONE, "GV Gossip Stone"); + locationTable[GC_MAZE_GOSSIP_STONE] = ItemLocation::HintStone(RC_GC_MAZE_GOSSIP_STONE, "GC Maze Gossip Stone"); + locationTable[GC_MEDIGORON_GOSSIP_STONE] = ItemLocation::HintStone(RC_GC_MEDIGORON_GOSSIP_STONE, "GC Medigoron Gossip Stone"); + locationTable[GRAVEYARD_GOSSIP_STONE] = ItemLocation::HintStone(RC_GY_GOSSIP_STONE, "GY Gossip Stone"); + locationTable[HC_MALON_GOSSIP_STONE] = ItemLocation::HintStone(RC_HC_MALON_GOSSIP_STONE, "HC Malon Gossip Stone"); + locationTable[HC_ROCK_WALL_GOSSIP_STONE] = ItemLocation::HintStone(RC_HC_ROCK_WALL_GOSSIP_STONE, "HC Rock Wall Gossip Stone"); + locationTable[HC_STORMS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HC_STORMS_GROTTO_GOSSIP_STONE, "HC Storms Grotto Gossip Stone"); + locationTable[KF_DEKU_TREE_GOSSIP_STONE_LEFT] = ItemLocation::HintStone(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE, "KF Deku Tree Left Gossip Stone"); + locationTable[KF_DEKU_TREE_GOSSIP_STONE_RIGHT] = ItemLocation::HintStone(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, "KF Deku Tree Right Gossip Stone"); + locationTable[KF_GOSSIP_STONE] = ItemLocation::HintStone(RC_KF_GOSSIP_STONE, "KF Gossip Stone"); + locationTable[LH_LAB_GOSSIP_STONE] = ItemLocation::HintStone(RC_LH_LAB_GOSSIP_STONE, "LH Lab Gossip Stone"); + locationTable[LH_GOSSIP_STONE_SOUTHEAST] = ItemLocation::HintStone(RC_LH_SOUTHEAST_GOSSIP_STONE, "LH Southeast Gossip Stone"); + locationTable[LH_GOSSIP_STONE_SOUTHWEST] = ItemLocation::HintStone(RC_LH_SOUTHWEST_GOSSIP_STONE, "LH Southwest Gossip Stone"); + locationTable[LW_GOSSIP_STONE] = ItemLocation::HintStone(RC_LW_GOSSIP_STONE, "LW Gossip Stone"); + locationTable[SFM_MAZE_GOSSIP_STONE_LOWER] = ItemLocation::HintStone(RC_SFM_MAZE_LOWER_GOSSIP_STONE, "SFM Maze Lower Gossip Stone"); + locationTable[SFM_MAZE_GOSSIP_STONE_UPPER] = ItemLocation::HintStone(RC_SFM_MAZE_UPPER_GOSSIP_STONE, "SFM Maze Upper Gossip Stone"); + locationTable[SFM_SARIA_GOSSIP_STONE] = ItemLocation::HintStone(RC_SFM_SARIA_GOSSIP_STONE, "SFM Saria Gossip Stone"); + locationTable[TOT_GOSSIP_STONE_LEFT] = ItemLocation::HintStone(RC_TOT_LEFT_GOSSIP_STONE, "ToT Left Gossip Stone"); + locationTable[TOT_GOSSIP_STONE_RIGHT] = ItemLocation::HintStone(RC_TOT_RIGHT_GOSSIP_STONE, "ToT Left Center Gossip Stone"); + locationTable[TOT_GOSSIP_STONE_RIGHT_CENTER] = ItemLocation::HintStone(RC_TOT_RIGHT_CENTER_GOSSIP_STONE, "ToT Right Center Gossip Stone"); + locationTable[TOT_GOSSIP_STONE_LEFT_CENTER] = ItemLocation::HintStone(RC_TOT_LEFT_CENTER_GOSSIP_STONE, "ToT Right Gossip Stone"); + locationTable[ZD_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZD_GOSSIP_STONE, "ZD Gossip Stone"); + locationTable[ZF_FAIRY_GOSSIP_STONE] = ItemLocation::HintStone(RC_FAIRY_GOSSIP_STONE, "Fairy Gossip Stone"); + locationTable[ZF_JABU_GOSSIP_STONE] = ItemLocation::HintStone(RC_JABU_GOSSIP_STONE, "Jabu Gossip Stone"); + locationTable[ZR_NEAR_GROTTOS_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE, "ZR Near Grottos Gossip Stone"); + locationTable[ZR_NEAR_DOMAIN_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE, "ZR Near Domain Gossip Stone"); + locationTable[HF_COW_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_COW_GROTTO_GOSSIP_STONE, "HF Cow Grotto Gossip Stone"); - locationTable[HF_NEAR_MARKET_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_NEAR_MARKET_GOSSIP_STONE, 0x00, 0x30, "HF Near Market Gossip Stone", {}); - locationTable[HF_SOUTHEAST_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_SOUTHEAST_GOSSIP_STONE, 0x00, 0x32, "HF Southeast Gossip Stone", {}); - locationTable[HF_OPEN_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE, 0x00, 0x33, "HF Open Grotto Gossip Stone", {}); - locationTable[KAK_OPEN_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE, 0x00, 0x38, "Kak Open Grotto Gossip Stone", {}); - locationTable[ZR_OPEN_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE, 0x00, 0x39, "ZR Open Grotto Gossip Stone", {}); - locationTable[KF_STORMS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_KF_STORMS_GOSSIP_STONE, 0x00, 0x3C, "KF Storms Gossip Stone", {}); - locationTable[LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE, 0x00, 0x34, "LW Near Shortcuts Gossip Stone", {}); - locationTable[DMT_STORMS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE, 0x00, 0x37, "DMT Storms Grotto Gossip Stone", {}); - locationTable[DMC_UPPER_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE, 0x00, 0x3A, "DMC Upper Grotto Gossip Stone", {}); + locationTable[HF_NEAR_MARKET_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_NEAR_MARKET_GOSSIP_STONE, "HF Near Market Gossip Stone"); + locationTable[HF_SOUTHEAST_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_SOUTHEAST_GOSSIP_STONE, "HF Southeast Gossip Stone"); + locationTable[HF_OPEN_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE, "HF Open Grotto Gossip Stone"); + locationTable[KAK_OPEN_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE, "Kak Open Grotto Gossip Stone"); + locationTable[ZR_OPEN_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE, "ZR Open Grotto Gossip Stone"); + locationTable[KF_STORMS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_KF_STORMS_GOSSIP_STONE, "KF Storms Gossip Stone"); + locationTable[LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_LW_NEAR_SHORTCUTS_GOSSIP_STONE, "LW Near Shortcuts Gossip Stone"); + locationTable[DMT_STORMS_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE, "DMT Storms Grotto Gossip Stone"); + locationTable[DMC_UPPER_GROTTO_GOSSIP_STONE] = ItemLocation::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE, "DMC Upper Grotto Gossip Stone"); - locationTable[GANONDORF_HINT] = ItemLocation::OtherHint(RC_GANONDORF_HINT, 0x00, 0x00, "Ganondorf Hint", {}); + locationTable[GANONDORF_HINT] = ItemLocation::OtherHint(RC_GANONDORF_HINT, "Ganondorf Hint"); for (int i = NONE; i != KEY_ENUM_MAX; i++) locationLookupTable.insert(std::make_pair(locationTable[i].GetRandomizerCheck(), static_cast(i))); @@ -1645,8 +1643,6 @@ void CreateItemOverrides() { SPDLOG_DEBUG(std::to_string(loc->Key().scene)); SPDLOG_DEBUG("\tType: "); SPDLOG_DEBUG(std::to_string(loc->Key().type)); - SPDLOG_DEBUG("\tFlag: "); - SPDLOG_DEBUG(std::to_string(loc->Key().flag)); SPDLOG_DEBUG("\t"); SPDLOG_DEBUG(loc->GetName()); SPDLOG_DEBUG(": "); diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp b/soh/soh/Enhancements/randomizer/3drando/item_location.hpp index b8e0bed21..e900ab941 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_location.hpp @@ -50,7 +50,6 @@ typedef union ItemOverride_Key { char pad_; uint8_t scene; uint8_t type; - uint8_t flag; }; } ItemOverride_Key; @@ -119,20 +118,16 @@ class SpoilerCollectionCheck { return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene, flag); } - static auto Cow(uint8_t scene, uint8_t flag) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COW, scene, flag); + static auto Cow() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COW, 0x00, 0x00); } - static auto Fishing(uint8_t bit) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MINIGAME, 0x00, bit); + static auto Fishing() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MINIGAME, 0x00, 0x00); } - static auto Scrub(uint8_t scene, uint8_t bit) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SCRUB, scene, bit); - } - - static auto Biggoron(uint8_t mask) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_BIGGORON, 0x00, mask); + static auto Scrub() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SCRUB, 0x00, 0x00); } static auto GerudoToken() { @@ -147,28 +142,28 @@ class SpoilerCollectionCheck { return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER, scene, flag); } - static auto ShopItem(uint8_t scene, uint8_t itemSlot) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM, scene, itemSlot); + static auto ShopItem() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM, 0x00, 0x00); } - static auto MagicBeans(uint8_t scene, uint8_t flag) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS, scene, flag); + static auto MagicBeans() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS, 0x00, 0x00); } - static auto Merchant(int8_t scene, uint8_t flag) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT, scene, flag); + static auto Merchant() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT, 0x00, 0x00); } - static auto RandomizerInf(int8_t scene, uint8_t flag) { - return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF, scene, flag); + static auto RandomizerInf() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF, 0x00, 0x00); } }; class ItemLocation { public: ItemLocation() = default; - ItemLocation(RandomizerCheck rc_, uint8_t scene_, ItemLocationType type_, uint8_t flag_, std::string name_, uint32_t hintKey_, uint32_t vanillaItem_, std::vector categories_, uint16_t price_ = 0, SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup_ = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) - : rc(rc_), scene(scene_), type(type_), flag(flag_), name(std::move(name_)), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)), price(price_), collectionCheck(collectionCheck_), collectionCheckGroup(collectionCheckGroup_) {} + ItemLocation(RandomizerCheck rc_, uint8_t scene_, ItemLocationType type_, std::string name_, uint32_t hintKey_, uint32_t vanillaItem_, std::vector categories_, uint16_t price_ = 0, SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup_ = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) + : rc(rc_), scene(scene_), type(type_), name(std::move(name_)), hintKey(hintKey_), vanillaItem(vanillaItem_), categories(std::move(categories_)), price(price_), collectionCheck(collectionCheck_), collectionCheckGroup(collectionCheckGroup_) {} ItemOverride_Key Key() const { ItemOverride_Key key; @@ -176,7 +171,6 @@ public: key.scene = scene; key.type = static_cast(type); //TODO make sure these match up - key.flag = flag; return key; } @@ -196,10 +190,6 @@ public: return scene; } - uint8_t GetFlag() const { - return flag; - } - bool IsAddedToPool() const { return addedToPool; } @@ -384,26 +374,16 @@ public: } void AddExcludeOption() { - //setting description /*--------------------------------------------------*/ - std::string_view desc = "Decide which locations you want to exclude from\n" - "the location pool. Locations that require an item\n" - "to be placed at them based on your current\n" - "settings cannot be excluded and won't be shown\n" - "unless you change your settings.\n" - "\n" - "If you exclude too many locations, it might not\n" - "be possible to fill the world."; - //add option to forbid any location from progress items if (name.length() < 23) { - excludedOption = Option::Bool(name, {"Include", "Exclude"}, {desc}); + excludedOption = Option::Bool(name, {"Include", "Exclude"}); } else { //insert a newline character if the text is too long for one row size_t lastSpace = name.rfind(' ', 23); std::string settingText = name; settingText.replace(lastSpace, 1, "\n "); - excludedOption = Option::Bool(settingText, {"Include", "Exclude"}, {desc}); + excludedOption = Option::Bool(settingText, {"Include", "Exclude"}); } // RANDOTODO: this without string compares and loops @@ -418,48 +398,48 @@ public: } } - static auto Base(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::Base, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; + static auto Base(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { + return ItemLocation{rc, scene, ItemLocationType::Base, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; } static auto Chest(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::Chest, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene, flag), collectionCheckGroup}; + return ItemLocation{rc, scene, ItemLocationType::Chest, std::move(name), hintKey, vanillaItem, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_CHEST, scene, flag), collectionCheckGroup}; } - static auto Chest(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::Chest, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; + static auto Chest(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { + return ItemLocation{rc, scene, ItemLocationType::Chest, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; } static auto Collectable(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::Collectable, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene, flag), collectionCheckGroup}; + return ItemLocation{rc, scene, ItemLocationType::Collectable, std::move(name), hintKey, vanillaItem, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE, scene, flag), collectionCheckGroup}; } - static auto Collectable(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::Collectable, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; + static auto Collectable(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { + return ItemLocation{rc, scene, ItemLocationType::Collectable, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; } static auto GSToken(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, std::vector&& categories, SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::GSToken, flag, std::move(name), hintKey, GOLD_SKULLTULA_TOKEN, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA, scene, flag), collectionCheckGroup}; + return ItemLocation{rc, scene, ItemLocationType::GSToken, std::move(name), hintKey, GOLD_SKULLTULA_TOKEN, std::move(categories), 0, SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA, scene, flag), collectionCheckGroup}; } - static auto GrottoScrub(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::GrottoScrub, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; + static auto GrottoScrub(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { + return ItemLocation{rc, scene, ItemLocationType::GrottoScrub, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; } - static auto Delayed(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::Delayed, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; + static auto Delayed(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { + return ItemLocation{rc, scene, ItemLocationType::Delayed, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; } - static auto Reward(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { - return ItemLocation{rc, scene, ItemLocationType::TempleReward, flag, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; + static auto Reward(RandomizerCheck rc, uint8_t scene, std::string&& name, const uint32_t hintKey, const uint32_t vanillaItem, std::vector&& categories, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), SpoilerCollectionCheckGroup collectionCheckGroup = SpoilerCollectionCheckGroup::GROUP_NO_GROUP) { + return ItemLocation{rc, scene, ItemLocationType::TempleReward, std::move(name), hintKey, vanillaItem, std::move(categories), 0, collectionCheck, collectionCheckGroup}; } - static auto OtherHint(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, std::vector&& categories) { - return ItemLocation{rc, scene, ItemLocationType::OtherHint, flag, std::move(name), NONE, NONE, std::move(categories)}; + static auto OtherHint(RandomizerCheck rc, std::string&& name) { + return ItemLocation{rc, 0, ItemLocationType::OtherHint, std::move(name), NONE, NONE, {}}; } - static auto HintStone(RandomizerCheck rc, uint8_t scene, uint8_t flag, std::string&& name, std::vector&& categories) { - return ItemLocation{rc, scene, ItemLocationType::HintStone, flag, std::move(name), NONE, NONE, std::move(categories)}; + static auto HintStone(RandomizerCheck rc, std::string&& name) { + return ItemLocation{rc, 0, ItemLocationType::HintStone, std::move(name), NONE, NONE, {}}; } void ResetVariables() { @@ -479,7 +459,6 @@ private: RandomizerCheck rc; uint8_t scene; ItemLocationType type; - uint8_t flag; bool checked = false; std::string name; @@ -493,7 +472,7 @@ private: HintType hintType; std::string hintedRegion; uint32_t delayedItem = NONE; - Option excludedOption = Option::Bool(name, {"Include", "Exclude"}, {"", ""}); + Option excludedOption = Option::Bool(name, {"Include", "Exclude"}); uint16_t price = 0; SpoilerCollectionCheck collectionCheck; SpoilerCollectionCheckGroup collectionCheckGroup; diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp index 1bda8a313..a78d00a30 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp @@ -162,8 +162,8 @@ Entrance* Area::GetExit(uint32_t exitToReturn) { return &exit; } } - auto message = "ERROR: EXIT " + AreaTable(exitToReturn)->regionName + " DOES NOT EXIST IN " + this->regionName; - CitraPrint(message); + //auto message = "ERROR: EXIT " + AreaTable(exitToReturn)->regionName + " DOES NOT EXIST IN " + this->regionName; + //CitraPrint(message); return nullptr; } diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp index 7ec696ac1..60529a2f6 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp @@ -214,7 +214,7 @@ public: "Child Night: " + std::to_string(childNight) + "\t" "Adult Day: " + std::to_string(adultDay) + "\t" "Adult Night: " + std::to_string(adultNight); - CitraPrint(message); + //CitraPrint(message); } }; diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp index 5ef76754e..6fe26a417 100644 --- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp @@ -8,7 +8,6 @@ #include "settings.hpp" #include "dungeon.hpp" -#include "setting_descriptions.hpp" using namespace Settings; @@ -462,11 +461,6 @@ namespace Logic { } uint8_t GetDifficultyValueFromString(Option& glitchOption) { - for (size_t i = 0; i < GlitchDifficulties.size(); i++) { - if (glitchOption.GetSelectedOptionText() == GlitchDifficulties[i]) { - return i + 1; - } - } return 0; } diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp index c31fb9ed4..5da2b618c 100644 --- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp @@ -5,15 +5,12 @@ #include #include -#include "cosmetics.hpp" #include "menu.hpp" -#include "patch.hpp" -#include "preset.hpp" +#include "playthrough.hpp" #include "randomizer.hpp" #include "settings.hpp" #include "spoiler_log.hpp" #include "location_access.hpp" -#include "debug.hpp" #include #include "../../randomizer/randomizerTypes.h" #include @@ -22,496 +19,9 @@ namespace { bool seedChanged; uint16_t pastSeedLength; std::vector presetEntries; -std::vector menuList; Option* currentSetting; -Menu* currentMenu; } // namespace -void PrintTopScreen() { - SPDLOG_DEBUG("\x1b[2;11H%sOcarina of Time 3D Randomizer%s", CYAN, RESET); - SPDLOG_DEBUG("\x1b[3;18H%s%s-%s%s", CYAN, RANDOMIZER_VERSION, COMMIT_NUMBER, RESET); - SPDLOG_DEBUG("\x1b[4;10HA/B/D-pad: Navigate Menu\n"); - SPDLOG_DEBUG(" Select: Exit to Homebrew Menu\n"); - SPDLOG_DEBUG(" Y: New Random Seed\n"); - SPDLOG_DEBUG(" X: Input Custom Seed\n"); - SPDLOG_DEBUG("\x1b[11;7HCurrent Seed: %u", Settings::seed); -} - -void MenuInit() { - Settings::InitSettings(); - - seedChanged = false; - - Menu* main = new Menu("Main", MenuType::MainMenu, &Settings::mainMenu, MAIN_MENU); - menuList.push_back(main); - currentMenu = main; - - srand(time(NULL)); - - if (!CreatePresetDirectories()) { - printf("\x1b[20;5Failed to create preset directories."); - printf("\x1b[21;5Loading presets might crash."); - } - - // If cached presets exist, load them - LoadCachedSettings(); - LoadCachedCosmetics(); - // If Randomize all settings in a category is selected - // Re-randomize them - Settings::RandomizeAllSettings(); - - PrintTopScreen(); - - PrintMainMenu(); -} - -#define KEY_DUP 0 -#define KEY_DDOWN 1 -#define KEY_DLEFT 2 -#define KEY_DRIGHT 3 -#define KEY_A 4 -#define KEY_B 5 -#define KEY_Y 6 -#define KEY_X 7 - -void MoveCursor(uint32_t kDown, bool updatedByHeld) { - // Option sub menus need special checking for locked options - if (currentMenu->mode == OPTION_SUB_MENU) { - // Cancel if holding and reached first/last selectable option - if (updatedByHeld) { - bool noSelectableOption = true; - if (kDown & KEY_DUP) { - for (int i = currentMenu->menuIdx - 1; i >= 0; i--) { - if (!currentMenu->settingsList->at(i)->IsHidden() && - !currentMenu->settingsList->at(i)->IsLocked()) { - noSelectableOption = false; - break; - } - } - } - if (kDown & KEY_DDOWN) { - for (size_t i = currentMenu->menuIdx + 1; i < currentMenu->settingsList->size(); i++) { - if (!currentMenu->settingsList->at(i)->IsHidden() && - !currentMenu->settingsList->at(i)->IsLocked()) { - noSelectableOption = false; - break; - } - } - } - if (noSelectableOption) { - return; - } - } - // Loop through settings until an unlocked one is reached - do { - if ((kDown & KEY_DUP) != 0) { - currentMenu->menuIdx--; - } - if ((kDown & KEY_DDOWN) != 0) { - currentMenu->menuIdx++; - } - - // Bounds checking - if (currentMenu->menuIdx == currentMenu->settingsList->size()) { - currentMenu->menuIdx = 0; - } else if (currentMenu->menuIdx == 0xFFFF) { - currentMenu->menuIdx = static_cast(currentMenu->settingsList->size() - 1); - } - - currentSetting = currentMenu->settingsList->at(currentMenu->menuIdx); - } while (currentSetting->IsLocked() || currentSetting->IsHidden()); - } - // All other menus except reset-to-defaults confirmation - else if (currentMenu->mode != RESET_TO_DEFAULTS) { - // Cancel if holding and reached first/last menu - if (updatedByHeld) { - if ((kDown & KEY_DUP && currentMenu->menuIdx == 0) || - (kDown & KEY_DDOWN && currentMenu->menuIdx == currentMenu->itemsList->size() - 1)) { - return; - } - } - - if (kDown & KEY_DUP) { - currentMenu->menuIdx--; - } - if (kDown & KEY_DDOWN) { - currentMenu->menuIdx++; - } - - // Bounds checking - uint16_t max = -1; - if (currentMenu->mode == LOAD_PRESET || currentMenu->mode == DELETE_PRESET) { // Number of presets if applicable - max = presetEntries.size(); - } else if (currentMenu->mode == GENERATE_MODE) { // Generate menu: 2 options - max = 2; - } else if (currentMenu->itemsList != nullptr) { - max = currentMenu->itemsList->size(); // Default max: Number of items in menu - } - if (currentMenu->menuIdx == max) { - currentMenu->menuIdx = 0; - } else if (currentMenu->menuIdx == 0xFFFF) { - currentMenu->menuIdx = max - 1; - } - - // Scroll Check - if (currentMenu->menuIdx > currentMenu->settingBound + (MAX_SUBMENUS_ON_SCREEN - 1)) { - currentMenu->settingBound = currentMenu->menuIdx - (MAX_SUBMENUS_ON_SCREEN - 1); - } else if (currentMenu->menuIdx < currentMenu->settingBound) { - currentMenu->settingBound = currentMenu->menuIdx; - } - } -} - -void MenuUpdate(uint32_t kDown, bool updatedByHeld) { - // Check for menu change - // If user pressed A on a non-option, non-action menu, they're navigating to a new menu - if (kDown & KEY_A && currentMenu->mode != OPTION_SUB_MENU && currentMenu->type != MenuType::Action) { - if (currentMenu->itemsList->size() > currentMenu->menuIdx) { - Menu* newMenu; - newMenu = currentMenu->itemsList->at(currentMenu->menuIdx); - menuList.push_back(newMenu); - currentMenu = menuList.back(); - ModeChangeInit(); - kDown = 0; - } - // If they pressed B on any menu other than main, go backwards to the previous menu - } else if (kDown & KEY_B && currentMenu->mode != MAIN_MENU) { - // Want to reset generate menu when leaving - if (currentMenu->mode == POST_GENERATE) { - currentMenu->mode = GENERATE_MODE; - } - PrintTopScreen(); - menuList.pop_back(); - currentMenu = menuList.back(); - ModeChangeInit(); - kDown = 0; - } - - if (currentMenu->mode != POST_GENERATE) { - - // New Random Seed - if (kDown & KEY_Y) { - Settings::seed = rand(); - seedChanged = true; - } - - // Input Custom Seed - if (kDown & KEY_X) { - // Settings::seed = GetInput("Enter Seed"); - seedChanged = true; - } - - // Reprint seed if it changed - if (seedChanged) { - printf("\x1b[11;21H%u", Settings::seed); - seedChanged = false; - } - } - - // Print current menu (if applicable) - MoveCursor(kDown, updatedByHeld); // Move cursor, if applicable - if (currentMenu->mode == MAIN_MENU) { - PrintMainMenu(); - ClearDescription(); - } else if (currentMenu->mode == OPTION_SUB_MENU) { - UpdateOptionSubMenu(kDown); - PrintOptionSubMenu(); - } else if (currentMenu->mode == LOAD_PRESET) { - UpdatePresetsMenu(kDown); - PrintPresetsMenu(); - } else if (currentMenu->mode == DELETE_PRESET) { - UpdatePresetsMenu(kDown); - PrintPresetsMenu(); - } else if (currentMenu->mode == RESET_TO_DEFAULTS) { - UpdateResetToDefaultsMenu(kDown); - PrintResetToDefaultsMenu(); - } else if (currentMenu->mode == GENERATE_MODE) { - UpdateGenerateMenu(kDown); - if (currentMenu->mode != POST_GENERATE) { - PrintGenerateMenu(); - } - } else if (currentMenu->mode == SUB_MENU) { - PrintSubMenu(); - } -} - -void ModeChangeInit() { - if (currentMenu->mode == OPTION_SUB_MENU) { - // loop through until we reach an unlocked setting - while (currentMenu->settingsList->at(currentMenu->menuIdx)->IsLocked() || - currentMenu->settingsList->at(currentMenu->menuIdx)->IsHidden()) { - currentMenu->menuIdx++; - } - currentSetting = currentMenu->settingsList->at(currentMenu->menuIdx); - - } else if (currentMenu->mode == SAVE_PRESET) { - ClearDescription(); - if (SaveSpecifiedPreset(GetInput("Preset Name").substr(0, 19), OptionCategory::Setting)) { - printf("\x1b[24;5HPreset Saved!"); - printf("\x1b[26;5HPress B to return to the preset menu."); - } else { - printf("\x1b[24;5HFailed to save preset."); - printf("\x1b[26;5HPress B to return to the preset menu."); - } - - } else if (currentMenu->mode == LOAD_PRESET || currentMenu->mode == DELETE_PRESET) { - presetEntries = GetSettingsPresets(); - - } else if (currentMenu->mode == GENERATE_MODE) { - } -} - -void UpdateCustomCosmeticColors(uint32_t kDown) { - if (kDown & KEY_A) { - if (currentSetting->GetSelectedOptionText().compare(0, 8, Cosmetics::CUSTOM_COLOR_PREFIX) == 0) { - std::string newColor = GetInput("Enter a 6 digit hex color").substr(0, 6); - if (Cosmetics::ValidHexString(newColor)) { - currentSetting->SetSelectedOptionText(Cosmetics::CustomColorOptionText(newColor)); - } - } - } -} - -void UpdateOptionSubMenu(uint32_t kDown) { - if ((kDown & KEY_DRIGHT) != 0) { - currentSetting->NextOptionIndex(); - } - if ((kDown & KEY_DLEFT) != 0) { - currentSetting->PrevOptionIndex(); - } - - // Bounds checking - currentSetting->SanitizeSelectedOptionIndex(); - - currentSetting->SetVariable(); - Settings::ForceChange(kDown, currentSetting); - UpdateCustomCosmeticColors(kDown); -} - -void UpdatePresetsMenu(uint32_t kDown) { - // clear any potential message - ClearDescription(); - if (kDown & KEY_A && currentMenu->mode == LOAD_PRESET && !presetEntries.empty()) { - if (LoadPreset(presetEntries[currentMenu->menuIdx], OptionCategory::Setting)) { - Settings::ResolveExcludedLocationConflicts(); - for (Menu* menu : Settings::GetAllOptionMenus()) { - menu->ResetMenuIndex(); - } - printf("\x1b[24;5HPreset Loaded!"); - } else { - printf("\x1b[24;5HFailed to load preset."); - } - } else if (kDown & KEY_A && currentMenu->mode == DELETE_PRESET && !presetEntries.empty()) { - if (DeletePreset(presetEntries[currentMenu->menuIdx], OptionCategory::Setting)) { - presetEntries.erase(presetEntries.begin() + currentMenu->menuIdx); - if (currentMenu->menuIdx == presetEntries.size()) { // Catch when last preset is deleted - currentMenu->menuIdx--; - } - printf("\x1b[24;5HPreset Deleted."); - } else { - printf("\x1b[24;5HFailed to delete preset."); - } - } -} - -void UpdateResetToDefaultsMenu(uint32_t kDown) { - // clear any potential message - ClearDescription(); - if (kDown & KEY_A) { - Settings::SetDefaultSettings(); - printf("\x1b[24;5HSettings have been reset to defaults."); - } -} - -void UpdateGenerateMenu(uint32_t kDown) { - if ((kDown & KEY_A) != 0) { - Settings::PlayOption = currentMenu->menuIdx; - // GenerateRandomizer(); - // This is just a dummy mode to stop the prompt from appearing again - currentMenu->mode = POST_GENERATE; - } -} - -void PrintMainMenu() { - printf("\x1b[0;%dHMain Settings", 1 + (BOTTOM_WIDTH - 13) / 2); - - for (uint8_t i = 0; i < MAX_SUBMENUS_ON_SCREEN; i++) { - if (i >= Settings::mainMenu.size()) - break; - - Menu* menu = Settings::mainMenu[i]; - - uint8_t row = 3 + i; - // make the current menu green - if (currentMenu->menuIdx == i) { - printf("\x1b[%d;%dH%s>", row, 2, GREEN); - printf("\x1b[%d;%dH%s%s", row, 3, menu->name.c_str(), RESET); - } else { - printf("\x1b[%d;%dH%s", row, 3, menu->name.c_str()); - } - } -} - -void PrintOptionSubMenu() { - // bounds checking incase settings go off screen - // this is complicated to account for hidden settings and there's probably a better way to do it - uint16_t hiddenSettings = 0; - uint16_t visibleSettings = 0; - for (uint16_t i = currentMenu->settingBound; visibleSettings < MAX_SUBMENU_SETTINGS_ON_SCREEN; i++) { - if (i >= currentMenu->settingsList->size()) { - break; - } - if (currentMenu->settingsList->at(i)->IsHidden()) { - hiddenSettings++; - } else { - visibleSettings++; - } - } - bool isLastVisibleSetting = true; - for (size_t i = currentMenu->menuIdx + 1; i < currentMenu->settingsList->size(); i++) { - if (!currentMenu->settingsList->at(i)->IsHidden()) { - isLastVisibleSetting = false; - break; - } - } - if (currentMenu->menuIdx >= - currentMenu->settingBound - (isLastVisibleSetting ? 0 : 1) + MAX_SUBMENU_SETTINGS_ON_SCREEN + hiddenSettings) { - currentMenu->settingBound = currentMenu->menuIdx; - uint8_t offset = 0; - // skip over hidden settings - while (offset < MAX_SUBMENU_SETTINGS_ON_SCREEN - (isLastVisibleSetting ? 1 : 2)) { - currentMenu->settingBound--; - if (currentMenu->settingBound == 0) { - break; - } - offset += currentMenu->settingsList->at(currentMenu->settingBound)->IsHidden() ? 0 : 1; - } - } else if (currentMenu->menuIdx < currentMenu->settingBound + 1) { - currentMenu->settingBound = std::max(currentMenu->menuIdx - 1, 0); - } - - // print menu name - printf("\x1b[0;%dH%s", 1 + (BOTTOM_WIDTH - currentMenu->name.length()) / 2, currentMenu->name.c_str()); - - // keep count of hidden settings to not make blank spaces appear in the list - hiddenSettings = 0; - - for (uint8_t i = 0; i - hiddenSettings < MAX_SUBMENU_SETTINGS_ON_SCREEN; i++) { - // break if there are no more settings to print - if (i + currentMenu->settingBound >= currentMenu->settingsList->size()) - break; - - Option* setting = currentMenu->settingsList->at(i + currentMenu->settingBound); - - uint8_t row = 3 + ((i - hiddenSettings) * 2); - // make the current setting green - if (currentMenu->menuIdx == i + currentMenu->settingBound) { - printf("\x1b[%d;%dH%s>", row, 1, GREEN); - printf("\x1b[%d;%dH%s:", row, 2, setting->GetName().data()); - printf("\x1b[%d;%dH%s%s", row, 26, setting->GetSelectedOptionText().data(), RESET); - // dim to make a locked setting grey - } else if (setting->IsLocked()) { - printf("\x1b[%d;%dH%s%s:", row, 2, DIM, setting->GetName().data()); - printf("\x1b[%d;%dH%s%s", row, 26, setting->GetSelectedOptionText().data(), RESET); - // don't display hidden settings - } else if (setting->IsHidden()) { - hiddenSettings++; - continue; - } else { - printf("\x1b[%d;%dH%s:", row, 2, setting->GetName().data()); - printf("\x1b[%d;%dH%s", row, 26, setting->GetSelectedOptionText().data()); - } - } - - PrintOptionDescription(); -} - -void PrintSubMenu() { - printf("\x1b[0;%dH%s", 1 + (BOTTOM_WIDTH - currentMenu->name.length()) / 2, currentMenu->name.c_str()); - - for (uint8_t i = 0; i < MAX_SUBMENUS_ON_SCREEN; i++) { - if (i >= currentMenu->itemsList->size()) - break; - - uint8_t row = 3 + i; - // make the current menu green - if (currentMenu->menuIdx == currentMenu->settingBound + i) { - printf("\x1b[%d;%dH%s>", row, 2, GREEN); - printf("\x1b[%d;%dH%s%s", row, 3, currentMenu->itemsList->at(currentMenu->settingBound + i)->name.c_str(), - RESET); - } else { - printf("\x1b[%d;%dH%s", row, 3, currentMenu->itemsList->at(currentMenu->settingBound + i)->name.c_str()); - } - } -} - -void PrintPresetsMenu() { - if (presetEntries.empty()) { - printf("\x1b[10;4HNo Presets Detected!"); - printf("\x1b[12;4HPress B to return to the preset menu."); - return; - } - - if (currentMenu->mode == LOAD_PRESET) { - printf("\x1b[0;%dHSelect a Preset to Load", 1 + (BOTTOM_WIDTH - 23) / 2); - } else if (currentMenu->mode == DELETE_PRESET) { - printf("\x1b[0;%dHSelect a Preset to Delete", 1 + (BOTTOM_WIDTH - 25) / 2); - } - - for (uint8_t i = 0; i < MAX_SUBMENU_SETTINGS_ON_SCREEN; i++) { - if (i >= presetEntries.size()) - break; - - std::string preset = presetEntries[i]; - - uint8_t row = 3 + (i * 2); - // make the current preset green - if (currentMenu->menuIdx == i) { - printf("\x1b[%d;%dH%s>", row, 14, GREEN); - printf("\x1b[%d;%dH%s%s", row, 15, preset.c_str(), RESET); - } else { - printf("\x1b[%d;%dH%s", row, 15, preset.c_str()); - } - } -} - -void PrintResetToDefaultsMenu() { - printf("\x1b[10;4HPress A to reset to default settings."); - printf("\x1b[12;4HPress B to return to the preset menu."); -} - -void PrintGenerateMenu() { - printf("\x1b[3;%dHHow will you play?", 1+(BOTTOM_WIDTH-18)/2); - std::vector playOptions = {"3ds Console", "Citra Emulator"}; - - for (uint8_t i = 0; i < playOptions.size(); i++) { - - std::string option = playOptions[i]; - uint8_t row = 6 + (i * 2); - //make the current selection green - if (currentMenu->menuIdx == i) { - printf("\x1b[%d;%dH%s>", row, 14, GREEN); - printf("\x1b[%d;%dH%s%s", row, 15, option.c_str(), RESET); - } else { - printf("\x1b[%d;%dH%s", row, 15, option.c_str()); - } - } -} - -void ClearDescription() { - //clear the previous description - std::string spaces = ""; - spaces.append(9 * TOP_WIDTH, ' '); - printf("\x1b[22;0H%s", spaces.c_str()); -} - -void PrintOptionDescription() { - ClearDescription(); - std::string_view description = currentSetting->GetSelectedOptionDescription(); - - printf("\x1b[22;0H%s", description.data()); -} - std::string GenerateRandomizer(std::unordered_map cvarSettings, std::set excludedLocations, std::set enabledTricks, std::string seedString) { @@ -568,8 +78,4 @@ std::string GenerateRandomizer(std::unordered_map } std::string fileName = fileNameStream.str(); return "./Randomizer/" + fileName + ".json"; -} - -std::string GetInput(const char* hintText) { - return std::string(); -} +} \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.hpp b/soh/soh/Enhancements/randomizer/3drando/menu.hpp index 8f58e2d05..333fcbb2b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/menu.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/menu.hpp @@ -5,22 +5,14 @@ #include #include "soh/Enhancements/randomizer/randomizerTypes.h" -#define MAIN_MENU 0 #define OPTION_SUB_MENU 1 #define SUB_MENU 2 #define GENERATE_MODE 3 #define LOAD_PRESET 4 #define SAVE_PRESET 5 #define DELETE_PRESET 6 -#define POST_GENERATE 7 #define RESET_TO_DEFAULTS 8 -#define MAX_SUBMENUS_ON_SCREEN 27 -#define MAX_SUBMENU_SETTINGS_ON_SCREEN 13 -#define TOP_WIDTH 50 -#define BOTTOM_WIDTH 40 -#define SCREEN_HEIGHT 30 - #define RESET "\x1b[0m" #define DIM "\x1b[2m" @@ -33,21 +25,4 @@ #define CYAN "\x1b[36m" #define WHITE "\x1b[37m" -void ModeChangeInit(); -void UpdateOptionSubMenu(uint32_t kDown); -void UpdatePresetsMenu(uint32_t kdown); -void UpdateResetToDefaultsMenu(uint32_t kdown); -void UpdateGenerateMenu(uint32_t kDown); -void PrintMainMenu(); -void PrintOptionSubMenu(); -void PrintSubMenu(); -void PrintPresetsMenu(); -void PrintResetToDefaultsMenu(); -void PrintGenerateMenu(); -void ClearDescription(); -void PrintOptionDescription(); -std::string GenerateRandomizer(std::unordered_map cvarSetting, std::set excludedLocations, std::set enabledTricks, std::string seedInput); -std::string GetInput(const char* hintText); - -extern void MenuInit(); -extern void MenuUpdate(uint32_t kDown, bool updatedByHeld); +std::string GenerateRandomizer(std::unordered_map cvarSetting, std::set excludedLocations, std::set enabledTricks, std::string seedInput); \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/3drando/music.cpp b/soh/soh/Enhancements/randomizer/3drando/music.cpp deleted file mode 100644 index 6171d2a0e..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/music.cpp +++ /dev/null @@ -1,128 +0,0 @@ -#include "music.hpp" -#include - -namespace Music { - const std::array seqTypesMusic = { - /* NA_BGM_FIELD */ SEQ_BGM_WORLD, - /* NA_BGM_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_KAKARIKO_ADULT */ SEQ_BGM_WORLD, - /* NA_BGM_ENEMY */ SEQ_NOSHUFFLE, // Temporarily unshuffled: Override plays incorrect in some areas, like Lake Hylia, by continuously repeating the start - /* NA_BGM_BOSS00 */ SEQ_BGM_BATTLE, - /* NA_BGM_FAIRY_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_MARKET */ SEQ_BGM_WORLD, - /* NA_BGM_TITLE */ SEQ_BGM_WORLD, - /* NA_BGM_LINK_HOUSE */ SEQ_BGM_WORLD, - /* NA_BGM_GAME_OVER */ SEQ_FANFARE, - /* NA_BGM_BOSS_CLEAR */ SEQ_FANFARE, - /* NA_BGM_ITEM_GET */ SEQ_FANFARE, - /* NA_BGM_OPENING_GANON */ SEQ_FANFARE, - /* NA_BGM_HEART_GET */ SEQ_FANFARE, - /* NA_BGM_OCA_LIGHT */ SEQ_OCARINA, - /* NA_BGM_BUYO_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_KAKARIKO_KID */ SEQ_BGM_WORLD, - /* NA_BGM_GODESS */ SEQ_BGM_EVENT, - /* NA_BGM_HIME */ SEQ_BGM_EVENT, - /* NA_BGM_FIRE_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_OPEN_TRE_BOX */ SEQ_FANFARE, - /* NA_BGM_FORST_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_HIRAL_GARDEN */ SEQ_BGM_WORLD, - /* NA_BGM_GANON_TOWER */ SEQ_BGM_WORLD, - /* NA_BGM_RONRON */ SEQ_BGM_WORLD, - /* NA_BGM_GORON */ SEQ_BGM_WORLD, - /* NA_BGM_SPIRIT_STONE */ SEQ_FANFARE, - /* NA_BGM_OCA_FLAME */ SEQ_OCARINA, - /* NA_BGM_OCA_WIND */ SEQ_OCARINA, - /* NA_BGM_OCA_WATER */ SEQ_OCARINA, - /* NA_BGM_OCA_SOUL */ SEQ_OCARINA, - /* NA_BGM_OCA_DARKNESS */ SEQ_OCARINA, - /* NA_BGM_MIDDLE_BOSS */ SEQ_BGM_ERROR, - /* NA_BGM_S_ITEM_GET */ SEQ_FANFARE, - /* NA_BGM_SHRINE_OF_TIME */ SEQ_BGM_WORLD, - /* NA_BGM_EVENT_CLEAR */ SEQ_FANFARE, - /* NA_BGM_KOKIRI */ SEQ_BGM_WORLD, - /* NA_BGM_OCA_YOUSEI */ SEQ_FANFARE, - /* NA_BGM_MAYOIMORI */ SEQ_BGM_WORLD, - /* NA_BGM_SOUL_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_HORSE */ SEQ_BGM_EVENT, - /* NA_BGM_HORSE_GOAL */ SEQ_FANFARE, - /* NA_BGM_INGO */ SEQ_BGM_WORLD, - /* NA_BGM_MEDAL_GET */ SEQ_FANFARE, - /* NA_BGM_OCA_SARIA */ SEQ_OCARINA, - /* NA_BGM_OCA_EPONA */ SEQ_OCARINA, - /* NA_BGM_OCA_ZELDA */ SEQ_OCARINA, - /* NA_BGM_OCA_SUNMOON */ SEQ_NOSHUFFLE, /* Remove Sun's Song from the Ocarina pool for now due to bugs */ - /* NA_BGM_OCA_TIME */ SEQ_OCARINA, - /* NA_BGM_OCA_STORM */ SEQ_OCARINA, - /* NA_BGM_NAVI */ SEQ_BGM_EVENT, - /* NA_BGM_DEKUNOKI */ SEQ_BGM_EVENT, - /* NA_BGM_FUSHA */ SEQ_BGM_WORLD, - /* NA_BGM_HIRAL_DEMO */ SEQ_NOSHUFFLE, - /* NA_BGM_MINI_GAME */ SEQ_BGM_EVENT, - /* NA_BGM_SEAK */ SEQ_BGM_EVENT, - /* NA_BGM_ZORA */ SEQ_BGM_WORLD, - /* NA_BGM_APPEAR */ SEQ_FANFARE, - /* NA_BGM_ADULT_LINK */ SEQ_BGM_EVENT, - /* NA_BGM_MASTER_SWORD */ SEQ_FANFARE, - /* NA_BGM_INTRO_GANON */ SEQ_BGM_EVENT, - /* NA_BGM_SHOP */ SEQ_BGM_WORLD, - /* NA_BGM_KENJA */ SEQ_BGM_EVENT, - /* NA_BGM_FILE_SELECT */ SEQ_NOSHUFFLE, - /* NA_BGM_ICE_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_GATE_OPEN */ SEQ_NOSHUFFLE, - /* NA_BGM_OWL */ SEQ_BGM_EVENT, - /* NA_BGM_DARKNESS_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_AQUA_DUNGEON */ SEQ_BGM_WORLD, - /* NA_BGM_BRIDGE */ SEQ_NOSHUFFLE, - /* NA_BGM_SARIA */ SEQ_NOSHUFFLE, - /* NA_BGM_GERUDO */ SEQ_BGM_WORLD, - /* NA_BGM_DRUGSTORE */ SEQ_BGM_WORLD, - /* NA_BGM_KOTAKE_KOUME */ SEQ_BGM_EVENT, - /* NA_BGM_ESCAPE */ SEQ_BGM_EVENT, - /* NA_BGM_UNDERGROUND */ SEQ_BGM_WORLD, - /* NA_BGM_GANON_BATTLE_1 */ SEQ_BGM_BATTLE, - /* NA_BGM_GANON_BATTLE_2 */ SEQ_BGM_BATTLE, - /* NA_BGM_END_DEMO */ SEQ_NOSHUFFLE, - /* NA_BGM_STAFF_1 */ SEQ_NOSHUFFLE, - /* NA_BGM_STAFF_2 */ SEQ_NOSHUFFLE, - /* NA_BGM_STAFF_3 */ SEQ_NOSHUFFLE, - /* NA_BGM_STAFF_4 */ SEQ_NOSHUFFLE, - /* NA_BGM_BOSS01 */ SEQ_BGM_BATTLE, - /* NA_BGM_MINI_GAME_2 */ SEQ_BGM_ERROR, - }; - - std::array seqOverridesMusic; - - /* Initializes the list of music overrides to unshuffled */ - void InitMusicRandomizer() { - for(int i = 0; i < SEQ_COUNT; i++) - seqOverridesMusic[i] = BGM_BASE + i; - } - - /* Shuffles the sequences grouping them by type */ - /* type is a bitmask of SeqType */ - void ShuffleSequences(int type) { - std::vector seqs; - - // Get all sequences of the desired type(s) into a vector - for (int i = 0; i < SEQ_COUNT; i++) { - if (seqTypesMusic[i] & type) { - seqs.push_back(seqOverridesMusic[i]); - } - } - - // Shuffle the vector... - for (std::size_t i = 0; i < seqs.size(); i++) - { - std::swap(seqs[i], seqs[rand() % seqs.size()]); - } - - // ...and feed it back into the overrides array - for (int i = 0; i < SEQ_COUNT; i++) { - if (seqTypesMusic[i] & type) - { - seqOverridesMusic[i] = seqs.back(); - seqs.pop_back(); - } - } - } -} // namespace Music diff --git a/soh/soh/Enhancements/randomizer/3drando/music.hpp b/soh/soh/Enhancements/randomizer/3drando/music.hpp deleted file mode 100644 index 90f7fc9dd..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/music.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace Music { - const uint32_t BGM_BASE = 0x1000585; - const int SEQ_COUNT = 85; - - enum SeqType { - SEQ_NOSHUFFLE = 0, - SEQ_BGM_WORLD = 1 << 0, - SEQ_BGM_EVENT = 1 << 1, - SEQ_BGM_BATTLE = 1 << 2, - SEQ_OCARINA = 1 << 3, - SEQ_FANFARE = 1 << 4, - // A soundtrack in this category has the issue where if another soundtrack that isn't - // in this category overrides it, it will keep playing when it should be stopped. - // For example when beating a mini-boss or finishing the zora diving game. - SEQ_BGM_ERROR = 1 << 5, - }; - - extern const std::array seqTypesMusic; - extern std::array seqOverridesMusic; - - void InitMusicRandomizer(); - void ShuffleSequences(int type); -} // namespace Music diff --git a/soh/soh/Enhancements/randomizer/3drando/patch.cpp b/soh/soh/Enhancements/randomizer/3drando/patch.cpp deleted file mode 100644 index 59ba85e1f..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/patch.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "patch.hpp" - -#include "cosmetics.hpp" -#include "custom_messages.hpp" -#include "music.hpp" -#include "sound_effects.hpp" -#include "shops.hpp" -#include "spoiler_log.hpp" -#include "entrance.hpp" -#include "hints.hpp" - -#include -#include -#include -#include -#include -#include - -// For specification on the IPS file format, visit: https://zerosoft.zophar.net/ips.php - -using FILEPtr = std::unique_ptr; - -void WriteFloatToBuffer(std::vector& buffer, float f, size_t offset) { - memcpy(buffer.data() + offset, &f, sizeof(float)); -} \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/3drando/patch.hpp b/soh/soh/Enhancements/randomizer/3drando/patch.hpp deleted file mode 100644 index 3dd95d8d4..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/patch.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include -#include "playthrough.hpp" -#include "settings.hpp" - -#define V_TO_P(addr) (addr - 0x100000) -#define P_TO_V(offset) (offset + 0x100000) -#define PATCH_CONSOLE 0 -#define PATCH_CITRA 1 -#define PATCH_SIZE_MAX 65535 - -bool WriteAllPatches(); diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp index fd1cbf969..088ba5067 100644 --- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp @@ -90,7 +90,7 @@ int Playthrough_Repeat(std::unordered_map cvarSet Settings::seedString = std::to_string(rand() % 0xFFFFFFFF); repeatedSeed = boost::hash_32{}(Settings::seedString); Settings::seed = repeatedSeed % 0xFFFFFFFF; - CitraPrint("testing seed: " + std::to_string(Settings::seed)); + //CitraPrint("testing seed: " + std::to_string(Settings::seed)); ClearProgress(); Playthrough_Init(Settings::seed, cvarSettings, excludedLocations, enabledTricks); printf("\x1b[15;15HSeeds Generated: %d\n", i + 1); diff --git a/soh/soh/Enhancements/randomizer/3drando/preset.cpp b/soh/soh/Enhancements/randomizer/3drando/preset.cpp deleted file mode 100644 index 57606e6f1..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/preset.cpp +++ /dev/null @@ -1,202 +0,0 @@ -#include "preset.hpp" - -#include -#include -#include -#include -#include -#include - -#include "category.hpp" -#include "settings.hpp" -#include "tinyxml2.h" -#include "utils.hpp" - -namespace fs = std::filesystem; - -static const std::string CACHED_SETTINGS_FILENAME = "CACHED_SETTINGS"; -static const std::string CACHED_COSMETICS_FILENAME = "CACHED_COSMETICS"; - -static std::string_view GetBasePath(OptionCategory category) { - static constexpr std::array paths{ - "/3ds/presets/oot3dr/settings/", - "/3ds/presets/oot3dr/cosmetics/", - }; - - switch(category) { - case OptionCategory::Setting : - case OptionCategory::Cosmetic : - return paths[static_cast(category)]; - case OptionCategory::Toggle : - break; - } - return ""; -} - -//Creates preset directories if they don't exist -bool CreatePresetDirectories() { - //Create the 3ds directory if it doesn't exist - std::filesystem::create_directory("./3ds"); - //Create the presets directory if it doesn't exist - std::filesystem::create_directory("./3ds/presets"); - //Create the oot3d directory if it doesn't exist - std::filesystem::create_directory("./3ds/presets/oot3dr"); - //Create the cosmetics directory if it doesn't exist - std::filesystem::create_directory("./3ds/presets/oot3dr/cosmetics"); - //Create the settings directory if it doesn't exist - std::filesystem::create_directory("./3ds/presets/oot3dr/settings"); - - return true; -} - -//Gets the preset filenames -std::vector GetSettingsPresets() { - std::vector presetEntries = {}; - for (const auto& entry : fs::directory_iterator(GetBasePath(OptionCategory::Setting))) { - if(entry.is_regular_file() && entry.path().stem().string() != CACHED_SETTINGS_FILENAME) { - presetEntries.push_back(entry.path().stem().string()); - } - } - return presetEntries; -} - -static std::string PresetPath(std::string_view presetName, OptionCategory category) { - return std::string(GetBasePath(category)).append(presetName).append(".xml"); -} - -// Presets are now saved as XML files using the tinyxml2 library. -// Documentation: https://leethomason.github.io/tinyxml2/index.html -bool SavePreset(std::string_view presetName, OptionCategory category) { - using namespace tinyxml2; - - XMLDocument preset = XMLDocument(false); - - // Create and insert the XML declaration - preset.InsertEndChild(preset.NewDeclaration()); - - // Create the root node - XMLElement* rootNode = preset.NewElement("settings"); - preset.InsertEndChild(rootNode); - - for (Menu* menu : Settings::GetAllOptionMenus()) { - if (menu->mode != OPTION_SUB_MENU) { - continue; - } - for (const Option* setting : *menu->settingsList) { - if (!setting->IsCategory(category)) { - continue; - } - - XMLElement* newSetting = rootNode->InsertNewChildElement("setting"); - newSetting->SetAttribute("name", RemoveLineBreaks(setting->GetName()).c_str()); - newSetting->SetText(setting->GetSelectedOptionText().c_str()); - } - } - - XMLError e = preset.SaveFile(PresetPath(presetName, category).c_str()); - return e == XML_SUCCESS; -} - -//Read the preset XML file -bool LoadPreset(std::string_view presetName, OptionCategory category) { - using namespace tinyxml2; - - XMLDocument preset; - XMLError e = preset.LoadFile(PresetPath(presetName, category).c_str()); - if (e != XML_SUCCESS) { - return false; - } - - XMLElement* rootNode = preset.RootElement(); - if (strcmp(rootNode->Name(), "settings") != 0) { - // We do not have our root node, so it may be the old structure. We don't support that one anymore. - return false; - } - - XMLElement* curNode = rootNode->FirstChildElement(); - - for (Menu* menu : Settings::GetAllOptionMenus()) { - if (menu->mode != OPTION_SUB_MENU) { - continue; - } - - for (Option* setting : *menu->settingsList) { - if (!setting->IsCategory(category)) { - continue; - } - - // Since presets are saved linearly, we can simply loop through the nodes as - // we loop through the settings to find most of the matching elements. - const std::string& settingToFind = RemoveLineBreaks(setting->GetName()); - if (settingToFind == RemoveLineBreaks(curNode->Attribute("name"))) { - setting->SetSelectedIndexByString(curNode->GetText()); - curNode = curNode->NextSiblingElement(); - } else { - // If the current setting and element don't match, then search - // linearly from the beginning. This will get us back on track if the - // next setting and element line up with each other. - curNode = rootNode->FirstChildElement(); - while (curNode != nullptr) { - if (settingToFind == RemoveLineBreaks(curNode->Attribute("name"))) { - setting->SetSelectedIndexByString(curNode->GetText()); - curNode = curNode->NextSiblingElement(); - break; - } - curNode = curNode->NextSiblingElement(); - } - } - - // Reset to the beginning if we reached the end. - if (curNode == nullptr) { - curNode = rootNode->FirstChildElement(); - } - } - } - return true; -} - -//Delete the selected preset -bool DeletePreset(std::string_view presetName, OptionCategory category) { - const std::string filepath = PresetPath(presetName, category); - - std::filesystem::remove(filepath); - - return true; -} - -//Saves the new preset to a file -bool SaveSpecifiedPreset(std::string_view presetName, OptionCategory category) { - //don't save if the user cancelled - if (presetName.empty()) { - return false; - } - return SavePreset(presetName, category); -} - -void SaveCachedSettings() { - SavePreset(CACHED_SETTINGS_FILENAME, OptionCategory::Setting); -} - -void LoadCachedSettings() { - //If cache file exists, load it - for (const auto& entry : fs::directory_iterator(GetBasePath(OptionCategory::Setting))) { - if(entry.path().stem().string() == CACHED_SETTINGS_FILENAME) { - //File exists, open - LoadPreset(CACHED_SETTINGS_FILENAME, OptionCategory::Setting); - } - } -} - -bool SaveCachedCosmetics() { - return SavePreset(CACHED_COSMETICS_FILENAME, OptionCategory::Cosmetic); -} - -void LoadCachedCosmetics() { - //If cache file exists, load it - for (const auto& entry : fs::directory_iterator(GetBasePath(OptionCategory::Cosmetic))) { - if(entry.path().stem().string() == CACHED_COSMETICS_FILENAME) { - //File exists, open - LoadPreset(CACHED_COSMETICS_FILENAME, OptionCategory::Cosmetic); - } - } -} diff --git a/soh/soh/Enhancements/randomizer/3drando/preset.hpp b/soh/soh/Enhancements/randomizer/3drando/preset.hpp deleted file mode 100644 index 64536757c..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/preset.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include -#include - -enum class OptionCategory; - -bool CreatePresetDirectories(); -std::vector GetSettingsPresets(); -bool SavePreset(std::string_view presetName, OptionCategory category); -bool LoadPreset(std::string_view presetName, OptionCategory category); -bool DeletePreset(std::string_view presetName, OptionCategory category); -bool SaveSpecifiedPreset(std::string_view presetName, OptionCategory category); -void SaveCachedSettings(); -void LoadCachedSettings(); -bool SaveCachedCosmetics(); -void LoadCachedCosmetics(); diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp index 0f2d9fdc0..167e12667 100644 --- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp @@ -9,8 +9,6 @@ #include #include -#define TICKS_PER_SEC 268123480.0 - void RandoMain::GenerateRando(std::unordered_map cvarSettings, std::set excludedLocations, std::set enabledTricks, std::string seedString) { HintTable_Init(); diff --git a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.cpp b/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.cpp deleted file mode 100644 index 9a270594c..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.cpp +++ /dev/null @@ -1,1821 +0,0 @@ -#include "setting_descriptions.hpp" - -//Setting descriptions are mostly copied from OoT Randomizer tooltips with minor edits - -/*------------------------------ -| RANDOMIZE SETTINGS | *SCREEN WIDTH* -------------------------------*/ /*--------------------------------------------------*/ -string_view openRandomize = "Randomize all Open Settings."; // -string_view worldRandomize = "Randomize all World Settings except for MQ\n" // - "dungeons."; // -string_view shuffleRandomize = "Randomize all Shuffle Settings."; // -string_view dungeonRandomize = "Randomize all Dungeon Shuffle Settings."; // - // -/*------------------------------ // -| LOGIC | // -------------------------------*/ // -string_view logicGlitchless = "No glitches are required, but may require some\n" // - "minor tricks. Add minor tricks to consider for\n" // - "logic in Logical Tricks."; // -string_view logicGlitched = "The glitches you enable at the set difficulty\n" // - "or below may be required.\n" // - "\n" // - "In development, but still usable."; // -string_view logicNoLogic = "Maximize randomization, All locations are\n" // - "considered available. MAY BE IMPOSSIBLE TO BEAT.";// -string_view logicVanilla = "For those who want to play the game normally but\n" - "with the improvements of the randomizer. All\n" // - "locations will contain their vanilla items. This\n" - "supercedes all item shuffle, logic, hint, and\n" // - "item pool settings. You can still use non-vanilla\n" - "world settings such as adult start or entrance\n" // - "shuffle, but the game may require glitches to\n" // - "complete if you do."; // -/*------------------------------ // -| FOREST | // -------------------------------*/ // -string_view forestOpen = "Mido no longer blocks the path to the Deku Tree,\n" - "and the Kokiri boy no longer blocks the path out\n" - "of the forest."; // -string_view forestClosed = "Beating Deku Tree is logically required to leave\n" - "the forest area (Kokiri Forest/Lost Woods/Sacred\n" - "Forest Meadow/Deku Tree), while the Kokiri Sword\n" - "and a Deku Shield are required to access the Deku\n" - "Tree. Items needed for this will be guaranteed\n" // - "inside the forest area. This setting is\n" // - "incompatible with starting as adult."; // -string_view forestClosedDeku = "The Kokiri boy no longer blocks the path out of\n"// - "the forest, but Mido still blocks the path to the\n" - "Deku Tree, requiring Kokiri Sword and Deku Shield\n" - "to access the Deku Tree."; // -/*------------------------------ // -| KAKARIKO GATE | // -------------------------------*/ // -string_view kakGateOpen = "The gate is always open instead of needing\n" // - "Zelda's Letter. The Happy Mask Shop opens upon\n" // - "obtaining Zelda's Letter without needing to show\n" - "it to the guard."; // -string_view kakGateClosed = "The gate and the Happy Mask Shop both remain\n" // - "closed until showing Zelda's Letter to the guard\n" - "in Kakariko."; // -/*------------------------------ // -| DOOR OF TIME | // -------------------------------*/ // -string_view doorOfTimeOpen = "The Door of Time starts opened instead of needing\n" - "to play the Song of Time."; // -string_view doorOfTimeSongOnly = "Only an Ocarina and the Song of Time need to be\n"// - "found to open the Door of Time."; // -string_view doorOfTimeClosed = "The Ocarina of Time, the Song of Time, and\n" // - "all Spiritual Stones need to be found to\n" // - "open the Door of Time."; // -/*------------------------------ // -| ZORA'S FOUNTAIN | // -------------------------------*/ // -string_view fountainNormal = "King Zora obstructs the way to Zora's Fountain.\n"// - "Ruto's Letter must be shown as child in order to\n" - "move him for both eras."; // -string_view fountainAdult = "King Zora is always moved in the adult era. This\n" - "means Ruto's Letter is only required to access\n" // - "Zora's Fountain as child."; // -string_view fountainOpen = "King Zora starts as moved in both the child and\n"// - "adult eras. This also removes Ruto's Letter from\n" - "the pool since it can't be used."; // -/*------------------------------ // -| GERUDO FORTRESS | // -------------------------------*/ // -string_view gerudoNormal = "All 4 carpenters can be rescued."; // -string_view gerudoFast = "Only the bottom left carpenter must be rescued."; // -string_view gerudoOpen = "The carpenters are rescued from the start of the\n" - "game, and if Shuffle Gerudo Card is disabled,\n" // - "the player starts with the Gerudo Card in the\n" // - "inventory allowing access to Gerudo Training\n" // - "Grounds."; // -/*------------------------------ // -| RAINBOW BRIDGE | // -------------------------------*/ // -string_view bridgeOpen = "The Rainbow Bridge is always present."; // -string_view bridgeVanilla = "The Rainbow Bridge requires Shadow and Spirit\n" // - "Medallions as well as Light Arrows."; // -string_view bridgeStones = "The Rainbow Bridge requires collecting a\n" // - "configurable number of Spiritual Stones."; // -string_view bridgeMedallions = "The Rainbow Bridge requires collecting a\n" // - "configurable number of Medallions."; // -string_view bridgeRewards = "The Rainbow Bridge requires collecting a\n" // - "configurable number of Dungeon Rewards."; // -string_view bridgeDungeons = "The Rainbow Bridge requires completing a\n" // - "configurable number of Dungeons.\n" // - "\n" // - "Dungeons are considered complete when Link steps\n" - "into the blue warp at the end of them."; // -string_view bridgeTokens = "The Rainbow Bridge requires collecting a\n" // - "configurable number of Gold Skulltula Tokens."; // -string_view bridgeGreg = "The Rainbow Bridge requires collecting\n" // - "Greg the green rupee."; // -/*------------------------------ // -| BRIDGE CONDITIONS | // -------------------------------*/ // -string_view bridgeStoneCountDesc = "Set the number of Spiritual Stones required to\n" // - "spawn the Rainbow Bridge."; // -string_view bridgeMedallionCountDesc = "Set the number of Medallions required to spawn the" - "Rainbow Bridge."; // -string_view bridgeRewardCountDesc = "Set the number of Dungeon Rewards (Spiritual\n" // - "Stones and Medallions) required to spawn the\n" // - "Rainbow Bridge."; // -string_view bridgeDungeonCountDesc = "Set the number of completed dungeons required to\n" - "spawn the Rainbow Bridge."; // -string_view bridgeTokenCountDesc = "Set the number of Gold Skulltula Tokens required\n" - "to spawn the Rainbow Bridge."; // -string_view bridgeRewardOptionsDesc = "Set whether the rewards are standard, if Greg\n" - "counts as a reward and considered for logic\n" - "or if Greg becomes a wildcard, counting as a reward but\n" - "not considered in logic."; // -/*------------------------------ // -| RANDOM GANONS TRIALS | // -------------------------------*/ // -string_view randomGanonsTrialsDesc = "Sets a random number of required trials to enter\n" - "Ganon's Tower."; // -/*------------------------------ // -| GANON'S TRIAL COUNT | // -------------------------------*/ // -string_view ganonsTrialCountDesc = "Set the number of trials required to enter\n" // - "Ganon's Tower. Trials will be randomly selected.";// -/*------------------------------ // -| STARTING AGE | // -------------------------------*/ // -string_view ageDesc = "Choose which age Link will start as.\n" // - "\n" // - "Starting as adult means you start with the Master\n" - "Sword in your inventory.\n" // - "\n" // - "Only the child option is compatible with Closed\n"// - "Forest."; // -/*------------------------------ // -| SHUFFLE ENTRANCES | // -------------------------------*/ // -string_view shuffleEntrancesDesc = "Shuffle where the entrances between areas lead to." - "If turned on, select which kinds of entrances you\n" - "want shuffled in the options below. Note that some" - "types of entrances can have wildly varying\n" // - "generation times."; // - // -/*------------------------------ // -| DUNGEON ENTRANCES | // -------------------------------*/ // -string_view dungeonEntrancesDesc = "Shuffle the pool of dungeon entrances, including\n" - "Bottom of the Well, Ice Cavern, and Gerudo\n" // - "Training Grounds. Shuffling Ganon's Castle can\n" // - "be enabled separately.\n" // - "\n" // - "Additionally, the entrances of Deku Tree, Fire\n" // - "Temple, Bottom of the Well and Gerudo Training\n" // - "Ground are opened for both adult and child."; // -/*------------------------------ // -| BOSS ENTRANCES | // -------------------------------*/ // -string_view bossEntrancesDesc = "Shuffle the pool of dungeon boss entrances.\n" // - "This affects the boss rooms of all stone and\n" // - "medallion dungeons.\n" // - "\n" // - "Child and adult boss rooms can be shuffled\n" // - "separately.\n" // - "Child may be expected to defeat Phantom Ganon\n" // - "and/or Bongo Bongo."; // -/*------------------------------ // -| OVERWORLD ENTRANCES | // -------------------------------*/ // -string_view overworldEntrancesDesc = "Shuffle the pool of Overworld entrances, which\n" // - "corresponds to almost all loading zones between\n"// - "Overworld areas.\n" // - "\n" // - "Some entrances are unshuffled to avoid issues:\n" // - "- Hyrule Castle Courtyard and Garden entrance\n" // - "- Both Market Back Alley entrances\n" // - "- Gerudo Valley to Lake Hylia (unless entrances\n"// - " are decoupled)"; // -/*------------------------------ // -| INTERIOR ENTRANCES | // -------------------------------*/ // -string_view interiorEntrancesOff = "Interior entrances will not be shuffled."; // -string_view interiorEntrancesSimple = "Shuffle the pool of interior entrances which\n" // - "contains most Houses and all Great Fairies."; // -string_view interiorEntrancesAll = "An extended version of 'Simple' with some extra\n"// - "places:\n" // - "- Windmill\n" // - "- Link's House\n" // - "- Temple of Time\n" // - "- Kakariko Potion Shop."; // -/*------------------------------ // -| GROTTO ENTRANCES | // -------------------------------*/ // -string_view grottoEntrancesDesc = "Shuffle the pool of grotto entrances, including\n"// - "all graves, small Fairy Fountains and the Lost\n" // - "Woods Stage."; // -/*------------------------------ // -| OWL DROPS | // -------------------------------*/ // -string_view owlDropsDesc = "Randomize where Kaepora Gaebora (the Owl) drops\n"// - "you at when you talk to him at Lake Hylia or at\n"// - "the top of Death Mountain Trail."; // -/*------------------------------ // -| WARP SONGS | // -------------------------------*/ // -string_view warpSongsDesc = "Randomize where each of the 6 warp songs leads to."; - // -/*------------------------------ // -| OVERWORLD SPAWNS | // -------------------------------*/ // -string_view overworldSpawnsDesc = "Randomize where you start as Child or Adult when\n" - "loading a save in the Overworld. This means you\n"// - "may not necessarily spawn inside Link's House or\n" - "Temple of Time.\n" // - "\n" // - "This stays consistent after saving and loading the" - "game again."; // -/*------------------------------ // -| MIXED ENTRANCE POOLS | // -------------------------------*/ // -string_view mixedPoolsDesc = "Shuffle entrances into a mixed pool instead of\n" // - "separate ones. For example, enabling the settings\n" - "to shuffle grotto, dungeon, and overworld\n" // - "entrances and selecting grotto and dungeon\n" // - "entrances here will allow a dungeon to be inside a" - "grotto or vice versa, while overworld entrances\n"// - "are shuffled in their own separate pool and\n" // - "indoors stay vanilla."; // -string_view mixDungeonsDesc = "Dungeon entrances will be part of the mixed pool."; -string_view mixOverworldDesc = "Overworld entrances will be part of the mixed\n" // - "pool."; // -string_view mixInteriorsDesc = "Interior entrances will be part of the mixed pool."; -string_view mixGrottosDesc = "Grotto entrances will be part of the mixed pool.";// -/*------------------------------ // -| DECOUPLED ENTRANCES | // -------------------------------*/ // -string_view decoupledEntrancesDesc = "Decouple entrances when shuffling them. This means" - "you are no longer guaranteed to end up back where " - "you came from when you go back through an\n" // - "entrance. This also adds the one-way entrance from" - "Gerudo Valley to Lake Hylia in the pool of\n" // - "overworld entrances when they are shuffled.\n" // - "Boss entrances are currently excluded from this\n"// - "and remain coupled regardless."; // -/*------------------------------ // -| BOMBCHUS IN LOGIC | // -------------------------------*/ // -string_view bombchuLogicDesc = "Bombchus are properly considered in logic.\n" // - "They can be replenished in shops, or through\n" // - "bombchu drops, if those are enabled.\n" // - "\n" // - "Bombchu Bowling is opened by bombchus."; // -/*------------------------------ // -| AMMO DROPS | // -------------------------------*/ // -string_view defaultAmmoDropsDesc = "Bombs, arrows, seeds, nuts, sticks and\n" // - "magic jars appear as normal.\n"; // -string_view bombchuDropsDesc = "Bombs, arrows, seeds, nuts, sticks and\n" // - "magic jars appear as normal.\n" // - "Bombchus can sometimes replace bomb drops."; // -string_view noAmmoDropsDesc = "All ammo drops will be replaced by blue rupees,\n"// - "except for Deku Sticks.\n" // - "Ammo upgrades will only refill ammo by 10 units.";// -/*------------------------------ // -| HEART DROPS AND REFILLS | // -------------------------------*/ // -string_view defaultHeartDropsDesc = "Heart drops will appear as normal.\n" // - "Health upgrades fully heal Link when picked up.\n"// - "Fairies heal Link as normal."; // -string_view noHeartDropsDesc = "Heart drops will be replaced by green rupees.\n" // - "Health upgrades fully heal Link when picked up.\n"// - "Fairies heal Link as normal."; // -string_view noHeartRefillDesc = "Heart drops will appear as normal.\n" // - "Health upgrades don't heal Link when picked up.\n"// - "Fairies heal Link by only 3 hearts."; // -string_view scarceHeartsDesc = "Heart drops will be replaced by green rupees.\n" // - "Health upgrades don't heal Link when picked up.\n"// - "Fairies heal Link by only 3 hearts."; // -/*------------------------------ // -| MQ DUNGEON COUNT | // -------------------------------*/ // -string_view mqDungeonCountDesc = "Specify the number of Master Quest dungeons to\n" // - "appear in the game. Which dungeons become Master\n" - "Quest will be chosen at random."; // -/*------------------------------ // -| SET MQ DUNGEONS | // -------------------------------*/ // -string_view setDungeonTypesDesc = "If set, you can choose specific dungeons to be\n" // - "vanilla, MQ, or random"; // -/*------------------------------ // -| SHUFFLE DUNGEON REWARDS | // -------------------------------*/ // -string_view shuffleRewardsEndOfDungeon= "Medallions and Spiritual Stones will be given as\n" - "rewards for beating dungeons.\n" // - "\n" // - "This setting will force Link's Pocket to be a\n" // - "Medallion or Spiritual Stone."; // -string_view shuffleRewardsAnyDungeon = "Medallions and Spiritual Stones can only appear\n"// - "inside of dungeons."; // -string_view shuffleRewardsOverworld = "Medallions and Spiritual Stones can only appear\n"// - "outside of dungeons."; // -string_view shuffleRewardsAnywhere = "Medallions and Spiritual Stones can appear\n" // - "anywhere."; // -/*------------------------------ // -| LINK'S POCKET | // -------------------------------*/ // -string_view linksPocketDungeonReward = "Link will start with a Dungeon Reward in his\n" // - "inventory."; // -string_view linksPocketAdvancement = "Link will receive a random advancement item at the" - "beginning of the playthrough."; // -string_view linksPocketAnything = "Link will receive a random item from the item pool" - "at the beginning of the playthrough."; // -string_view linksPocketNothing = "Link will start with a very useful green rupee."; // -/*------------------------------ // -| SONG SHUFFLE | // -------------------------------*/ // -string_view songsSongLocations = "Songs will only appear at locations that normally\n" - "teach songs."; // -string_view songsDungeonRewards = "Songs appear at the end of dungeons. For major\n" // - "dungeons, they will be at the boss heart container" - "location. The remaining 4 songs are placed at:\n" // - "- Zelda's Lullaby Location\n" // - "- Ice Cavern's Serenade of Water Location\n" // - "- Bottom of the Well's Lens of Truth Location\n" // - "- Gerudo Training Ground's Ice Arrow Location"; // -string_view songsAllLocations = "Songs can appear in any location."; // - // -/*------------------------------ // -| SHOPSANITY | // -------------------------------*/ // -string_view shopsOff = "All shop items will be the same as vanilla."; // -string_view shopsZero = "Vanilla shop items will be shuffled among\n" // - "different shops."; // -string_view shopsOne = "Vanilla shop items will be shuffled among\n" // - "different shops, and each shop will contain\n" // - "one non-vanilla shop item."; // -string_view shopsTwo = "Vanilla shop items will be shuffled among\n" // - "different shops, and each shop will contain\n" // - "two non-vanilla shop items."; // -string_view shopsThree = "Vanilla shop items will be shuffled among\n" // - "different shops, and each shop will contain\n" // - "three non-vanilla shop items."; // -string_view shopsFour = "Vanilla shop items will be shuffled among\n" // - "different shops, and each shop will contain\n" // - "four non-vanilla shop items."; // -string_view shopsRandom = "Vanilla shop items will be shuffled among\n" // - "different shops, and each shop will contain\n" // - "1-4 non-vanilla shop items."; // - // -/*------------------------------ // -| SHOPSANITY PRICES | // -------------------------------*/ // -string_view shopPriceBalanced = "Weighted randomization, max 300."; // -string_view shopPriceStarter = "True randomization, max 95"; // -string_view shopPriceAdult = "True randomization, max 200"; // -string_view shopPriceGiant = "True randomization, max 500"; // -string_view shopPriceTycoon = "True randomization, max 995"; // -string_view shopPriceAffordable = "Cap shop prices to affordable value just above" // - "the previous tier wallet's max value"; // - // -/*------------------------------ // -| TOKENSANITY | // -------------------------------*/ // -string_view tokensOff = "GS locations will not be shuffled."; // -string_view tokensDungeon = "This only shuffles the GS locations that are\n" // - "within dungeons, increasing the value of most\n" // - "dungeons and making internal dungeon exploration\n" - "more diverse."; // -string_view tokensOverworld = "This only shuffles the GS locations that are\n" // - "outside of dungeons."; // -string_view tokensAllTokens = "Effectively adds 100 new locations for items to\n"// - "appear."; // - -/*------------------------------ // -| SCRUB SHUFFLE | // -------------------------------*/ // -string_view scrubsOff = "Only the 3 Scrubs that give one-time items in the\n" - "vanilla game (PoH, Deku Nut capacity, and Deku\n" // - "Stick capacity) will have random items."; // -string_view scrubsAffordable = "All Scrub prices will be reduced to 10 rupees each"; -string_view scrubsExpensive = "All Scrub prices will be their vanilla prices.\n" // - "This will require spending over 1000 rupees on\n" // - "Scrubs."; // -string_view scrubsRandomPrices = "All Scrub prices will be between 0-95 rupees. This" - "will on average be very, very expensive overall.";// -/*------------------------------ // -| SHUFFLE COWS | // -------------------------------*/ // -string_view shuffleCowsDesc = "Enabling this will let cows give you items upon\n"// - "performing Epona's song in front of them. There\n"// - "are 9 cows, and an extra in MQ Jabu."; // - // -/*------------------------------ // -| SHUFFLE KOKIRI SWORD | // -------------------------------*/ // -string_view kokiriSwordDesc = "Enabling this shuffles the Kokiri Sword into the\n" - "item pool.\n" // - "\n" // - "This will require extensive use of sticks until\n"// - "the sword is found."; // -/*------------------------------ // -| SHUFFLE OCARINAS | // -------------------------------*/ // -string_view ocarinasDesc = "Enabling this shuffles the Fairy Ocarina and the\n" - "Ocarina of Time into the item pool.\n" // - "\n" // - "This will require finding an Ocarina before being\n" - "able to play songs."; // -/*------------------------------ // -| SHUFFLE WEIRD EGG | // -------------------------------*/ // -string_view weirdEggDesc = "Enabling this shuffles the Weird Egg from Malon\n"// - "into the item pool.\n" // - "This will require finding the Weird Egg to talk to" - "Zelda in Hyrule Castle, which in turn locks\n" // - "rewards from Impa, Saria, Malon, and Talon, as\n" // - "well as the Happy Mask Sidequest. The Weird Egg is" - "also required for Zelda's Letter to unlock the\n" // - "Kakariko Gate as child which can lock some\n" // - "progression"; // -/*------------------------------ // -| SHUFFLE Gerudo Membership Card | // -------------------------------*/ // -string_view gerudoTokenDesc = "Enabling this shuffles the Gerudo Membership Card into the\n" - "item pool.\n" // - "\n" // - "The Gerudo Membership Card is required to enter the Gerudo\n" - "Training Ground."; // -/*------------------------------ // -| SHUFFLE MAGIC BEANS | // -------------------------------*/ // -string_view magicBeansDesc = "Enabling this adds a pack of 10 beans to the item\n" - "pool and changes the Magic Bean Salesman to sell a" - "random item at a price of 60 rupees."; // -/*------------------------------ // -| SHUFFLE MERCHANTS | // -------------------------------*/ // -string_view merchantsDesc = "Enabling this changes Medigoron, Granny and the\n"// - "Carpet Salesman to sell a random item once at a\n"// - "high price (100 for Granny, 200 for the others).\n\n" - "A Giant's Knife and a pack of Bombchus will be\n" // - "added to the item pool, and one of the bottles\n" // - "will contain a Blue Potion"; // -string_view merchantsHintsDesc = "These hints will make the merchants tell you\n" // - "which item they're selling.\n" // - "\n" // - "The Hint Clarity setting will affect how they\n" // - "refer to the item."; // -/*------------------------------ // -| SHUFFLE FROG SONG RUPEES | // -------------------------------*/ // -string_view frogSongRupeesDesc = "Enabling this adds 5 Purple Rupees to the item\n" // - "pool and shuffles the rewards from playing Zelda's\n" - "Lullaby, Epona's Song, Saria's Song, Sun's Song,\n" - "and Song of Time to the frogs in Zora's River.\n";// -/*------------------------------ // -| SHUFFLE ADULT TRADE | // -------------------------------*/ // -string_view adultTradeDesc = "Enabling this adds all of the adult trade quest\n"// - "items to the pool, each of which can be traded\n" // - "for a unique reward. You will be able to choose\n"// - "which of your owned adult trade items is visible\n" - "in the inventory by selecting the item and using\n" - "the L and R buttons. If disabled, only the Claim\n" - "Check will be found in the pool."; // -/*------------------------------ // -| SHUFFLE CHEST MINIGAME | // -------------------------------*/ // -string_view chestMinigameDesc = "The 5 key chests in the Treasure Chest Shop will\n" - "be randomized, and the 6 keys will be added to the"// - "pool. The rupee chests will be replaced by traps.\n" - "Also, the shop owner is on vacation, so he can't\n" - "close any chests or doors once you leave.\n" // - "\n" // - "If you choose the \"pack\" option, you will get\n"// - "all the keys at once, in a single item."; // - // -/*------------------------------ // -| SHUFFLE 100 GS REWARD | // -------------------------------*/ // -string_view shuffle100GsDesc = "The cursed rich man in the House of Skulltula\n" // - "will give you a random item for collecting all\n" // - "100 Gold Skulltula Tokens, then he will give you\n" - "Huge Rupees."; // - // -/*------------------------------ // -| MAPS AND COMPASSES | // -------------------------------*/ // -string_view mapCompassStartWith = "Maps and Compasses are given to you from the\n" // - "start. This will add a small amount of money and\n" - "refill items to the pool."; // -string_view mapCompassVanilla = "Maps and Compasses will appear in their vanilla\n"// - "locations."; // -string_view mapCompassOwnDungeon = "Maps and Compasses can only appear in their\n" // - "respective dungeon."; // -string_view mapCompassAnyDungeon = "Maps and Compasses can only appear in a dungeon,\n" - "but not necessarily the dungeon they are for."; // -string_view mapCompassOverworld = "Maps and Compasses can only appear outside of\n" // - "dungeons."; // -string_view mapCompassAnywhere = "Maps and Compasses can appear anywhere in the\n" // - "world."; // -/*------------------------------ // -| SMALL KEYS | // -------------------------------*/ // -string_view smallKeyStartWith = "Small Keys are given to you from the start so you\n" - "won't have to worry about locked doors. An easier\n" - "mode."; // -string_view smallKeyVanilla = "Small Keys will appear in their vanilla locations." - "You start with 3 keys in Spirit Temple MQ because\n" - "the vanilla key layout is not beatable in logic.";// -string_view smallKeyOwnDungeon = "Small Keys can only appear in their respective\n" // - "dungeon. If Fire Temple is not a Master Quest\n" // - "dungeon, the door to the Boss Key chest will be\n"// - "unlocked."; // -string_view smallKeyAnyDungeon = "Small Keys can only appear inside of any dungeon,\n" - "but won't necessarily be in the dungeon that the\n" - "key is for. A difficult mode since it is more\n" // - "likely to need to enter a dungeon multiple times."; -string_view smallKeyOverworld = "Small Keys can only appear outside of dungeons.\n"// - "You may need to enter a dungeon multiple times to\n" - "gain items to access the overworld locations with\n" - "the keys required to finish a dungeon."; // -string_view smallKeyAnywhere = "Small Keys can appear anywhere in the world. A\n" // - "difficult mode since it is more likely to need to\n" - "enter a dungeon multiple times."; // -/*------------------------------ // -| GERUDO FORTRESS KEYS | // -------------------------------*/ // -string_view gerudoKeysVanilla = "Gerudo Fortress Keys will appear in their vanilla\n" - "location, dropping from fighting Gerudo guards\n" // - "that attack when trying to free the jailed\n" // - "carpenters."; // -string_view gerudoKeysAnyDungeon = "Gerudo Fortress Keys can only appear inside of\n" // - "dungeons."; // -string_view gerudoKeysOverworld = "Gerudo Fortress Keys can only appear outside of\n"// - "dungeons."; // -string_view gerudoKeysAnywhere = "Gerudo Fortress Keys can appear anywhere in the\n"// - "world."; // -/*------------------------------ // -| Key Rings | // -------------------------------*/ // -string_view keyRingDesc = "Selected key ring dungeons will have all of their\n" - "keys found at once in a ring rather than\n" // - "individually.\n\n" // - "For example, instead of shuffling 5 Forest Temple\n" - "small keys into the pool, you will find a single\n" - "key ring which will give you all 5 keys at once.\n"; -/*------------------------------ // -| BOSS KEYS | // -------------------------------*/ // -string_view bossKeyStartWith = "Boss Keys are given to you from the start so you\n" - "won't have to worry about boss doors. An easier\n"// - "mode."; // -string_view bossKeyVanilla = "Boss Keys will appear in their vanilla locations."; -string_view bossKeyOwnDungeon = "Boss Keys can only appear in their respective\n" // - "dungeon."; // -string_view bossKeyAnyDungeon = "Boss Keys can only appear inside of any dungeon,\n" - "but won't necessarily be in the dungeon that the\n" - "key is for. A difficult mode since it is more\n" // - "likely to need to enter a dungeon multiple times."; -string_view bossKeyOverworld = "Boss Keys can only appear outside of dungeons.\n" // - "You may need to enter a dungeon without the boss\n" - "key to get items required to find the key in the\n" - "overworld."; // -string_view bossKeyAnywhere = "Boss Keys can appear anywhere in the world. A\n" // - "difficult mode since it is more likely to need to\n" - "enter a dungeon multiple times."; // -/*------------------------------ // -| GANON'S CASTLE BOSS KEY | // -------------------------------*/ // -string_view ganonKeyStartWith = "Ganon's Castle Boss Key is given to you from the\n" - "start and you don't have to worry about finding it"; -string_view ganonKeyVanilla = "Ganon's Castle Boss Key will appear in the vanilla" - "location."; // -string_view ganonKeyOwnDungeon = "Ganon's Castle Boss Key can only appear inside\n" // - "Ganon's Castle."; // -string_view ganonKeyAnyDungeon = "Ganon's Castle Boss Key can only appear inside of\n" - "a dungeon, but not necessarily Ganon's Castle."; // -string_view ganonKeyOverworld = "Ganon's Castle Boss Key can only appear outside of" - "dungeons."; // -string_view ganonKeyAnywhere = "Ganon's Castle Boss Key can appear anywhere in the" - "world."; // -string_view ganonKeyLACS = "These settings put the boss key on the Light Arrow" - "Cutscene location, from Zelda in Temple of Time as" - "adult, with differing requirements."; // -string_view ganonKey100GS = "Ganon's Castle Boss Key is given to you by the\n" // - "cursed rich man in the House of Skulltula after\n"// - "you collect all 100 Gold Skulltula Tokens."; // -/*------------------------------ // -| LACS CONDITIONS | // -------------------------------*/ // -string_view lacsStoneCountDesc = "Set the number of Spiritual Stones required to\n" // - "trigger the Light Arrow Cutscene."; // -string_view lacsMedallionCountDesc = "Set the number of Medallions required to trigger\n" - "the Light Arrow Cutscene."; // -string_view lacsRewardCountDesc = "Set the number of Dungeon Rewards (Spiritual\n" // - "Stones and Medallions) required to trigger the\n" // - "Light Arrow Cutscene."; // -string_view lacsDungeonCountDesc = "Set the number of completed dungeons required to\n" - "trigger the Light Arrow Cutscene.\n" // - "\n" // - "Dungeons are considered complete when Link steps\n" - "into the blue warp at the end of them."; // -string_view lacsTokenCountDesc = "Set the number of Gold Skulltula Tokens required\n" - "to trigger the Light Arrow Cutscene."; // -string_view lacsRewardOptionsDesc = "Set whether the rewards are standard, if Greg\n" - "counts as a reward and considered for logic\n" - "or if Greg becomes a wildcard, counting as a reward but\n" - "not considered in logic."; // -/*------------------------------ // -| SKIP CHILD STEALTH | // -------------------------------*/ // -string_view childStealthDesc = "The crawlspace into Hyrule Castle goes straight to" - "Zelda, skipping the guards."; // -/*------------------------------ // -| SKIP TOWER ESCAPE | // -------------------------------*/ // -string_view skipTowerEscapeDesc = "The tower escape sequence between Ganondorf and\n"// - "Ganon will be skipped."; // -/*------------------------------ // -| SKIP EPONA RACE | // -------------------------------*/ // -string_view skipEponaRaceDesc = "Epona can be summoned with Epona's Song without\n"// - "needing to race Ingo."; // -/*------------------------------ // -| SKIP MINIGAME PHASES | // -------------------------------*/ // -string_view skipMinigamePhasesDesc = "Completing the second objective in the Dampe Race\n" - "and Gerudo Archery on the first attempt will give\n" - "both rewards at once for that minigame."; // -/*------------------------------ // -| FREE SCARECROW | // -------------------------------*/ // -string_view freeScarecrowDesc = "Pulling out the Ocarina near a spot at which\n" // - "Pierre can spawn will do so, without needing\n" // - "the song."; // -/*------------------------------ // -| FOUR POES CUTSCENE | // -------------------------------*/ // -string_view fourPoesDesc = "The cutscene with the 4 poes in Forest Temple will" - "be skipped. If the cutscene is not skipped, it can" - "be exploited to reach the basement early."; // -/*------------------------------ // -| LAKE HYLIA OWL | // -------------------------------*/ // -string_view lakeHyliaOwlDesc = "The owl flight cutscene in Lake Hylia will be\n" // - "skipped. This cutscene lets you see what item\n" // - "is on top of the laboratory roof."; // -/*------------------------------ // -| BIG POE TARGET COUNT | // -------------------------------*/ // -string_view bigPoeTargetCountDesc = "The Poe buyer will give a reward for turning in\n"// - "the chosen number of Big Poes."; // -/*------------------------------ // -| NUM REQUIRED CUCCOS | // -------------------------------*/ // -string_view numRequiredCuccosDesc = "The cucco lady will give a reward for returning\n"// - "this many of her cuccos to the pen."; // -/*------------------------------ // -| KING ZORA SPEED | // --------------------------------*/ // -string_view kingZoraSpeedFast = "King Zora will move out of the way in 1 shuffle"; // - // -string_view kingZoraSpeedVanilla = "King Zora will move out of the way in 26 shuffles"; - // -string_view kingZoraSpeedRandom = "King Zora will move out of the way in 1 to 128\n" // - "shuffles, with lower numbers being more common"; // -/*------------------------------ // -| COMPLETE MASK QUEST | // -------------------------------*/ // -string_view completeMaskDesc = "Once the happy mask shop is opened, all masks\n" // - "will be available to be borrowed."; // -/*------------------------------ // -| ENABLE GLITCH CUTSCENES | // -------------------------------*/ // -string_view glitchCutscenesDesc = "The cutscenes of the Poes in Forest Temple and\n" // - "Darunia in Fire Temple will not be skipped.\n" // - "These cutscenes are only useful for glitched\n" // - "gameplay and can be safely skipped otherwise."; // -/*------------------------------ // -| QUICK TEXT | // -------------------------------*/ // -string_view quickTextDesc0 = "Quick text will be unchanged, requiring\n" // - "frame-perfect inputs like in the vanilla game."; // -string_view quickTextDesc1 = "Every text box will be completable by pressing B\n" - "at any point while it's scrolling."; // -string_view quickTextDesc2 = "Every text box will auto-complete instantly.\n" // - "No scrolling allowed!"; // -string_view quickTextDesc3 = "Holding B will advance and close text boxes\n" // - "automatically, except for choice selections."; // -/*------------------------------ // -| SKIP SONG REPLAYS | // -------------------------------*/ // -string_view skipSongReplaysDesc = "The automatic replay after you play a song will\n"// - "be skipped.\n" // - "You can choose to keep the sfx anyway, but you\n" // - "will have control of Link during it."; // -/*------------------------------ // -| KEEP FW WARP POINT | // -------------------------------*/ // -string_view keepFWWarpPointDesc = "The Farore's Wind warp point will stay active\n" // - "after having been warped to. The old point will\n"// - "need to be dispelled before setting a new one."; // -/*------------------------------ // -| FAST BUNNY HOOD | // -------------------------------*/ // -string_view fastBunnyHoodDesc = "The Bunny Hood mask behaves like it does in\n" // - "Majora's Mask and makes you run 50% faster."; // -/*------------------------------ // -| GOSSIP STONE HINTS | // -------------------------------*/ // -string_view gossipStonesHintsDesc = "Gossip Stones can be made to give hints about\n" // - "where items can be found.\n" // - "Different settings can be chosen to decide which\n" - "item is needed to speak to Gossip Stones. Choosing" - "to stick with the Mask of Truth will make the\n" // - "hints very difficult to obtain.\n" // - "Hints for 'on the way of the hero' are locations\n" - "that contain items that are required to beat the\n" - "game."; // - // -/*------------------------------ // -| HINT CLARITY | // -------------------------------*/ // -string_view obscureHintsDesc = "Sets the difficulty of hints.\n" // - "Obscure: Hints are unique for each thing, but\n" // - "the writing may be confusing.\n" // - "E.g. Kokiri Sword > a butter knife"; // -string_view ambiguousHintsDesc = "Sets the difficulty of hints.\n" // - "Ambiguous: Hints are clearly written, but may\n" // - "refer to more than one thing.\n" // - "E.g. Kokiri Sword > a sword"; // -string_view clearHintsDesc = "Sets the difficulty of hints.\n" // - "Clear: Hints are clearly written and are unique\n"// - "for each thing.\n" // - "E.g. Kokiri Sword > the Kokiri Sword"; // -/*------------------------------ // -| HINT DISTRIBUTION | // -------------------------------*/ // -string_view uselessHintsDesc = "Only junk hints."; // -string_view balancedHintsDesc = "Recommended hint spread."; // -string_view strongHintsDesc = "More useful hints."; // -string_view veryStrongHintsDesc = "Many powerful hints."; // - // -/*------------------------------ // -| MAP AND COMPASS GIVES INFO | // -------------------------------*/ // -string_view compassesShowRewardsDesc = "If dungeon rewards are set to be shuffled at the\n" - "end of dungeons, the in-game menu will reveal\n" // - "which reward is in each dungeon, if the compass\n"// - "for that dungeon has been collected."; // -string_view compassesShowWotHDesc = "The in-game menu will reveal whether each\n" // - "dungeon is on the Way of the Hero, a barren\n" // - "location, or neither, if the compass for that\n" // - "dungeon has been collected."; // -string_view mapsShowDungeonModesDesc = "If any Master Quest dungeons will be randomly\n" // - "shuffled, the in-game menu will reveal whether\n" // - "it is in its Vanilla or Master Quest form, if\n" // - "the map for the dungeon has been collected.\n" // - "Ganon's Castle and Gerudo Training Grounds are\n" // - "always revealed, as they do not have maps."; // -/*------------------------------ // -| DAMAGE MULTIPLIER | // -------------------------------*/ // -string_view damageMultiDesc = "Changes the amount of damage taken.\n" // - "\n" // - "If set to OHKO, Link will die in one hit."; // -/*------------------------------ // -| STARTING TIME | // -------------------------------*/ // -string_view startingTimeDesc = "Change up Link's sleep routine."; // - // -/*------------------------------ // -| ALL LOCATIONS REACHABLE | // -------------------------------*/ // -string_view locationsReachableDesc = "When this options is enabled, the randomizer will\n" - "guarantee that every item is obtainable and every\n" - "location is reachable. When disabled, only\n" // - "required items and locations to beat the game\n" // - "will be guaranteed reachable."; // -/*------------------------------ // -| NIGHT GS EXPECT SUNS | // -------------------------------*/ // -string_view nightGSDesc = "GS Tokens that can only be obtained during the\n" // - "night expect you to have Sun's Song to collect\n" // - "them. This prevents needing to wait until night\n"// - "for some locations."; // - // -/*------------------------------ // -| CHEST ANIMATIONS | // -------------------------------*/ // -string_view chestAnimDesc = "Choose if you want the slow animation to play\n" // - "if a chest contains a major item.\n"; // - // -/*------------------------------ // -| CHEST SIZE AND COLOR | // -------------------------------*/ // -string_view chestSizeDesc = "This option will change the appearance of all\n" // - "regular chests depending on their contents:\n" // - "Major Items = Big Wooden Chests\n" // - "Lesser Items = Small Wooden Chests\n" // - "Boss Keys = Big Fancy Chests\n" // - "Small Keys = Small Fancy Chests"; // - // -/*------------------------------ // -| INGAME SPOILERS | // -------------------------------*/ // -string_view ingameSpoilersShowDesc = "Every spoiler is shown."; // -string_view ingameSpoilersHideDesc = "Hides the spheres page and only shows a\n" // - "location's item after it has been found."; // - // -/*------------------------------ // -| MENU OPENING BUTTON | // -------------------------------*/ // -string_view menuButtonDesc = "Choose which button will bring up the Dungeon\n" // - "Information Menu. You can also use the menu to\n" // - "buffer frame perfect inputs if you choose D-Pad"; // - // -/*------------------------------ // -| START WITH CONSUMABLES | // -------------------------------*/ // -string_view startWithConsumablesDesc = "Start the game with maxed out Deku Sticks and Deku" - "Nuts."; // - // -/*------------------------------ // -| START WITH MAX RUPEES | // -------------------------------*/ // -string_view startWithMaxRupeesDesc = "Start the game with a full wallet.\n" // - "Wallet upgrades will also fill the wallet."; // - // -/*------------------------------ // -| ITEM POOL | // -------------------------------*/ // -string_view itemPoolPlentiful = "Extra major items are added to the pool."; // -string_view itemPoolBalanced = "Original item pool."; // -string_view itemPoolScarce = "Some excess items are removed, including health\n"// - "upgrades."; // -string_view itemPoolMinimal = "Most excess items are removed."; // - // -/*------------------------------ // -| ICE TRAPS | // -------------------------------*/ // -string_view iceTrapsOff = "All Ice Traps are removed."; // -string_view iceTrapsNormal = "Only Ice Traps from the base item pool are placed."; -string_view iceTrapsExtra = "Chance to add extra Ice Traps when junk items are\n" - "added to the itempool."; // -string_view iceTrapsMayhem = "All added junk items will be Ice Traps."; // -string_view iceTrapsOnslaught = "All junk items will be replaced by Ice Traps, even" - "those in the base pool."; // -/*------------------------------ // -| REMOVE DOUBLE DEFENSE | // -------------------------------*/ // -string_view removeDDDesc = "If set the double defense item will be removed\n" // - "from the item pool for balanced and plentiful."; // -/*------------------------------ // -| PROGRESSSIVE GORON SOWRD | // -------------------------------*/ // -string_view progGoronSword = "Giant's Knife will always be found\n" // - "before Biggoron's Sword. Medigoron only starts\n" // - "selling new knives once the Giant's Knife\n" // - "has been found and broken."; // -/*------------------------------ // -| USE FARORE'S WIND ANYWHERE | // -------------------------------*/ // -string_view faroresWindAnywhereDesc = "Farore's Wind can be used outside of dungeons."; // - // -/*------------------------------ // -| LIFT AGE RESTRICTIONS | // -------------------------------*/ // -string_view ageRestrictionsDesc = "Remove age restrictions for inventory items.\n" // - "Select \"Choose\" to open the list of individual\n" - "options.\n\n" // - "Most of the items won't appear correctly when\n" // - "used as the wrong version of Link, but they'll be\n" - "fully functional otherwise."; // - // -/*------------------------------ // -| ENABLE ADULT DEKU STICK | // -------------------------------*/ // -string_view adultStickDesc = "Adult Link can wield a deku stick. In game Adult\n" - "Link will look like he's holding a Hylian Shield,\n" - "but rest assured it is a deku stick."; // - // -/*------------------------------ // -| ENABLE ADULT BOOMERANG | // -------------------------------*/ // -string_view adultBoomerangDesc = "Adult Link can throw the boomerang."; // - // -/*------------------------------ // -| ENABLE CHILD HAMMER | // -------------------------------*/ // -string_view childHammerDesc = "Child Link can swing the Megaton Hammer."; // -/*------------------------------ // -| ENABLE ADULT SLINGSHOT | // -------------------------------*/ // -string_view adultSlingshotDesc = "Adult Link can use the Slingshot (but it looks\n" // - "like the Bow)."; // - // -/*------------------------------ // -| ENABLE CHILD BOW | // -------------------------------*/ // -string_view childBowDesc = "Child Link can use the Bow. It will look like the\n" - "Slingshot, but will shoot arrows."; // - // -/*------------------------------ // -| ENABLE CHILD HOOKSHOT | // -------------------------------*/ // -string_view childHookshotDesc = "Child Link can use the Hookshot/Longshot.\n" // - "It will be difficult to aim, the red dot and\n" // - "laser won't appear and the hook will look like\n" // - "a small bomb."; // -/*------------------------------ // -| ENABLE CHILD IRON BOOTS | // -------------------------------*/ // -string_view childIronBootsDesc = "Child Link can equip the Iron Boots."; // - // -/*------------------------------ // -| ENABLE CHILD HOVER BOOTS | // -------------------------------*/ // -string_view childHoverBootsDesc = "Child Link can equip the Hover Boots. The yellow\n" - "circle beneath Link's feet won't appear."; // - // -/*------------------------------ // -| ENABLE ADULT MASKS | // -------------------------------*/ // -string_view adultMasksDesc = "Adult Link can equip masks.\n" // - "\n" // - "This setting will not change the logic."; // - // -/*------------------------------ // -| ENABLE ADULT KOKIRI SWORD | // -------------------------------*/ // -string_view adultKokiriSwordDesc = "Adult Link can equip the Kokiri Sword."; // - // -/*------------------------------ // -| ENABLE CHILD MASTER SWORD | // -------------------------------*/ // -string_view childMasterSwordDesc = "Child Link can equip the Master Sword."; // - // -/*------------------------------ // -| ENABLE CHILD BIGGORON SWORD | // -------------------------------*/ // -string_view childBiggoronSwordDesc = "Child Link can equip the Biggoron Sword and the\n"// - "Giant's Knife."; // - // -/*------------------------------ // -| ENABLE ADULT DEKU SHIELD | // -------------------------------*/ // -string_view adultDekuShieldDesc = "Adult Link can equip the Deku Shield."; // - // -/*------------------------------ // -| ENABLE CHILD MIRROR SHIELD | // -------------------------------*/ // -string_view childMirrorShieldDesc = "Child Link can equip the Mirror Shield."; // - // -/*------------------------------ // -| ENABLE CHILD GORON TUNIC | // -------------------------------*/ // -string_view childGoronTunicDesc = "Child Link can equip the Goron Tunic."; // - // -/*------------------------------ // -| ENABLE CHILD ZORA TUNIC | // -------------------------------*/ // -string_view childZoraTunicDesc = "Child Link can equip the Zora Tunic."; // - // -/*------------------------------ // -| GK DURABILITY | // -------------------------------*/ // -string_view gkDurabilityVanilla = "The durability will always be set to 8."; // -string_view gkDurabilityRandomRisk = "Each Giant's Knife will get a random durability\n"// - "between 1 and 128, with low being more common,\n" // - "and with an average of 15."; // -string_view gkDurabilityRandomSafe = "Each Giant's Knife will get a random durability\n"// - "between 10 and 50, with an average of 30."; // - // -/*------------------------------ // -| BLUE FIRE ARROWS | // -------------------------------*/ // -string_view blueFireArrowsDesc = "Ice Arrows gain the ability to melt red ice\n" // - "and break the mud walls in Dodongo's Cavern."; // -/*------------------------------ // -| SUNLIGHT ARROWS | // -------------------------------*/ // -string_view sunlightArrowsDesc = "Light Arrows gain the ability to activate sun\n" // - "switches."; // -/*------------------------------ // -| MULTIPLAYER | // -------------------------------*/ // -string_view mp_EnabledDesc = "Enables multiplayer.\n" // - "Other players will always be seen and heard\n" // - "regardless of the other settings."; // -string_view mp_SharedProgressDesc = "Progress and certain actors will be synced between" - "everyone in the network that has this option on,\n" - "the same seed hash, and the same sync id."; // -string_view mp_SyncIdDesc = "Limits shared progress to only sync with other\n" // - "players that have the same sync ID. This is only\n" - "necessary to set if multiple groups of players\n" // - "play on the same seed hash, but only want to share" - "their progress with certan people.\n" // - "For example, when doing a 2v2 race."; // -string_view mp_SharedHealthDesc = "Syncs health when shared progress is on,\n" // - "otherwise just shares the damage and recovery."; // -string_view mp_SharedRupeesDesc = "Syncs rupees when shared progress is on,\n" // - "otherwise just shares the gain and loss."; // -string_view mp_SharedAmmoDesc = "Syncs ammo when shared progress is on,\n" // - "otherwise just shares the gain and loss."; // - // -/*------------------------------ // -| INGAME DEFAULTS | // -------------------------------*/ // -string_view zTargetingDesc = "Sets L-Targeting to start as switch or hold."; // -string_view cameraControlDesc = "Sets the camera controls to start as normal or\n" // - "with the y-axis inverted."; // -string_view motionControlDesc = "Sets the motion controls to start on or off."; // -string_view togglePlayMusicDesc = "Starts the game with the music on or off."; // -string_view togglePlaySFXDesc = "Starts the game with the sound effects on or off."; -string_view silenceNaviDesc = "Sets whether Navi should start silenced or not."; // -string_view ignoreMaskReactionDesc = "Sets whether NPCs ignore the worn mask or not.\n" // - "Does not apply when trading masks."; // - // -/*------------------------------ // -| NAVI & TRAIL COLORS | // -------------------------------*/ // -string_view naviColorsDesc = "Inner color is for the main light orb, outer color" - "is for the aura.\n\n" // - "The Rainbow option will make the color change\n" // - "continuously in a 3 seconds loop."; // -string_view necessarySimpleModeDesc = "For boomerang and sword trails, OoT3D uses a\n" // - "special texture that doesn't support every color.\n\n" - "Unsupported colors will always use the plain\n" // - "texture from OoT instead:\n" // - "- Black and Purple sword trails\n" // - "- White, Black and Purple boomerang trails\n" // - "- Random or Custom colors without at least one\n" // - " maxed out RGB component."; // -string_view alwaysSimpleModeDesc = "All boomerang and sword trails will use the plain\n" - "texture from OoT, regardless of what color is\n" // - "chosen."; // - // -/*------------------------------ // -| COLORED KEYS | // -------------------------------*/ // -string_view coloredKeysDesc = "If set, small key models will be colored\n" // - "differently depending on which dungeon they can be" - "used in. Forest Temple keys are green. Fire Temple" - "keys are red. etc."; // -string_view coloredBossKeysDesc = "If set, boss key models will be colored\n" // - "differently depending on which dungeon they can be" - "used in. The Forest Temple boss key is green. The " - "Fire Temple boss key is red. etc."; // -/*------------------------------ // -| MIRROR WORLD | // -------------------------------*/ // -string_view mirrorWorldDesc = "If set, the world will be mirrored."; // - // -/*------------------------------ // -| SHUFFLE MUSIC | // -------------------------------*/ // -string_view musicRandoDesc = "Randomize the music in the game."; // -string_view shuffleBGMDesc = "Randomize area background music, either\n" // - "grouped into categories or all mixed together."; // -string_view fanfaresOffDesc = "Fanfares are not shuffled."; // -string_view onlyFanfaresDesc = "Fanfares and ocarina songs are shuffled in\n" // - "separate pools."; // -string_view fanfaresOcarinaDesc = "Fanfares and ocarina songs are shuffled together\n" - "in the same pool."; // -string_view shuffleOcaMusicDesc = "The music that plays back after you play an" // - "ocarina song is randomized."; // -/*------------------------------ // -| SHUFFLE SFX | // -------------------------------*/ // -string_view shuffleSFXOff = "Sound effects will stay vanilla."; // -string_view shuffleSFXAll = "All sound effects will be shuffled."; // -string_view shuffleSFXSceneSpecific = "All sound effects will be shuffled, but will also\n" - "be different in each scene."; // -string_view shuffleSFXChaos = "Each sound effect will become random about\n" // - "every second."; // -string_view shuffleSFXCategorically = "Sound effects will be shuffled in categories.\n" // - "\n" // - "The sound may get annoying fast when disabled."; // -/*------------------------------ // -| RANDOM TRAP DAMAGE TYPE | // -------------------------------*/ // -string_view randomTrapDmgDesc = "All traps will be the base game ice trap"; // - // -string_view basicTrapDmgDesc = "All alternative traps will cause a small damage\n"// - "and no other negative effects"; // - // -string_view advancedTrapDmgDesc = "Some chest traps will burn your Deku Shield or\n" // - "cause a lot of damage (with one-hit protection)"; // - //--------------// -/*------------------------------ // -| DETAILED LOGIC EXPLANATIONS | // -------------------------------*/ -string_view ToggleLogicNoneDesc = "Disables all the Detailed Logic tricks."; // -string_view ToggleLogicNoviceDesc = "Enables only the easier Detailed Logic tricks"; // -string_view ToggleLogicIntermediateDesc = "Enables all but the harder Detailed Logic tricks."; -string_view ToggleLogicExpertDesc = "Enables all the Detailed Logic tricks."; // -string_view LogicTempDesc = ""; // - // -string_view LogicGrottosWithoutAgonyDesc = "Difficulty: Novice\n" // - "Grottos can be accessed without Stone of Agony,\n"// - "simply by knowing where they are located."; // -string_view LogicVisibleCollisionDesc = "Difficulty: Novice\n" // - "The closed Kakariko Village Gate can be crossed\n"// - "when coming from Death Mountain Trail.\n" // - "Useful for Entrance Randomiser."; // -string_view LogicFewerTunicRequirementsDesc = "Difficulty: Novice\n" // - "Allows the following possible without Tunics:\n" // - "- Enter Water Temple.\n" // - "- Enter Fire Temple. Only the first floor\n" // - " is accessible, and not Volvagia.\n" // - "- Zora's Fountain Bottom Freestanding PoH.\n" // - "- Gerudo Training Grounds Underwater Silver Rupee\n" - "Chest. May need to make multiple trips."; // -string_view LogicLostWoodsGSBeanDesc = "Difficulty: Novice\n" // - "You can collect the token with a precise Hookshot\n" - "use, as long as you can kill the Skulltula first.\n" - "It can be killed using Longshot, Bow, Bombchus\n" // - "or Din's Fire."; // -string_view LogicLabDivingDesc = "Difficulty: Novice\n" // - "Remove the Iron Boots in the midst of Hookshotting" - "the underwater crate"; // -string_view LogicLabWallGSDesc = "Difficulty: Intermediate\n" // - "The jump slash to actually collect the token is\n"// - "somewhat precise"; // -string_view LogicGraveyardPoHDesc = "Difficulty: Novice\n" // - "Using a precise moving setup you can obtain the\n"// - "Piece of Heart by having the Boomerang interact\n"// - "with it along the return path."; // -string_view LogicChildDampeRacePoHDesc = "Difficulty: Intermediate\n" // - "It is possible to complete the second dampe race\n" - "as child in under a minute, but it is a strict\n" // - "time limit."; // -string_view LogicGVHammerChestDesc = "Difficulty: Novice\n" // - "The chest can be reached by sidehopping between\n"// - "the wall and the east most hammer rock."; // -string_view LogicGerudoKitchenDesc = "Difficulty: Intermediate\n" // - "The logic normally guarantees one of Bow,\n" // - "Hookshot, or Hover Boots."; // -string_view LogicLensWastelandDesc = "Difficulty: Expert\n" // - "By memorizing the path, you can travel through the" - "Wasteland without using the Lens of Truth to see\n" - "the Poe. The equivalent trick for going in reverse" - "through the Wasteland is \"Reverse Wasteland\"."; // -string_view LogicReverseWastelandDesc = "Difficulty: Expert\n" // - "By memorizing the path, you can travel through the" - "Wasteland in reverse."; // -string_view LogicColossusGSDesc = "Difficulty: Expert\n" // - "Somewhat precise. If you kill enough Leevers you\n" - "can get enough of a break to take some time to aim" - "more carefully."; // -string_view LogicOutsideGanonsGSDesc = "Difficulty: Intermediate\n" // - "Can be killed with a precise sidehop jumpslash\n" // - "from the top of the broken arch."; // -string_view LogicManOnRoofDesc = "Difficulty: Novice\n" // - "Can be reached by side-hopping off the watchtower."; -string_view LogicWindmillPoHHookshotDesc = "Difficulty: Novice\n" // - "Adult Link can reach the upper area of the windmill" - "using the hookshot and a midair jump slash."; // -string_view LogicDMTBombableDesc = "Difficulty: Expert\n" // - "Child Link can blow up the wall using a nearby\n" // - "bomb flower. You must backwalk with the flower and" - "then quickly throw it toward the wall."; // -string_view LogicDMTSoilGSDesc = "Difficulty: Intermediate\n" // - "Bugs will go into the soft soil even while the\n" // - "boulder is still blocking the entrance if dropped\n" - "from above. Then, using a precise moving setup you" - "can kill the Gold Skulltula and obtain the token by" - "having the Boomerang collect it while returning.";// -string_view LogicDMTSummitHoverDesc = "Difficulty: Intermediate\n" // - "By rolling around the lower boulder with hover\n" // - "boots and grabbing the ledge with the higher\n" // - "boulder near the wall, you'll be able to grab the\n" - "ledge above it to reach the summit."; // -string_view LogicLinkGoronDinsDesc = "Difficulty: Intermediate\n" // - "The timing is quite awkward."; // -string_view LogicGoronCityLeftMostDesc = "Difficulty: Novice\n" // - "A precise backwalk starting from on top of the\n" // - "crate and ending with a precisely-timed backflip\n" - "can reach this chest without needing either the\n"// - "Hammer or Silver Gauntlets."; // -string_view LogicGoronCityPotDesc = "Difficulty: Expert\n" // - "A Bombchu can be used to stop the spinning pot,\n"// - "but it can be quite finicky to get it to work."; // -string_view LogicGoronCityPotWithStrengthDesc = "Difficulty: Intermediate\n" // - "Allows for stopping the Goron City Spinning Pot\n"// - "using a bomb flower alone, requiring strength in\n" - "lieu of inventory explosives."; // -string_view LogicChildRollingWithStrengthDesc = "Difficulty: Expert\n" // - "Use the bombflower on the stairs or near\n" // - "Medigoron. Timing is tight, especially without\n" // - "backwalking."; // -string_view LogicCraterUpperToLowerDesc = "Difficulty: Intermediate\n" // - "With the Hammer, you can jump slash the rock twice" - "in the same jump in order to destroy it before you" - "fall into the lava."; // -string_view LogicCraterBeanPoHWithHoversDesc = "Difficulty: Expert\n" // - "Hover from the base of the bridge near Goron City\n" - "and walk up the very steep slope."; // -string_view LogicBiggoronBoleroDesc = "Difficulty: Intermediate\n" // - "Playing a warp song normally causes a trade item\n" - "to spoil immediately, however, it is possible use\n" - "Bolero to reach Biggoron and still deliver the Eye" - "Drops before they spoil. If you do not wear the\n" - "Goron Tunic, the heat timer inside the crater will" - "override the trade item's timer. When you exit to\n" - "Death Mountain Trail you will have one second to\n" - "show the Eye Drops before they expire."; // -string_view LogicZoraRiverLowerDesc = "Difficulty: Novice\n" // - "Adult can reach this PoH with a precise jump, no\n" - "Hover Boots required."; // -string_view LogicZoraRiverUpperDesc = "Difficulty: Novice\n" // - "Adult can reach this PoH with a precise jump, no\n" - "Hover Boots required."; // -string_view LogicZFGreatFairyDesc = "Difficulty: Novice\n" // - "Destroying the boulders blocking the hidden area\n" - "with silver gauntlets and hammer lets you pass\n" // - "under the wall to the great fairy fountain."; // -string_view LogicDekuB1WebsWithBowDesc = "Difficulty: Novice\n" // - "All spider web walls in the Deku Tree basement can" - "be burnt as adult with just a bow by shooting\n" // - "through torches. This trick only applies to the\n"// - "circular web leading to Gohma; the two vertical\n"// - "webs are always in logic. Backflip onto the chest\n" - "near the torch at the bottom of the vine wall.\n" // - "With precise positioning you can shoot through the" - "torch to the right edge of the circular web."; // -string_view LogicDekuB1SkipDesc = "Difficulty: Intermediate\n" // - "A precise jump can be used to skip needing to use\n" - "the Slingshot to go around B1 of the Deku Tree. If" - "used with the \"Closed Forest\" setting, a\n" // - "Slingshot will not be guaranteed to exist\n" // - "somewhere inside the Forest. This trick applies to" - "both Vanilla and Master Quest."; // -string_view LogicDekuBasementGSDesc = "Difficulty: Intermediate\n" // - "Can be defeated by doing a precise jump slash."; // -string_view LogicDCStaircaseDesc = "Difficulty: Intermediate\n" // - "The Bow can be used to knock down the stairs with\n" - "two well-timed shots."; // -string_view LogicDCJumpDesc = "Difficulty: Novice\n" // - "Jump is adult only."; // -string_view LogicDCSlingshotSkipDesc = "Difficulty: Expert\n" // - "With precise platforming, child can cross the\n" // - "platforms while the flame circles are there. When\n" - "enabling this trick, it's recommended that you\n" // - "also enable the Adult variant: \"Dodongo's Cavern\n" - "Spike Trap Room Jump without Hover Boots\"."; // -string_view LogicDCScarecrowGSDesc = "Difficulty: Intermediate\n" // - "You can jump off an Armos Statue to reach the\n" // - "alcove with the Gold Skulltula. It takes quite a\n" - "long time to pull the statue the entire way. The\n" - "jump to the alcove can be a bit picky when done\n"// - "as child."; // -string_view LogicJabuBossGSAdultDesc = "Difficulty: Intermediate\n" // - "You can easily get over to the door to the near\n"// - "boss area early with Hover Boots. The tricky part\n" - "is getting through the door without being able to\n" - "use a box to keep the switch pressed. One way is\n" - "to quickly roll from the switch and open the door\n" - "before it closes."; // -string_view LogicJabuScrubJumpDiveDesc = "Difficulty: Novice\n" // - "Standing above the underwater tunnel leading to\n"// - "the scrub, jump down and swim through the tunnel.\n" - "This allows adult to access the scrub with no\n" // - "Scale or Iron Boots."; // -string_view LogicForestOutsideBackdoorDesc = "Difficulty: Intermediate\n" // - "With a precise jump slash from above, you can\n" // - "reach the backdoor to the west courtyard without\n" - "Hover Boots. Applies to both Vanilla and Master\n"// - "Quest."; // -string_view LogicForestDoorFrameDesc = "Difficulty: Intermediate\n" // - "A precise Hover Boots movement from the upper\n" // - "balconies in this courtyard can be used to get on\n" - "top of the door frame. Applies to both Vanilla and" - "Master Quest. In Vanilla, from on top the door\n" // - "frame you can summon Pierre, allowing you to\n" // - "access the falling ceiling room early. In Master\n" - "Quest, this allows you to obtain the GS on the\n" // - "door frame as adult without Hookshot or Song of\n"// - "Time."; // -string_view LogicForestOutdoorEastGSDesc = "Difficulty: Novice\n" // - "Precise Boomerang throws can allow child to kill\n" - "the Skulltula and collect the token."; // -string_view LogicFireBossDoorJumpDesc = "Difficulty: Intermediate\n" // - "The Fire Temple Boss Door can be reached with a\n"// - "precise jump. You must be touching the side wall\n" - "of the room so that Link will grab the ledge from\n" - "farther away than is normally possible."; // -string_view LogicFireStrengthDesc = "Difficulty: Expert\n" // - "A precise jump can be used to skip pushing the\n" // - "block."; // -string_view LogicFireScarecrowDesc = "Difficulty: Novice\n" // - "Also known as \"Pixelshot\". The Longshot can\n" // - "reach the target on the elevator itself, allowing\n" - "you to skip needing to spawn the scarecrow."; // -string_view LogicFireFlameMazeDesc = "Difficulty: Expert\n" // - "If you move quickly you can sneak past the edge of" - "a flame wall before it can rise up to block you.\n" - "To do it without taking damage is more precise.\n"// - "Allows you to progress without needing either a\n"// - "Small Key or Hover Boots."; // -string_view LogicFireSongOfTimeDesc = "Difficulty: Intermediate\n" // - "A precise jump can be used to reach this room."; // -string_view LogicWaterTempleTorchLongshotDesc = "Difficulty: Novice\n" // - "Stand on the eastern side of the central pillar\n"// - "and longshot the torches on the bottom level.\n" // - "Swim through the corridor and float up to the top\n" - "level. This allows access to this area and lower\n" - "water levels without Iron Boots. The majority of\n" - "the tricks that allow you to skip Iron Boots in\n"// - "the Water Temple are not going to be relevant\n" // - "unless this trick is first enabled."; // -string_view LogicWaterTempleUpperBoostDesc = "Difficulty: Expert\n" // - "Stand on the corner closest to the upper ledge\n" // - "where you play Zelda's Lullaby to raise the water\n" - "and put a bomb down behind you. Hold forward when\n" - "the bomb explodes and Link should jump just far\n"// - "enough to grab the ledge."; // -string_view LogicWaterCentralBowDesc = "Difficulty: Intermediate\n" // - "A very precise Bow shot can hit the eye switch\n" // - "from the floor above. Then, you can jump down into" - "the hallway and make through it before the gate\n"// - "closes. It can also be done as child, using the\n"// - "Slingshot instead of the Bow."; // -string_view LogicWaterCentralGSFWDesc = "Difficulty: Novice\n" // - "If you set Farore's Wind inside the central pillar" - "and then return to that warp point after raising\n" - "the water to the highest level, you can obtain\n" // - "this Skulltula Token with Hookshot or Boomerang.";// -string_view LogicWaterCrackedWallNothingDesc = "Difficulty: Expert\n" // - "A precise jump slash (among other methods) will\n"// - "get you to the cracked wall without needing the\n"// - "Hover Boots or to raise the water to the middle\n"// - "level. This trick supersedes \"Water Temple\n" // - "Cracked Wall with Hover Boots\"."; // -string_view LogicWaterCrackedWallHoversDesc = "Difficulty: Expert\n" // - "With a midair side-hop while wearing the Hover\n" // - "Boots, you can reach the cracked wall without\n" // - "needing to raise the water up to the middle level."; -string_view LogicWaterBossKeyRegionDesc = "Difficulty: Intermediate\n" // - "With precise Hover Boots movement it is possible\n" - "to reach the boss key chest's region without\n" // - "needing the Longshot. It is not necessary to take\n" - "damage from the spikes. The Gold Skulltula Token\n" - "in the following room can also be obtained with\n"// - "just the Hover Boots."; // -string_view LogicWaterBKJumpDiveDesc = "Difficulty: Intermediate\n" // - "Stand on the very edge of the raised corridor\n" // - "leading from the push block room to the rolling\n"// - "boulder corridor. Face the gold skulltula on the\n" - "waterfall and jump over the boulder corridor floor" - "into the pool of water, swimming right once\n" // - "underwater. This allows access to the boss key\n" // - "room without Iron boots."; // -string_view LogicWaterNorthBasementLedgeJumpDesc = "Difficulty: Novice\n" // - "In the northern basement there's a ledge from\n" // - "where, in vanilla Water Temple, boulders roll out\n" - "into the room. Normally to jump directly to this\n" - "ledge logically requires the Hover Boots, but with" - "precise jump, it can be done without them. This\n"// - "trick applies to both Vanilla and Master Quest."; // -string_view LogicWaterDragonAdultDesc = "Difficulty: Expert\n" // - "Normally you need both Hookshot and Iron Boots to\n" - "hit the switch and swim through the tunnel to get\n" - "to the chest. But by hitting the switch from dry\n" - "land, using one of Bombchus, Hookshot, or Bow, it\n" - "is possible to skip one or both of those\n" // - "requirements. After the gate has been opened, a\n"// - "well-timed dive with at least the Silver Scale\n" // - "could be used to swim through the tunnel."; // -string_view LogicWaterDragonJumpDiveDesc = "Difficulty: Expert\n" // - "If you come into the dragon statue room from the\n" - "serpent river, you can jump down from above and\n"// - "get into the tunnel without needing either Iron\n"// - "Boots or a Scale. This trick applies to both\n" // - "Vanilla and Master Quest. In Vanilla, you must\n" // - "shoot the switch from above with the Bow, and then" - "quickly get through the tunnel before the gate\n" // - "closes."; // -string_view LogicWaterRiverGSDesc = "Difficulty: Novice\n" // - "Standing on the exposed ground toward the end of\n" - "the river, a precise Longshot use can obtain the\n" - "token."; // -string_view LogicWaterFallingPlatformGSDesc = "Difficulty: Intermediate\n" // - "If you stand on the very edge of the platform,\n" // - "this Gold Skulltula can be obtained with only the\n" - "Hookshot."; // -string_view LogicSpiritLowerAdultSwitchDesc = "Difficulty: Novice\n" // - "A bomb can be used to hit the switch on the\n" // - "ceiling, but it must be thrown from a particular\n" - "distance away and with precise timing."; // -string_view LogicSpiritChildBombchuDesc = "Difficulty: Intermediate\n" // - "A carefully-timed Bombchu can hit the switch."; // -string_view LogicSpiritWallDesc = "Difficulty: Expert\n" // - "The logic normally guarantees a way of dealing\n" // - "with both the Beamos and the Walltula before\n" // - "climbing the wall."; // -string_view LogicSpiritLobbyGSDesc = "Difficulty: Intermediate\n" // - "Standing on the highest part of the arm of the\n" // - "statue, a precise Boomerang throw can kill and\n" // - "obtain this Gold Skulltula. You must throw the\n" // - "Boomerang slightly off to the side so that it\n" // - "curves into the Skulltula, as aiming directly at\n" - "it will clank off of the wall in front."; // -string_view LogicSpiritMapChestDesc = "Difficulty: Intermediate\n" // - "To get a line of sight from the upper torch to the" - "map chest torches, you must pull an Armos statue\n" - "all the way up the stairs."; // -string_view LogicSpiritSunChestDesc = "Difficulty: Expert\n" // - "Using the blocks in the room as platforms you can\n" - "get lines of sight to all three torches. The timer" - "on the torches is quite short so you must move\n" // - "quickly in order to light all three."; // -string_view LogicShadowFireArrowEntryDesc = "Difficulty: Expert\n" // - "It is possible to light all of the torches to open" - "the Shadow Temple entrance with just Fire Arrows,\n" - "but you must be very quick, precise, and strategic" - "with how you take your shots."; // -string_view LogicShadowUmbrellaDesc = "Difficulty: Expert\n" // - "A very precise Hover Boots movement from off of\n"// - "the lower chest can get you on top of the crushing\n" - "spikes without needing to pull the block. Applies\n" - "to both Vanilla and Master Quest."; // -string_view LogicShadowFreestandingKeyDesc = "Difficulty: Intermediate\n" // - "Release the Bombchu with good timing so that it\n"// - "explodes near the bottom of the pot."; // -string_view LogicShadowStatueDesc = "Difficulty: Novice\n" // - "By sending a Bombchu around the edge of the gorge," - "you can knock down the statue without needing a\n"// - "Bow. Applies in both vanilla and MQ Shadow."; // -string_view LogicShadowBongoDesc = "Difficulty Expert\n" // - "Using precise sword slashes, Bongo Bongo can be\n"// - "defeated without using projectiles.\n" // - "This trick is much more difficult when done with\n" - "Kokiri Sword vs Master Sword or Biggorron Sword.\n" - "Useful for Boss Entrance Randomizer."; // -string_view LogicChildDeadhandDesc = "Difficulty: Novice\n" // - "Requires 9 sticks or 5 jump slashes."; // -string_view LogicGtgWithoutHookshotDesc = "Difficulty: Expert\n" // - "The final silver rupee on the ceiling can be\n" // - "reached by being pulled up into it by the\n" // - "Wallmaster.\n" // - "Then, you must also reach the exit of the room\n" // - "without the use of the Hookshot. If you move\n" // - "quickly, you can sneak past the edge of a\n" // - "flame wall before it can rise up to block you.\n" // - "To do so without taking damage is more precise"; // -string_view LogicGtgFakeWallDesc = "Difficulty: Novice\n" // - "A precise Hover Boots use from the top of the\n" // - "chest can allow you to grab the ledge without\n" // - "needing the usual requirements."; // -string_view LogicLensSpiritDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Spirit Temple."; // -string_view LogicLensShadowDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Shadow Temple before the invisible moving platform"; -string_view LogicLensShadowBackDesc = "Difficulty: Intermediate\n" // - "Removes the requirements for the Lens of Truth in\n" - "Shadow Temple beyond the invisible moving platform"; -string_view LogicLensBotwDesc = "Difficulty: Intermediate\n" // - "Removes the requirements for the Lens of Truth in\n" - "Bottom of the Well."; // -string_view LogicLensGtgDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Gerudo Training Grounds."; // -string_view LogicLensCastleDesc = "Difficulty: Intermediate\n" // - "Removes the requirements for the Lens of Truth in\n" - "Ganon's Castle."; // -string_view LogicLensJabuMQDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Jabu Jabu's Belly MQ."; // -string_view LogicLensSpiritMQDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Spirit Temple MQ."; // -string_view LogicLensShadowMQDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Shadow Temple MQ before the invisible moving \n" // - "platform"; // -string_view LogicLensShadowMQBackDesc = "Difficulty: Intermediate\n" // - "Removes the requirements for the Lens of Truth in\n" - "Shadow Temple MQ beyond the invisible moving \n" // - "platform"; // -string_view LogicLensBotwMQDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Bottom of the Well MQ."; // -string_view LogicLensGtgMQDesc = "Difficulty: Novice\n" // - "Removes the requirements for the Lens of Truth in\n" - "Gerudo Training Grounds MQ."; // -string_view LogicLensCastleMQDesc = "Difficulty: Intermediate\n" // - "Removes the requirements for the Lens of Truth in\n" - "Ganon's Castle MQ."; // -string_view LogicSpiritTrialHookshotDesc = "Difficulty: Intermediate\n" // - "A precise jump off of an Armos can collect the\n" // - "highest rupee."; // - // -string_view LogicFlamingChestsDesc = "Difficulty: Novice\n" // - "The chests encircled in flames in Gerudo Training\n" - "Grounds and in Spirit Temple can be opened by\n" // - "running into the flames while Link is invincible\n" - "after taking damage."; // - // -/*------------------------------ // -| GLITCHES | // -------------------------------*/ // -const std::vector GlitchDifficulties{"Novice", "Intermediate", "Advanced", "Expert", "Hero"}; // -/* Restricted Items */ // -string_view GlitchRestrictedItemsDescDisabled = "Swapping an item that can normally be used in an\n" - "area with one that would be dimmed will let you\n" - "use that item for 1 frame after closing your\n" // - "inventory. This can be useful on its own or in\n" // - "combination with other glitches."; // -string_view GlitchRestrictedItemsDescNovice = "You may be required to use restricted items."; // -/* Super Stab */ // -string_view GlitchSuperStabDescDisabled = "Forcing sticks to unequip during a crouch stab by\n" - "breaking it and moving them in your inventory has\n" - "the effect of hitting all spherical collision."; // -string_view GlitchSuperStabDescNovice = "You may be expected to hit switches or kill gold\n" - "skulltulas with a super stab."; // -/* ISG */ // -string_view GlitchISGDescDisabled = "Shortened to ISG, allows Link's melee weapon to\n"// - "be in a constant swinging state. Simply touching\n" - "objects with this causes them to get hit.\n" // - "Putting away the weapon while ISG is on hits\n" // - "any object with a spherical hitbox,\n" // - "such as small skulltulas. It is initiated by\n" // - "interrupting a crouch stab."; // -string_view GlitchISGDescNovice = "ISG may be required to kill certain enemies,\n" // - "or to Bomb Hover when enabled."; // -string_view GlitchISGDescIntermediate = "You may be required to use a bomb to activate ISG."; -string_view GlitchISGDescAdvanced = "You may be required to use a bomb to activate ISG\n" - "repeatedly or while under attack."; // -/* Hover */ // -string_view GlitchHoverDescDisabled = "Hovering allows Link to consecutively backflip\n" // - "in the air without falling. By shielding\n" // - "damage with ISG on, Link will stay in midair.\n" // - "While bombs aren't always required, this option\n"// - "will always expect them to be used.\n" // - "\n" // - "Requires ISG to be enabled."; // -string_view GlitchHoverDescNovice = "Only bombchus are required for hovering."; // -string_view GlitchHoverDescIntermediate = "Some hovers may require that you start from flat\n" - "terrain, which requires somewhat precise timing.";// -string_view GlitchHoverDescAdvanced = "Usage of regular bombs will now also be expected,\n" - "which may require consecutive precise timings."; // -/* Bomb OI */ // -string_view GlitchBombOIDescDisabled = "Allowing a bomb to explode in Link's hands while\n" - "moving and then attempting to pull out a cutscene\n" - "item on a specific frame will cause Link to play\n" - "an invisible ocarina instead.\n" // - "This will only work if bombs are not dimmed on the" - "frame you use the cutscene item."; // -string_view GlitchBombOIDescNovice = "You may be expected to use ocarina items with a\n"// - "bomb to play warp songs."; // -string_view GlitchBombOIDescIntermediate = "You may be expected to use ocarina items with a\n"// - "bomb to play the ocarina where Link's position\n" // - "matters."; // -string_view GlitchBombOIDescAdvanced = "You may be expected to use restricted items to use" - "the cutscene item or to make the bombs usable on\n" - "the correct frame."; // -string_view GlitchBombOIDescExpert = "You may be expected to use restricted items to\n" // - "perform ocarina items where Link's position isn't\n" - "particularly lenient"; // -/* Hover Boost */ // -string_view GlitchHoverBoostDescDisabled = "Equipping hover boots when Link takes damage will\n" - "cause him to keep the high knockback speed and\n" // - "lets him traverse large gaps.\n" // - "If performed at the edge of a platform Link will\n" - "instead perform a mega jump which has less range\n" - "but more height than a hover boost."; // -string_view GlitchHoverBoostDescNovice = "Hover boosts that do not need the maximum speed\n"// - "may be required."; // -string_view GlitchHoverBoostDescIntermediate = "Hover boosts that do need the maximum speed may be" - "required."; // -string_view GlitchHoverBoostDescAdvanced = "Hover boosts that use more complex movement during" - "the hover may be required."; // -/* Super Slide */ // -string_view GlitchSuperSlideDescDisabled = "Holding the circle pad just outside the dead zone\n" - "will cause Link to turn on the spot which locks\n"// - "his speed. This can be used to preserve high\n" // - "speeds indefinitely."; // -string_view GlitchSuperSlideDescNovice = "Forward extended super slides (FESSes) where Link\n" - "is damaged by an explosion may be required."; // -string_view GlitchSuperSlideDescIntermediate = "Hammer extended super slides where the recoil from" - "a hammer crouch stab is used may be required."; // -string_view GlitchSuperSlideDescAdvanced = "Hyper Extended Super Slides (HESSes) and\n" // - "damageless FESSes where Link rolls into a bomb may" - "be required."; // -string_view GlitchSuperSlideDescExpert = "HESSes with more precise movement may be required."; -/* Megaflip */ // -string_view GlitchMegaflipDescDisabled = "A backflip or sidehop with high speed from an\n" // - "attack hitting your shield during i-frames. This\n" - "is normally achieved by rolling into an explosion.\n" - "Equipping hover boots to preserve the high speed\n" - "when landing is known as a hoverflip."; // -string_view GlitchMegaflipDescNovice = "You may be expected to perform megaflips on flat\n" - "ground with bombs."; // -string_view GlitchMegaflipDescIntermediate = "You may be expected to perform megaflips in small\n" - "areas, distance megaflips, or hoverflips with a\n"// - "bomb."; // -string_view GlitchMegaflipDescAdvanced = "You may be expected to perform hoverflips with\n" // - "difficult midair movement, or distance megaflips\n" - "under time pressure with a bomb.\n\n" // - "Additionally, you may be expected to perform\n" // - "novice megaflips with a bombchu"; // -string_view GlitchMegaflipDescExpert = "You may be expected to perform intermediate\n" // - "megaflips with a bombchu."; // -string_view GlitchMegaflipDescHero = "You may be expected to perform any megaflip with a" - "bombchu."; // -/* A-Slide */ // -string_view GlitchASlideDescDisabled = "An A-slide is performed the same as a megaflip\n" // - "except without pressing the A button at the end.\n" - "This causes child Link's collision to glitch below" - "the ground and lets him bypass certain actors."; // -string_view GlitchASlideDescNovice = "You may be expected to perform A-slides to pass\n"// - "actors you can't press A to interact with."; // -string_view GlitchASlideDescIntermediate = "You may be expected to perform A-slides quickly or" - "around actors that can be interacted with."; // -string_view GlitchASlideDescAdvanced = "You may be expected to perform novice A-slides\n" // - "with a bombchu."; // -string_view GlitchASlideDescExpert = "You may be expected to perform intermediate\n" // - "A-slides with a bombchu."; -/* Hammer Slide */ // -string_view GlitchHammerSlideDescDisabled = "Equipping hover boots after a hammer crouch stab\n" - "against a wall preserves the recoil speed which\n"// - "allows Link to cross larger gaps than usual."; // -string_view GlitchHammerSlideDescNovice = "Simple hammer slides may be required"; // -string_view GlitchHammerSlideDescIntermediate = "Hammer slides which require good movement and high" - "speed may be required."; // -/* Ledge Cancel */ // -string_view GlitchLedgeCancelDescDisabled = "Climbing a short ledge and shielding damage will\n" - "prevent the ledge climbing state from ending.\n" // - "This state allows Link to walk through some actors" - "such as boulders and NPCs."; // -string_view GlitchLedgeCancelDescNovice = "You may be expected to perform ledge cancels using" - "bombs as a damage source."; // -string_view GlitchLedgeCancelDescIntermediate = "You may be expected to perform ledge cancels in\n"// - "places with little room."; // -string_view GlitchLedgeCancelDescAdvanced = "You may be expected to perform ledge cancels using" - "bombchus as a damage source."; // -/* Action Swap */ // -string_view GlitchActionSwapDescDisabled = "Action swap allows Link to switch between 2 held\n" - "items without the put away/equip animations.\n" // - "This can be exploited to produce various effects."; -string_view GlitchActionSwapDescNovice = "You may be expected to use shallow water to set up" - "action swap."; // -string_view GlitchActionSwapDescAdvanced = "You may be expected to use bombchus to set up\n" // - "action swap."; // -/* QPA */ // -string_view GlitchQPADescDisabled = "Certain events can cancel putting away an item\n" // - "which later lets Link put it away without an\n" // - "animation. This can be used with sticks to access\n" - "a glitched damage value with the properties of\n" // - "hammer and fire arrows, or with a bottle to store\n" - "a cutscene for ocarina items."; // -string_view GlitchQPADescNovice = "You may be expected to get QPA using the boots\n" // - "animation to delay putting away the item and a\n" // - "bomb."; // -string_view GlitchQPADescIntermediate = "You may be expected to get QPA using only a bomb."; -string_view GlitchQPADescAdvanced = "You may be expected to get QPA using a ledge grab\n" - "to interrupt putting away the item."; // -string_view GlitchQPADescExpert = "You may be expected to get QPA from enemy attacks."; -/* Hookshot Clip */ // -string_view GlitchHookshotClipDescDisabled = "Hookshot Clipping allows Link to hookshot through\n" - "certain walls, which is useful if a valid\n" // - "target is on the other side."; // -string_view GlitchHookshotClipDescNovice = "Basic Hookshot Clipping may be required."; // -string_view GlitchHookshotClipDescIntermediate = "Hookshot clips with precise angles and poor\n" // - "visibility may be required."; // -/* Hookshot Jump: Bonk */ // -string_view GlitchHookshotJump_BonkDescDisabled = "A Hookshot Jump is an umbrella term for techniques" - "that launch Link into the sky using the Hookshot\n" - "in various ways, sometimes together with\n" // - "other items. The bonk method only requires the\n" // - "Hookshot itself."; // -string_view GlitchHookshotJump_BonkDescNovice = "Simple hookshot jumps against large flat walls of\n" - "hookshottable surfaces may be required."; // -string_view GlitchHookshotJump_BonkDescIntermediate = "Less lenient hookshot jumps may be required."; // -string_view GlitchHookshotJump_BonkDescAdvanced = "Hookshot jumps with precise midair movement may be" - "required."; // -/* Hookshot Jump: Boots */ // -string_view GlitchHookshotJump_BootsDescDisabled = "This Hookshot Jump technique is one of the easier\n" - "ones, and require any pair of boots."; // -string_view GlitchHookshotJump_BootsDescNovice = "Only relatively short Hookshot Jumps with boots\n"// - "may be required."; // -string_view GlitchHookshotJump_BootsDescIntermediate = "Higher Hookshot Jumps with boots, where you look\n" - "further up or downwards may be required."; // -string_view GlitchHookshotJump_BootsDescAdvanced = "Hookshot jumps that require a lot of height and\n"// - "precise midair movement may be required."; // -/* Cutscene Dives */ // -string_view GlitchCutsceneDiveDescDisabled = "Water physics won't effect Link if he enters the\n" - "water while a cutscene is playing, allowing him\n"// - "to sink to the bottom."; // -string_view GlitchCutsceneDiveDescNovice = "Attempting to use Farore's Wind (when it's already" - "set) with another magic item active prevents the\n" - "water from clearing the FW cutscene until the\n" // - "other effect ends.\n" // - "You may be expected to use Nayru's Love as the\n" // - "other magic effect."; // -string_view GlitchCutsceneDiveDescIntermediate = "You can catch something in a bottle while standing" - "over water using the hover boots to fall through\n" - "the water during the catching cutscene."; // -string_view GlitchCutsceneDiveDescAdvanced = "You may be expected to use magic arrows to perform" - "Farore's Wind cutscene dives."; // -/* Navi Dive: Stick */ // -string_view GlitchNaviDive_StickDescDisabled = "A Navi dive is a type of cutscene dive achieved by" - "falling off a ledge while talking to Navi. While\n" - "the usual method for achieving this is a TSC, it\n" - "is also possible to perform using a jump attack\n"// - "with deku sticks."; // -string_view GlitchNaviDive_StickDescNovice = "You may be expected to enter BotW with a stick\n" // - "Navi dive."; // -string_view GlitchNaviDive_StickDescIntermediate = "You may be expected to use the LH to ZD shortcut\n" - "with a stick Navi dive."; // -string_view GlitchNaviDive_StickDescAdvanced = "You may be expected to use the LW to ZR shortcut\n" - "with a stick Navi dive."; // -/* TSC */ // -string_view GlitchTripleSlashClipDescDisabled = "When doing a three-slash-combo with either the\n" // - "Kokiri Sword or the Master Sword and put it away,\n" - "Link will be placed back a small distance.\n" // - "If, while slashing, you use the recoil of hitting\n" - "a wall and then put away the sword, Link may clip\n" - "into a wall behind him if angled correctly."; // -string_view GlitchTripleSlashClipDescNovice = "Basic Triple Slash Clipping may be required."; // -string_view GlitchTripleSlashClipDescIntermediate = "Some more complex OoB movement may be required."; // -string_view GlitchTripleSlashClipDescAdvanced = "Very precise OoB movement may be required."; // -string_view GlitchTripleSlashClipDescExpert = "Very precise TSCs may be required."; // -/* Ledge Clip */ // -string_view GlitchLedgeClipDescDisabled = "A Ledge Clip allows Link to fall through a floor\n" - "or pass through an object by facing a wall\n" // - "and dropping down to the left in various ways.\n" // - "These only work as an adult."; // -string_view GlitchLedgeClipDescNovice = "Basic Ledge Clips may be required.\n" // - "Some require that you let go of the ledge with\n" // - "a specific timing."; // -string_view GlitchLedgeClipDescIntermediate = "Certain harder clips may also be required."; // -string_view GlitchLedgeClipDescAdvanced = "Ledge clips with complex OoB movement may be\n" // - "required."; // -/* Seam Walk */ // -string_view GlitchSeamWalkDescDisabled = "Where 2 walls come together they form a seam that\n" - "Link can stand on. It is possible to use these to\n" - "gain height and reach normally inaccessible areas.\n" - "Additionally these seams can reach far above the\n" - "walls that form them, creating invisible seams."; // -string_view GlitchSeamWalkDescNovice = "Short seam walks up visible walls with ISG may be\n" - "required."; // -string_view GlitchSeamWalkDescIntermediate = "Short seam walks up visible walls without ISG or\n" - "longer seam walks with ISG may be required."; // -string_view GlitchSeamWalkDescAdvanced = "Longer seam walks without ISG may be required."; // -string_view GlitchSeamWalkDescExpert = "Very precise seam walks may be required."; // -string_view GlitchSeamWalkDescHero = "Crossing Gerudo Valley as child by walking up a\n"// - "wall with the cucco may be required."; // -/* Misc Glitches */ // -string_view GlitchWWTEscapeDesc = "Using deku nuts and the crawlspace to let you\n" // - "move while reading the nearby sign, you can walk\n" - "through the Kokiri guarding the exit. This only\n"// - "affects logic with shuffled entrances."; // -string_view GlitchGVTentAsChildDesc = "The loading zone for the carpenters' tent exists\n" - "in the child map despite the tent being removed.\n\n" - "With this setting enabled you may be expected to\n" - "use that loading zone."; // -string_view GlitchGFGuardSneakDesc = "By using the bow, hookshot, or boomerang while\n" // - "looking up and targeting the Fortress wall, you\n"// - "can walk\n past the guard on the slope without\n" // - "being caught."; // -string_view GlitchItemlessWastelandDesc = "By starting a backwalk and then targeting every\n"// - "other frame Link will maintain backwalk speed\n" // - "over the quicksand in the haunted wasteland which\n" - "lets him cross with no items."; // -string_view GlitchOccamsStatueDesc = "With some precise movement through loading zones\n" - "in Darunia's room, it is possible to unload the\n"// - "collision of the statue blocking the way to DMC.";// -string_view GlitchZDOoBJumpSlashDesc = "Jump slashing the wall next to the pillar above\n"// - "the ZD to LH shortcut as adult will let you clip\n" - "through. From here you can either jump to the shop" - "loading zone or fall OoB a little bit and swim\n" // - "into the shortcut loading zone."; // -string_view GlitchJabuStickRecoilDesc = "Child can enter Jabu without a fish in a bottle\n"// - "using the recoil from breaking a deku stick while\n" - "sidehopping next to the loading zone."; // -string_view GlitchJabuAdultDesc = "Adult can enter Jabu by walking over a specific\n"// - "section of ice on the side near ice cavern."; // -string_view GlitchBlueFireWallDesc = "Pouring blue fire on certain destructable walls\n"// - "will cause them to break."; // -string_view GlitchClassicHalfieDesc = "Dying during a jump attack towards a ledge just\n"// - "too high to climb will put Link on top of the\n" // - "ledge. Combined with a fairy this lets Link climb\n" - "ledges such as the one to the switch in DC."; // -string_view GlitchModernHalfieDesc = "Using a bomb flower and a twisted backflip, it is\n" - "possible to access the switch in DC with only a\n"// - "deku shield and the goron bracelet."; // -string_view GlitchJabuSwitchDesc = "Using a cutscene item the frame you land on the\n"// - "blue switches in Jabu Jabu's Belly will make them\n" - "stay held for a while after you step off them."; // -string_view GlitchForestBKSkipDesc = "Using the hookshot or bow to shorten a backflip\n"// - "it is possible to land on the other side of the\n"// - "railing in the north of the lobby and get clipped\n" - "out of bounds. From here it is possible to jump\n"// - "into the boss loading zone."; // -string_view GlitchFireGrunzClipDesc = "Grabbing a ledge in a corner partially clips Link\n" - "through the wall. A bomb can be used to push Link\n" - "fully through the wall to get out of bounds. This\n" - "can be used in the fire temple along with hover\n"// - "boots to skip hammer in the first room."; // diff --git a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.hpp b/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.hpp deleted file mode 100644 index cb11d2cd0..000000000 --- a/soh/soh/Enhancements/randomizer/3drando/setting_descriptions.hpp +++ /dev/null @@ -1,581 +0,0 @@ -#pragma once -#include -#include - -using string_view = std::string_view; - -extern string_view openRandomize; -extern string_view worldRandomize; -extern string_view shuffleRandomize; -extern string_view dungeonRandomize; - -extern string_view logicGlitchless; -extern string_view logicGlitched; -extern string_view logicNoLogic; -extern string_view logicVanilla; - -extern string_view forestOpen; -extern string_view forestClosed; -extern string_view forestClosedDeku; - -extern string_view kakGateOpen; -extern string_view kakGateClosed; - -extern string_view doorOfTimeOpen; -extern string_view doorOfTimeSongOnly; -extern string_view doorOfTimeClosed; - -extern string_view fountainNormal; -extern string_view fountainAdult; -extern string_view fountainOpen; - -extern string_view gerudoNormal; -extern string_view gerudoFast; -extern string_view gerudoOpen; - -extern string_view bridgeOpen; -extern string_view bridgeVanilla; -extern string_view bridgeStones; -extern string_view bridgeMedallions; -extern string_view bridgeRewards; -extern string_view bridgeDungeons; -extern string_view bridgeTokens; -extern string_view bridgeGreg; - -extern string_view bridgeStoneCountDesc; -extern string_view bridgeMedallionCountDesc; -extern string_view bridgeRewardCountDesc; -extern string_view bridgeDungeonCountDesc; -extern string_view bridgeTokenCountDesc; - -extern string_view bridgeRewardOptionsDesc; - -extern string_view randomGanonsTrialsDesc; - -extern string_view ganonsTrialCountDesc; - -extern string_view ageDesc; - -extern string_view shuffleEntrancesDesc; - -extern string_view dungeonEntrancesDesc; - -extern string_view bossEntrancesDesc; - -extern string_view overworldEntrancesDesc; - -extern string_view grottoEntrancesDesc; - -extern string_view owlDropsDesc; - -extern string_view warpSongsDesc; - -extern string_view overworldSpawnsDesc; - -extern string_view mixedPoolsDesc; -extern string_view mixDungeonsDesc; -extern string_view mixOverworldDesc; -extern string_view mixInteriorsDesc; -extern string_view mixGrottosDesc; - -extern string_view decoupledEntrancesDesc; - -extern string_view interiorEntrancesOff; -extern string_view interiorEntrancesSimple; -extern string_view interiorEntrancesAll; - -extern string_view bombchuLogicDesc; - -extern string_view defaultAmmoDropsDesc; -extern string_view bombchuDropsDesc; -extern string_view noAmmoDropsDesc; - -extern string_view defaultHeartDropsDesc; -extern string_view noHeartDropsDesc; -extern string_view noHeartRefillDesc; -extern string_view scarceHeartsDesc; - -extern string_view mqDungeonCountDesc; -extern string_view setDungeonTypesDesc; - -extern string_view shuffleRewardsEndOfDungeon; -extern string_view shuffleRewardsAnyDungeon; -extern string_view shuffleRewardsOverworld; -extern string_view shuffleRewardsAnywhere; - -extern string_view linksPocketDungeonReward; -extern string_view linksPocketAdvancement; -extern string_view linksPocketAnything; -extern string_view linksPocketNothing; - -extern string_view songsSongLocations; -extern string_view songsDungeonRewards; -extern string_view songsAllLocations; - -extern string_view shopsOff; -extern string_view shopsZero; -extern string_view shopsOne; -extern string_view shopsTwo; -extern string_view shopsThree; -extern string_view shopsFour; -extern string_view shopsRandom; - -extern string_view shopPriceBalanced; -extern string_view shopPriceStarter; -extern string_view shopPriceAdult; -extern string_view shopPriceGiant; -extern string_view shopPriceTycoon; -extern string_view shopPriceAffordable; - -extern string_view tokensOff; -extern string_view tokensDungeon; -extern string_view tokensOverworld; -extern string_view tokensAllTokens; - -extern string_view scrubsOff; -extern string_view scrubsAffordable; -extern string_view scrubsExpensive; -extern string_view scrubsRandomPrices; - -extern string_view shuffleCowsDesc; - -extern string_view kokiriSwordDesc; - -extern string_view ocarinasDesc; - -extern string_view weirdEggDesc; - -extern string_view gerudoTokenDesc; - -extern string_view magicBeansDesc; - -extern string_view merchantsDesc; -extern string_view merchantsHintsDesc; - -extern string_view frogSongRupeesDesc; - -extern string_view adultTradeDesc; - -extern string_view chestMinigameDesc; - -extern string_view shuffle100GsDesc; - -extern string_view mapCompassStartWith; -extern string_view mapCompassVanilla; -extern string_view mapCompassOwnDungeon; -extern string_view mapCompassAnyDungeon; -extern string_view mapCompassOverworld; -extern string_view mapCompassAnywhere; - -extern string_view smallKeyStartWith; -extern string_view smallKeyVanilla; -extern string_view smallKeyOwnDungeon; -extern string_view smallKeyAnyDungeon; -extern string_view smallKeyOverworld; -extern string_view smallKeyAnywhere; - -extern string_view gerudoKeysVanilla; -extern string_view gerudoKeysAnyDungeon; -extern string_view gerudoKeysOverworld; -extern string_view gerudoKeysAnywhere; - -extern string_view keyRingDesc; - -extern string_view bossKeyStartWith; -extern string_view bossKeyVanilla; -extern string_view bossKeyOwnDungeon; -extern string_view bossKeyAnyDungeon; -extern string_view bossKeyOverworld; -extern string_view bossKeyAnywhere; - -extern string_view ganonKeyStartWith; -extern string_view ganonKeyVanilla; -extern string_view ganonKeyOwnDungeon; -extern string_view ganonKeyAnyDungeon; -extern string_view ganonKeyOverworld; -extern string_view ganonKeyAnywhere; -extern string_view ganonKeyLACS; -extern string_view ganonKey100GS; - -extern string_view lacsStoneCountDesc; -extern string_view lacsMedallionCountDesc; -extern string_view lacsRewardCountDesc; -extern string_view lacsDungeonCountDesc; -extern string_view lacsTokenCountDesc; - -extern string_view lacsRewardOptionsDesc; - -extern string_view childStealthDesc; - -extern string_view skipTowerEscapeDesc; - -extern string_view skipEponaRaceDesc; - -extern string_view skipMinigamePhasesDesc; - -extern string_view freeScarecrowDesc; - -extern string_view fourPoesDesc; - -extern string_view lakeHyliaOwlDesc; - -extern string_view bigPoeTargetCountDesc; - -extern string_view numRequiredCuccosDesc; - -extern string_view kingZoraSpeedFast; -extern string_view kingZoraSpeedVanilla; -extern string_view kingZoraSpeedRandom; - -extern string_view completeMaskDesc; - -extern string_view glitchCutscenesDesc; - -extern string_view quickTextDesc0; -extern string_view quickTextDesc1; -extern string_view quickTextDesc2; -extern string_view quickTextDesc3; -extern string_view skipSongReplaysDesc; - -extern string_view keepFWWarpPointDesc; - -extern string_view fastBunnyHoodDesc; - -extern string_view gossipStonesHintsDesc; - -extern string_view obscureHintsDesc; -extern string_view ambiguousHintsDesc; -extern string_view clearHintsDesc; - -extern string_view uselessHintsDesc; -extern string_view balancedHintsDesc; -extern string_view strongHintsDesc; -extern string_view veryStrongHintsDesc; - -extern string_view compassesShowRewardsDesc; -extern string_view compassesShowWotHDesc; -extern string_view mapsShowDungeonModesDesc; - -extern string_view damageMultiDesc; - -extern string_view startingTimeDesc; - -extern string_view locationsReachableDesc; -extern string_view nightGSDesc; - -extern string_view chestAnimDesc; - -extern string_view chestSizeDesc; - -extern string_view ingameSpoilersShowDesc; -extern string_view ingameSpoilersHideDesc; - -extern string_view menuButtonDesc; - -extern string_view startWithConsumablesDesc; - -extern string_view startWithMaxRupeesDesc; - -extern string_view itemPoolPlentiful; -extern string_view itemPoolBalanced; -extern string_view itemPoolScarce; -extern string_view itemPoolMinimal; - -extern string_view iceTrapsOff; -extern string_view iceTrapsNormal; -extern string_view iceTrapsExtra; -extern string_view iceTrapsMayhem; -extern string_view iceTrapsOnslaught; - -extern string_view removeDDDesc; - -extern string_view progGoronSword; - -extern string_view faroresWindAnywhereDesc; - -extern string_view ageRestrictionsDesc; -extern string_view adultStickDesc; -extern string_view adultBoomerangDesc; -extern string_view childHammerDesc; -extern string_view adultSlingshotDesc; -extern string_view childBowDesc; -extern string_view childHookshotDesc; -extern string_view childIronBootsDesc; -extern string_view childHoverBootsDesc; -extern string_view adultMasksDesc; -extern string_view adultKokiriSwordDesc; -extern string_view childMasterSwordDesc; -extern string_view childBiggoronSwordDesc; -extern string_view adultDekuShieldDesc; -extern string_view childMirrorShieldDesc; -extern string_view childGoronTunicDesc; -extern string_view childZoraTunicDesc; - -extern string_view gkDurabilityVanilla; -extern string_view gkDurabilityRandomRisk; -extern string_view gkDurabilityRandomSafe; - -extern string_view blueFireArrowsDesc; -extern string_view sunlightArrowsDesc; - -extern string_view mp_EnabledDesc; -extern string_view mp_SharedProgressDesc; -extern string_view mp_SyncIdDesc; -extern string_view mp_SharedHealthDesc; -extern string_view mp_SharedRupeesDesc; -extern string_view mp_SharedAmmoDesc; - -extern string_view zTargetingDesc; -extern string_view cameraControlDesc; -extern string_view motionControlDesc; -extern string_view togglePlayMusicDesc; -extern string_view togglePlaySFXDesc; -extern string_view silenceNaviDesc; -extern string_view ignoreMaskReactionDesc; - -extern string_view naviColorsDesc; -extern string_view necessarySimpleModeDesc; -extern string_view alwaysSimpleModeDesc; - -extern string_view coloredKeysDesc; -extern string_view coloredBossKeysDesc; - -extern string_view mirrorWorldDesc; - -extern string_view musicRandoDesc; -extern string_view shuffleBGMDesc; -extern string_view fanfaresOffDesc; -extern string_view onlyFanfaresDesc; -extern string_view fanfaresOcarinaDesc; -extern string_view shuffleOcaMusicDesc; - -extern string_view shuffleSFXOff; -extern string_view shuffleSFXAll; -extern string_view shuffleSFXSceneSpecific; -extern string_view shuffleSFXChaos; -extern string_view shuffleSFXCategorically; - -extern string_view randomTrapDmgDesc; -extern string_view basicTrapDmgDesc; -extern string_view advancedTrapDmgDesc; - -extern string_view ToggleAllTricksDesc; - -extern string_view ToggleLogicNoneDesc; -extern string_view ToggleLogicNoviceDesc; -extern string_view ToggleLogicIntermediateDesc; -extern string_view ToggleLogicExpertDesc; -extern string_view LogicTempDesc; -extern string_view LogicGrottosWithoutAgonyDesc; -extern string_view LogicVisibleCollisionDesc; -extern string_view LogicFewerTunicRequirementsDesc; -extern string_view LogicLostWoodsGSBeanDesc; -extern string_view LogicLabDivingDesc; -extern string_view LogicLabWallGSDesc; -extern string_view LogicGraveyardPoHDesc; -extern string_view LogicChildDampeRacePoHDesc; -extern string_view LogicGVHammerChestDesc; -extern string_view LogicGerudoKitchenDesc; -extern string_view LogicLensWastelandDesc; -extern string_view LogicReverseWastelandDesc; -extern string_view LogicColossusGSDesc; -extern string_view LogicOutsideGanonsGSDesc; -extern string_view LogicManOnRoofDesc; -extern string_view LogicWindmillPoHHookshotDesc; -extern string_view LogicDMTBombableDesc; -extern string_view LogicDMTSoilGSDesc; -extern string_view LogicDMTSummitHoverDesc; -extern string_view LogicLinkGoronDinsDesc; -extern string_view LogicGoronCityLeftMostDesc; -extern string_view LogicGoronCityPotDesc; -extern string_view LogicGoronCityPotWithStrengthDesc; -extern string_view LogicChildRollingWithStrengthDesc; -extern string_view LogicCraterUpperToLowerDesc; -extern string_view LogicCraterBeanPoHWithHoversDesc; -extern string_view LogicBiggoronBoleroDesc; -extern string_view LogicZoraRiverLowerDesc; -extern string_view LogicZoraRiverUpperDesc; -extern string_view LogicZFGreatFairyDesc; -extern string_view LogicDekuB1WebsWithBowDesc; -extern string_view LogicDekuB1SkipDesc; -extern string_view LogicDekuBasementGSDesc; -extern string_view LogicDCStaircaseDesc; -extern string_view LogicDCJumpDesc; -extern string_view LogicDCSlingshotSkipDesc; -extern string_view LogicDCScarecrowGSDesc; -extern string_view LogicJabuBossGSAdultDesc; -extern string_view LogicJabuScrubJumpDiveDesc; -extern string_view LogicForestOutsideBackdoorDesc; -extern string_view LogicForestDoorFrameDesc; -extern string_view LogicForestOutdoorEastGSDesc; -extern string_view LogicFireBossDoorJumpDesc; -extern string_view LogicFireStrengthDesc; -extern string_view LogicFireScarecrowDesc; -extern string_view LogicFireFlameMazeDesc; -extern string_view LogicFireSongOfTimeDesc; -extern string_view LogicWaterTempleTorchLongshotDesc; -extern string_view LogicWaterTempleUpperBoostDesc; -extern string_view LogicWaterCentralBowDesc; -extern string_view LogicWaterCentralGSFWDesc; -extern string_view LogicWaterCrackedWallNothingDesc; -extern string_view LogicWaterCrackedWallHoversDesc; -extern string_view LogicWaterBossKeyRegionDesc; -extern string_view LogicWaterBKJumpDiveDesc; -extern string_view LogicWaterNorthBasementLedgeJumpDesc; -extern string_view LogicWaterDragonAdultDesc; -extern string_view LogicWaterDragonJumpDiveDesc; -extern string_view LogicWaterRiverGSDesc; -extern string_view LogicWaterFallingPlatformGSDesc; -extern string_view LogicSpiritLowerAdultSwitchDesc; -extern string_view LogicSpiritChildBombchuDesc; -extern string_view LogicSpiritWallDesc; -extern string_view LogicSpiritLobbyGSDesc; -extern string_view LogicSpiritMapChestDesc; -extern string_view LogicSpiritSunChestDesc; -extern string_view LogicShadowFireArrowEntryDesc; -extern string_view LogicShadowUmbrellaDesc; -extern string_view LogicShadowFreestandingKeyDesc; -extern string_view LogicShadowStatueDesc; -extern string_view LogicShadowBongoDesc; -extern string_view LogicChildDeadhandDesc; -extern string_view LogicGtgWithoutHookshotDesc; -extern string_view LogicGtgFakeWallDesc; -extern string_view LogicLensSpiritDesc; -extern string_view LogicLensShadowDesc; -extern string_view LogicLensShadowBackDesc; -extern string_view LogicLensBotwDesc; -extern string_view LogicLensGtgDesc; -extern string_view LogicLensCastleDesc; -extern string_view LogicLensJabuMQDesc; -extern string_view LogicLensSpiritMQDesc; -extern string_view LogicLensShadowMQDesc; -extern string_view LogicLensShadowMQBackDesc; -extern string_view LogicLensBotwMQDesc; -extern string_view LogicLensGtgMQDesc; -extern string_view LogicLensCastleMQDesc; -extern string_view LogicSpiritTrialHookshotDesc; -extern string_view LogicFlamingChestsDesc; - -extern const std::vector GlitchDifficulties; - -extern string_view GlitchRestrictedItemsDescDisabled; -extern string_view GlitchRestrictedItemsDescNovice; - -extern string_view GlitchSuperStabDescDisabled; -extern string_view GlitchSuperStabDescNovice; - -extern string_view GlitchISGDescDisabled; -extern string_view GlitchISGDescNovice; -extern string_view GlitchISGDescIntermediate; -extern string_view GlitchISGDescAdvanced; - -extern string_view GlitchHoverDescDisabled; -extern string_view GlitchHoverDescNovice; -extern string_view GlitchHoverDescIntermediate; -extern string_view GlitchHoverDescAdvanced; - -extern string_view GlitchBombOIDescDisabled; -extern string_view GlitchBombOIDescNovice; -extern string_view GlitchBombOIDescIntermediate; -extern string_view GlitchBombOIDescAdvanced; -extern string_view GlitchBombOIDescExpert; - -extern string_view GlitchHoverBoostDescDisabled; -extern string_view GlitchHoverBoostDescNovice; -extern string_view GlitchHoverBoostDescIntermediate; -extern string_view GlitchHoverBoostDescAdvanced; - -extern string_view GlitchSuperSlideDescDisabled; -extern string_view GlitchSuperSlideDescNovice; -extern string_view GlitchSuperSlideDescIntermediate; -extern string_view GlitchSuperSlideDescAdvanced; -extern string_view GlitchSuperSlideDescExpert; - -extern string_view GlitchMegaflipDescDisabled; -extern string_view GlitchMegaflipDescNovice; -extern string_view GlitchMegaflipDescIntermediate; -extern string_view GlitchMegaflipDescAdvanced; -extern string_view GlitchMegaflipDescExpert; -extern string_view GlitchMegaflipDescHero; - -extern string_view GlitchASlideDescDisabled; -extern string_view GlitchASlideDescNovice; -extern string_view GlitchASlideDescIntermediate; -extern string_view GlitchASlideDescAdvanced; -extern string_view GlitchASlideDescExpert; - -extern string_view GlitchHammerSlideDescDisabled; -extern string_view GlitchHammerSlideDescNovice; -extern string_view GlitchHammerSlideDescIntermediate; - -extern string_view GlitchLedgeCancelDescDisabled; -extern string_view GlitchLedgeCancelDescNovice; -extern string_view GlitchLedgeCancelDescIntermediate; -extern string_view GlitchLedgeCancelDescAdvanced; - -extern string_view GlitchActionSwapDescDisabled; -extern string_view GlitchActionSwapDescNovice; -extern string_view GlitchActionSwapDescAdvanced; - -extern string_view GlitchQPADescDisabled; -extern string_view GlitchQPADescNovice; -extern string_view GlitchQPADescIntermediate; -extern string_view GlitchQPADescAdvanced; -extern string_view GlitchQPADescExpert; - -extern string_view GlitchHookshotClipDescDisabled; -extern string_view GlitchHookshotClipDescNovice; -extern string_view GlitchHookshotClipDescIntermediate; - -extern string_view GlitchHookshotJump_BonkDescDisabled; -extern string_view GlitchHookshotJump_BonkDescNovice; -extern string_view GlitchHookshotJump_BonkDescIntermediate; -extern string_view GlitchHookshotJump_BonkDescAdvanced; - -extern string_view GlitchHookshotJump_BootsDescDisabled; -extern string_view GlitchHookshotJump_BootsDescNovice; -extern string_view GlitchHookshotJump_BootsDescIntermediate; -extern string_view GlitchHookshotJump_BootsDescAdvanced; - -extern string_view GlitchCutsceneDiveDescDisabled; -extern string_view GlitchCutsceneDiveDescNovice; -extern string_view GlitchCutsceneDiveDescIntermediate; -extern string_view GlitchCutsceneDiveDescAdvanced; - -extern string_view GlitchNaviDive_StickDescDisabled; -extern string_view GlitchNaviDive_StickDescNovice; -extern string_view GlitchNaviDive_StickDescIntermediate; -extern string_view GlitchNaviDive_StickDescAdvanced; - -extern string_view GlitchTripleSlashClipDescDisabled; -extern string_view GlitchTripleSlashClipDescNovice; -extern string_view GlitchTripleSlashClipDescIntermediate; -extern string_view GlitchTripleSlashClipDescAdvanced; -extern string_view GlitchTripleSlashClipDescExpert; - -extern string_view GlitchLedgeClipDescDisabled; -extern string_view GlitchLedgeClipDescNovice; -extern string_view GlitchLedgeClipDescIntermediate; -extern string_view GlitchLedgeClipDescAdvanced; - -extern string_view GlitchSeamWalkDescDisabled; -extern string_view GlitchSeamWalkDescNovice; -extern string_view GlitchSeamWalkDescIntermediate; -extern string_view GlitchSeamWalkDescAdvanced; -extern string_view GlitchSeamWalkDescExpert; -extern string_view GlitchSeamWalkDescHero; - -extern string_view GlitchWWTEscapeDesc; -extern string_view GlitchGVTentAsChildDesc; -extern string_view GlitchGFGuardSneakDesc; -extern string_view GlitchItemlessWastelandDesc; -extern string_view GlitchOccamsStatueDesc; -extern string_view GlitchZDOoBJumpSlashDesc; -extern string_view GlitchJabuStickRecoilDesc; -extern string_view GlitchJabuAdultDesc; -extern string_view GlitchBlueFireWallDesc; -extern string_view GlitchClassicHalfieDesc; -extern string_view GlitchModernHalfieDesc; -extern string_view GlitchJabuSwitchDesc; -extern string_view GlitchForestBKSkipDesc; -extern string_view GlitchFireGrunzClipDesc; diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp index 42c51797d..210affdc2 100644 --- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp @@ -1,22 +1,15 @@ #include "settings.hpp" -#include "cosmetics.hpp" #include "dungeon.hpp" #include "fill.hpp" #include "item_location.hpp" -#include "music.hpp" -#include "sound_effects.hpp" #include "random.hpp" #include "randomizer.hpp" -#include "setting_descriptions.hpp" #include "trial.hpp" #include "keys.hpp" -using namespace Cosmetics; using namespace Dungeon; using namespace Trial; -using namespace Music; -using namespace SFX; namespace Settings { uint32_t seed; @@ -51,23 +44,23 @@ namespace Settings { return options; } - // Setting name, Options, Setting Descriptions (assigned in setting_descriptions.cpp) Category (default: Setting),Default index (default: 0), Default hidden (default: false) - //Open Settings Any option index past the last description will use the last description - Option RandomizeOpen = Option::Bool("Randomize Settings", {"No","Yes"}, {openRandomize}, OptionCategory::Toggle); - Option OpenForest = Option::U8 ("Forest", {"Closed", "Closed Deku", "Open"}, {forestClosed, forestClosedDeku, forestOpen}, OptionCategory::Setting, OPENFOREST_CLOSED); - Option OpenKakariko = Option::U8 ("Kakariko Gate", {"Closed", "Open"}, {kakGateClosed, kakGateOpen}); - Option OpenDoorOfTime = Option::U8 ("Door of Time", {"Closed", "Song only", "Open"}, {doorOfTimeClosed, doorOfTimeSongOnly, doorOfTimeOpen}); - Option ZorasFountain = Option::U8 ("Zora's Fountain", {"Closed", "Closed as child", "Open"}, {fountainNormal, fountainAdult, fountainOpen}); - Option GerudoFortress = Option::U8 ("Gerudo Fortress", {"Normal", "Fast", "Open"}, {gerudoNormal, gerudoFast, gerudoOpen}); - Option Bridge = Option::U8 ("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeon rewards", "Dungeons", "Tokens", "Greg"}, {bridgeVanilla, bridgeOpen, bridgeStones, bridgeMedallions, bridgeRewards, bridgeDungeons, bridgeTokens, bridgeGreg}, OptionCategory::Setting, RAINBOWBRIDGE_VANILLA); - Option BridgeStoneCount = Option::U8 ("Stone Count", {NumOpts(0, 4)}, {bridgeStoneCountDesc}, OptionCategory::Setting, 1, true); - Option BridgeMedallionCount= Option::U8 ("Medallion Count", {NumOpts(0, 7)}, {bridgeMedallionCountDesc}, OptionCategory::Setting, 1, true); - Option BridgeRewardCount = Option::U8 ("Reward Count", {NumOpts(0, 10)}, {bridgeRewardCountDesc}, OptionCategory::Setting, 1, true); - Option BridgeDungeonCount = Option::U8 ("Dungeon Count", {NumOpts(0, 9)}, {bridgeDungeonCountDesc}, OptionCategory::Setting, 1, true); - Option BridgeTokenCount = Option::U8 ("Token Count", {NumOpts(0, 100)}, {bridgeTokenCountDesc}, OptionCategory::Setting, 1, true); - Option BridgeRewardOptions = Option::U8 ("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"}, {bridgeRewardOptionsDesc}); - Option RandomGanonsTrials = Option::Bool("Random Ganon's Trials", {"Off", "On"}, {randomGanonsTrialsDesc}, OptionCategory::Setting, ON); - Option GanonsTrialsCount = Option::U8 ("Trial Count", {NumOpts(0, 6)}, {ganonsTrialCountDesc}, OptionCategory::Setting, 1, true); + // Setting name, Options, Category (default: Setting),Default index (default: 0), Default hidden (default: false) + //Open Settings + Option RandomizeOpen = Option::Bool("Randomize Settings", {"No","Yes"}, OptionCategory::Toggle); + Option OpenForest = Option::U8 ("Forest", {"Closed", "Closed Deku", "Open"}, OptionCategory::Setting, OPENFOREST_CLOSED); + Option OpenKakariko = Option::U8 ("Kakariko Gate", {"Closed", "Open"}); + Option OpenDoorOfTime = Option::U8 ("Door of Time", {"Closed", "Song only", "Open"}); + Option ZorasFountain = Option::U8 ("Zora's Fountain", {"Closed", "Closed as child", "Open"}); + Option GerudoFortress = Option::U8 ("Gerudo Fortress", {"Normal", "Fast", "Open"}); + Option Bridge = Option::U8 ("Rainbow Bridge", {"Vanilla", "Always open", "Stones", "Medallions", "Dungeon rewards", "Dungeons", "Tokens", "Greg"}, OptionCategory::Setting, RAINBOWBRIDGE_VANILLA); + Option BridgeStoneCount = Option::U8 ("Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, 1, true); + Option BridgeMedallionCount= Option::U8 ("Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, 1, true); + Option BridgeRewardCount = Option::U8 ("Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, 1, true); + Option BridgeDungeonCount = Option::U8 ("Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, 1, true); + Option BridgeTokenCount = Option::U8 ("Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, 1, true); + Option BridgeRewardOptions = Option::U8 ("Bridge Reward Options", {"Standard Rewards", "Greg as Reward", "Greg as Wildcard"}); + Option RandomGanonsTrials = Option::Bool("Random Ganon's Trials", {"Off", "On"}, OptionCategory::Setting, ON); + Option GanonsTrialsCount = Option::U8 ("Trial Count", {NumOpts(0, 6)}, OptionCategory::Setting, 1, true); std::vector