diff --git a/soh/assets/code/fbdemo_circle/z_fbdemo_circle.h b/soh/assets/code/fbdemo_circle/z_fbdemo_circle.h
index 82d0ee81e..5418aa741 100644
--- a/soh/assets/code/fbdemo_circle/z_fbdemo_circle.h
+++ b/soh/assets/code/fbdemo_circle/z_fbdemo_circle.h
@@ -15,7 +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;
+#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 549dfd5f8..b6bde1966 100644
--- a/soh/assets/code/fbdemo_triforce/z_fbdemo_triforce.h
+++ b/soh/assets/code/fbdemo_triforce/z_fbdemo_triforce.h
@@ -3,10 +3,10 @@
 
 #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;
+#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 a4f61e5c9..ce195e562 100644
--- a/soh/assets/code/fbdemo_wipe1/z_fbdemo_wipe1.h
+++ b/soh/assets/code/fbdemo_wipe1/z_fbdemo_wipe1.h
@@ -3,10 +3,10 @@
 
 #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;
+#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/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h b/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h
index b9eeb5f50..89e6c9342 100644
--- a/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h
+++ b/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h
@@ -15,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;
diff --git a/soh/assets/objects/gameplay_keep/gameplay_keep.h b/soh/assets/objects/gameplay_keep/gameplay_keep.h
index c9134addd..473b2b8d6 100644
--- a/soh/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/soh/assets/objects/gameplay_keep/gameplay_keep.h
@@ -2721,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;
diff --git a/soh/assets/objects/object_bdoor/object_bdoor.h b/soh/assets/objects/object_bdoor/object_bdoor.h
index a197aba7d..5b0442482 100644
--- a/soh/assets/objects/object_bdoor/object_bdoor.h
+++ b/soh/assets/objects/object_bdoor/object_bdoor.h
@@ -3,34 +3,34 @@
 
 #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;
+#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_bw/object_bw.h b/soh/assets/objects/object_bw/object_bw.h
index fea2abe95..9d98367bf 100644
--- a/soh/assets/objects/object_bw/object_bw.h
+++ b/soh/assets/objects/object_bw/object_bw.h
@@ -3,47 +3,47 @@
 
 #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;
+#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_fd/object_fd.h b/soh/assets/objects/object_fd/object_fd.h
index 6ce718cc9..fb2beed84 100644
--- a/soh/assets/objects/object_fd/object_fd.h
+++ b/soh/assets/objects/object_fd/object_fd.h
@@ -3,8 +3,8 @@
 
 #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;
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 626a71e7a..c0d23fa91 100644
--- a/soh/assets/objects/object_ice_objects/object_ice_objects.h
+++ b/soh/assets/objects/object_ice_objects/object_ice_objects.h
@@ -9,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;
@@ -30,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;
@@ -39,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;
@@ -54,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;
diff --git a/soh/assets/objects/object_ik/object_ik.h b/soh/assets/objects/object_ik/object_ik.h
index f401b5bac..4e6da046b 100644
--- a/soh/assets/objects/object_ik/object_ik.h
+++ b/soh/assets/objects/object_ik/object_ik.h
@@ -24,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;
@@ -45,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;
@@ -93,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;
@@ -153,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;
@@ -180,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;
@@ -216,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;
@@ -228,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;
@@ -282,11 +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;
+#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_mori_tex/object_mori_tex.h b/soh/assets/objects/object_mori_tex/object_mori_tex.h
index c5051e1b2..be4290bf4 100644
--- a/soh/assets/objects/object_mori_tex/object_mori_tex.h
+++ b/soh/assets/objects/object_mori_tex/object_mori_tex.h
@@ -12,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;
diff --git a/soh/assets/objects/object_os/object_os.h b/soh/assets/objects/object_os/object_os.h
index e42bd5cde..bf4c8ff00 100644
--- a/soh/assets/objects/object_os/object_os.h
+++ b/soh/assets/objects/object_os/object_os.h
@@ -3,77 +3,77 @@
 
 #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;
+#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 84d4a2de7..a1c05f07f 100644
--- a/soh/assets/objects/object_os_anime/object_os_anime.h
+++ b/soh/assets/objects/object_os_anime/object_os_anime.h
@@ -108,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;
@@ -120,77 +120,77 @@ 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;
diff --git a/soh/assets/objects/object_rs/object_rs.h b/soh/assets/objects/object_rs/object_rs.h
index 05cde59bb..5355c5079 100644
--- a/soh/assets/objects/object_rs/object_rs.h
+++ b/soh/assets/objects/object_rs/object_rs.h
@@ -3,44 +3,44 @@
 
 #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;
@@ -51,17 +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;
+#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_tr/object_tr.h b/soh/assets/objects/object_tr/object_tr.h
index c9557c89f..94c66db5f 100644
--- a/soh/assets/objects/object_tr/object_tr.h
+++ b/soh/assets/objects/object_tr/object_tr.h
@@ -3,284 +3,284 @@
 
 #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;
+#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_tw/object_tw.h b/soh/assets/objects/object_tw/object_tw.h
index 1fb24c089..0c714d1bf 100644
--- a/soh/assets/objects/object_tw/object_tw.h
+++ b/soh/assets/objects/object_tw/object_tw.h
@@ -3,692 +3,692 @@
 
 #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;
+#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/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h b/soh/assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h
index da11257dd..1e13929ef 100644
--- a/soh/assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h
+++ b/soh/assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h
@@ -3,89 +3,89 @@
 
 #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;
@@ -114,7 +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;
+#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/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h
index 340ed73e5..30ff0b896 100644
--- a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h
+++ b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h
@@ -9,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;
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 69b235c51..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
@@ -3,64 +3,64 @@
 
 #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;
+#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_static/icon_item_static.h b/soh/assets/textures/icon_item_static/icon_item_static.h
index e6f719c91..c32305859 100644
--- a/soh/assets/textures/icon_item_static/icon_item_static.h
+++ b/soh/assets/textures/icon_item_static/icon_item_static.h
@@ -3,275 +3,275 @@
 
 #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;
diff --git a/soh/assets/textures/parameter_static/parameter_static.h b/soh/assets/textures/parameter_static/parameter_static.h
index acc785c70..c7be020a5 100644
--- a/soh/assets/textures/parameter_static/parameter_static.h
+++ b/soh/assets/textures/parameter_static/parameter_static.h
@@ -72,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;
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 @@
         <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0x10F148"/>
         <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0x10F548"/>
         <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0x10F948"/>
-        <Array Name="sCircleWipeVtx" Count="34" Offset="0x10FD48">
+        <Array Name="sTransCircleVtx" Count="34" Offset="0x10FD48">
             <Vtx/>
         </Array>
         <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
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 @@
 <Root>
     <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0x10E1D0" RangeEnd="0x10E2A0">
-        <DList Name="sTriforceWipeDL" Offset="0x10E1D0"/>
-        <Array Name="sTriforceWipeVtx" Count="10" Offset="0x10E200">
+        <DList Name="sTransTriforceDL" Offset="0x10E1D0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0x10E200">
             <Vtx/>
         </Array>
     </File>
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 @@
 <Root>
-    <!-- ZAPD isn't finding sWipe1Vtx and sWipe1Tex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
     <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0x10E2A0" RangeEnd="0x10EC30" Segment="0">
-        <Array Name="sWipe1Vtx" Count="25" Offset="0x10E2A0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0x10E2A0">
             <Vtx/>
         </Array>
-        <Texture Name="sWipe1Tex" Format="i4" Width="64" Height="64" Offset="0x10E430"/>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0x10E430"/>
        <!-- <DList Name="sWipe1DL" Offset="0x10EC30"/>-->
     </File>
 </Root>
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..2670b752d 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
@@ -4,7 +4,7 @@
         <DList Name="gBrownFragmentDL" Offset="0x530"/>
         <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
         <DList Name="gDoorLockDL" Offset="0x1100"/>
-        <DList Name="gDoorChainsDL" Offset="0x11F0"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
         <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
         <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
         <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
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..ea19eaac3 100644
--- a/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml
+++ b/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml
@@ -933,10 +933,10 @@
         <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4A090"/>
         <DList Name="gDoorMetalBarsDL" Offset="0x4B0D0"/>
         <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x4B160"/>
-        <Texture Name="gSunTex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
-        <Texture Name="gSunEveningTex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
-        <DList Name="gKokiriDustMoteTextureLoadDL" Offset="0x4D160"/>
-        <DList Name="gKokiriDustMoteDL" Offset="0x4D1A8"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x4D160"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x4D1A8"/>
         <DList Name="gSunDL" Offset="0x4D1C0"/>
         <DList Name="gZTargetLockOnTriangleDL" Offset="0x4D450"/>
         <DList Name="gEffFire1DL" Offset="0x4D4E0"/>
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 @@
 <Root>
     <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
     <File Name="object_bdoor" Segment="6">
-        <Texture Name="object_bdoor_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
-        <DList Name="object_bdoor_DL_0010C0" Offset="0x10C0"/>
-        <DList Name="object_bdoor_DL_001400" Offset="0x1400"/>
-        <DList Name="object_bdoor_DL_001530" Offset="0x1530"/>
-        <Texture Name="object_bdoor_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
-        <Texture Name="object_bdoor_Tex_0025C0" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
-        <Texture Name="object_bdoor_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
-        <Texture Name="object_bdoor_Tex_0045C0" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
-        <Texture Name="object_bdoor_Tex_0055C0" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
-        <Texture Name="object_bdoor_Tex_0065C0" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_bw" Segment="6">
-        <Animation Name="object_bw_Anim_000228" Offset="0x228"/>
-        <DList Name="object_bw_DL_0002C0" Offset="0x2C0"/>
-        <DList Name="object_bw_DL_0003E8" Offset="0x3E8"/>
-        <DList Name="object_bw_DL_000558" Offset="0x558"/>
-        <DList Name="object_bw_DL_000680" Offset="0x680"/>
-        <DList Name="object_bw_DL_001050" Offset="0x1050"/>
-        <Texture Name="object_bw_Tex_001240" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
-        <Texture Name="object_bw_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
-        <Texture Name="object_bw_TLUT_001640" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
-        <Texture Name="object_bw_Tex_001840" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
-        <Texture Name="object_bw_Tex_001C40" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
-        <Limb Name="object_bw_Limb_002040" LimbType="Standard" Offset="0x2040"/>
-        <Limb Name="object_bw_Limb_00204C" LimbType="Standard" Offset="0x204C"/>
-        <Limb Name="object_bw_Limb_002058" LimbType="Standard" Offset="0x2058"/>
-        <Limb Name="object_bw_Limb_002064" LimbType="Standard" Offset="0x2064"/>
-        <Limb Name="object_bw_Limb_002070" LimbType="Standard" Offset="0x2070"/>
-        <Limb Name="object_bw_Limb_00207C" LimbType="Standard" Offset="0x207C"/>
-        <Limb Name="object_bw_Limb_002088" LimbType="Standard" Offset="0x2088"/>
-        <Limb Name="object_bw_Limb_002094" LimbType="Standard" Offset="0x2094"/>
-        <Limb Name="object_bw_Limb_0020A0" LimbType="Standard" Offset="0x20A0"/>
-        <Limb Name="object_bw_Limb_0020AC" LimbType="Standard" Offset="0x20AC"/>
-        <Limb Name="object_bw_Limb_0020B8" LimbType="Standard" Offset="0x20B8"/>
-        <Skeleton Name="object_bw_Skel_0020F0" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
-        <Animation Name="object_bw_Anim_0021A0" Offset="0x21A0"/>
-        <Animation Name="object_bw_Anim_002250" Offset="0x2250"/>
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
     </File>
 </Root>
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..a379870ef 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,7 @@
 <Root>
     <File Name="object_fd" Segment="6">
         <!-- Boss title card -->
-        <Texture Name="gVolvagiaBossTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
+        <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
 
         <!-- Skeletons -->
         <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x114E0"/>
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 @@
     <File Name="object_ice_objects" Segment="6">
         <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
         <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
-        <DList Name="object_ice_objects_DL_0006F0" Offset="0x6F0"/>
-        <DList Name="object_ice_objects_DL_0012A0" Offset="0x12A0"/>
-        <Collision Name="object_ice_objects_Col_001C1C" Offset="0x1C1C"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
         <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
         <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
         <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
         <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
-        <DList Name="object_ice_objects_DL_002640" Offset="0x2640"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
         <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
         <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
-        <Collision Name="object_ice_objects_Col_002920" Offset="0x2920"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
         <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
-        <Texture Name="object_ice_objects_Tex_003150" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
         <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
         <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
-        <Texture Name="object_ice_objects_Tex_005150" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
-        <Texture Name="object_ice_objects_Tex_005550" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
         <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
         <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
         <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
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 @@
         <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
         <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
         <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
-        <Skeleton Name="object_ik_Skel_01E178" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
-        <Skeleton Name="object_ik_Skel_0205C0" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
 
         <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
         <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
         <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
         <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
         <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
-        <Animation Name="object_ik_Anim_001C28" Offset="0x1C28"/>
-        <Animation Name="object_ik_Anim_002538" Offset="0x2538"/>
-        <Animation Name="object_ik_Anim_0029FC" Offset="0x29FC"/>
-        <Animation Name="object_ik_Anim_0033C4" Offset="0x33C4"/>
-        <Animation Name="object_ik_Anim_003DBC" Offset="0x3DBC"/>
-        <Animation Name="object_ik_Anim_0045BC" Offset="0x45BC"/>
-        <Animation Name="object_ik_Anim_00485C" Offset="0x485C"/>
-        <Animation Name="object_ik_Anim_005944" Offset="0x5944"/>
-        <Animation Name="object_ik_Anim_006194" Offset="0x6194"/>
-        <Animation Name="object_ik_Anim_006734" Offset="0x6734"/>
-        <Animation Name="object_ik_Anim_00C114" Offset="0xC114"/>
-        <Animation Name="object_ik_Anim_00CD70" Offset="0xCD70"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
         <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
-        <Animation Name="object_ik_Anim_00ED24" Offset="0xED24"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
         <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
         <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
-        <Animation Name="object_ik_Anim_0203D8" Offset="0x203D8"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
 
         <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
-        <Texture Name="object_ik_Tex_00F7A0" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
         <!-- This is a duplicate texture to accound for authentic texture overflowing -->
         <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
              duplicate offset values -->
         <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
-        <Texture Name="object_ik_Tex_00FBA0" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
-        <Texture Name="object_ik_Tex_00FFA0" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
-        <Texture Name="object_ik_Tex_0101A0" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
         <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
-        <Texture Name="object_ik_Tex_010BA0" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
-        <Texture Name="object_ik_Tex_0113A0" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
-        <Texture Name="object_ik_Tex_011420" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011520" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011660" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
         <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
         <DList Name="object_ik_DL_015380" Offset="0x15380"/>
-        <DList Name="object_ik_DL_0154E0" Offset="0x154E0"/>
-        <DList Name="object_ik_DL_015840" Offset="0x15840"/>
-        <DList Name="object_ik_DL_015B00" Offset="0x15B00"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
         <DList Name="object_ik_DL_016118" Offset="0x16118"/>
         <DList Name="object_ik_DL_016278" Offset="0x16278"/>
         <DList Name="object_ik_DL_016340" Offset="0x16340"/>
         <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
         <DList Name="object_ik_DL_016568" Offset="0x16568"/>
         <DList Name="object_ik_DL_016658" Offset="0x16658"/>
-        <DList Name="object_ik_DL_016748" Offset="0x16748"/>
-        <DList Name="object_ik_DL_0169E8" Offset="0x169E8"/>
-        <DList Name="object_ik_DL_016BE0" Offset="0x16BE0"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
         <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
         <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
         <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
@@ -79,14 +79,14 @@
         <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
         <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
-        <Texture Name="object_ik_Tex_0174B8" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
-        <DList Name="object_ik_DL_018E78" Offset="0x18E78"/>
-        <DList Name="object_ik_DL_019100" Offset="0x19100"/>
-        <DList Name="object_ik_DL_019E08" Offset="0x19E08"/>
-        <DList Name="object_ik_DL_01BA78" Offset="0x1BA78"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
         <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
         <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
         <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
@@ -101,8 +101,8 @@
         <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
         <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
         <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
-        <Texture Name="object_ik_Tex_01DDA8" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
-        <Texture Name="object_ik_Tex_01DEA8" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
         <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
     </File>
 </Root>
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 @@
         <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
         <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
 
-        <Texture Name="gMorieStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
         <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
         <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
 
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 @@
 <Root>
     <File Name="object_os" Segment="6">
-        <Animation Name="object_os_Anim_0002E4" Offset="0x2E4"/>
-        <DList Name="object_os_DL_001D80" Offset="0x1D80"/>
-        <DList Name="object_os_DL_0020A8" Offset="0x20A8"/>
-        <DList Name="object_os_DL_0025E8" Offset="0x25E8"/>
-        <DList Name="object_os_DL_002718" Offset="0x2718"/>
-        <DList Name="object_os_DL_002848" Offset="0x2848"/>
-        <DList Name="object_os_DL_002A00" Offset="0x2A00"/>
-        <DList Name="object_os_DL_002B30" Offset="0x2B30"/>
-        <DList Name="object_os_DL_002C60" Offset="0x2C60"/>
-        <Texture Name="object_os_TLUT_002E18" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
-        <Texture Name="object_os_TLUT_003018" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
-        <Texture Name="object_os_Tex_003218" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003258" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003358" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003398" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0033D8" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
-        <Texture Name="object_os_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0040D8" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0044D8" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_004558" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
-        <Limb Name="object_os_Limb_0045D8" LimbType="Standard" Offset="0x45D8"/>
-        <Limb Name="object_os_Limb_0045E4" LimbType="Standard" Offset="0x45E4"/>
-        <Limb Name="object_os_Limb_0045F0" LimbType="Standard" Offset="0x45F0"/>
-        <Limb Name="object_os_Limb_0045FC" LimbType="Standard" Offset="0x45FC"/>
-        <Limb Name="object_os_Limb_004608" LimbType="Standard" Offset="0x4608"/>
-        <Limb Name="object_os_Limb_004614" LimbType="Standard" Offset="0x4614"/>
-        <Limb Name="object_os_Limb_004620" LimbType="Standard" Offset="0x4620"/>
-        <Limb Name="object_os_Limb_00462C" LimbType="Standard" Offset="0x462C"/>
-        <Skeleton Name="object_os_Skel_004658" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
     </File>
 </Root>
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 @@
         <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
         <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
         <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
-        <Animation Name="gObjOsAnim_5808" Offset="0x5808"/>
-        <Animation Name="gObjOsAnim_62DC" Offset="0x62DC"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
         <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
         <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
-        <Animation Name="gObjOsAnim_65E0" Offset="0x65E0"/>
-        <Animation Name="gObjOsAnim_6A60" Offset="0x6A60"/>
-        <Animation Name="gObjOsAnim_6EE0" Offset="0x6EE0"/>
-        <Animation Name="gObjOsAnim_6F9C" Offset="0x6F9C"/>
-        <Animation Name="gObjOsAnim_7064" Offset="0x7064"/>
-        <Animation Name="gObjOsAnim_7120" Offset="0x7120"/>
-        <Animation Name="gObjOsAnim_7454" Offset="0x7454"/>
-        <Animation Name="gObjOsAnim_7830" Offset="0x7830"/>
-        <Animation Name="gObjOsAnim_7D94" Offset="0x7D94"/>
-        <Animation Name="gObjOsAnim_7E64" Offset="0x7E64"/>
-        <Animation Name="gObjOsAnim_7F38" Offset="0x7F38"/>
-        <Animation Name="gObjOsAnim_7FFC" Offset="0x7FFC"/>
-        <Animation Name="gObjOsAnim_80B4" Offset="0x80B4"/>
-        <Animation Name="gObjOsAnim_8178" Offset="0x8178"/>
-        <Animation Name="gObjOsAnim_879C" Offset="0x879C"/>
-        <Animation Name="gObjOsAnim_8F6C" Offset="0x8F6C"/>
-        <Animation Name="gObjOsAnim_9028" Offset="0x9028"/>
-        <Animation Name="gObjOsAnim_90EC" Offset="0x90EC"/>
-        <Animation Name="gObjOsAnim_91AC" Offset="0x91AC"/>
-        <Animation Name="gObjOsAnim_9274" Offset="0x9274"/>
-        <Animation Name="gObjOsAnim_982C" Offset="0x982C"/>
-        <Animation Name="gObjOsAnim_98EC" Offset="0x98EC"/>
-        <Animation Name="gObjOsAnim_99A4" Offset="0x99A4"/>
-        <Animation Name="gObjOsAnim_9B64" Offset="0x9B64"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
         <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
         <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
     </File>
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 @@
 <Root>
     <File Name="object_rs" Segment="6">
-        <Animation Name="object_rs_Anim_00065C" Offset="0x65C"/>
-        <DList Name="object_rs_DL_001FA0" Offset="0x1FA0"/>
-        <DList Name="object_rs_DL_0021F8" Offset="0x21F8"/>
-        <DList Name="object_rs_DL_0025F8" Offset="0x25F8"/>
-        <DList Name="object_rs_DL_002730" Offset="0x2730"/>
-        <DList Name="object_rs_DL_002860" Offset="0x2860"/>
-        <DList Name="object_rs_DL_002A70" Offset="0x2A70"/>
-        <DList Name="object_rs_DL_002BA8" Offset="0x2BA8"/>
-        <DList Name="object_rs_DL_002CD8" Offset="0x2CD8"/>
-        <Texture Name="object_rs_TLUT_002EE8" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_0030E8" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003128" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003168" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004568" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004668" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
-        <Texture Name="object_rs_Tex_0046E8" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
-        <Limb Name="object_rs_Limb_0047E8" LimbType="Standard" Offset="0x47E8"/>
-        <Limb Name="object_rs_Limb_0047F4" LimbType="Standard" Offset="0x47F4"/>
-        <Limb Name="object_rs_Limb_004800" LimbType="Standard" Offset="0x4800"/>
-        <Limb Name="object_rs_Limb_00480C" LimbType="Standard" Offset="0x480C"/>
-        <Limb Name="object_rs_Limb_004818" LimbType="Standard" Offset="0x4818"/>
-        <Limb Name="object_rs_Limb_004824" LimbType="Standard" Offset="0x4824"/>
-        <Limb Name="object_rs_Limb_004830" LimbType="Standard" Offset="0x4830"/>
-        <Limb Name="object_rs_Limb_00483C" LimbType="Standard" Offset="0x483C"/>
-        <Skeleton Name="object_rs_Skel_004868" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tr" Segment="6">
-        <Animation Name="object_tr_Anim_000BFC" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
-        <Animation Name="object_tr_Anim_0013CC" Offset="0x13CC"/> <!-- Looking over right shoulder -->
-        <Animation Name="object_tr_Anim_001CDC" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
-        <Animation Name="object_tr_Anim_002BC4" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
-        <Animation Name="object_tr_Anim_0035CC" Offset="0x35CC"/> <!-- Looking over left shoulder -->
-        <Animation Name="object_tr_Anim_003FC8" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
-        <Animation Name="object_tr_Anim_0049C8" Offset="0x49C8"/> <!-- Floating on broom -->
-        <Animation Name="object_tr_Anim_005308" Offset="0x5308"/>
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
         <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
-        <DList Name="object_tr_DL_006520" Offset="0x6520"/>
-        <DList Name="object_tr_DL_0066A0" Offset="0x66A0"/>
-        <DList Name="object_tr_DL_006800" Offset="0x6800"/>
-        <DList Name="object_tr_DL_006940" Offset="0x6940"/>
-        <DList Name="object_tr_DL_006A50" Offset="0x6A50"/>
-        <DList Name="object_tr_DL_006B48" Offset="0x6B48"/>
-        <DList Name="object_tr_DL_006C58" Offset="0x6C58"/>
-        <DList Name="object_tr_DL_006D50" Offset="0x6D50"/>
-        <DList Name="object_tr_DL_006E70" Offset="0x6E70"/>
-        <DList Name="object_tr_DL_006FF0" Offset="0x6FF0"/>
-        <DList Name="object_tr_DL_007118" Offset="0x7118"/>
-        <DList Name="object_tr_DL_007238" Offset="0x7238"/>
-        <DList Name="object_tr_DL_007358" Offset="0x7358"/>
-        <DList Name="object_tr_DL_0074D8" Offset="0x74D8"/>
-        <DList Name="object_tr_DL_007600" Offset="0x7600"/>
-        <DList Name="object_tr_DL_007720" Offset="0x7720"/>
-        <DList Name="object_tr_DL_007728" Offset="0x7728"/>
-        <Texture Name="object_tr_TLUT_007730" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
-        <Texture Name="object_tr_Tex_0078D8" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
-        <Texture Name="object_tr_Tex_0080D8" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
-        <Texture Name="object_tr_Tex_0082D8" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
-        <Texture Name="object_tr_Tex_0084D8" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
-        <Texture Name="object_tr_Tex_0086D8" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
-        <Texture Name="object_tr_Tex_008AD8" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B58" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B98" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
-        <Texture Name="object_tr_Tex_008D98" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008DD8" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008E58" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
-        <Texture Name="object_tr_Tex_008ED8" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
-        <Texture Name="object_tr_Tex_0092D8" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
-        <Texture Name="object_tr_Tex_0093D8" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
-        <Texture Name="object_tr_Tex_009458" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_009498" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_0094D8" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
-        <Texture Name="object_tr_Tex_0098D8" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
-        <DList Name="object_tr_DL_00AF38" Offset="0xAF38"/>
-        <DList Name="object_tr_DL_00B568" Offset="0xB568"/>
-        <DList Name="object_tr_DL_00B5C8" Offset="0xB5C8"/>
-        <DList Name="object_tr_DL_00B678" Offset="0xB678"/>
-        <DList Name="object_tr_DL_00B728" Offset="0xB728"/>
-        <DList Name="object_tr_DL_00B8D0" Offset="0xB8D0"/>
-        <DList Name="object_tr_DL_00B968" Offset="0xB968"/>
-        <DList Name="object_tr_DL_00BA00" Offset="0xBA00"/>
-        <DList Name="object_tr_DL_00BB68" Offset="0xBB68"/>
-        <Texture Name="object_tr_Tex_00BCD0" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
         <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
-        <Texture Name="object_tr_Tex_00C2D0" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
         <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
-        <Limb Name="object_tr_Limb_00C390" LimbType="Standard" Offset="0xC390"/>
-        <Limb Name="object_tr_Limb_00C39C" LimbType="Standard" Offset="0xC39C"/>
-        <Limb Name="object_tr_Limb_00C3A8" LimbType="Standard" Offset="0xC3A8"/>
-        <Limb Name="object_tr_Limb_00C3B4" LimbType="Standard" Offset="0xC3B4"/>
-        <Limb Name="object_tr_Limb_00C3C0" LimbType="Standard" Offset="0xC3C0"/>
-        <Limb Name="object_tr_Limb_00C3CC" LimbType="Standard" Offset="0xC3CC"/>
-        <Limb Name="object_tr_Limb_00C3D8" LimbType="Standard" Offset="0xC3D8"/>
-        <Limb Name="object_tr_Limb_00C3E4" LimbType="Standard" Offset="0xC3E4"/>
-        <Limb Name="object_tr_Limb_00C3F0" LimbType="Standard" Offset="0xC3F0"/>
-        <Limb Name="object_tr_Limb_00C3FC" LimbType="Standard" Offset="0xC3FC"/>
-        <Limb Name="object_tr_Limb_00C408" LimbType="Standard" Offset="0xC408"/>
-        <Limb Name="object_tr_Limb_00C414" LimbType="Standard" Offset="0xC414"/>
-        <Limb Name="object_tr_Limb_00C420" LimbType="Standard" Offset="0xC420"/>
-        <Limb Name="object_tr_Limb_00C42C" LimbType="Standard" Offset="0xC42C"/>
-        <Limb Name="object_tr_Limb_00C438" LimbType="Standard" Offset="0xC438"/>
-        <Limb Name="object_tr_Limb_00C444" LimbType="Standard" Offset="0xC444"/>
-        <Limb Name="object_tr_Limb_00C450" LimbType="Standard" Offset="0xC450"/>
-        <Limb Name="object_tr_Limb_00C45C" LimbType="Standard" Offset="0xC45C"/>
-        <Limb Name="object_tr_Limb_00C468" LimbType="Standard" Offset="0xC468"/>
-        <Limb Name="object_tr_Limb_00C474" LimbType="Standard" Offset="0xC474"/>
-        <Limb Name="object_tr_Limb_00C480" LimbType="Standard" Offset="0xC480"/>
-        <Limb Name="object_tr_Limb_00C48C" LimbType="Standard" Offset="0xC48C"/>
-        <Limb Name="object_tr_Limb_00C498" LimbType="Standard" Offset="0xC498"/>
-        <Limb Name="object_tr_Limb_00C4A4" LimbType="Standard" Offset="0xC4A4"/>
-        <Limb Name="object_tr_Limb_00C4B0" LimbType="Standard" Offset="0xC4B0"/>
-        <Limb Name="object_tr_Limb_00C4BC" LimbType="Standard" Offset="0xC4BC"/>
-        <Skeleton Name="object_tr_Skel_00C530" Type="Flex" LimbType="Standard" Offset="0xC530"/>
-        <Animation Name="object_tr_Anim_00C60C" Offset="0xC60C"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
         <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
-        <DList Name="object_tr_DL_00D820" Offset="0xD820"/>
-        <DList Name="object_tr_DL_00D9A0" Offset="0xD9A0"/>
-        <DList Name="object_tr_DL_00DB00" Offset="0xDB00"/>
-        <DList Name="object_tr_DL_00DC40" Offset="0xDC40"/>
-        <DList Name="object_tr_DL_00DD50" Offset="0xDD50"/>
-        <DList Name="object_tr_DL_00DE48" Offset="0xDE48"/>
-        <DList Name="object_tr_DL_00DF58" Offset="0xDF58"/>
-        <DList Name="object_tr_DL_00E050" Offset="0xE050"/>
-        <DList Name="object_tr_DL_00E170" Offset="0xE170"/>
-        <DList Name="object_tr_DL_00E2F0" Offset="0xE2F0"/>
-        <DList Name="object_tr_DL_00E418" Offset="0xE418"/>
-        <DList Name="object_tr_DL_00E538" Offset="0xE538"/>
-        <DList Name="object_tr_DL_00E658" Offset="0xE658"/>
-        <DList Name="object_tr_DL_00E7D8" Offset="0xE7D8"/>
-        <DList Name="object_tr_DL_00E900" Offset="0xE900"/>
-        <DList Name="object_tr_DL_00EA20" Offset="0xEA20"/>
-        <DList Name="object_tr_DL_00EA28" Offset="0xEA28"/>
-        <Texture Name="object_tr_Tex_00EA30" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
-        <Texture Name="object_tr_Tex_00F230" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
-        <Texture Name="object_tr_Tex_00F430" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
-        <DList Name="object_tr_DL_010710" Offset="0x10710"/>
-        <DList Name="object_tr_DL_010D40" Offset="0x10D40"/>
-        <DList Name="object_tr_DL_010DA0" Offset="0x10DA0"/>
-        <DList Name="object_tr_DL_010E50" Offset="0x10E50"/>
-        <DList Name="object_tr_DL_010F00" Offset="0x10F00"/>
-        <DList Name="object_tr_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tr_DL_011140" Offset="0x11140"/>
-        <DList Name="object_tr_DL_0111D8" Offset="0x111D8"/>
-        <DList Name="object_tr_DL_011340" Offset="0x11340"/>
-        <Texture Name="object_tr_Tex_0114A8" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
-        <Limb Name="object_tr_Limb_0114E8" LimbType="Standard" Offset="0x114E8"/>
-        <Limb Name="object_tr_Limb_0114F4" LimbType="Standard" Offset="0x114F4"/>
-        <Limb Name="object_tr_Limb_011500" LimbType="Standard" Offset="0x11500"/>
-        <Limb Name="object_tr_Limb_01150C" LimbType="Standard" Offset="0x1150C"/>
-        <Limb Name="object_tr_Limb_011518" LimbType="Standard" Offset="0x11518"/>
-        <Limb Name="object_tr_Limb_011524" LimbType="Standard" Offset="0x11524"/>
-        <Limb Name="object_tr_Limb_011530" LimbType="Standard" Offset="0x11530"/>
-        <Limb Name="object_tr_Limb_01153C" LimbType="Standard" Offset="0x1153C"/>
-        <Limb Name="object_tr_Limb_011548" LimbType="Standard" Offset="0x11548"/>
-        <Limb Name="object_tr_Limb_011554" LimbType="Standard" Offset="0x11554"/>
-        <Limb Name="object_tr_Limb_011560" LimbType="Standard" Offset="0x11560"/>
-        <Limb Name="object_tr_Limb_01156C" LimbType="Standard" Offset="0x1156C"/>
-        <Limb Name="object_tr_Limb_011578" LimbType="Standard" Offset="0x11578"/>
-        <Limb Name="object_tr_Limb_011584" LimbType="Standard" Offset="0x11584"/>
-        <Limb Name="object_tr_Limb_011590" LimbType="Standard" Offset="0x11590"/>
-        <Limb Name="object_tr_Limb_01159C" LimbType="Standard" Offset="0x1159C"/>
-        <Limb Name="object_tr_Limb_0115A8" LimbType="Standard" Offset="0x115A8"/>
-        <Limb Name="object_tr_Limb_0115B4" LimbType="Standard" Offset="0x115B4"/>
-        <Limb Name="object_tr_Limb_0115C0" LimbType="Standard" Offset="0x115C0"/>
-        <Limb Name="object_tr_Limb_0115CC" LimbType="Standard" Offset="0x115CC"/>
-        <Limb Name="object_tr_Limb_0115D8" LimbType="Standard" Offset="0x115D8"/>
-        <Limb Name="object_tr_Limb_0115E4" LimbType="Standard" Offset="0x115E4"/>
-        <Limb Name="object_tr_Limb_0115F0" LimbType="Standard" Offset="0x115F0"/>
-        <Limb Name="object_tr_Limb_0115FC" LimbType="Standard" Offset="0x115FC"/>
-        <Limb Name="object_tr_Limb_011608" LimbType="Standard" Offset="0x11608"/>
-        <Limb Name="object_tr_Limb_011614" LimbType="Standard" Offset="0x11614"/>
-        <Skeleton Name="object_tr_Skel_011688" Type="Flex" LimbType="Standard" Offset="0x11688"/>
-        <Animation Name="object_tr_Anim_012E1C" Offset="0x12E1C"/> <!-- Casting magic -->
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tw" Segment="6">
-        <Animation Name="object_tw_Anim_0004A4" Offset="0x4A4"/>
-        <Animation Name="object_tw_Anim_000AAC" Offset="0xAAC"/>
-        <Animation Name="object_tw_Anim_0012A4" Offset="0x12A4"/>
-        <Animation Name="object_tw_Anim_0017E0" Offset="0x17E0"/>
-        <Animation Name="object_tw_Anim_001D10" Offset="0x1D10"/>
-        <Animation Name="object_tw_Anim_00230C" Offset="0x230C"/>
-        <Animation Name="object_tw_Anim_003614" Offset="0x3614"/>
-        <Animation Name="object_tw_Anim_003E34" Offset="0x3E34"/>
-        <Animation Name="object_tw_Anim_004548" Offset="0x4548"/>
-        <Animation Name="object_tw_Anim_00578C" Offset="0x578C"/>
-        <Animation Name="object_tw_Anim_006530" Offset="0x6530"/>
-        <Animation Name="object_tw_Anim_006F28" Offset="0x6F28"/>
-        <Limb Name="object_tw_Limb_006F40" LimbType="Standard" Offset="0x6F40"/>
-        <Limb Name="object_tw_Limb_006F4C" LimbType="Standard" Offset="0x6F4C"/>
-        <Limb Name="object_tw_Limb_006F58" LimbType="Standard" Offset="0x6F58"/>
-        <Limb Name="object_tw_Limb_006F64" LimbType="Standard" Offset="0x6F64"/>
-        <Limb Name="object_tw_Limb_006F70" LimbType="Standard" Offset="0x6F70"/>
-        <Limb Name="object_tw_Limb_006F7C" LimbType="Standard" Offset="0x6F7C"/>
-        <Limb Name="object_tw_Limb_006F88" LimbType="Standard" Offset="0x6F88"/>
-        <Limb Name="object_tw_Limb_006F94" LimbType="Standard" Offset="0x6F94"/>
-        <Limb Name="object_tw_Limb_006FA0" LimbType="Standard" Offset="0x6FA0"/>
-        <Limb Name="object_tw_Limb_006FAC" LimbType="Standard" Offset="0x6FAC"/>
-        <Limb Name="object_tw_Limb_006FB8" LimbType="Standard" Offset="0x6FB8"/>
-        <Limb Name="object_tw_Limb_006FC4" LimbType="Standard" Offset="0x6FC4"/>
-        <Limb Name="object_tw_Limb_006FD0" LimbType="Standard" Offset="0x6FD0"/>
-        <Limb Name="object_tw_Limb_006FDC" LimbType="Standard" Offset="0x6FDC"/>
-        <Limb Name="object_tw_Limb_006FE8" LimbType="Standard" Offset="0x6FE8"/>
-        <Limb Name="object_tw_Limb_006FF4" LimbType="Standard" Offset="0x6FF4"/>
-        <Limb Name="object_tw_Limb_007000" LimbType="Standard" Offset="0x7000"/>
-        <Limb Name="object_tw_Limb_00700C" LimbType="Standard" Offset="0x700C"/>
-        <Limb Name="object_tw_Limb_007018" LimbType="Standard" Offset="0x7018"/>
-        <Limb Name="object_tw_Limb_007024" LimbType="Standard" Offset="0x7024"/>
-        <Limb Name="object_tw_Limb_007030" LimbType="Standard" Offset="0x7030"/>
-        <Limb Name="object_tw_Limb_00703C" LimbType="Standard" Offset="0x703C"/>
-        <Limb Name="object_tw_Limb_007048" LimbType="Standard" Offset="0x7048"/>
-        <Limb Name="object_tw_Limb_007054" LimbType="Standard" Offset="0x7054"/>
-        <Limb Name="object_tw_Limb_007060" LimbType="Standard" Offset="0x7060"/>
-        <Limb Name="object_tw_Limb_00706C" LimbType="Standard" Offset="0x706C"/>
-        <Skeleton Name="object_tw_Skel_0070E0" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
-        <Animation Name="object_tw_Anim_007688" Offset="0x7688"/>
-        <Animation Name="object_tw_Anim_007CA8" Offset="0x7CA8"/>
-        <Animation Name="object_tw_Anim_0088C8" Offset="0x88C8"/>
-        <Animation Name="object_tw_Anim_009398" Offset="0x9398"/>
-        <Animation Name="object_tw_Anim_00947C" Offset="0x947C"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
         <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
-        <Texture Name="object_tw_TLUT_009490" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
-        <Texture Name="object_tw_Tex_009638" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
-        <Texture Name="object_tw_Tex_009E38" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
-        <Texture Name="object_tw_Tex_00A038" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
-        <Texture Name="object_tw_Tex_00A238" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
-        <Texture Name="object_tw_Tex_00A438" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A838" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8B8" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8F8" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
-        <Texture Name="object_tw_Tex_00AAF8" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00AB38" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00ABB8" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
-        <Texture Name="object_tw_Tex_00AC38" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
-        <Texture Name="object_tw_Tex_00B038" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
-        <Texture Name="object_tw_Tex_00B138" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
-        <Texture Name="object_tw_Tex_00B1B8" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B1F8" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B238" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B638" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00BA38" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
-        <Texture Name="object_tw_Tex_00BE38" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
-        <Texture Name="object_tw_Tex_00C238" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
-        <Texture Name="object_tw_Tex_00CA38" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
-        <Texture Name="object_tw_Tex_00CAB8" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
-        <DList Name="object_tw_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tw_DL_0116A0" Offset="0x116A0"/>
-        <DList Name="object_tw_DL_011C98" Offset="0x11C98"/>
-        <DList Name="object_tw_DL_011E28" Offset="0x11E28"/>
-        <DList Name="object_tw_DL_011FB8" Offset="0x11FB8"/>
-        <DList Name="object_tw_DL_012018" Offset="0x12018"/>
-        <DList Name="object_tw_DL_0120C8" Offset="0x120C8"/>
-        <DList Name="object_tw_DL_012178" Offset="0x12178"/>
-        <DList Name="object_tw_DL_012210" Offset="0x12210"/>
-        <DList Name="object_tw_DL_0122A8" Offset="0x122A8"/>
-        <DList Name="object_tw_DL_012410" Offset="0x12410"/>
-        <DList Name="object_tw_DL_012578" Offset="0x12578"/>
-        <DList Name="object_tw_DL_0126E0" Offset="0x126E0"/>
-        <DList Name="object_tw_DL_012848" Offset="0x12848"/>
-        <DList Name="object_tw_DL_0128E0" Offset="0x128E0"/>
-        <DList Name="object_tw_DL_012978" Offset="0x12978"/>
-        <DList Name="object_tw_DL_012A28" Offset="0x12A28"/>
-        <DList Name="object_tw_DL_012AD8" Offset="0x12AD8"/>
-        <DList Name="object_tw_DL_012B38" Offset="0x12B38"/>
-        <DList Name="object_tw_DL_012CE0" Offset="0x12CE0"/>
-        <DList Name="object_tw_DL_013310" Offset="0x13310"/>
-        <DList Name="object_tw_DL_0134B8" Offset="0x134B8"/>
-        <DList Name="object_tw_DL_013AE8" Offset="0x13AE8"/>
-        <DList Name="object_tw_DL_013D68" Offset="0x13D68"/>
-        <DList Name="object_tw_DL_013E98" Offset="0x13E98"/>
-        <DList Name="object_tw_DL_013F98" Offset="0x13F98"/>
-        <DList Name="object_tw_DL_014070" Offset="0x14070"/>
-        <DList Name="object_tw_DL_014158" Offset="0x14158"/>
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
         <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
-        <DList Name="object_tw_DL_015440" Offset="0x15440"/>
-        <DList Name="object_tw_DL_015538" Offset="0x15538"/>
-        <DList Name="object_tw_DL_015648" Offset="0x15648"/>
-        <DList Name="object_tw_DL_015740" Offset="0x15740"/>
-        <DList Name="object_tw_DL_015850" Offset="0x15850"/>
-        <DList Name="object_tw_DL_015990" Offset="0x15990"/>
-        <DList Name="object_tw_DL_015B10" Offset="0x15B10"/>
-        <DList Name="object_tw_DL_015C30" Offset="0x15C30"/>
-        <DList Name="object_tw_DL_015D58" Offset="0x15D58"/>
-        <DList Name="object_tw_DL_015E78" Offset="0x15E78"/>
-        <DList Name="object_tw_DL_015FF8" Offset="0x15FF8"/>
-        <DList Name="object_tw_DL_016118" Offset="0x16118"/>
-        <DList Name="object_tw_DL_016240" Offset="0x16240"/>
-        <DList Name="object_tw_DL_016360" Offset="0x16360"/>
-        <DList Name="object_tw_DL_0164C0" Offset="0x164C0"/>
-        <DList Name="object_tw_DL_0164C8" Offset="0x164C8"/>
-        <DList Name="object_tw_DL_0164D0" Offset="0x164D0"/>
-        <Texture Name="object_tw_Tex_016650" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
-        <Texture Name="object_tw_Tex_0166D0" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
         <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
-        <DList Name="object_tw_DL_017910" Offset="0x17910"/>
-        <DList Name="object_tw_DL_017A08" Offset="0x17A08"/>
-        <DList Name="object_tw_DL_017B18" Offset="0x17B18"/>
-        <DList Name="object_tw_DL_017C10" Offset="0x17C10"/>
-        <DList Name="object_tw_DL_017D20" Offset="0x17D20"/>
-        <DList Name="object_tw_DL_017E60" Offset="0x17E60"/>
-        <DList Name="object_tw_DL_017FE0" Offset="0x17FE0"/>
-        <DList Name="object_tw_DL_018100" Offset="0x18100"/>
-        <DList Name="object_tw_DL_018228" Offset="0x18228"/>
-        <DList Name="object_tw_DL_018348" Offset="0x18348"/>
-        <DList Name="object_tw_DL_0184C8" Offset="0x184C8"/>
-        <DList Name="object_tw_DL_0185E8" Offset="0x185E8"/>
-        <DList Name="object_tw_DL_018710" Offset="0x18710"/>
-        <DList Name="object_tw_DL_018830" Offset="0x18830"/>
-        <DList Name="object_tw_DL_018990" Offset="0x18990"/>
-        <DList Name="object_tw_DL_018998" Offset="0x18998"/>
-        <DList Name="object_tw_DL_0189A0" Offset="0x189A0"/>
-        <Texture Name="object_tw_Tex_018B20" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
-        <Texture Name="object_tw_Tex_018B60" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
-        <DList Name="object_tw_DL_018FC0" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
-        <Texture Name="object_tw_Tex_019078" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
-        <Texture Name="object_tw_Tex_019478" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
-        <DList Name="object_tw_DL_019938" Offset="0x19938"/> <!-- koume Ground Flame -->
-        <Texture Name="object_tw_Tex_019A20" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
-        <DList Name="object_tw_DL_019D40" Offset="0x19D40"/> <!-- Koume Ground Crater -->
-        <Texture Name="object_tw_Tex_019E00" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
-        <Texture Name="object_tw_Tex_01A200" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
-        <DList Name="object_tw_DL_01A430" Offset="0x1A430"/>
-        <DList Name="object_tw_DL_01A528" Offset="0x1A528"/>
-        <DList Name="object_tw_DL_01A5A8" Offset="0x1A5A8"/>
-        <Texture Name="object_tw_Tex_01A5C0" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
-        <DList Name="object_tw_DL_01A790" Offset="0x1A790"/>
-        <DList Name="object_tw_DL_01A8A0" Offset="0x1A8A0"/>
-        <DList Name="object_tw_DL_01A998" Offset="0x1A998"/>
-        <DList Name="object_tw_DL_01AA50" Offset="0x1AA50"/>
-        <DList Name="object_tw_DL_01AB00" Offset="0x1AB00"/>
-        <Texture Name="object_tw_Tex_01AB20" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
         <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
-        <DList Name="object_tw_DL_01BC00" Offset="0x1BC00"/>
-        <Texture Name="object_tw_Tex_01BCA0" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
-        <Texture Name="object_tw_Tex_01C0A0" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
-        <DList Name="object_tw_DL_01C1C0" Offset="0x1C1C0"/>
-        <Texture Name="object_tw_Tex_01C2A0" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
-        <Texture Name="object_tw_Tex_01C6A0" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
-        <DList Name="object_tw_DL_01CEE0" Offset="0x1CEE0"/>
-        <Texture Name="object_tw_Tex_01CFA8" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
-        <Texture Name="object_tw_Tex_01D3A8" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
-        <DList Name="object_tw_DL_01DBE8" Offset="0x1DBE8"/>
-        <DList Name="object_tw_DL_01DDF0" Offset="0x1DDF0"/>
-        <DList Name="object_tw_DL_01E020" Offset="0x1E020"/>
-        <DList Name="object_tw_DL_01E0E0" Offset="0x1E0E0"/>
-        <DList Name="object_tw_DL_01E2C0" Offset="0x1E2C0"/>
-        <DList Name="object_tw_DL_01E3A0" Offset="0x1E3A0"/>
-        <Texture Name="object_tw_Tex_01E430" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
-        <DList Name="object_tw_DL_01E9F0" Offset="0x1E9F0"/>
-        <Texture Name="object_tw_Tex_01EB28" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
-        <DList Name="object_tw_DL_01EC68" Offset="0x1EC68"/>
-        <Texture Name="object_tw_Tex_01ECF0" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
-        <DList Name="object_tw_DL_01EEB0" Offset="0x1EEB0"/>
-        <DList Name="object_tw_DL_01F238" Offset="0x1F238"/>
-        <DList Name="object_tw_DL_01F390" Offset="0x1F390"/>
-        <DList Name="object_tw_DL_01F608" Offset="0x1F608"/>
-        <Limb Name="object_tw_Limb_01F6E8" LimbType="Standard" Offset="0x1F6E8"/>
-        <Limb Name="object_tw_Limb_01F6F4" LimbType="Standard" Offset="0x1F6F4"/>
-        <Limb Name="object_tw_Limb_01F700" LimbType="Standard" Offset="0x1F700"/>
-        <Limb Name="object_tw_Limb_01F70C" LimbType="Standard" Offset="0x1F70C"/>
-        <Limb Name="object_tw_Limb_01F718" LimbType="Standard" Offset="0x1F718"/>
-        <Limb Name="object_tw_Limb_01F724" LimbType="Standard" Offset="0x1F724"/>
-        <Limb Name="object_tw_Limb_01F730" LimbType="Standard" Offset="0x1F730"/>
-        <Limb Name="object_tw_Limb_01F73C" LimbType="Standard" Offset="0x1F73C"/>
-        <Limb Name="object_tw_Limb_01F748" LimbType="Standard" Offset="0x1F748"/>
-        <Limb Name="object_tw_Limb_01F754" LimbType="Standard" Offset="0x1F754"/>
-        <Limb Name="object_tw_Limb_01F760" LimbType="Standard" Offset="0x1F760"/>
-        <Limb Name="object_tw_Limb_01F76C" LimbType="Standard" Offset="0x1F76C"/>
-        <Limb Name="object_tw_Limb_01F778" LimbType="Standard" Offset="0x1F778"/>
-        <Limb Name="object_tw_Limb_01F784" LimbType="Standard" Offset="0x1F784"/>
-        <Limb Name="object_tw_Limb_01F790" LimbType="Standard" Offset="0x1F790"/>
-        <Limb Name="object_tw_Limb_01F79C" LimbType="Standard" Offset="0x1F79C"/>
-        <Limb Name="object_tw_Limb_01F7A8" LimbType="Standard" Offset="0x1F7A8"/>
-        <Limb Name="object_tw_Limb_01F7B4" LimbType="Standard" Offset="0x1F7B4"/>
-        <Limb Name="object_tw_Limb_01F7C0" LimbType="Standard" Offset="0x1F7C0"/>
-        <Limb Name="object_tw_Limb_01F7CC" LimbType="Standard" Offset="0x1F7CC"/>
-        <Limb Name="object_tw_Limb_01F7D8" LimbType="Standard" Offset="0x1F7D8"/>
-        <Limb Name="object_tw_Limb_01F7E4" LimbType="Standard" Offset="0x1F7E4"/>
-        <Limb Name="object_tw_Limb_01F7F0" LimbType="Standard" Offset="0x1F7F0"/>
-        <Limb Name="object_tw_Limb_01F7FC" LimbType="Standard" Offset="0x1F7FC"/>
-        <Limb Name="object_tw_Limb_01F808" LimbType="Standard" Offset="0x1F808"/>
-        <Limb Name="object_tw_Limb_01F814" LimbType="Standard" Offset="0x1F814"/>
-        <Skeleton Name="object_tw_Skel_01F888" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
-        <Texture Name="object_tw_Tex_02A070" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
-        <Animation Name="object_tw_Anim_0216DC" Offset="0x216DC"/>
-        <Animation Name="object_tw_Anim_022700" Offset="0x22700"/>
-        <Animation Name="object_tw_Anim_023750" Offset="0x23750"/>
-        <Animation Name="object_tw_Anim_024374" Offset="0x24374"/>
-        <Animation Name="object_tw_Anim_0244B4" Offset="0x244B4"/>
-        <Texture Name="object_tw_Tex_0244D0" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
-        <Texture Name="object_tw_Tex_024510" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
-        <Texture Name="object_tw_Tex_024710" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
-        <Texture Name="object_tw_Tex_024910" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
-        <Texture Name="object_tw_Tex_024B10" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
-        <DList Name="object_tw_DL_027720" Offset="0x27720"/>
-        <DList Name="object_tw_DL_027820" Offset="0x27820"/>
-        <DList Name="object_tw_DL_027970" Offset="0x27970"/>
-        <DList Name="object_tw_DL_027A60" Offset="0x27A60"/>
-        <DList Name="object_tw_DL_027B78" Offset="0x27B78"/>
-        <DList Name="object_tw_DL_027C98" Offset="0x27C98"/>
-        <DList Name="object_tw_DL_027DE8" Offset="0x27DE8"/>
-        <DList Name="object_tw_DL_027EE0" Offset="0x27EE0"/>
-        <DList Name="object_tw_DL_027FE8" Offset="0x27FE8"/>
-        <DList Name="object_tw_DL_028100" Offset="0x28100"/>
-        <DList Name="object_tw_DL_028220" Offset="0x28220"/>
-        <DList Name="object_tw_DL_028370" Offset="0x28370"/>
-        <DList Name="object_tw_DL_028468" Offset="0x28468"/>
-        <DList Name="object_tw_DL_028570" Offset="0x28570"/>
-        <DList Name="object_tw_DL_028668" Offset="0x28668"/>
-        <DList Name="object_tw_DL_028778" Offset="0x28778"/>
-        <DList Name="object_tw_DL_028870" Offset="0x28870"/>
-        <DList Name="object_tw_DL_028980" Offset="0x28980"/>
-        <DList Name="object_tw_DL_028B78" Offset="0x28B78"/>
-        <DList Name="object_tw_DL_028D70" Offset="0x28D70"/>
-        <DList Name="object_tw_DL_029268" Offset="0x29268"/>
-        <DList Name="object_tw_DL_0293E0" Offset="0x293E0"/>
-        <DList Name="object_tw_DL_029530" Offset="0x29530"/>
-        <DList Name="object_tw_DL_029620" Offset="0x29620"/>
-        <DList Name="object_tw_DL_029738" Offset="0x29738"/>
-        <DList Name="object_tw_DL_029900" Offset="0x29900"/>
-        <DList Name="object_tw_DL_0299F8" Offset="0x299F8"/>
-        <DList Name="object_tw_DL_029B10" Offset="0x29B10"/>
-        <Texture Name="object_tw_TLUT_029E50" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
-        <Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02A470" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02A870" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02A970" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
-        <Texture Name="object_tw_Tex_02A9B0" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02ADB0" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
-        <Texture Name="object_tw_Tex_02ADF0" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02AE30" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02AF30" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
-        <DList Name="object_tw_DL_02CAF0" Offset="0x2CAF0"/>
-        <DList Name="object_tw_DL_02CB50" Offset="0x2CB50"/>
-        <DList Name="object_tw_DL_02CBB0" Offset="0x2CBB0"/>
-        <DList Name="object_tw_DL_02D320" Offset="0x2D320"/>
-        <DList Name="object_tw_DL_02D4A0" Offset="0x2D4A0"/>
-        <DList Name="object_tw_DL_02D5D8" Offset="0x2D5D8"/>
-        <DList Name="object_tw_DL_02D710" Offset="0x2D710"/>
-        <DList Name="object_tw_DL_02D890" Offset="0x2D890"/>
-        <DList Name="object_tw_DL_02D940" Offset="0x2D940"/>
-        <DList Name="object_tw_DL_02D9F0" Offset="0x2D9F0"/>
-        <DList Name="object_tw_DL_02DAE0" Offset="0x2DAE0"/>
-        <DList Name="object_tw_DL_02DBC8" Offset="0x2DBC8"/>
-        <DList Name="object_tw_DL_02DCB8" Offset="0x2DCB8"/>
-        <DList Name="object_tw_DL_02DDD8" Offset="0x2DDD8"/>
-        <DList Name="object_tw_DL_02DEB0" Offset="0x2DEB0"/>
-        <DList Name="object_tw_DL_02DFB0" Offset="0x2DFB0"/>
-        <DList Name="object_tw_DL_02E098" Offset="0x2E098"/>
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
         <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
-        <Limb Name="object_tw_Limb_031D70" LimbType="Standard" Offset="0x31D70"/>
-        <Limb Name="object_tw_Limb_031D7C" LimbType="Standard" Offset="0x31D7C"/>
-        <Limb Name="object_tw_Limb_031D88" LimbType="Standard" Offset="0x31D88"/>
-        <Limb Name="object_tw_Limb_031D94" LimbType="Standard" Offset="0x31D94"/>
-        <Limb Name="object_tw_Limb_031DA0" LimbType="Standard" Offset="0x31DA0"/>
-        <Limb Name="object_tw_Limb_031DAC" LimbType="Standard" Offset="0x31DAC"/>
-        <Limb Name="object_tw_Limb_031DB8" LimbType="Standard" Offset="0x31DB8"/>
-        <Limb Name="object_tw_Limb_031DC4" LimbType="Standard" Offset="0x31DC4"/>
-        <Limb Name="object_tw_Limb_031DD0" LimbType="Standard" Offset="0x31DD0"/>
-        <Limb Name="object_tw_Limb_031DDC" LimbType="Standard" Offset="0x31DDC"/>
-        <Limb Name="object_tw_Limb_031DE8" LimbType="Standard" Offset="0x31DE8"/>
-        <Limb Name="object_tw_Limb_031DF4" LimbType="Standard" Offset="0x31DF4"/>
-        <Limb Name="object_tw_Limb_031E00" LimbType="Standard" Offset="0x31E00"/>
-        <Limb Name="object_tw_Limb_031E0C" LimbType="Standard" Offset="0x31E0C"/>
-        <Limb Name="object_tw_Limb_031E18" LimbType="Standard" Offset="0x31E18"/>
-        <Limb Name="object_tw_Limb_031E24" LimbType="Standard" Offset="0x31E24"/>
-        <Limb Name="object_tw_Limb_031E30" LimbType="Standard" Offset="0x31E30"/>
-        <Limb Name="object_tw_Limb_031E3C" LimbType="Standard" Offset="0x31E3C"/>
-        <Limb Name="object_tw_Limb_031E48" LimbType="Standard" Offset="0x31E48"/>
-        <Limb Name="object_tw_Limb_031E54" LimbType="Standard" Offset="0x31E54"/>
-        <Limb Name="object_tw_Limb_031E60" LimbType="Standard" Offset="0x31E60"/>
-        <Limb Name="object_tw_Limb_031E6C" LimbType="Standard" Offset="0x31E6C"/>
-        <Limb Name="object_tw_Limb_031E78" LimbType="Standard" Offset="0x31E78"/>
-        <Limb Name="object_tw_Limb_031E84" LimbType="Standard" Offset="0x31E84"/>
-        <Limb Name="object_tw_Limb_031E90" LimbType="Standard" Offset="0x31E90"/>
-        <Limb Name="object_tw_Limb_031E9C" LimbType="Standard" Offset="0x31E9C"/>
-        <Limb Name="object_tw_Limb_031EA8" LimbType="Standard" Offset="0x31EA8"/>
-        <Limb Name="object_tw_Limb_031EB4" LimbType="Standard" Offset="0x31EB4"/>
-        <Limb Name="object_tw_Limb_031EC0" LimbType="Standard" Offset="0x31EC0"/>
-        <Limb Name="object_tw_Limb_031ECC" LimbType="Standard" Offset="0x31ECC"/>
-        <Limb Name="object_tw_Limb_031ED8" LimbType="Standard" Offset="0x31ED8"/>
-        <Limb Name="object_tw_Limb_031EE4" LimbType="Standard" Offset="0x31EE4"/>
-        <Limb Name="object_tw_Limb_031EF0" LimbType="Standard" Offset="0x31EF0"/>
-        <Limb Name="object_tw_Limb_031EFC" LimbType="Standard" Offset="0x31EFC"/>
-        <Limb Name="object_tw_Limb_031F08" LimbType="Standard" Offset="0x31F08"/>
-        <Limb Name="object_tw_Limb_031F14" LimbType="Standard" Offset="0x31F14"/>
-        <Limb Name="object_tw_Limb_031F20" LimbType="Standard" Offset="0x31F20"/>
-        <Limb Name="object_tw_Limb_031F2C" LimbType="Standard" Offset="0x31F2C"/>
-        <Limb Name="object_tw_Limb_031F38" LimbType="Standard" Offset="0x31F38"/>
-        <Limb Name="object_tw_Limb_031F44" LimbType="Standard" Offset="0x31F44"/>
-        <Limb Name="object_tw_Limb_031F50" LimbType="Standard" Offset="0x31F50"/>
-        <Limb Name="object_tw_Limb_031F5C" LimbType="Standard" Offset="0x31F5C"/>
-        <Limb Name="object_tw_Limb_031F68" LimbType="Standard" Offset="0x31F68"/>
-        <Skeleton Name="object_tw_Skel_032020" Type="Flex" LimbType="Standard" Offset="0x32020"/>
-        <Animation Name="object_tw_Anim_032BF8" Offset="0x32BF8"/>
-        <Animation Name="object_tw_Anim_0338F0" Offset="0x338F0"/>
-        <Animation Name="object_tw_Anim_0343B4" Offset="0x343B4"/>
-        <Animation Name="object_tw_Anim_035030" Offset="0x35030"/>
-        <Animation Name="object_tw_Anim_035988" Offset="0x35988"/>
-        <Animation Name="object_tw_Anim_036FBC" Offset="0x36FBC"/>
-        <Animation Name="object_tw_Anim_038E2C" Offset="0x38E2C"/>
-        <Animation Name="object_tw_Anim_03A2D0" Offset="0x3A2D0"/>
-        <DList Name="object_tw_DL_03A680" Offset="0x3A680"/>
-        <Texture Name="object_tw_Tex_03A7B0" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x31D70"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x31D7C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x31D88"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x31D94"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x31DA0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x31DAC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x31DB8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x31DC4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x31DD0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x31DDC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x31DE8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x31DF4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x31E00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x31E0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x31E18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x31E24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x31E30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x31E3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x31E48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x31E54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x31E60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x31E6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x31E78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x31E84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x31E90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x31E9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x31EA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x31EB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x31EC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x31ECC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x31ED8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x31EE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x31EF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x31EFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x31F08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x31F14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x31F20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x31F2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x31F38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x31F44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x31F50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x31F5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x31F68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x32020"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x32BF8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x338F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x343B4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x35030"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x35988"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x36FBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x38E2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x3A2D0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x3A680"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
     </File>
 </Root>
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 @@
 <Root>
     
     <File Name="ovl_Boss_Ganon2" BaseAddress="0x808FCF40" RangeStart="0xA2C8" RangeEnd="0x10778">
-        <Texture Name="ovl_Boss_Ganon2_Tex_00A2C8" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x00A2C8"/>
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x00A2C8"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00B2C8">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B308" Offset="0x00B308"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B378" Offset="0x00B378"/>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00B308"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B378"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B390">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3D0" Offset="0x00B3D0"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3F0" Offset="0x00B3F0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B420" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B420"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B820" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B820"/>
-        <Array Name="ovl_Boss_Ganon2_Vtx_00BA20" Count="22" Offset="0x00BA20">
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B3D0"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B3F0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B420"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B820"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00BA20">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00BB80" Offset="0x00BB80"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00BC98" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00BC98"/>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00BB80"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00BC98"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00CC98">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00CCD8" Offset="0x00CCD8"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00CD58" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CD58"/>
+        <DList Name="gGanonTriforceDL" Offset="0x00CCD8"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CD58"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D758">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00D798" Offset="0x00D798"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00D820" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D820"/>
+        <DList Name="gGanonLightningDL" Offset="0x00D798"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D820"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00E020">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00E1C0" Offset="0x00E1C0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00E2E0" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00E2E0"/>
+        <DList Name="gGanonFireRingDL" Offset="0x00E1C0"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00E2E0"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00EAE0">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00EC40" Offset="0x00EC40"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00ED48" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00ED48"/>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00EC40"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00ED48"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00F148">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00F188" Offset="0x00F188"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F208" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00F208"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F408" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F408"/>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00F188"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00F208"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F408"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00FC08">
             <Vtx/>
         </Array>
@@ -72,6 +72,6 @@
         <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0x010298">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_0103A8" Offset="0x0103A8"/>
+        <DList Name="gGanonMasterSwordDL" Offset="0x0103A8"/>
     </File>
 </Root>
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..e9c8d7ef5 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
@@ -2,7 +2,7 @@
     <File Name="daiyousei_izumi_scene" Segment="2">
         <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
         <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
-        <Cutscene Name="gGreatFairyDoubleDefenceCs" Offset="0x25D0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
         <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
     </File>
     <File Name="daiyousei_izumi_room_0" Segment="3">
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 @@
 <Root>
     <File Name="icon_item_24_static" Segment="9">
-        <Texture Name="gForestMedallionIconTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
-        <Texture Name="gFireMedallionIconTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
-        <Texture Name="gWaterMedallionIconTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
-        <Texture Name="gSpiritMedallionIconTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
-        <Texture Name="gShadowMedallionIconTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
-        <Texture Name="gLightMedallionIconTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
-        <Texture Name="gKokiriEmeraldIconTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
-        <Texture Name="gGoronRubyIconTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
-        <Texture Name="gZoraSapphireIconTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
-        <Texture Name="gStoneOfAgonyIconTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
-        <Texture Name="gGerudosCardIconTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
-        <Texture Name="gGoldSkulltulaIconTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
-        <Texture Name="gHeartContainerIconTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
-        <Texture Name="gUnusedPieceOfHeartIconTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
-        <Texture Name="gBossKeyIconTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
-        <Texture Name="gCompassIconTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
-        <Texture Name="gDungeonMapIconTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
-        <Texture Name="gSmallKeyIconTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
-        <Texture Name="gSmallMagicJarIconTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
-        <Texture Name="gBigMagicJarIconTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="icon_item_static" Segment="8">
-        <Texture Name="gDekuStickIconTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="gDekuNutIconTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="gBombIconTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="gFairyBowIconTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
-        <Texture Name="gFireArrowIconTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="gDinsFireIconTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
-        <Texture Name="gFairySlingshotIconTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
-        <Texture Name="gFairyOcarinaIconTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
-        <Texture Name="gOcarinaofTimeIconTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
-        <Texture Name="gBombchuIconTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
-        <Texture Name="gHookshotIconTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
-        <Texture Name="gLongshotIconTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
-        <Texture Name="gIceArrowIconTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
-        <Texture Name="gFaroresWindIconTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
-        <Texture Name="gBoomerangIconTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
-        <Texture Name="gLensofTruthIconTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
-        <Texture Name="gMagicBeansIconTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
-        <Texture Name="gMegatonHammerIconTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
-        <Texture Name="gLightArrowIconTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
-        <Texture Name="gNayrusLoveIconTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
-        <Texture Name="gEmptyBottleIconTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
-        <Texture Name="gRedPotionIconTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
-        <Texture Name="gGreenPotionIconTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
-        <Texture Name="gBluePotionIconTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
-        <Texture Name="gBottledFairyIconTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
-        <Texture Name="gFishIconTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
-        <Texture Name="gMilkFullIconTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
-        <Texture Name="gRutosLetterIconTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
-        <Texture Name="gBlueFireIconTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
-        <Texture Name="gBugIconTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
-        <Texture Name="gBigPoeIconTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
-        <Texture Name="gMilkhalfIconTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
-        <Texture Name="gPoeIconTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
-        <Texture Name="gWeirdEggIconTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
-        <Texture Name="gCuccoIconTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
-        <Texture Name="gZeldasLetterIconTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
-        <Texture Name="gKeatonMaskIconTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
-        <Texture Name="gSkullMaskIconTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
-        <Texture Name="gSpookyMaskIconTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
-        <Texture Name="gBunnyHoodIconTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
-        <Texture Name="gGoronMaskIconTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
-        <Texture Name="gZoraMaskIconTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
-        <Texture Name="gGerudoMaskIconTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
-        <Texture Name="gMaskofTruthIconTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
-        <Texture Name="gSoldOutIconTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
-        <Texture Name="gPocketEggIconTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
-        <Texture Name="gPocketCuccoIconTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
-        <Texture Name="gCojiroIconTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
-        <Texture Name="gOddMushroomIconTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
-        <Texture Name="gOddPotionIconTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
-        <Texture Name="gPoachersSawIconTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
-        <Texture Name="gBrokenBiggoronSwordIconTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
-        <Texture Name="gPrescriptionIconTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
-        <Texture Name="gEyeBallFrogIconTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
-        <Texture Name="gEyeDropsIconTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
-        <Texture Name="gClaimCheckIconTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
-        <Texture Name="gFairyBowFireIconTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
-        <Texture Name="gFairyBowIceIconTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
-        <Texture Name="gFairyBowLightIconTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
-        <Texture Name="gKokiriSwordIconTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
-        <Texture Name="gMasterSwordIconTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
-        <Texture Name="gBiggoronSwordIconTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
-        <Texture Name="gDekuShieldIconTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
-        <Texture Name="gHylianShieldIconTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
-        <Texture Name="gMirrorShieldIconTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
-        <Texture Name="gKokiriTunicIconTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
-        <Texture Name="gGoronTunicIconTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
-        <Texture Name="gZoraTunicIconTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
-        <Texture Name="gKokiriBootsIconTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
-        <Texture Name="gIronBootsIconTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
-        <Texture Name="gHoverBootsIconTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
-        <Texture Name="gBulletBag30IconTex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
-        <Texture Name="gBulletBag40IconTex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
-        <Texture Name="gBulletBag50IconTex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
-        <Texture Name="gQuiver30IconTex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
-        <Texture Name="gQuiver40IconTex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
-        <Texture Name="gQuiver50IconTex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
-        <Texture Name="gBombBag20IconTex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
-        <Texture Name="gBombBag30IconTex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
-        <Texture Name="gBombBag40IconTex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
-        <Texture Name="gGoronsBraceletIconTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
-        <Texture Name="gSilverGauntletsIconTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
-        <Texture Name="gGoldenGauntletsIconTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
-        <Texture Name="gSilverScaleIconTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
-        <Texture Name="gGoldenScaleIconTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
-        <Texture Name="gBrokenGiantsKnifeIconTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
-        <Texture Name="gAdultsWalletIconTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
-        <Texture Name="gGiantsWalletIconTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
-        <Texture Name="gDekuSeedsIconTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
-        <Texture Name="gFishingPoleIconTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
         <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
         <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
         <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
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 @@
         <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
         <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
         <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
-        <Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
-        <Texture Name="gOcarinaCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
-        <Texture Name="gOcarinaCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
-        <Texture Name="gOcarinaCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
-        <Texture Name="gOcarinaCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
         <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
         <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
         <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
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 @@
         <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0x10F168"/>
         <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0x10F568"/>
         <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0x10F968"/>
-        <Array Name="sCircleWipeVtx" Count="34" Offset="0x10FD68">
+        <Array Name="sTransCircleVtx" Count="34" Offset="0x10FD68">
             <Vtx/>
         </Array>
         <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
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 @@
 <Root>
     <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0x10E1D0" RangeEnd="0x10E2A0">
-        <DList Name="sTriforceWipeDL" Offset="0x10E1D0"/>
-        <Array Name="sTriforceWipeVtx" Count="10" Offset="0x10E200">
+        <DList Name="sTransTriforceDL" Offset="0x10E1D0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0x10E200">
             <Vtx/>
         </Array>
     </File>
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 @@
 <Root>
-    <!-- ZAPD isn't finding sWipe1Vtx and sWipe1Tex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
     <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0x10E2A0" RangeEnd="0x10EC30" Segment="0">
-        <Array Name="sWipe1Vtx" Count="25" Offset="0x10E2A0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0x10E2A0">
             <Vtx/>
         </Array>
-        <Texture Name="sWipe1Tex" Format="i4" Width="64" Height="64" Offset="0x10E430"/>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0x10E430"/>
        <!-- <DList Name="sWipe1DL" Offset="0x10EC30"/>-->
     </File>
 </Root>
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..2670b752d 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
@@ -4,7 +4,7 @@
         <DList Name="gBrownFragmentDL" Offset="0x530"/>
         <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
         <DList Name="gDoorLockDL" Offset="0x1100"/>
-        <DList Name="gDoorChainsDL" Offset="0x11F0"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
         <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
         <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
         <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
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..b0dcb9640 100644
--- a/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml
+++ b/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml
@@ -930,10 +930,10 @@
         <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4A090"/>
         <DList Name="gDoorMetalBarsDL" Offset="0x4B0D0"/>
         <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x4B160"/>
-        <Texture Name="gSunTex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
-        <Texture Name="gSunEveningTex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
-        <DList Name="gKokiriDustMoteTextureLoadDL" Offset="0x4D160"/>
-        <DList Name="gKokiriDustMoteDL" Offset="0x4D1A8"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x4D160"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x4D1A8"/>
         <DList Name="gSunDL" Offset="0x4D1C0"/>
         <DList Name="gZTargetLockOnTriangleDL" Offset="0x4D450"/>
         <DList Name="gEffFire1DL" Offset="0x4D4E0"/>
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 @@
 <Root>
     <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
     <File Name="object_bdoor" Segment="6">
-        <Texture Name="object_bdoor_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
-        <DList Name="object_bdoor_DL_0010C0" Offset="0x10C0"/>
-        <DList Name="object_bdoor_DL_001400" Offset="0x1400"/>
-        <DList Name="object_bdoor_DL_001530" Offset="0x1530"/>
-        <Texture Name="object_bdoor_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
-        <Texture Name="object_bdoor_Tex_0025C0" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
-        <Texture Name="object_bdoor_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
-        <Texture Name="object_bdoor_Tex_0045C0" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
-        <Texture Name="object_bdoor_Tex_0055C0" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
-        <Texture Name="object_bdoor_Tex_0065C0" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_bw" Segment="6">
-        <Animation Name="object_bw_Anim_000228" Offset="0x228"/>
-        <DList Name="object_bw_DL_0002C0" Offset="0x2C0"/>
-        <DList Name="object_bw_DL_0003E8" Offset="0x3E8"/>
-        <DList Name="object_bw_DL_000558" Offset="0x558"/>
-        <DList Name="object_bw_DL_000680" Offset="0x680"/>
-        <DList Name="object_bw_DL_001050" Offset="0x1050"/>
-        <Texture Name="object_bw_Tex_001240" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
-        <Texture Name="object_bw_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
-        <Texture Name="object_bw_TLUT_001640" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
-        <Texture Name="object_bw_Tex_001840" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
-        <Texture Name="object_bw_Tex_001C40" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
-        <Limb Name="object_bw_Limb_002040" LimbType="Standard" Offset="0x2040"/>
-        <Limb Name="object_bw_Limb_00204C" LimbType="Standard" Offset="0x204C"/>
-        <Limb Name="object_bw_Limb_002058" LimbType="Standard" Offset="0x2058"/>
-        <Limb Name="object_bw_Limb_002064" LimbType="Standard" Offset="0x2064"/>
-        <Limb Name="object_bw_Limb_002070" LimbType="Standard" Offset="0x2070"/>
-        <Limb Name="object_bw_Limb_00207C" LimbType="Standard" Offset="0x207C"/>
-        <Limb Name="object_bw_Limb_002088" LimbType="Standard" Offset="0x2088"/>
-        <Limb Name="object_bw_Limb_002094" LimbType="Standard" Offset="0x2094"/>
-        <Limb Name="object_bw_Limb_0020A0" LimbType="Standard" Offset="0x20A0"/>
-        <Limb Name="object_bw_Limb_0020AC" LimbType="Standard" Offset="0x20AC"/>
-        <Limb Name="object_bw_Limb_0020B8" LimbType="Standard" Offset="0x20B8"/>
-        <Skeleton Name="object_bw_Skel_0020F0" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
-        <Animation Name="object_bw_Anim_0021A0" Offset="0x21A0"/>
-        <Animation Name="object_bw_Anim_002250" Offset="0x2250"/>
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
     </File>
 </Root>
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..6ff8bbe8c 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,7 @@
 <Root>
     <File Name="object_fd" Segment="6">
         <!-- Boss title card -->
-        <Texture Name="gVolvagiaBossTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
+        <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
 
         <!-- Skeletons -->
         <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x114E0"/>
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 @@
     <File Name="object_ice_objects" Segment="6">
         <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
         <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
-        <DList Name="object_ice_objects_DL_0006F0" Offset="0x6F0"/>
-        <DList Name="object_ice_objects_DL_0012A0" Offset="0x12A0"/>
-        <Collision Name="object_ice_objects_Col_001C1C" Offset="0x1C1C"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
         <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
         <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
         <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
         <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
-        <DList Name="object_ice_objects_DL_002640" Offset="0x2640"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
         <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
         <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
-        <Collision Name="object_ice_objects_Col_002920" Offset="0x2920"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
         <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
-        <Texture Name="object_ice_objects_Tex_003150" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
         <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
         <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
-        <Texture Name="object_ice_objects_Tex_005150" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
-        <Texture Name="object_ice_objects_Tex_005550" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
         <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
         <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
         <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
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 @@
         <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
         <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
         <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
-        <Skeleton Name="object_ik_Skel_01E178" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
-        <Skeleton Name="object_ik_Skel_0205C0" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
 
         <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
         <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
         <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
         <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
         <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
-        <Animation Name="object_ik_Anim_001C28" Offset="0x1C28"/>
-        <Animation Name="object_ik_Anim_002538" Offset="0x2538"/>
-        <Animation Name="object_ik_Anim_0029FC" Offset="0x29FC"/>
-        <Animation Name="object_ik_Anim_0033C4" Offset="0x33C4"/>
-        <Animation Name="object_ik_Anim_003DBC" Offset="0x3DBC"/>
-        <Animation Name="object_ik_Anim_0045BC" Offset="0x45BC"/>
-        <Animation Name="object_ik_Anim_00485C" Offset="0x485C"/>
-        <Animation Name="object_ik_Anim_005944" Offset="0x5944"/>
-        <Animation Name="object_ik_Anim_006194" Offset="0x6194"/>
-        <Animation Name="object_ik_Anim_006734" Offset="0x6734"/>
-        <Animation Name="object_ik_Anim_00C114" Offset="0xC114"/>
-        <Animation Name="object_ik_Anim_00CD70" Offset="0xCD70"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
         <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
-        <Animation Name="object_ik_Anim_00ED24" Offset="0xED24"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
         <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
         <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
-        <Animation Name="object_ik_Anim_0203D8" Offset="0x203D8"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
 
         <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
-        <Texture Name="object_ik_Tex_00F7A0" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
         <!-- This is a duplicate texture to accound for authentic texture overflowing -->
         <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
              duplicate offset values -->
         <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
-        <Texture Name="object_ik_Tex_00FBA0" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
-        <Texture Name="object_ik_Tex_00FFA0" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
-        <Texture Name="object_ik_Tex_0101A0" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
         <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
-        <Texture Name="object_ik_Tex_010BA0" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
-        <Texture Name="object_ik_Tex_0113A0" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
-        <Texture Name="object_ik_Tex_011420" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011520" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011660" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
         <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
         <DList Name="object_ik_DL_015380" Offset="0x15380"/>
-        <DList Name="object_ik_DL_0154E0" Offset="0x154E0"/>
-        <DList Name="object_ik_DL_015840" Offset="0x15840"/>
-        <DList Name="object_ik_DL_015B00" Offset="0x15B00"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
         <DList Name="object_ik_DL_016118" Offset="0x16118"/>
         <DList Name="object_ik_DL_016278" Offset="0x16278"/>
         <DList Name="object_ik_DL_016340" Offset="0x16340"/>
         <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
         <DList Name="object_ik_DL_016568" Offset="0x16568"/>
         <DList Name="object_ik_DL_016658" Offset="0x16658"/>
-        <DList Name="object_ik_DL_016748" Offset="0x16748"/>
-        <DList Name="object_ik_DL_0169E8" Offset="0x169E8"/>
-        <DList Name="object_ik_DL_016BE0" Offset="0x16BE0"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
         <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
         <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
         <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
@@ -79,14 +79,14 @@
         <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
         <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
-        <Texture Name="object_ik_Tex_0174B8" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
-        <DList Name="object_ik_DL_018E78" Offset="0x18E78"/>
-        <DList Name="object_ik_DL_019100" Offset="0x19100"/>
-        <DList Name="object_ik_DL_019E08" Offset="0x19E08"/>
-        <DList Name="object_ik_DL_01BA78" Offset="0x1BA78"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
         <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
         <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
         <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
@@ -101,8 +101,8 @@
         <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
         <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
         <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
-        <Texture Name="object_ik_Tex_01DDA8" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
-        <Texture Name="object_ik_Tex_01DEA8" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
         <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
     </File>
 </Root>
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 @@
         <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
         <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
 
-        <Texture Name="gMorieStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
         <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
         <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
 
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 @@
 <Root>
     <File Name="object_os" Segment="6">
-        <Animation Name="object_os_Anim_0002E4" Offset="0x2E4"/>
-        <DList Name="object_os_DL_001D80" Offset="0x1D80"/>
-        <DList Name="object_os_DL_0020A8" Offset="0x20A8"/>
-        <DList Name="object_os_DL_0025E8" Offset="0x25E8"/>
-        <DList Name="object_os_DL_002718" Offset="0x2718"/>
-        <DList Name="object_os_DL_002848" Offset="0x2848"/>
-        <DList Name="object_os_DL_002A00" Offset="0x2A00"/>
-        <DList Name="object_os_DL_002B30" Offset="0x2B30"/>
-        <DList Name="object_os_DL_002C60" Offset="0x2C60"/>
-        <Texture Name="object_os_TLUT_002E18" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
-        <Texture Name="object_os_TLUT_003018" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
-        <Texture Name="object_os_Tex_003218" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003258" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003358" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003398" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0033D8" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
-        <Texture Name="object_os_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0040D8" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0044D8" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_004558" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
-        <Limb Name="object_os_Limb_0045D8" LimbType="Standard" Offset="0x45D8"/>
-        <Limb Name="object_os_Limb_0045E4" LimbType="Standard" Offset="0x45E4"/>
-        <Limb Name="object_os_Limb_0045F0" LimbType="Standard" Offset="0x45F0"/>
-        <Limb Name="object_os_Limb_0045FC" LimbType="Standard" Offset="0x45FC"/>
-        <Limb Name="object_os_Limb_004608" LimbType="Standard" Offset="0x4608"/>
-        <Limb Name="object_os_Limb_004614" LimbType="Standard" Offset="0x4614"/>
-        <Limb Name="object_os_Limb_004620" LimbType="Standard" Offset="0x4620"/>
-        <Limb Name="object_os_Limb_00462C" LimbType="Standard" Offset="0x462C"/>
-        <Skeleton Name="object_os_Skel_004658" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
     </File>
 </Root>
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 @@
         <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
         <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
         <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
-        <Animation Name="gObjOsAnim_5808" Offset="0x5808"/>
-        <Animation Name="gObjOsAnim_62DC" Offset="0x62DC"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
         <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
         <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
-        <Animation Name="gObjOsAnim_65E0" Offset="0x65E0"/>
-        <Animation Name="gObjOsAnim_6A60" Offset="0x6A60"/>
-        <Animation Name="gObjOsAnim_6EE0" Offset="0x6EE0"/>
-        <Animation Name="gObjOsAnim_6F9C" Offset="0x6F9C"/>
-        <Animation Name="gObjOsAnim_7064" Offset="0x7064"/>
-        <Animation Name="gObjOsAnim_7120" Offset="0x7120"/>
-        <Animation Name="gObjOsAnim_7454" Offset="0x7454"/>
-        <Animation Name="gObjOsAnim_7830" Offset="0x7830"/>
-        <Animation Name="gObjOsAnim_7D94" Offset="0x7D94"/>
-        <Animation Name="gObjOsAnim_7E64" Offset="0x7E64"/>
-        <Animation Name="gObjOsAnim_7F38" Offset="0x7F38"/>
-        <Animation Name="gObjOsAnim_7FFC" Offset="0x7FFC"/>
-        <Animation Name="gObjOsAnim_80B4" Offset="0x80B4"/>
-        <Animation Name="gObjOsAnim_8178" Offset="0x8178"/>
-        <Animation Name="gObjOsAnim_879C" Offset="0x879C"/>
-        <Animation Name="gObjOsAnim_8F6C" Offset="0x8F6C"/>
-        <Animation Name="gObjOsAnim_9028" Offset="0x9028"/>
-        <Animation Name="gObjOsAnim_90EC" Offset="0x90EC"/>
-        <Animation Name="gObjOsAnim_91AC" Offset="0x91AC"/>
-        <Animation Name="gObjOsAnim_9274" Offset="0x9274"/>
-        <Animation Name="gObjOsAnim_982C" Offset="0x982C"/>
-        <Animation Name="gObjOsAnim_98EC" Offset="0x98EC"/>
-        <Animation Name="gObjOsAnim_99A4" Offset="0x99A4"/>
-        <Animation Name="gObjOsAnim_9B64" Offset="0x9B64"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
         <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
         <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
     </File>
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 @@
 <Root>
     <File Name="object_rs" Segment="6">
-        <Animation Name="object_rs_Anim_00065C" Offset="0x65C"/>
-        <DList Name="object_rs_DL_001FA0" Offset="0x1FA0"/>
-        <DList Name="object_rs_DL_0021F8" Offset="0x21F8"/>
-        <DList Name="object_rs_DL_0025F8" Offset="0x25F8"/>
-        <DList Name="object_rs_DL_002730" Offset="0x2730"/>
-        <DList Name="object_rs_DL_002860" Offset="0x2860"/>
-        <DList Name="object_rs_DL_002A70" Offset="0x2A70"/>
-        <DList Name="object_rs_DL_002BA8" Offset="0x2BA8"/>
-        <DList Name="object_rs_DL_002CD8" Offset="0x2CD8"/>
-        <Texture Name="object_rs_TLUT_002EE8" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_0030E8" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003128" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003168" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004568" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004668" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
-        <Texture Name="object_rs_Tex_0046E8" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
-        <Limb Name="object_rs_Limb_0047E8" LimbType="Standard" Offset="0x47E8"/>
-        <Limb Name="object_rs_Limb_0047F4" LimbType="Standard" Offset="0x47F4"/>
-        <Limb Name="object_rs_Limb_004800" LimbType="Standard" Offset="0x4800"/>
-        <Limb Name="object_rs_Limb_00480C" LimbType="Standard" Offset="0x480C"/>
-        <Limb Name="object_rs_Limb_004818" LimbType="Standard" Offset="0x4818"/>
-        <Limb Name="object_rs_Limb_004824" LimbType="Standard" Offset="0x4824"/>
-        <Limb Name="object_rs_Limb_004830" LimbType="Standard" Offset="0x4830"/>
-        <Limb Name="object_rs_Limb_00483C" LimbType="Standard" Offset="0x483C"/>
-        <Skeleton Name="object_rs_Skel_004868" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tr" Segment="6">
-        <Animation Name="object_tr_Anim_000BFC" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
-        <Animation Name="object_tr_Anim_0013CC" Offset="0x13CC"/> <!-- Looking over right shoulder -->
-        <Animation Name="object_tr_Anim_001CDC" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
-        <Animation Name="object_tr_Anim_002BC4" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
-        <Animation Name="object_tr_Anim_0035CC" Offset="0x35CC"/> <!-- Looking over left shoulder -->
-        <Animation Name="object_tr_Anim_003FC8" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
-        <Animation Name="object_tr_Anim_0049C8" Offset="0x49C8"/> <!-- Floating on broom -->
-        <Animation Name="object_tr_Anim_005308" Offset="0x5308"/>
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
         <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
-        <DList Name="object_tr_DL_006520" Offset="0x6520"/>
-        <DList Name="object_tr_DL_0066A0" Offset="0x66A0"/>
-        <DList Name="object_tr_DL_006800" Offset="0x6800"/>
-        <DList Name="object_tr_DL_006940" Offset="0x6940"/>
-        <DList Name="object_tr_DL_006A50" Offset="0x6A50"/>
-        <DList Name="object_tr_DL_006B48" Offset="0x6B48"/>
-        <DList Name="object_tr_DL_006C58" Offset="0x6C58"/>
-        <DList Name="object_tr_DL_006D50" Offset="0x6D50"/>
-        <DList Name="object_tr_DL_006E70" Offset="0x6E70"/>
-        <DList Name="object_tr_DL_006FF0" Offset="0x6FF0"/>
-        <DList Name="object_tr_DL_007118" Offset="0x7118"/>
-        <DList Name="object_tr_DL_007238" Offset="0x7238"/>
-        <DList Name="object_tr_DL_007358" Offset="0x7358"/>
-        <DList Name="object_tr_DL_0074D8" Offset="0x74D8"/>
-        <DList Name="object_tr_DL_007600" Offset="0x7600"/>
-        <DList Name="object_tr_DL_007720" Offset="0x7720"/>
-        <DList Name="object_tr_DL_007728" Offset="0x7728"/>
-        <Texture Name="object_tr_TLUT_007730" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
-        <Texture Name="object_tr_Tex_0078D8" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
-        <Texture Name="object_tr_Tex_0080D8" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
-        <Texture Name="object_tr_Tex_0082D8" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
-        <Texture Name="object_tr_Tex_0084D8" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
-        <Texture Name="object_tr_Tex_0086D8" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
-        <Texture Name="object_tr_Tex_008AD8" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B58" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B98" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
-        <Texture Name="object_tr_Tex_008D98" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008DD8" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008E58" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
-        <Texture Name="object_tr_Tex_008ED8" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
-        <Texture Name="object_tr_Tex_0092D8" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
-        <Texture Name="object_tr_Tex_0093D8" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
-        <Texture Name="object_tr_Tex_009458" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_009498" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_0094D8" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
-        <Texture Name="object_tr_Tex_0098D8" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
-        <DList Name="object_tr_DL_00AF38" Offset="0xAF38"/>
-        <DList Name="object_tr_DL_00B568" Offset="0xB568"/>
-        <DList Name="object_tr_DL_00B5C8" Offset="0xB5C8"/>
-        <DList Name="object_tr_DL_00B678" Offset="0xB678"/>
-        <DList Name="object_tr_DL_00B728" Offset="0xB728"/>
-        <DList Name="object_tr_DL_00B8D0" Offset="0xB8D0"/>
-        <DList Name="object_tr_DL_00B968" Offset="0xB968"/>
-        <DList Name="object_tr_DL_00BA00" Offset="0xBA00"/>
-        <DList Name="object_tr_DL_00BB68" Offset="0xBB68"/>
-        <Texture Name="object_tr_Tex_00BCD0" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
         <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
-        <Texture Name="object_tr_Tex_00C2D0" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
         <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
-        <Limb Name="object_tr_Limb_00C390" LimbType="Standard" Offset="0xC390"/>
-        <Limb Name="object_tr_Limb_00C39C" LimbType="Standard" Offset="0xC39C"/>
-        <Limb Name="object_tr_Limb_00C3A8" LimbType="Standard" Offset="0xC3A8"/>
-        <Limb Name="object_tr_Limb_00C3B4" LimbType="Standard" Offset="0xC3B4"/>
-        <Limb Name="object_tr_Limb_00C3C0" LimbType="Standard" Offset="0xC3C0"/>
-        <Limb Name="object_tr_Limb_00C3CC" LimbType="Standard" Offset="0xC3CC"/>
-        <Limb Name="object_tr_Limb_00C3D8" LimbType="Standard" Offset="0xC3D8"/>
-        <Limb Name="object_tr_Limb_00C3E4" LimbType="Standard" Offset="0xC3E4"/>
-        <Limb Name="object_tr_Limb_00C3F0" LimbType="Standard" Offset="0xC3F0"/>
-        <Limb Name="object_tr_Limb_00C3FC" LimbType="Standard" Offset="0xC3FC"/>
-        <Limb Name="object_tr_Limb_00C408" LimbType="Standard" Offset="0xC408"/>
-        <Limb Name="object_tr_Limb_00C414" LimbType="Standard" Offset="0xC414"/>
-        <Limb Name="object_tr_Limb_00C420" LimbType="Standard" Offset="0xC420"/>
-        <Limb Name="object_tr_Limb_00C42C" LimbType="Standard" Offset="0xC42C"/>
-        <Limb Name="object_tr_Limb_00C438" LimbType="Standard" Offset="0xC438"/>
-        <Limb Name="object_tr_Limb_00C444" LimbType="Standard" Offset="0xC444"/>
-        <Limb Name="object_tr_Limb_00C450" LimbType="Standard" Offset="0xC450"/>
-        <Limb Name="object_tr_Limb_00C45C" LimbType="Standard" Offset="0xC45C"/>
-        <Limb Name="object_tr_Limb_00C468" LimbType="Standard" Offset="0xC468"/>
-        <Limb Name="object_tr_Limb_00C474" LimbType="Standard" Offset="0xC474"/>
-        <Limb Name="object_tr_Limb_00C480" LimbType="Standard" Offset="0xC480"/>
-        <Limb Name="object_tr_Limb_00C48C" LimbType="Standard" Offset="0xC48C"/>
-        <Limb Name="object_tr_Limb_00C498" LimbType="Standard" Offset="0xC498"/>
-        <Limb Name="object_tr_Limb_00C4A4" LimbType="Standard" Offset="0xC4A4"/>
-        <Limb Name="object_tr_Limb_00C4B0" LimbType="Standard" Offset="0xC4B0"/>
-        <Limb Name="object_tr_Limb_00C4BC" LimbType="Standard" Offset="0xC4BC"/>
-        <Skeleton Name="object_tr_Skel_00C530" Type="Flex" LimbType="Standard" Offset="0xC530"/>
-        <Animation Name="object_tr_Anim_00C60C" Offset="0xC60C"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
         <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
-        <DList Name="object_tr_DL_00D820" Offset="0xD820"/>
-        <DList Name="object_tr_DL_00D9A0" Offset="0xD9A0"/>
-        <DList Name="object_tr_DL_00DB00" Offset="0xDB00"/>
-        <DList Name="object_tr_DL_00DC40" Offset="0xDC40"/>
-        <DList Name="object_tr_DL_00DD50" Offset="0xDD50"/>
-        <DList Name="object_tr_DL_00DE48" Offset="0xDE48"/>
-        <DList Name="object_tr_DL_00DF58" Offset="0xDF58"/>
-        <DList Name="object_tr_DL_00E050" Offset="0xE050"/>
-        <DList Name="object_tr_DL_00E170" Offset="0xE170"/>
-        <DList Name="object_tr_DL_00E2F0" Offset="0xE2F0"/>
-        <DList Name="object_tr_DL_00E418" Offset="0xE418"/>
-        <DList Name="object_tr_DL_00E538" Offset="0xE538"/>
-        <DList Name="object_tr_DL_00E658" Offset="0xE658"/>
-        <DList Name="object_tr_DL_00E7D8" Offset="0xE7D8"/>
-        <DList Name="object_tr_DL_00E900" Offset="0xE900"/>
-        <DList Name="object_tr_DL_00EA20" Offset="0xEA20"/>
-        <DList Name="object_tr_DL_00EA28" Offset="0xEA28"/>
-        <Texture Name="object_tr_Tex_00EA30" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
-        <Texture Name="object_tr_Tex_00F230" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
-        <Texture Name="object_tr_Tex_00F430" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
-        <DList Name="object_tr_DL_010710" Offset="0x10710"/>
-        <DList Name="object_tr_DL_010D40" Offset="0x10D40"/>
-        <DList Name="object_tr_DL_010DA0" Offset="0x10DA0"/>
-        <DList Name="object_tr_DL_010E50" Offset="0x10E50"/>
-        <DList Name="object_tr_DL_010F00" Offset="0x10F00"/>
-        <DList Name="object_tr_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tr_DL_011140" Offset="0x11140"/>
-        <DList Name="object_tr_DL_0111D8" Offset="0x111D8"/>
-        <DList Name="object_tr_DL_011340" Offset="0x11340"/>
-        <Texture Name="object_tr_Tex_0114A8" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
-        <Limb Name="object_tr_Limb_0114E8" LimbType="Standard" Offset="0x114E8"/>
-        <Limb Name="object_tr_Limb_0114F4" LimbType="Standard" Offset="0x114F4"/>
-        <Limb Name="object_tr_Limb_011500" LimbType="Standard" Offset="0x11500"/>
-        <Limb Name="object_tr_Limb_01150C" LimbType="Standard" Offset="0x1150C"/>
-        <Limb Name="object_tr_Limb_011518" LimbType="Standard" Offset="0x11518"/>
-        <Limb Name="object_tr_Limb_011524" LimbType="Standard" Offset="0x11524"/>
-        <Limb Name="object_tr_Limb_011530" LimbType="Standard" Offset="0x11530"/>
-        <Limb Name="object_tr_Limb_01153C" LimbType="Standard" Offset="0x1153C"/>
-        <Limb Name="object_tr_Limb_011548" LimbType="Standard" Offset="0x11548"/>
-        <Limb Name="object_tr_Limb_011554" LimbType="Standard" Offset="0x11554"/>
-        <Limb Name="object_tr_Limb_011560" LimbType="Standard" Offset="0x11560"/>
-        <Limb Name="object_tr_Limb_01156C" LimbType="Standard" Offset="0x1156C"/>
-        <Limb Name="object_tr_Limb_011578" LimbType="Standard" Offset="0x11578"/>
-        <Limb Name="object_tr_Limb_011584" LimbType="Standard" Offset="0x11584"/>
-        <Limb Name="object_tr_Limb_011590" LimbType="Standard" Offset="0x11590"/>
-        <Limb Name="object_tr_Limb_01159C" LimbType="Standard" Offset="0x1159C"/>
-        <Limb Name="object_tr_Limb_0115A8" LimbType="Standard" Offset="0x115A8"/>
-        <Limb Name="object_tr_Limb_0115B4" LimbType="Standard" Offset="0x115B4"/>
-        <Limb Name="object_tr_Limb_0115C0" LimbType="Standard" Offset="0x115C0"/>
-        <Limb Name="object_tr_Limb_0115CC" LimbType="Standard" Offset="0x115CC"/>
-        <Limb Name="object_tr_Limb_0115D8" LimbType="Standard" Offset="0x115D8"/>
-        <Limb Name="object_tr_Limb_0115E4" LimbType="Standard" Offset="0x115E4"/>
-        <Limb Name="object_tr_Limb_0115F0" LimbType="Standard" Offset="0x115F0"/>
-        <Limb Name="object_tr_Limb_0115FC" LimbType="Standard" Offset="0x115FC"/>
-        <Limb Name="object_tr_Limb_011608" LimbType="Standard" Offset="0x11608"/>
-        <Limb Name="object_tr_Limb_011614" LimbType="Standard" Offset="0x11614"/>
-        <Skeleton Name="object_tr_Skel_011688" Type="Flex" LimbType="Standard" Offset="0x11688"/>
-        <Animation Name="object_tr_Anim_012E1C" Offset="0x12E1C"/> <!-- Casting magic -->
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tw" Segment="6">
-        <Animation Name="object_tw_Anim_0004A4" Offset="0x4A4"/>
-        <Animation Name="object_tw_Anim_000AAC" Offset="0xAAC"/>
-        <Animation Name="object_tw_Anim_0012A4" Offset="0x12A4"/>
-        <Animation Name="object_tw_Anim_0017E0" Offset="0x17E0"/>
-        <Animation Name="object_tw_Anim_001D10" Offset="0x1D10"/>
-        <Animation Name="object_tw_Anim_00230C" Offset="0x230C"/>
-        <Animation Name="object_tw_Anim_003614" Offset="0x3614"/>
-        <Animation Name="object_tw_Anim_003E34" Offset="0x3E34"/>
-        <Animation Name="object_tw_Anim_004548" Offset="0x4548"/>
-        <Animation Name="object_tw_Anim_00578C" Offset="0x578C"/>
-        <Animation Name="object_tw_Anim_006530" Offset="0x6530"/>
-        <Animation Name="object_tw_Anim_006F28" Offset="0x6F28"/>
-        <Limb Name="object_tw_Limb_006F40" LimbType="Standard" Offset="0x6F40"/>
-        <Limb Name="object_tw_Limb_006F4C" LimbType="Standard" Offset="0x6F4C"/>
-        <Limb Name="object_tw_Limb_006F58" LimbType="Standard" Offset="0x6F58"/>
-        <Limb Name="object_tw_Limb_006F64" LimbType="Standard" Offset="0x6F64"/>
-        <Limb Name="object_tw_Limb_006F70" LimbType="Standard" Offset="0x6F70"/>
-        <Limb Name="object_tw_Limb_006F7C" LimbType="Standard" Offset="0x6F7C"/>
-        <Limb Name="object_tw_Limb_006F88" LimbType="Standard" Offset="0x6F88"/>
-        <Limb Name="object_tw_Limb_006F94" LimbType="Standard" Offset="0x6F94"/>
-        <Limb Name="object_tw_Limb_006FA0" LimbType="Standard" Offset="0x6FA0"/>
-        <Limb Name="object_tw_Limb_006FAC" LimbType="Standard" Offset="0x6FAC"/>
-        <Limb Name="object_tw_Limb_006FB8" LimbType="Standard" Offset="0x6FB8"/>
-        <Limb Name="object_tw_Limb_006FC4" LimbType="Standard" Offset="0x6FC4"/>
-        <Limb Name="object_tw_Limb_006FD0" LimbType="Standard" Offset="0x6FD0"/>
-        <Limb Name="object_tw_Limb_006FDC" LimbType="Standard" Offset="0x6FDC"/>
-        <Limb Name="object_tw_Limb_006FE8" LimbType="Standard" Offset="0x6FE8"/>
-        <Limb Name="object_tw_Limb_006FF4" LimbType="Standard" Offset="0x6FF4"/>
-        <Limb Name="object_tw_Limb_007000" LimbType="Standard" Offset="0x7000"/>
-        <Limb Name="object_tw_Limb_00700C" LimbType="Standard" Offset="0x700C"/>
-        <Limb Name="object_tw_Limb_007018" LimbType="Standard" Offset="0x7018"/>
-        <Limb Name="object_tw_Limb_007024" LimbType="Standard" Offset="0x7024"/>
-        <Limb Name="object_tw_Limb_007030" LimbType="Standard" Offset="0x7030"/>
-        <Limb Name="object_tw_Limb_00703C" LimbType="Standard" Offset="0x703C"/>
-        <Limb Name="object_tw_Limb_007048" LimbType="Standard" Offset="0x7048"/>
-        <Limb Name="object_tw_Limb_007054" LimbType="Standard" Offset="0x7054"/>
-        <Limb Name="object_tw_Limb_007060" LimbType="Standard" Offset="0x7060"/>
-        <Limb Name="object_tw_Limb_00706C" LimbType="Standard" Offset="0x706C"/>
-        <Skeleton Name="object_tw_Skel_0070E0" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
-        <Animation Name="object_tw_Anim_007688" Offset="0x7688"/>
-        <Animation Name="object_tw_Anim_007CA8" Offset="0x7CA8"/>
-        <Animation Name="object_tw_Anim_0088C8" Offset="0x88C8"/>
-        <Animation Name="object_tw_Anim_009398" Offset="0x9398"/>
-        <Animation Name="object_tw_Anim_00947C" Offset="0x947C"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
         <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
-        <Texture Name="object_tw_TLUT_009490" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
-        <Texture Name="object_tw_Tex_009638" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
-        <Texture Name="object_tw_Tex_009E38" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
-        <Texture Name="object_tw_Tex_00A038" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
-        <Texture Name="object_tw_Tex_00A238" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
-        <Texture Name="object_tw_Tex_00A438" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A838" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8B8" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8F8" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
-        <Texture Name="object_tw_Tex_00AAF8" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00AB38" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00ABB8" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
-        <Texture Name="object_tw_Tex_00AC38" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
-        <Texture Name="object_tw_Tex_00B038" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
-        <Texture Name="object_tw_Tex_00B138" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
-        <Texture Name="object_tw_Tex_00B1B8" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B1F8" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B238" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B638" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00BA38" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
-        <Texture Name="object_tw_Tex_00BE38" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
-        <Texture Name="object_tw_Tex_00C238" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
-        <Texture Name="object_tw_Tex_00CA38" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
-        <Texture Name="object_tw_Tex_00CAB8" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
-        <DList Name="object_tw_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tw_DL_0116A0" Offset="0x116A0"/>
-        <DList Name="object_tw_DL_011C98" Offset="0x11C98"/>
-        <DList Name="object_tw_DL_011E28" Offset="0x11E28"/>
-        <DList Name="object_tw_DL_011FB8" Offset="0x11FB8"/>
-        <DList Name="object_tw_DL_012018" Offset="0x12018"/>
-        <DList Name="object_tw_DL_0120C8" Offset="0x120C8"/>
-        <DList Name="object_tw_DL_012178" Offset="0x12178"/>
-        <DList Name="object_tw_DL_012210" Offset="0x12210"/>
-        <DList Name="object_tw_DL_0122A8" Offset="0x122A8"/>
-        <DList Name="object_tw_DL_012410" Offset="0x12410"/>
-        <DList Name="object_tw_DL_012578" Offset="0x12578"/>
-        <DList Name="object_tw_DL_0126E0" Offset="0x126E0"/>
-        <DList Name="object_tw_DL_012848" Offset="0x12848"/>
-        <DList Name="object_tw_DL_0128E0" Offset="0x128E0"/>
-        <DList Name="object_tw_DL_012978" Offset="0x12978"/>
-        <DList Name="object_tw_DL_012A28" Offset="0x12A28"/>
-        <DList Name="object_tw_DL_012AD8" Offset="0x12AD8"/>
-        <DList Name="object_tw_DL_012B38" Offset="0x12B38"/>
-        <DList Name="object_tw_DL_012CE0" Offset="0x12CE0"/>
-        <DList Name="object_tw_DL_013310" Offset="0x13310"/>
-        <DList Name="object_tw_DL_0134B8" Offset="0x134B8"/>
-        <DList Name="object_tw_DL_013AE8" Offset="0x13AE8"/>
-        <DList Name="object_tw_DL_013D68" Offset="0x13D68"/>
-        <DList Name="object_tw_DL_013E98" Offset="0x13E98"/>
-        <DList Name="object_tw_DL_013F98" Offset="0x13F98"/>
-        <DList Name="object_tw_DL_014070" Offset="0x14070"/>
-        <DList Name="object_tw_DL_014158" Offset="0x14158"/>
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
         <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
-        <DList Name="object_tw_DL_015440" Offset="0x15440"/>
-        <DList Name="object_tw_DL_015538" Offset="0x15538"/>
-        <DList Name="object_tw_DL_015648" Offset="0x15648"/>
-        <DList Name="object_tw_DL_015740" Offset="0x15740"/>
-        <DList Name="object_tw_DL_015850" Offset="0x15850"/>
-        <DList Name="object_tw_DL_015990" Offset="0x15990"/>
-        <DList Name="object_tw_DL_015B10" Offset="0x15B10"/>
-        <DList Name="object_tw_DL_015C30" Offset="0x15C30"/>
-        <DList Name="object_tw_DL_015D58" Offset="0x15D58"/>
-        <DList Name="object_tw_DL_015E78" Offset="0x15E78"/>
-        <DList Name="object_tw_DL_015FF8" Offset="0x15FF8"/>
-        <DList Name="object_tw_DL_016118" Offset="0x16118"/>
-        <DList Name="object_tw_DL_016240" Offset="0x16240"/>
-        <DList Name="object_tw_DL_016360" Offset="0x16360"/>
-        <DList Name="object_tw_DL_0164C0" Offset="0x164C0"/>
-        <DList Name="object_tw_DL_0164C8" Offset="0x164C8"/>
-        <DList Name="object_tw_DL_0164D0" Offset="0x164D0"/>
-        <Texture Name="object_tw_Tex_016650" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
-        <Texture Name="object_tw_Tex_0166D0" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
         <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
-        <DList Name="object_tw_DL_017910" Offset="0x17910"/>
-        <DList Name="object_tw_DL_017A08" Offset="0x17A08"/>
-        <DList Name="object_tw_DL_017B18" Offset="0x17B18"/>
-        <DList Name="object_tw_DL_017C10" Offset="0x17C10"/>
-        <DList Name="object_tw_DL_017D20" Offset="0x17D20"/>
-        <DList Name="object_tw_DL_017E60" Offset="0x17E60"/>
-        <DList Name="object_tw_DL_017FE0" Offset="0x17FE0"/>
-        <DList Name="object_tw_DL_018100" Offset="0x18100"/>
-        <DList Name="object_tw_DL_018228" Offset="0x18228"/>
-        <DList Name="object_tw_DL_018348" Offset="0x18348"/>
-        <DList Name="object_tw_DL_0184C8" Offset="0x184C8"/>
-        <DList Name="object_tw_DL_0185E8" Offset="0x185E8"/>
-        <DList Name="object_tw_DL_018710" Offset="0x18710"/>
-        <DList Name="object_tw_DL_018830" Offset="0x18830"/>
-        <DList Name="object_tw_DL_018990" Offset="0x18990"/>
-        <DList Name="object_tw_DL_018998" Offset="0x18998"/>
-        <DList Name="object_tw_DL_0189A0" Offset="0x189A0"/>
-        <Texture Name="object_tw_Tex_018B20" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
-        <Texture Name="object_tw_Tex_018B60" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
-        <DList Name="object_tw_DL_018FC0" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
-        <Texture Name="object_tw_Tex_019078" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
-        <Texture Name="object_tw_Tex_019478" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
-        <DList Name="object_tw_DL_019938" Offset="0x19938"/> <!-- koume Ground Flame -->
-        <Texture Name="object_tw_Tex_019A20" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
-        <DList Name="object_tw_DL_019D40" Offset="0x19D40"/> <!-- Koume Ground Crater -->
-        <Texture Name="object_tw_Tex_019E00" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
-        <Texture Name="object_tw_Tex_01A200" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
-        <DList Name="object_tw_DL_01A430" Offset="0x1A430"/>
-        <DList Name="object_tw_DL_01A528" Offset="0x1A528"/>
-        <DList Name="object_tw_DL_01A5A8" Offset="0x1A5A8"/>
-        <Texture Name="object_tw_Tex_01A5C0" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
-        <DList Name="object_tw_DL_01A790" Offset="0x1A790"/>
-        <DList Name="object_tw_DL_01A8A0" Offset="0x1A8A0"/>
-        <DList Name="object_tw_DL_01A998" Offset="0x1A998"/>
-        <DList Name="object_tw_DL_01AA50" Offset="0x1AA50"/>
-        <DList Name="object_tw_DL_01AB00" Offset="0x1AB00"/>
-        <Texture Name="object_tw_Tex_01AB20" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
         <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
-        <DList Name="object_tw_DL_01BC00" Offset="0x1BC00"/>
-        <Texture Name="object_tw_Tex_01BCA0" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
-        <Texture Name="object_tw_Tex_01C0A0" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
-        <DList Name="object_tw_DL_01C1C0" Offset="0x1C1C0"/>
-        <Texture Name="object_tw_Tex_01C2A0" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
-        <Texture Name="object_tw_Tex_01C6A0" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
-        <DList Name="object_tw_DL_01CEE0" Offset="0x1CEE0"/>
-        <Texture Name="object_tw_Tex_01CFA8" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
-        <Texture Name="object_tw_Tex_01D3A8" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
-        <DList Name="object_tw_DL_01DBE8" Offset="0x1DBE8"/>
-        <DList Name="object_tw_DL_01DDF0" Offset="0x1DDF0"/>
-        <DList Name="object_tw_DL_01E020" Offset="0x1E020"/>
-        <DList Name="object_tw_DL_01E0E0" Offset="0x1E0E0"/>
-        <DList Name="object_tw_DL_01E2C0" Offset="0x1E2C0"/>
-        <DList Name="object_tw_DL_01E3A0" Offset="0x1E3A0"/>
-        <Texture Name="object_tw_Tex_01E430" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
-        <DList Name="object_tw_DL_01E9F0" Offset="0x1E9F0"/>
-        <Texture Name="object_tw_Tex_01EB28" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
-        <DList Name="object_tw_DL_01EC68" Offset="0x1EC68"/>
-        <Texture Name="object_tw_Tex_01ECF0" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
-        <DList Name="object_tw_DL_01EEB0" Offset="0x1EEB0"/>
-        <DList Name="object_tw_DL_01F238" Offset="0x1F238"/>
-        <DList Name="object_tw_DL_01F390" Offset="0x1F390"/>
-        <DList Name="object_tw_DL_01F608" Offset="0x1F608"/>
-        <Limb Name="object_tw_Limb_01F6E8" LimbType="Standard" Offset="0x1F6E8"/>
-        <Limb Name="object_tw_Limb_01F6F4" LimbType="Standard" Offset="0x1F6F4"/>
-        <Limb Name="object_tw_Limb_01F700" LimbType="Standard" Offset="0x1F700"/>
-        <Limb Name="object_tw_Limb_01F70C" LimbType="Standard" Offset="0x1F70C"/>
-        <Limb Name="object_tw_Limb_01F718" LimbType="Standard" Offset="0x1F718"/>
-        <Limb Name="object_tw_Limb_01F724" LimbType="Standard" Offset="0x1F724"/>
-        <Limb Name="object_tw_Limb_01F730" LimbType="Standard" Offset="0x1F730"/>
-        <Limb Name="object_tw_Limb_01F73C" LimbType="Standard" Offset="0x1F73C"/>
-        <Limb Name="object_tw_Limb_01F748" LimbType="Standard" Offset="0x1F748"/>
-        <Limb Name="object_tw_Limb_01F754" LimbType="Standard" Offset="0x1F754"/>
-        <Limb Name="object_tw_Limb_01F760" LimbType="Standard" Offset="0x1F760"/>
-        <Limb Name="object_tw_Limb_01F76C" LimbType="Standard" Offset="0x1F76C"/>
-        <Limb Name="object_tw_Limb_01F778" LimbType="Standard" Offset="0x1F778"/>
-        <Limb Name="object_tw_Limb_01F784" LimbType="Standard" Offset="0x1F784"/>
-        <Limb Name="object_tw_Limb_01F790" LimbType="Standard" Offset="0x1F790"/>
-        <Limb Name="object_tw_Limb_01F79C" LimbType="Standard" Offset="0x1F79C"/>
-        <Limb Name="object_tw_Limb_01F7A8" LimbType="Standard" Offset="0x1F7A8"/>
-        <Limb Name="object_tw_Limb_01F7B4" LimbType="Standard" Offset="0x1F7B4"/>
-        <Limb Name="object_tw_Limb_01F7C0" LimbType="Standard" Offset="0x1F7C0"/>
-        <Limb Name="object_tw_Limb_01F7CC" LimbType="Standard" Offset="0x1F7CC"/>
-        <Limb Name="object_tw_Limb_01F7D8" LimbType="Standard" Offset="0x1F7D8"/>
-        <Limb Name="object_tw_Limb_01F7E4" LimbType="Standard" Offset="0x1F7E4"/>
-        <Limb Name="object_tw_Limb_01F7F0" LimbType="Standard" Offset="0x1F7F0"/>
-        <Limb Name="object_tw_Limb_01F7FC" LimbType="Standard" Offset="0x1F7FC"/>
-        <Limb Name="object_tw_Limb_01F808" LimbType="Standard" Offset="0x1F808"/>
-        <Limb Name="object_tw_Limb_01F814" LimbType="Standard" Offset="0x1F814"/>
-        <Skeleton Name="object_tw_Skel_01F888" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
-        <Texture Name="object_tw_Tex_02A070" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
-        <Animation Name="object_tw_Anim_0216DC" Offset="0x216DC"/>
-        <Animation Name="object_tw_Anim_022700" Offset="0x22700"/>
-        <Animation Name="object_tw_Anim_023750" Offset="0x23750"/>
-        <Animation Name="object_tw_Anim_024374" Offset="0x24374"/>
-        <Animation Name="object_tw_Anim_0244B4" Offset="0x244B4"/>
-        <Texture Name="object_tw_Tex_0244D0" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
-        <Texture Name="object_tw_Tex_024510" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
-        <Texture Name="object_tw_Tex_024710" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
-        <Texture Name="object_tw_Tex_024910" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
-        <Texture Name="object_tw_Tex_024B10" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
-        <DList Name="object_tw_DL_027720" Offset="0x27720"/>
-        <DList Name="object_tw_DL_027820" Offset="0x27820"/>
-        <DList Name="object_tw_DL_027970" Offset="0x27970"/>
-        <DList Name="object_tw_DL_027A60" Offset="0x27A60"/>
-        <DList Name="object_tw_DL_027B78" Offset="0x27B78"/>
-        <DList Name="object_tw_DL_027C98" Offset="0x27C98"/>
-        <DList Name="object_tw_DL_027DE8" Offset="0x27DE8"/>
-        <DList Name="object_tw_DL_027EE0" Offset="0x27EE0"/>
-        <DList Name="object_tw_DL_027FE8" Offset="0x27FE8"/>
-        <DList Name="object_tw_DL_028100" Offset="0x28100"/>
-        <DList Name="object_tw_DL_028220" Offset="0x28220"/>
-        <DList Name="object_tw_DL_028370" Offset="0x28370"/>
-        <DList Name="object_tw_DL_028468" Offset="0x28468"/>
-        <DList Name="object_tw_DL_028570" Offset="0x28570"/>
-        <DList Name="object_tw_DL_028668" Offset="0x28668"/>
-        <DList Name="object_tw_DL_028778" Offset="0x28778"/>
-        <DList Name="object_tw_DL_028870" Offset="0x28870"/>
-        <DList Name="object_tw_DL_028980" Offset="0x28980"/>
-        <DList Name="object_tw_DL_028B78" Offset="0x28B78"/>
-        <DList Name="object_tw_DL_028D70" Offset="0x28D70"/>
-        <DList Name="object_tw_DL_029268" Offset="0x29268"/>
-        <DList Name="object_tw_DL_0293E0" Offset="0x293E0"/>
-        <DList Name="object_tw_DL_029530" Offset="0x29530"/>
-        <DList Name="object_tw_DL_029620" Offset="0x29620"/>
-        <DList Name="object_tw_DL_029738" Offset="0x29738"/>
-        <DList Name="object_tw_DL_029900" Offset="0x29900"/>
-        <DList Name="object_tw_DL_0299F8" Offset="0x299F8"/>
-        <DList Name="object_tw_DL_029B10" Offset="0x29B10"/>
-        <Texture Name="object_tw_TLUT_029E50" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
-        <Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02A470" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02A870" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02A970" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
-        <Texture Name="object_tw_Tex_02A9B0" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02ADB0" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
-        <Texture Name="object_tw_Tex_02ADF0" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02AE30" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02AF30" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
-        <DList Name="object_tw_DL_02CAF0" Offset="0x2CAF0"/>
-        <DList Name="object_tw_DL_02CB50" Offset="0x2CB50"/>
-        <DList Name="object_tw_DL_02CBB0" Offset="0x2CBB0"/>
-        <DList Name="object_tw_DL_02D320" Offset="0x2D320"/>
-        <DList Name="object_tw_DL_02D4A0" Offset="0x2D4A0"/>
-        <DList Name="object_tw_DL_02D5D8" Offset="0x2D5D8"/>
-        <DList Name="object_tw_DL_02D710" Offset="0x2D710"/>
-        <DList Name="object_tw_DL_02D890" Offset="0x2D890"/>
-        <DList Name="object_tw_DL_02D940" Offset="0x2D940"/>
-        <DList Name="object_tw_DL_02D9F0" Offset="0x2D9F0"/>
-        <DList Name="object_tw_DL_02DAE0" Offset="0x2DAE0"/>
-        <DList Name="object_tw_DL_02DBC8" Offset="0x2DBC8"/>
-        <DList Name="object_tw_DL_02DCB8" Offset="0x2DCB8"/>
-        <DList Name="object_tw_DL_02DDD8" Offset="0x2DDD8"/>
-        <DList Name="object_tw_DL_02DEB0" Offset="0x2DEB0"/>
-        <DList Name="object_tw_DL_02DFB0" Offset="0x2DFB0"/>
-        <DList Name="object_tw_DL_02E098" Offset="0x2E098"/>
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
         <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
-        <Limb Name="object_tw_Limb_031D70" LimbType="Standard" Offset="0x31D70"/>
-        <Limb Name="object_tw_Limb_031D7C" LimbType="Standard" Offset="0x31D7C"/>
-        <Limb Name="object_tw_Limb_031D88" LimbType="Standard" Offset="0x31D88"/>
-        <Limb Name="object_tw_Limb_031D94" LimbType="Standard" Offset="0x31D94"/>
-        <Limb Name="object_tw_Limb_031DA0" LimbType="Standard" Offset="0x31DA0"/>
-        <Limb Name="object_tw_Limb_031DAC" LimbType="Standard" Offset="0x31DAC"/>
-        <Limb Name="object_tw_Limb_031DB8" LimbType="Standard" Offset="0x31DB8"/>
-        <Limb Name="object_tw_Limb_031DC4" LimbType="Standard" Offset="0x31DC4"/>
-        <Limb Name="object_tw_Limb_031DD0" LimbType="Standard" Offset="0x31DD0"/>
-        <Limb Name="object_tw_Limb_031DDC" LimbType="Standard" Offset="0x31DDC"/>
-        <Limb Name="object_tw_Limb_031DE8" LimbType="Standard" Offset="0x31DE8"/>
-        <Limb Name="object_tw_Limb_031DF4" LimbType="Standard" Offset="0x31DF4"/>
-        <Limb Name="object_tw_Limb_031E00" LimbType="Standard" Offset="0x31E00"/>
-        <Limb Name="object_tw_Limb_031E0C" LimbType="Standard" Offset="0x31E0C"/>
-        <Limb Name="object_tw_Limb_031E18" LimbType="Standard" Offset="0x31E18"/>
-        <Limb Name="object_tw_Limb_031E24" LimbType="Standard" Offset="0x31E24"/>
-        <Limb Name="object_tw_Limb_031E30" LimbType="Standard" Offset="0x31E30"/>
-        <Limb Name="object_tw_Limb_031E3C" LimbType="Standard" Offset="0x31E3C"/>
-        <Limb Name="object_tw_Limb_031E48" LimbType="Standard" Offset="0x31E48"/>
-        <Limb Name="object_tw_Limb_031E54" LimbType="Standard" Offset="0x31E54"/>
-        <Limb Name="object_tw_Limb_031E60" LimbType="Standard" Offset="0x31E60"/>
-        <Limb Name="object_tw_Limb_031E6C" LimbType="Standard" Offset="0x31E6C"/>
-        <Limb Name="object_tw_Limb_031E78" LimbType="Standard" Offset="0x31E78"/>
-        <Limb Name="object_tw_Limb_031E84" LimbType="Standard" Offset="0x31E84"/>
-        <Limb Name="object_tw_Limb_031E90" LimbType="Standard" Offset="0x31E90"/>
-        <Limb Name="object_tw_Limb_031E9C" LimbType="Standard" Offset="0x31E9C"/>
-        <Limb Name="object_tw_Limb_031EA8" LimbType="Standard" Offset="0x31EA8"/>
-        <Limb Name="object_tw_Limb_031EB4" LimbType="Standard" Offset="0x31EB4"/>
-        <Limb Name="object_tw_Limb_031EC0" LimbType="Standard" Offset="0x31EC0"/>
-        <Limb Name="object_tw_Limb_031ECC" LimbType="Standard" Offset="0x31ECC"/>
-        <Limb Name="object_tw_Limb_031ED8" LimbType="Standard" Offset="0x31ED8"/>
-        <Limb Name="object_tw_Limb_031EE4" LimbType="Standard" Offset="0x31EE4"/>
-        <Limb Name="object_tw_Limb_031EF0" LimbType="Standard" Offset="0x31EF0"/>
-        <Limb Name="object_tw_Limb_031EFC" LimbType="Standard" Offset="0x31EFC"/>
-        <Limb Name="object_tw_Limb_031F08" LimbType="Standard" Offset="0x31F08"/>
-        <Limb Name="object_tw_Limb_031F14" LimbType="Standard" Offset="0x31F14"/>
-        <Limb Name="object_tw_Limb_031F20" LimbType="Standard" Offset="0x31F20"/>
-        <Limb Name="object_tw_Limb_031F2C" LimbType="Standard" Offset="0x31F2C"/>
-        <Limb Name="object_tw_Limb_031F38" LimbType="Standard" Offset="0x31F38"/>
-        <Limb Name="object_tw_Limb_031F44" LimbType="Standard" Offset="0x31F44"/>
-        <Limb Name="object_tw_Limb_031F50" LimbType="Standard" Offset="0x31F50"/>
-        <Limb Name="object_tw_Limb_031F5C" LimbType="Standard" Offset="0x31F5C"/>
-        <Limb Name="object_tw_Limb_031F68" LimbType="Standard" Offset="0x31F68"/>
-        <Skeleton Name="object_tw_Skel_032020" Type="Flex" LimbType="Standard" Offset="0x32020"/>
-        <Animation Name="object_tw_Anim_032BF8" Offset="0x32BF8"/>
-        <Animation Name="object_tw_Anim_0338F0" Offset="0x338F0"/>
-        <Animation Name="object_tw_Anim_0343B4" Offset="0x343B4"/>
-        <Animation Name="object_tw_Anim_035030" Offset="0x35030"/>
-        <Animation Name="object_tw_Anim_035988" Offset="0x35988"/>
-        <Animation Name="object_tw_Anim_036FBC" Offset="0x36FBC"/>
-        <Animation Name="object_tw_Anim_038E2C" Offset="0x38E2C"/>
-        <Animation Name="object_tw_Anim_03A2D0" Offset="0x3A2D0"/>
-        <DList Name="object_tw_DL_03A680" Offset="0x3A680"/>
-        <Texture Name="object_tw_Tex_03A7B0" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x31D70"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x31D7C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x31D88"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x31D94"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x31DA0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x31DAC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x31DB8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x31DC4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x31DD0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x31DDC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x31DE8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x31DF4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x31E00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x31E0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x31E18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x31E24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x31E30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x31E3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x31E48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x31E54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x31E60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x31E6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x31E78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x31E84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x31E90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x31E9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x31EA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x31EB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x31EC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x31ECC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x31ED8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x31EE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x31EF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x31EFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x31F08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x31F14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x31F20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x31F2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x31F38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x31F44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x31F50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x31F5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x31F68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x32020"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x32BF8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x338F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x343B4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x35030"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x35988"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x36FBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x38E2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x3A2D0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x3A680"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="ovl_Boss_Ganon2" BaseAddress="0x808FCFC0" RangeStart="0xA2C8" RangeEnd="0x10778">
-        <Texture Name="ovl_Boss_Ganon2_Tex_00A2C8" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x00A2C8"/>
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x00A2C8"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00B2C8">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B308" Offset="0x00B308"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B378" Offset="0x00B378"/>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00B308"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B378"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B390">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3D0" Offset="0x00B3D0"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3F0" Offset="0x00B3F0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B420" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B420"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B820" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B820"/>
-        <Array Name="ovl_Boss_Ganon2_Vtx_00BA20" Count="22" Offset="0x00BA20">
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B3D0"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B3F0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B420"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B820"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00BA20">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00BB80" Offset="0x00BB80"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00BC98" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00BC98"/>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00BB80"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00BC98"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00CC98">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00CCD8" Offset="0x00CCD8"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00CD58" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CD58"/>
+        <DList Name="gGanonTriforceDL" Offset="0x00CCD8"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CD58"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D758">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00D798" Offset="0x00D798"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00D820" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D820"/>
+        <DList Name="gGanonLightningDL" Offset="0x00D798"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D820"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00E020">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00E1C0" Offset="0x00E1C0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00E2E0" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00E2E0"/>
+        <DList Name="gGanonFireRingDL" Offset="0x00E1C0"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00E2E0"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00EAE0">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00EC40" Offset="0x00EC40"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00ED48" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00ED48"/>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00EC40"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00ED48"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00F148">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00F188" Offset="0x00F188"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F208" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00F208"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F408" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F408"/>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00F188"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00F208"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F408"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00FC08">
             <Vtx/>
         </Array>
@@ -71,6 +71,6 @@
         <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0x010298">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_0103A8" Offset="0x0103A8"/>
+        <DList Name="gGanonMasterSwordDL" Offset="0x0103A8"/>
     </File>
 </Root>
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..e9c8d7ef5 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
@@ -2,7 +2,7 @@
     <File Name="daiyousei_izumi_scene" Segment="2">
         <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
         <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
-        <Cutscene Name="gGreatFairyDoubleDefenceCs" Offset="0x25D0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
         <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
     </File>
     <File Name="daiyousei_izumi_room_0" Segment="3">
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 @@
 <Root>
     <File Name="icon_item_24_static" Segment="9">
-        <Texture Name="gForestMedallionIconTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
-        <Texture Name="gFireMedallionIconTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
-        <Texture Name="gWaterMedallionIconTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
-        <Texture Name="gSpiritMedallionIconTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
-        <Texture Name="gShadowMedallionIconTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
-        <Texture Name="gLightMedallionIconTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
-        <Texture Name="gKokiriEmeraldIconTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
-        <Texture Name="gGoronRubyIconTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
-        <Texture Name="gZoraSapphireIconTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
-        <Texture Name="gStoneOfAgonyIconTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
-        <Texture Name="gGerudosCardIconTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
-        <Texture Name="gGoldSkulltulaIconTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
-        <Texture Name="gHeartContainerIconTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
-        <Texture Name="gUnusedPieceOfHeartIconTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
-        <Texture Name="gBossKeyIconTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
-        <Texture Name="gCompassIconTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
-        <Texture Name="gDungeonMapIconTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
-        <Texture Name="gSmallKeyIconTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
-        <Texture Name="gSmallMagicJarIconTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
-        <Texture Name="gBigMagicJarIconTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="icon_item_static" Segment="8">
-        <Texture Name="gDekuStickIconTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="gDekuNutIconTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="gBombIconTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="gFairyBowIconTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
-        <Texture Name="gFireArrowIconTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="gDinsFireIconTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
-        <Texture Name="gFairySlingshotIconTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
-        <Texture Name="gFairyOcarinaIconTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
-        <Texture Name="gOcarinaofTimeIconTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
-        <Texture Name="gBombchuIconTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
-        <Texture Name="gHookshotIconTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
-        <Texture Name="gLongshotIconTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
-        <Texture Name="gIceArrowIconTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
-        <Texture Name="gFaroresWindIconTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
-        <Texture Name="gBoomerangIconTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
-        <Texture Name="gLensofTruthIconTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
-        <Texture Name="gMagicBeansIconTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
-        <Texture Name="gMegatonHammerIconTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
-        <Texture Name="gLightArrowIconTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
-        <Texture Name="gNayrusLoveIconTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
-        <Texture Name="gEmptyBottleIconTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
-        <Texture Name="gRedPotionIconTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
-        <Texture Name="gGreenPotionIconTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
-        <Texture Name="gBluePotionIconTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
-        <Texture Name="gBottledFairyIconTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
-        <Texture Name="gFishIconTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
-        <Texture Name="gMilkFullIconTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
-        <Texture Name="gRutosLetterIconTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
-        <Texture Name="gBlueFireIconTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
-        <Texture Name="gBugIconTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
-        <Texture Name="gBigPoeIconTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
-        <Texture Name="gMilkhalfIconTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
-        <Texture Name="gPoeIconTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
-        <Texture Name="gWeirdEggIconTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
-        <Texture Name="gCuccoIconTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
-        <Texture Name="gZeldasLetterIconTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
-        <Texture Name="gKeatonMaskIconTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
-        <Texture Name="gSkullMaskIconTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
-        <Texture Name="gSpookyMaskIconTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
-        <Texture Name="gBunnyHoodIconTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
-        <Texture Name="gGoronMaskIconTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
-        <Texture Name="gZoraMaskIconTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
-        <Texture Name="gGerudoMaskIconTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
-        <Texture Name="gMaskofTruthIconTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
-        <Texture Name="gSoldOutIconTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
-        <Texture Name="gPocketEggIconTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
-        <Texture Name="gPocketCuccoIconTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
-        <Texture Name="gCojiroIconTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
-        <Texture Name="gOddMushroomIconTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
-        <Texture Name="gOddPotionIconTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
-        <Texture Name="gPoachersSawIconTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
-        <Texture Name="gBrokenBiggoronSwordIconTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
-        <Texture Name="gPrescriptionIconTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
-        <Texture Name="gEyeBallFrogIconTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
-        <Texture Name="gEyeDropsIconTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
-        <Texture Name="gClaimCheckIconTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
-        <Texture Name="gFairyBowFireIconTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
-        <Texture Name="gFairyBowIceIconTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
-        <Texture Name="gFairyBowLightIconTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
-        <Texture Name="gKokiriSwordIconTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
-        <Texture Name="gMasterSwordIconTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
-        <Texture Name="gBiggoronSwordIconTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
-        <Texture Name="gDekuShieldIconTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
-        <Texture Name="gHylianShieldIconTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
-        <Texture Name="gMirrorShieldIconTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
-        <Texture Name="gKokiriTunicIconTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
-        <Texture Name="gGoronTunicIconTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
-        <Texture Name="gZoraTunicIconTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
-        <Texture Name="gKokiriBootsIconTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
-        <Texture Name="gIronBootsIconTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
-        <Texture Name="gHoverBootsIconTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
-        <Texture Name="gBulletBag30IconTex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
-        <Texture Name="gBulletBag40IconTex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
-        <Texture Name="gBulletBag50IconTex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
-        <Texture Name="gQuiver30IconTex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
-        <Texture Name="gQuiver40IconTex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
-        <Texture Name="gQuiver50IconTex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
-        <Texture Name="gBombBag20IconTex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
-        <Texture Name="gBombBag30IconTex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
-        <Texture Name="gBombBag40IconTex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
-        <Texture Name="gGoronsBraceletIconTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
-        <Texture Name="gSilverGauntletsIconTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
-        <Texture Name="gGoldenGauntletsIconTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
-        <Texture Name="gSilverScaleIconTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
-        <Texture Name="gGoldenScaleIconTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
-        <Texture Name="gBrokenGiantsKnifeIconTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
-        <Texture Name="gAdultsWalletIconTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
-        <Texture Name="gGiantsWalletIconTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
-        <Texture Name="gDekuSeedsIconTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
-        <Texture Name="gFishingPoleIconTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
         <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
         <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
         <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
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 @@
         <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
         <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
         <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
-        <Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
-        <Texture Name="gOcarinaCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
-        <Texture Name="gOcarinaCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
-        <Texture Name="gOcarinaCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
-        <Texture Name="gOcarinaCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
         <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
         <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
         <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
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 @@
         <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xE94C8"/>
         <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xE98C8"/>
         <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xE9CC8"/>
-        <Array Name="sCircleWipeVtx" Count="34" Offset="0xEA0C8">
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xEA0C8">
             <Vtx/>
         </Array>
         <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
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 @@
 <Root>
     <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xE8550" RangeEnd="0x10E2A0">
-        <DList Name="sTriforceWipeDL" Offset="0xE8550"/>
-        <Array Name="sTriforceWipeVtx" Count="10" Offset="0xE8580">
+        <DList Name="sTransTriforceDL" Offset="0xE8550"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xE8580">
             <Vtx/>
         </Array>
     </File>
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 @@
 <Root>
-    <!-- ZAPD isn't finding sWipe1Vtx and sWipe1Tex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
     <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xE8620" RangeEnd="0x10EC30" Segment="0">
-        <Array Name="sWipe1Vtx" Count="25" Offset="0xE8620">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xE8620">
             <Vtx/>
         </Array>
-        <Texture Name="sWipe1Tex" Format="i4" Width="64" Height="64" Offset="0xE87B0"/>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xE87B0"/>
        <!-- <DList Name="sWipe1DL" Offset="0x10EC30"/>-->
     </File>
 </Root>
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..2670b752d 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
@@ -4,7 +4,7 @@
         <DList Name="gBrownFragmentDL" Offset="0x530"/>
         <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
         <DList Name="gDoorLockDL" Offset="0x1100"/>
-        <DList Name="gDoorChainsDL" Offset="0x11F0"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
         <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
         <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
         <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
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..b0dcb9640 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
@@ -930,10 +930,10 @@
         <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4A090"/>
         <DList Name="gDoorMetalBarsDL" Offset="0x4B0D0"/>
         <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x4B160"/>
-        <Texture Name="gSunTex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
-        <Texture Name="gSunEveningTex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
-        <DList Name="gKokiriDustMoteTextureLoadDL" Offset="0x4D160"/>
-        <DList Name="gKokiriDustMoteDL" Offset="0x4D1A8"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x4D160"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x4D1A8"/>
         <DList Name="gSunDL" Offset="0x4D1C0"/>
         <DList Name="gZTargetLockOnTriangleDL" Offset="0x4D450"/>
         <DList Name="gEffFire1DL" Offset="0x4D4E0"/>
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 @@
 <Root>
     <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
     <File Name="object_bdoor" Segment="6">
-        <Texture Name="object_bdoor_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
-        <DList Name="object_bdoor_DL_0010C0" Offset="0x10C0"/>
-        <DList Name="object_bdoor_DL_001400" Offset="0x1400"/>
-        <DList Name="object_bdoor_DL_001530" Offset="0x1530"/>
-        <Texture Name="object_bdoor_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
-        <Texture Name="object_bdoor_Tex_0025C0" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
-        <Texture Name="object_bdoor_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
-        <Texture Name="object_bdoor_Tex_0045C0" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
-        <Texture Name="object_bdoor_Tex_0055C0" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
-        <Texture Name="object_bdoor_Tex_0065C0" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_bw" Segment="6">
-        <Animation Name="object_bw_Anim_000228" Offset="0x228"/>
-        <DList Name="object_bw_DL_0002C0" Offset="0x2C0"/>
-        <DList Name="object_bw_DL_0003E8" Offset="0x3E8"/>
-        <DList Name="object_bw_DL_000558" Offset="0x558"/>
-        <DList Name="object_bw_DL_000680" Offset="0x680"/>
-        <DList Name="object_bw_DL_001050" Offset="0x1050"/>
-        <Texture Name="object_bw_Tex_001240" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
-        <Texture Name="object_bw_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
-        <Texture Name="object_bw_TLUT_001640" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
-        <Texture Name="object_bw_Tex_001840" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
-        <Texture Name="object_bw_Tex_001C40" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
-        <Limb Name="object_bw_Limb_002040" LimbType="Standard" Offset="0x2040"/>
-        <Limb Name="object_bw_Limb_00204C" LimbType="Standard" Offset="0x204C"/>
-        <Limb Name="object_bw_Limb_002058" LimbType="Standard" Offset="0x2058"/>
-        <Limb Name="object_bw_Limb_002064" LimbType="Standard" Offset="0x2064"/>
-        <Limb Name="object_bw_Limb_002070" LimbType="Standard" Offset="0x2070"/>
-        <Limb Name="object_bw_Limb_00207C" LimbType="Standard" Offset="0x207C"/>
-        <Limb Name="object_bw_Limb_002088" LimbType="Standard" Offset="0x2088"/>
-        <Limb Name="object_bw_Limb_002094" LimbType="Standard" Offset="0x2094"/>
-        <Limb Name="object_bw_Limb_0020A0" LimbType="Standard" Offset="0x20A0"/>
-        <Limb Name="object_bw_Limb_0020AC" LimbType="Standard" Offset="0x20AC"/>
-        <Limb Name="object_bw_Limb_0020B8" LimbType="Standard" Offset="0x20B8"/>
-        <Skeleton Name="object_bw_Skel_0020F0" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
-        <Animation Name="object_bw_Anim_0021A0" Offset="0x21A0"/>
-        <Animation Name="object_bw_Anim_002250" Offset="0x2250"/>
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
     </File>
 </Root>
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..6ff8bbe8c 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,7 @@
 <Root>
     <File Name="object_fd" Segment="6">
         <!-- Boss title card -->
-        <Texture Name="gVolvagiaBossTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
+        <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
 
         <!-- Skeletons -->
         <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x114E0"/>
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 @@
     <File Name="object_ice_objects" Segment="6">
         <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
         <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
-        <DList Name="object_ice_objects_DL_0006F0" Offset="0x6F0"/>
-        <DList Name="object_ice_objects_DL_0012A0" Offset="0x12A0"/>
-        <Collision Name="object_ice_objects_Col_001C1C" Offset="0x1C1C"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
         <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
         <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
         <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
         <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
-        <DList Name="object_ice_objects_DL_002640" Offset="0x2640"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
         <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
         <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
-        <Collision Name="object_ice_objects_Col_002920" Offset="0x2920"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
         <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
-        <Texture Name="object_ice_objects_Tex_003150" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
         <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
         <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
-        <Texture Name="object_ice_objects_Tex_005150" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
-        <Texture Name="object_ice_objects_Tex_005550" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
         <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
         <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
         <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
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 @@
         <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
         <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
         <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
-        <Skeleton Name="object_ik_Skel_01E178" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
-        <Skeleton Name="object_ik_Skel_0205C0" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
 
         <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
         <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
         <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
         <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
         <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
-        <Animation Name="object_ik_Anim_001C28" Offset="0x1C28"/>
-        <Animation Name="object_ik_Anim_002538" Offset="0x2538"/>
-        <Animation Name="object_ik_Anim_0029FC" Offset="0x29FC"/>
-        <Animation Name="object_ik_Anim_0033C4" Offset="0x33C4"/>
-        <Animation Name="object_ik_Anim_003DBC" Offset="0x3DBC"/>
-        <Animation Name="object_ik_Anim_0045BC" Offset="0x45BC"/>
-        <Animation Name="object_ik_Anim_00485C" Offset="0x485C"/>
-        <Animation Name="object_ik_Anim_005944" Offset="0x5944"/>
-        <Animation Name="object_ik_Anim_006194" Offset="0x6194"/>
-        <Animation Name="object_ik_Anim_006734" Offset="0x6734"/>
-        <Animation Name="object_ik_Anim_00C114" Offset="0xC114"/>
-        <Animation Name="object_ik_Anim_00CD70" Offset="0xCD70"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
         <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
-        <Animation Name="object_ik_Anim_00ED24" Offset="0xED24"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
         <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
         <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
-        <Animation Name="object_ik_Anim_0203D8" Offset="0x203D8"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
 
         <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
-        <Texture Name="object_ik_Tex_00F7A0" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
         <!-- This is a duplicate texture to accound for authentic texture overflowing -->
         <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
              duplicate offset values -->
         <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
-        <Texture Name="object_ik_Tex_00FBA0" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
-        <Texture Name="object_ik_Tex_00FFA0" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
-        <Texture Name="object_ik_Tex_0101A0" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
         <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
-        <Texture Name="object_ik_Tex_010BA0" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
-        <Texture Name="object_ik_Tex_0113A0" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
-        <Texture Name="object_ik_Tex_011420" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011520" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011660" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
         <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
         <DList Name="object_ik_DL_015380" Offset="0x15380"/>
-        <DList Name="object_ik_DL_0154E0" Offset="0x154E0"/>
-        <DList Name="object_ik_DL_015840" Offset="0x15840"/>
-        <DList Name="object_ik_DL_015B00" Offset="0x15B00"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
         <DList Name="object_ik_DL_016118" Offset="0x16118"/>
         <DList Name="object_ik_DL_016278" Offset="0x16278"/>
         <DList Name="object_ik_DL_016340" Offset="0x16340"/>
         <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
         <DList Name="object_ik_DL_016568" Offset="0x16568"/>
         <DList Name="object_ik_DL_016658" Offset="0x16658"/>
-        <DList Name="object_ik_DL_016748" Offset="0x16748"/>
-        <DList Name="object_ik_DL_0169E8" Offset="0x169E8"/>
-        <DList Name="object_ik_DL_016BE0" Offset="0x16BE0"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
         <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
         <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
         <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
@@ -79,14 +79,14 @@
         <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
         <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
-        <Texture Name="object_ik_Tex_0174B8" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
-        <DList Name="object_ik_DL_018E78" Offset="0x18E78"/>
-        <DList Name="object_ik_DL_019100" Offset="0x19100"/>
-        <DList Name="object_ik_DL_019E08" Offset="0x19E08"/>
-        <DList Name="object_ik_DL_01BA78" Offset="0x1BA78"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
         <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
         <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
         <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
@@ -101,8 +101,8 @@
         <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
         <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
         <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
-        <Texture Name="object_ik_Tex_01DDA8" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
-        <Texture Name="object_ik_Tex_01DEA8" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
         <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
     </File>
 </Root>
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 @@
         <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
         <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
 
-        <Texture Name="gMorieStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
         <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
         <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
 
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 @@
 <Root>
     <File Name="object_os" Segment="6">
-        <Animation Name="object_os_Anim_0002E4" Offset="0x2E4"/>
-        <DList Name="object_os_DL_001D80" Offset="0x1D80"/>
-        <DList Name="object_os_DL_0020A8" Offset="0x20A8"/>
-        <DList Name="object_os_DL_0025E8" Offset="0x25E8"/>
-        <DList Name="object_os_DL_002718" Offset="0x2718"/>
-        <DList Name="object_os_DL_002848" Offset="0x2848"/>
-        <DList Name="object_os_DL_002A00" Offset="0x2A00"/>
-        <DList Name="object_os_DL_002B30" Offset="0x2B30"/>
-        <DList Name="object_os_DL_002C60" Offset="0x2C60"/>
-        <Texture Name="object_os_TLUT_002E18" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
-        <Texture Name="object_os_TLUT_003018" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
-        <Texture Name="object_os_Tex_003218" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003258" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003358" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003398" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0033D8" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
-        <Texture Name="object_os_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0040D8" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0044D8" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_004558" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
-        <Limb Name="object_os_Limb_0045D8" LimbType="Standard" Offset="0x45D8"/>
-        <Limb Name="object_os_Limb_0045E4" LimbType="Standard" Offset="0x45E4"/>
-        <Limb Name="object_os_Limb_0045F0" LimbType="Standard" Offset="0x45F0"/>
-        <Limb Name="object_os_Limb_0045FC" LimbType="Standard" Offset="0x45FC"/>
-        <Limb Name="object_os_Limb_004608" LimbType="Standard" Offset="0x4608"/>
-        <Limb Name="object_os_Limb_004614" LimbType="Standard" Offset="0x4614"/>
-        <Limb Name="object_os_Limb_004620" LimbType="Standard" Offset="0x4620"/>
-        <Limb Name="object_os_Limb_00462C" LimbType="Standard" Offset="0x462C"/>
-        <Skeleton Name="object_os_Skel_004658" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
     </File>
 </Root>
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 @@
         <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
         <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
         <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
-        <Animation Name="gObjOsAnim_5808" Offset="0x5808"/>
-        <Animation Name="gObjOsAnim_62DC" Offset="0x62DC"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
         <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
         <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
-        <Animation Name="gObjOsAnim_65E0" Offset="0x65E0"/>
-        <Animation Name="gObjOsAnim_6A60" Offset="0x6A60"/>
-        <Animation Name="gObjOsAnim_6EE0" Offset="0x6EE0"/>
-        <Animation Name="gObjOsAnim_6F9C" Offset="0x6F9C"/>
-        <Animation Name="gObjOsAnim_7064" Offset="0x7064"/>
-        <Animation Name="gObjOsAnim_7120" Offset="0x7120"/>
-        <Animation Name="gObjOsAnim_7454" Offset="0x7454"/>
-        <Animation Name="gObjOsAnim_7830" Offset="0x7830"/>
-        <Animation Name="gObjOsAnim_7D94" Offset="0x7D94"/>
-        <Animation Name="gObjOsAnim_7E64" Offset="0x7E64"/>
-        <Animation Name="gObjOsAnim_7F38" Offset="0x7F38"/>
-        <Animation Name="gObjOsAnim_7FFC" Offset="0x7FFC"/>
-        <Animation Name="gObjOsAnim_80B4" Offset="0x80B4"/>
-        <Animation Name="gObjOsAnim_8178" Offset="0x8178"/>
-        <Animation Name="gObjOsAnim_879C" Offset="0x879C"/>
-        <Animation Name="gObjOsAnim_8F6C" Offset="0x8F6C"/>
-        <Animation Name="gObjOsAnim_9028" Offset="0x9028"/>
-        <Animation Name="gObjOsAnim_90EC" Offset="0x90EC"/>
-        <Animation Name="gObjOsAnim_91AC" Offset="0x91AC"/>
-        <Animation Name="gObjOsAnim_9274" Offset="0x9274"/>
-        <Animation Name="gObjOsAnim_982C" Offset="0x982C"/>
-        <Animation Name="gObjOsAnim_98EC" Offset="0x98EC"/>
-        <Animation Name="gObjOsAnim_99A4" Offset="0x99A4"/>
-        <Animation Name="gObjOsAnim_9B64" Offset="0x9B64"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
         <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
         <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
     </File>
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 @@
 <Root>
     <File Name="object_rs" Segment="6">
-        <Animation Name="object_rs_Anim_00065C" Offset="0x65C"/>
-        <DList Name="object_rs_DL_001FA0" Offset="0x1FA0"/>
-        <DList Name="object_rs_DL_0021F8" Offset="0x21F8"/>
-        <DList Name="object_rs_DL_0025F8" Offset="0x25F8"/>
-        <DList Name="object_rs_DL_002730" Offset="0x2730"/>
-        <DList Name="object_rs_DL_002860" Offset="0x2860"/>
-        <DList Name="object_rs_DL_002A70" Offset="0x2A70"/>
-        <DList Name="object_rs_DL_002BA8" Offset="0x2BA8"/>
-        <DList Name="object_rs_DL_002CD8" Offset="0x2CD8"/>
-        <Texture Name="object_rs_TLUT_002EE8" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_0030E8" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003128" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003168" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004568" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004668" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
-        <Texture Name="object_rs_Tex_0046E8" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
-        <Limb Name="object_rs_Limb_0047E8" LimbType="Standard" Offset="0x47E8"/>
-        <Limb Name="object_rs_Limb_0047F4" LimbType="Standard" Offset="0x47F4"/>
-        <Limb Name="object_rs_Limb_004800" LimbType="Standard" Offset="0x4800"/>
-        <Limb Name="object_rs_Limb_00480C" LimbType="Standard" Offset="0x480C"/>
-        <Limb Name="object_rs_Limb_004818" LimbType="Standard" Offset="0x4818"/>
-        <Limb Name="object_rs_Limb_004824" LimbType="Standard" Offset="0x4824"/>
-        <Limb Name="object_rs_Limb_004830" LimbType="Standard" Offset="0x4830"/>
-        <Limb Name="object_rs_Limb_00483C" LimbType="Standard" Offset="0x483C"/>
-        <Skeleton Name="object_rs_Skel_004868" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tr" Segment="6">
-        <Animation Name="object_tr_Anim_000BFC" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
-        <Animation Name="object_tr_Anim_0013CC" Offset="0x13CC"/> <!-- Looking over right shoulder -->
-        <Animation Name="object_tr_Anim_001CDC" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
-        <Animation Name="object_tr_Anim_002BC4" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
-        <Animation Name="object_tr_Anim_0035CC" Offset="0x35CC"/> <!-- Looking over left shoulder -->
-        <Animation Name="object_tr_Anim_003FC8" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
-        <Animation Name="object_tr_Anim_0049C8" Offset="0x49C8"/> <!-- Floating on broom -->
-        <Animation Name="object_tr_Anim_005308" Offset="0x5308"/>
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
         <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
-        <DList Name="object_tr_DL_006520" Offset="0x6520"/>
-        <DList Name="object_tr_DL_0066A0" Offset="0x66A0"/>
-        <DList Name="object_tr_DL_006800" Offset="0x6800"/>
-        <DList Name="object_tr_DL_006940" Offset="0x6940"/>
-        <DList Name="object_tr_DL_006A50" Offset="0x6A50"/>
-        <DList Name="object_tr_DL_006B48" Offset="0x6B48"/>
-        <DList Name="object_tr_DL_006C58" Offset="0x6C58"/>
-        <DList Name="object_tr_DL_006D50" Offset="0x6D50"/>
-        <DList Name="object_tr_DL_006E70" Offset="0x6E70"/>
-        <DList Name="object_tr_DL_006FF0" Offset="0x6FF0"/>
-        <DList Name="object_tr_DL_007118" Offset="0x7118"/>
-        <DList Name="object_tr_DL_007238" Offset="0x7238"/>
-        <DList Name="object_tr_DL_007358" Offset="0x7358"/>
-        <DList Name="object_tr_DL_0074D8" Offset="0x74D8"/>
-        <DList Name="object_tr_DL_007600" Offset="0x7600"/>
-        <DList Name="object_tr_DL_007720" Offset="0x7720"/>
-        <DList Name="object_tr_DL_007728" Offset="0x7728"/>
-        <Texture Name="object_tr_TLUT_007730" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
-        <Texture Name="object_tr_Tex_0078D8" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
-        <Texture Name="object_tr_Tex_0080D8" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
-        <Texture Name="object_tr_Tex_0082D8" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
-        <Texture Name="object_tr_Tex_0084D8" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
-        <Texture Name="object_tr_Tex_0086D8" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
-        <Texture Name="object_tr_Tex_008AD8" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B58" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B98" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
-        <Texture Name="object_tr_Tex_008D98" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008DD8" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008E58" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
-        <Texture Name="object_tr_Tex_008ED8" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
-        <Texture Name="object_tr_Tex_0092D8" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
-        <Texture Name="object_tr_Tex_0093D8" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
-        <Texture Name="object_tr_Tex_009458" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_009498" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_0094D8" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
-        <Texture Name="object_tr_Tex_0098D8" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
-        <DList Name="object_tr_DL_00AF38" Offset="0xAF38"/>
-        <DList Name="object_tr_DL_00B568" Offset="0xB568"/>
-        <DList Name="object_tr_DL_00B5C8" Offset="0xB5C8"/>
-        <DList Name="object_tr_DL_00B678" Offset="0xB678"/>
-        <DList Name="object_tr_DL_00B728" Offset="0xB728"/>
-        <DList Name="object_tr_DL_00B8D0" Offset="0xB8D0"/>
-        <DList Name="object_tr_DL_00B968" Offset="0xB968"/>
-        <DList Name="object_tr_DL_00BA00" Offset="0xBA00"/>
-        <DList Name="object_tr_DL_00BB68" Offset="0xBB68"/>
-        <Texture Name="object_tr_Tex_00BCD0" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
         <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
-        <Texture Name="object_tr_Tex_00C2D0" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
         <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
-        <Limb Name="object_tr_Limb_00C390" LimbType="Standard" Offset="0xC390"/>
-        <Limb Name="object_tr_Limb_00C39C" LimbType="Standard" Offset="0xC39C"/>
-        <Limb Name="object_tr_Limb_00C3A8" LimbType="Standard" Offset="0xC3A8"/>
-        <Limb Name="object_tr_Limb_00C3B4" LimbType="Standard" Offset="0xC3B4"/>
-        <Limb Name="object_tr_Limb_00C3C0" LimbType="Standard" Offset="0xC3C0"/>
-        <Limb Name="object_tr_Limb_00C3CC" LimbType="Standard" Offset="0xC3CC"/>
-        <Limb Name="object_tr_Limb_00C3D8" LimbType="Standard" Offset="0xC3D8"/>
-        <Limb Name="object_tr_Limb_00C3E4" LimbType="Standard" Offset="0xC3E4"/>
-        <Limb Name="object_tr_Limb_00C3F0" LimbType="Standard" Offset="0xC3F0"/>
-        <Limb Name="object_tr_Limb_00C3FC" LimbType="Standard" Offset="0xC3FC"/>
-        <Limb Name="object_tr_Limb_00C408" LimbType="Standard" Offset="0xC408"/>
-        <Limb Name="object_tr_Limb_00C414" LimbType="Standard" Offset="0xC414"/>
-        <Limb Name="object_tr_Limb_00C420" LimbType="Standard" Offset="0xC420"/>
-        <Limb Name="object_tr_Limb_00C42C" LimbType="Standard" Offset="0xC42C"/>
-        <Limb Name="object_tr_Limb_00C438" LimbType="Standard" Offset="0xC438"/>
-        <Limb Name="object_tr_Limb_00C444" LimbType="Standard" Offset="0xC444"/>
-        <Limb Name="object_tr_Limb_00C450" LimbType="Standard" Offset="0xC450"/>
-        <Limb Name="object_tr_Limb_00C45C" LimbType="Standard" Offset="0xC45C"/>
-        <Limb Name="object_tr_Limb_00C468" LimbType="Standard" Offset="0xC468"/>
-        <Limb Name="object_tr_Limb_00C474" LimbType="Standard" Offset="0xC474"/>
-        <Limb Name="object_tr_Limb_00C480" LimbType="Standard" Offset="0xC480"/>
-        <Limb Name="object_tr_Limb_00C48C" LimbType="Standard" Offset="0xC48C"/>
-        <Limb Name="object_tr_Limb_00C498" LimbType="Standard" Offset="0xC498"/>
-        <Limb Name="object_tr_Limb_00C4A4" LimbType="Standard" Offset="0xC4A4"/>
-        <Limb Name="object_tr_Limb_00C4B0" LimbType="Standard" Offset="0xC4B0"/>
-        <Limb Name="object_tr_Limb_00C4BC" LimbType="Standard" Offset="0xC4BC"/>
-        <Skeleton Name="object_tr_Skel_00C530" Type="Flex" LimbType="Standard" Offset="0xC530"/>
-        <Animation Name="object_tr_Anim_00C60C" Offset="0xC60C"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
         <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
-        <DList Name="object_tr_DL_00D820" Offset="0xD820"/>
-        <DList Name="object_tr_DL_00D9A0" Offset="0xD9A0"/>
-        <DList Name="object_tr_DL_00DB00" Offset="0xDB00"/>
-        <DList Name="object_tr_DL_00DC40" Offset="0xDC40"/>
-        <DList Name="object_tr_DL_00DD50" Offset="0xDD50"/>
-        <DList Name="object_tr_DL_00DE48" Offset="0xDE48"/>
-        <DList Name="object_tr_DL_00DF58" Offset="0xDF58"/>
-        <DList Name="object_tr_DL_00E050" Offset="0xE050"/>
-        <DList Name="object_tr_DL_00E170" Offset="0xE170"/>
-        <DList Name="object_tr_DL_00E2F0" Offset="0xE2F0"/>
-        <DList Name="object_tr_DL_00E418" Offset="0xE418"/>
-        <DList Name="object_tr_DL_00E538" Offset="0xE538"/>
-        <DList Name="object_tr_DL_00E658" Offset="0xE658"/>
-        <DList Name="object_tr_DL_00E7D8" Offset="0xE7D8"/>
-        <DList Name="object_tr_DL_00E900" Offset="0xE900"/>
-        <DList Name="object_tr_DL_00EA20" Offset="0xEA20"/>
-        <DList Name="object_tr_DL_00EA28" Offset="0xEA28"/>
-        <Texture Name="object_tr_Tex_00EA30" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
-        <Texture Name="object_tr_Tex_00F230" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
-        <Texture Name="object_tr_Tex_00F430" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
-        <DList Name="object_tr_DL_010710" Offset="0x10710"/>
-        <DList Name="object_tr_DL_010D40" Offset="0x10D40"/>
-        <DList Name="object_tr_DL_010DA0" Offset="0x10DA0"/>
-        <DList Name="object_tr_DL_010E50" Offset="0x10E50"/>
-        <DList Name="object_tr_DL_010F00" Offset="0x10F00"/>
-        <DList Name="object_tr_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tr_DL_011140" Offset="0x11140"/>
-        <DList Name="object_tr_DL_0111D8" Offset="0x111D8"/>
-        <DList Name="object_tr_DL_011340" Offset="0x11340"/>
-        <Texture Name="object_tr_Tex_0114A8" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
-        <Limb Name="object_tr_Limb_0114E8" LimbType="Standard" Offset="0x114E8"/>
-        <Limb Name="object_tr_Limb_0114F4" LimbType="Standard" Offset="0x114F4"/>
-        <Limb Name="object_tr_Limb_011500" LimbType="Standard" Offset="0x11500"/>
-        <Limb Name="object_tr_Limb_01150C" LimbType="Standard" Offset="0x1150C"/>
-        <Limb Name="object_tr_Limb_011518" LimbType="Standard" Offset="0x11518"/>
-        <Limb Name="object_tr_Limb_011524" LimbType="Standard" Offset="0x11524"/>
-        <Limb Name="object_tr_Limb_011530" LimbType="Standard" Offset="0x11530"/>
-        <Limb Name="object_tr_Limb_01153C" LimbType="Standard" Offset="0x1153C"/>
-        <Limb Name="object_tr_Limb_011548" LimbType="Standard" Offset="0x11548"/>
-        <Limb Name="object_tr_Limb_011554" LimbType="Standard" Offset="0x11554"/>
-        <Limb Name="object_tr_Limb_011560" LimbType="Standard" Offset="0x11560"/>
-        <Limb Name="object_tr_Limb_01156C" LimbType="Standard" Offset="0x1156C"/>
-        <Limb Name="object_tr_Limb_011578" LimbType="Standard" Offset="0x11578"/>
-        <Limb Name="object_tr_Limb_011584" LimbType="Standard" Offset="0x11584"/>
-        <Limb Name="object_tr_Limb_011590" LimbType="Standard" Offset="0x11590"/>
-        <Limb Name="object_tr_Limb_01159C" LimbType="Standard" Offset="0x1159C"/>
-        <Limb Name="object_tr_Limb_0115A8" LimbType="Standard" Offset="0x115A8"/>
-        <Limb Name="object_tr_Limb_0115B4" LimbType="Standard" Offset="0x115B4"/>
-        <Limb Name="object_tr_Limb_0115C0" LimbType="Standard" Offset="0x115C0"/>
-        <Limb Name="object_tr_Limb_0115CC" LimbType="Standard" Offset="0x115CC"/>
-        <Limb Name="object_tr_Limb_0115D8" LimbType="Standard" Offset="0x115D8"/>
-        <Limb Name="object_tr_Limb_0115E4" LimbType="Standard" Offset="0x115E4"/>
-        <Limb Name="object_tr_Limb_0115F0" LimbType="Standard" Offset="0x115F0"/>
-        <Limb Name="object_tr_Limb_0115FC" LimbType="Standard" Offset="0x115FC"/>
-        <Limb Name="object_tr_Limb_011608" LimbType="Standard" Offset="0x11608"/>
-        <Limb Name="object_tr_Limb_011614" LimbType="Standard" Offset="0x11614"/>
-        <Skeleton Name="object_tr_Skel_011688" Type="Flex" LimbType="Standard" Offset="0x11688"/>
-        <Animation Name="object_tr_Anim_012E1C" Offset="0x12E1C"/> <!-- Casting magic -->
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tw" Segment="6">
-        <Animation Name="object_tw_Anim_0004A4" Offset="0x4A4"/>
-        <Animation Name="object_tw_Anim_000AAC" Offset="0xAAC"/>
-        <Animation Name="object_tw_Anim_0012A4" Offset="0x12A4"/>
-        <Animation Name="object_tw_Anim_0017E0" Offset="0x17E0"/>
-        <Animation Name="object_tw_Anim_001D10" Offset="0x1D10"/>
-        <Animation Name="object_tw_Anim_00230C" Offset="0x230C"/>
-        <Animation Name="object_tw_Anim_003614" Offset="0x3614"/>
-        <Animation Name="object_tw_Anim_003E34" Offset="0x3E34"/>
-        <Animation Name="object_tw_Anim_004548" Offset="0x4548"/>
-        <Animation Name="object_tw_Anim_00578C" Offset="0x578C"/>
-        <Animation Name="object_tw_Anim_006530" Offset="0x6530"/>
-        <Animation Name="object_tw_Anim_006F28" Offset="0x6F28"/>
-        <Limb Name="object_tw_Limb_006F40" LimbType="Standard" Offset="0x6F40"/>
-        <Limb Name="object_tw_Limb_006F4C" LimbType="Standard" Offset="0x6F4C"/>
-        <Limb Name="object_tw_Limb_006F58" LimbType="Standard" Offset="0x6F58"/>
-        <Limb Name="object_tw_Limb_006F64" LimbType="Standard" Offset="0x6F64"/>
-        <Limb Name="object_tw_Limb_006F70" LimbType="Standard" Offset="0x6F70"/>
-        <Limb Name="object_tw_Limb_006F7C" LimbType="Standard" Offset="0x6F7C"/>
-        <Limb Name="object_tw_Limb_006F88" LimbType="Standard" Offset="0x6F88"/>
-        <Limb Name="object_tw_Limb_006F94" LimbType="Standard" Offset="0x6F94"/>
-        <Limb Name="object_tw_Limb_006FA0" LimbType="Standard" Offset="0x6FA0"/>
-        <Limb Name="object_tw_Limb_006FAC" LimbType="Standard" Offset="0x6FAC"/>
-        <Limb Name="object_tw_Limb_006FB8" LimbType="Standard" Offset="0x6FB8"/>
-        <Limb Name="object_tw_Limb_006FC4" LimbType="Standard" Offset="0x6FC4"/>
-        <Limb Name="object_tw_Limb_006FD0" LimbType="Standard" Offset="0x6FD0"/>
-        <Limb Name="object_tw_Limb_006FDC" LimbType="Standard" Offset="0x6FDC"/>
-        <Limb Name="object_tw_Limb_006FE8" LimbType="Standard" Offset="0x6FE8"/>
-        <Limb Name="object_tw_Limb_006FF4" LimbType="Standard" Offset="0x6FF4"/>
-        <Limb Name="object_tw_Limb_007000" LimbType="Standard" Offset="0x7000"/>
-        <Limb Name="object_tw_Limb_00700C" LimbType="Standard" Offset="0x700C"/>
-        <Limb Name="object_tw_Limb_007018" LimbType="Standard" Offset="0x7018"/>
-        <Limb Name="object_tw_Limb_007024" LimbType="Standard" Offset="0x7024"/>
-        <Limb Name="object_tw_Limb_007030" LimbType="Standard" Offset="0x7030"/>
-        <Limb Name="object_tw_Limb_00703C" LimbType="Standard" Offset="0x703C"/>
-        <Limb Name="object_tw_Limb_007048" LimbType="Standard" Offset="0x7048"/>
-        <Limb Name="object_tw_Limb_007054" LimbType="Standard" Offset="0x7054"/>
-        <Limb Name="object_tw_Limb_007060" LimbType="Standard" Offset="0x7060"/>
-        <Limb Name="object_tw_Limb_00706C" LimbType="Standard" Offset="0x706C"/>
-        <Skeleton Name="object_tw_Skel_0070E0" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
-        <Animation Name="object_tw_Anim_007688" Offset="0x7688"/>
-        <Animation Name="object_tw_Anim_007CA8" Offset="0x7CA8"/>
-        <Animation Name="object_tw_Anim_0088C8" Offset="0x88C8"/>
-        <Animation Name="object_tw_Anim_009398" Offset="0x9398"/>
-        <Animation Name="object_tw_Anim_00947C" Offset="0x947C"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
         <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
-        <Texture Name="object_tw_TLUT_009490" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
-        <Texture Name="object_tw_Tex_009638" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
-        <Texture Name="object_tw_Tex_009E38" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
-        <Texture Name="object_tw_Tex_00A038" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
-        <Texture Name="object_tw_Tex_00A238" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
-        <Texture Name="object_tw_Tex_00A438" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A838" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8B8" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8F8" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
-        <Texture Name="object_tw_Tex_00AAF8" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00AB38" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00ABB8" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
-        <Texture Name="object_tw_Tex_00AC38" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
-        <Texture Name="object_tw_Tex_00B038" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
-        <Texture Name="object_tw_Tex_00B138" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
-        <Texture Name="object_tw_Tex_00B1B8" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B1F8" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B238" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B638" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00BA38" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
-        <Texture Name="object_tw_Tex_00BE38" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
-        <Texture Name="object_tw_Tex_00C238" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
-        <Texture Name="object_tw_Tex_00CA38" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
-        <Texture Name="object_tw_Tex_00CAB8" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
-        <DList Name="object_tw_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tw_DL_0116A0" Offset="0x116A0"/>
-        <DList Name="object_tw_DL_011C98" Offset="0x11C98"/>
-        <DList Name="object_tw_DL_011E28" Offset="0x11E28"/>
-        <DList Name="object_tw_DL_011FB8" Offset="0x11FB8"/>
-        <DList Name="object_tw_DL_012018" Offset="0x12018"/>
-        <DList Name="object_tw_DL_0120C8" Offset="0x120C8"/>
-        <DList Name="object_tw_DL_012178" Offset="0x12178"/>
-        <DList Name="object_tw_DL_012210" Offset="0x12210"/>
-        <DList Name="object_tw_DL_0122A8" Offset="0x122A8"/>
-        <DList Name="object_tw_DL_012410" Offset="0x12410"/>
-        <DList Name="object_tw_DL_012578" Offset="0x12578"/>
-        <DList Name="object_tw_DL_0126E0" Offset="0x126E0"/>
-        <DList Name="object_tw_DL_012848" Offset="0x12848"/>
-        <DList Name="object_tw_DL_0128E0" Offset="0x128E0"/>
-        <DList Name="object_tw_DL_012978" Offset="0x12978"/>
-        <DList Name="object_tw_DL_012A28" Offset="0x12A28"/>
-        <DList Name="object_tw_DL_012AD8" Offset="0x12AD8"/>
-        <DList Name="object_tw_DL_012B38" Offset="0x12B38"/>
-        <DList Name="object_tw_DL_012CE0" Offset="0x12CE0"/>
-        <DList Name="object_tw_DL_013310" Offset="0x13310"/>
-        <DList Name="object_tw_DL_0134B8" Offset="0x134B8"/>
-        <DList Name="object_tw_DL_013AE8" Offset="0x13AE8"/>
-        <DList Name="object_tw_DL_013D68" Offset="0x13D68"/>
-        <DList Name="object_tw_DL_013E98" Offset="0x13E98"/>
-        <DList Name="object_tw_DL_013F98" Offset="0x13F98"/>
-        <DList Name="object_tw_DL_014070" Offset="0x14070"/>
-        <DList Name="object_tw_DL_014158" Offset="0x14158"/>
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
         <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
-        <DList Name="object_tw_DL_015440" Offset="0x15440"/>
-        <DList Name="object_tw_DL_015538" Offset="0x15538"/>
-        <DList Name="object_tw_DL_015648" Offset="0x15648"/>
-        <DList Name="object_tw_DL_015740" Offset="0x15740"/>
-        <DList Name="object_tw_DL_015850" Offset="0x15850"/>
-        <DList Name="object_tw_DL_015990" Offset="0x15990"/>
-        <DList Name="object_tw_DL_015B10" Offset="0x15B10"/>
-        <DList Name="object_tw_DL_015C30" Offset="0x15C30"/>
-        <DList Name="object_tw_DL_015D58" Offset="0x15D58"/>
-        <DList Name="object_tw_DL_015E78" Offset="0x15E78"/>
-        <DList Name="object_tw_DL_015FF8" Offset="0x15FF8"/>
-        <DList Name="object_tw_DL_016118" Offset="0x16118"/>
-        <DList Name="object_tw_DL_016240" Offset="0x16240"/>
-        <DList Name="object_tw_DL_016360" Offset="0x16360"/>
-        <DList Name="object_tw_DL_0164C0" Offset="0x164C0"/>
-        <DList Name="object_tw_DL_0164C8" Offset="0x164C8"/>
-        <DList Name="object_tw_DL_0164D0" Offset="0x164D0"/>
-        <Texture Name="object_tw_Tex_016650" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
-        <Texture Name="object_tw_Tex_0166D0" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
         <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
-        <DList Name="object_tw_DL_017910" Offset="0x17910"/>
-        <DList Name="object_tw_DL_017A08" Offset="0x17A08"/>
-        <DList Name="object_tw_DL_017B18" Offset="0x17B18"/>
-        <DList Name="object_tw_DL_017C10" Offset="0x17C10"/>
-        <DList Name="object_tw_DL_017D20" Offset="0x17D20"/>
-        <DList Name="object_tw_DL_017E60" Offset="0x17E60"/>
-        <DList Name="object_tw_DL_017FE0" Offset="0x17FE0"/>
-        <DList Name="object_tw_DL_018100" Offset="0x18100"/>
-        <DList Name="object_tw_DL_018228" Offset="0x18228"/>
-        <DList Name="object_tw_DL_018348" Offset="0x18348"/>
-        <DList Name="object_tw_DL_0184C8" Offset="0x184C8"/>
-        <DList Name="object_tw_DL_0185E8" Offset="0x185E8"/>
-        <DList Name="object_tw_DL_018710" Offset="0x18710"/>
-        <DList Name="object_tw_DL_018830" Offset="0x18830"/>
-        <DList Name="object_tw_DL_018990" Offset="0x18990"/>
-        <DList Name="object_tw_DL_018998" Offset="0x18998"/>
-        <DList Name="object_tw_DL_0189A0" Offset="0x189A0"/>
-        <Texture Name="object_tw_Tex_018B20" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
-        <Texture Name="object_tw_Tex_018B60" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
-        <DList Name="object_tw_DL_018FC0" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
-        <Texture Name="object_tw_Tex_019078" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
-        <Texture Name="object_tw_Tex_019478" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
-        <DList Name="object_tw_DL_019938" Offset="0x19938"/> <!-- koume Ground Flame -->
-        <Texture Name="object_tw_Tex_019A20" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
-        <DList Name="object_tw_DL_019D40" Offset="0x19D40"/> <!-- Koume Ground Crater -->
-        <Texture Name="object_tw_Tex_019E00" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
-        <Texture Name="object_tw_Tex_01A200" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
-        <DList Name="object_tw_DL_01A430" Offset="0x1A430"/>
-        <DList Name="object_tw_DL_01A528" Offset="0x1A528"/>
-        <DList Name="object_tw_DL_01A5A8" Offset="0x1A5A8"/>
-        <Texture Name="object_tw_Tex_01A5C0" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
-        <DList Name="object_tw_DL_01A790" Offset="0x1A790"/>
-        <DList Name="object_tw_DL_01A8A0" Offset="0x1A8A0"/>
-        <DList Name="object_tw_DL_01A998" Offset="0x1A998"/>
-        <DList Name="object_tw_DL_01AA50" Offset="0x1AA50"/>
-        <DList Name="object_tw_DL_01AB00" Offset="0x1AB00"/>
-        <Texture Name="object_tw_Tex_01AB20" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
         <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
-        <DList Name="object_tw_DL_01BC00" Offset="0x1BC00"/>
-        <Texture Name="object_tw_Tex_01BCA0" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
-        <Texture Name="object_tw_Tex_01C0A0" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
-        <DList Name="object_tw_DL_01C1C0" Offset="0x1C1C0"/>
-        <Texture Name="object_tw_Tex_01C2A0" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
-        <Texture Name="object_tw_Tex_01C6A0" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
-        <DList Name="object_tw_DL_01CEE0" Offset="0x1CEE0"/>
-        <Texture Name="object_tw_Tex_01CFA8" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
-        <Texture Name="object_tw_Tex_01D3A8" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
-        <DList Name="object_tw_DL_01DBE8" Offset="0x1DBE8"/>
-        <DList Name="object_tw_DL_01DDF0" Offset="0x1DDF0"/>
-        <DList Name="object_tw_DL_01E020" Offset="0x1E020"/>
-        <DList Name="object_tw_DL_01E0E0" Offset="0x1E0E0"/>
-        <DList Name="object_tw_DL_01E2C0" Offset="0x1E2C0"/>
-        <DList Name="object_tw_DL_01E3A0" Offset="0x1E3A0"/>
-        <Texture Name="object_tw_Tex_01E430" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
-        <DList Name="object_tw_DL_01E9F0" Offset="0x1E9F0"/>
-        <Texture Name="object_tw_Tex_01EB28" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
-        <DList Name="object_tw_DL_01EC68" Offset="0x1EC68"/>
-        <Texture Name="object_tw_Tex_01ECF0" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
-        <DList Name="object_tw_DL_01EEB0" Offset="0x1EEB0"/>
-        <DList Name="object_tw_DL_01F238" Offset="0x1F238"/>
-        <DList Name="object_tw_DL_01F390" Offset="0x1F390"/>
-        <DList Name="object_tw_DL_01F608" Offset="0x1F608"/>
-        <Limb Name="object_tw_Limb_01F6E8" LimbType="Standard" Offset="0x1F6E8"/>
-        <Limb Name="object_tw_Limb_01F6F4" LimbType="Standard" Offset="0x1F6F4"/>
-        <Limb Name="object_tw_Limb_01F700" LimbType="Standard" Offset="0x1F700"/>
-        <Limb Name="object_tw_Limb_01F70C" LimbType="Standard" Offset="0x1F70C"/>
-        <Limb Name="object_tw_Limb_01F718" LimbType="Standard" Offset="0x1F718"/>
-        <Limb Name="object_tw_Limb_01F724" LimbType="Standard" Offset="0x1F724"/>
-        <Limb Name="object_tw_Limb_01F730" LimbType="Standard" Offset="0x1F730"/>
-        <Limb Name="object_tw_Limb_01F73C" LimbType="Standard" Offset="0x1F73C"/>
-        <Limb Name="object_tw_Limb_01F748" LimbType="Standard" Offset="0x1F748"/>
-        <Limb Name="object_tw_Limb_01F754" LimbType="Standard" Offset="0x1F754"/>
-        <Limb Name="object_tw_Limb_01F760" LimbType="Standard" Offset="0x1F760"/>
-        <Limb Name="object_tw_Limb_01F76C" LimbType="Standard" Offset="0x1F76C"/>
-        <Limb Name="object_tw_Limb_01F778" LimbType="Standard" Offset="0x1F778"/>
-        <Limb Name="object_tw_Limb_01F784" LimbType="Standard" Offset="0x1F784"/>
-        <Limb Name="object_tw_Limb_01F790" LimbType="Standard" Offset="0x1F790"/>
-        <Limb Name="object_tw_Limb_01F79C" LimbType="Standard" Offset="0x1F79C"/>
-        <Limb Name="object_tw_Limb_01F7A8" LimbType="Standard" Offset="0x1F7A8"/>
-        <Limb Name="object_tw_Limb_01F7B4" LimbType="Standard" Offset="0x1F7B4"/>
-        <Limb Name="object_tw_Limb_01F7C0" LimbType="Standard" Offset="0x1F7C0"/>
-        <Limb Name="object_tw_Limb_01F7CC" LimbType="Standard" Offset="0x1F7CC"/>
-        <Limb Name="object_tw_Limb_01F7D8" LimbType="Standard" Offset="0x1F7D8"/>
-        <Limb Name="object_tw_Limb_01F7E4" LimbType="Standard" Offset="0x1F7E4"/>
-        <Limb Name="object_tw_Limb_01F7F0" LimbType="Standard" Offset="0x1F7F0"/>
-        <Limb Name="object_tw_Limb_01F7FC" LimbType="Standard" Offset="0x1F7FC"/>
-        <Limb Name="object_tw_Limb_01F808" LimbType="Standard" Offset="0x1F808"/>
-        <Limb Name="object_tw_Limb_01F814" LimbType="Standard" Offset="0x1F814"/>
-        <Skeleton Name="object_tw_Skel_01F888" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
-        <Texture Name="object_tw_Tex_02A070" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
-        <Animation Name="object_tw_Anim_0216DC" Offset="0x216DC"/>
-        <Animation Name="object_tw_Anim_022700" Offset="0x22700"/>
-        <Animation Name="object_tw_Anim_023750" Offset="0x23750"/>
-        <Animation Name="object_tw_Anim_024374" Offset="0x24374"/>
-        <Animation Name="object_tw_Anim_0244B4" Offset="0x244B4"/>
-        <Texture Name="object_tw_Tex_0244D0" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
-        <Texture Name="object_tw_Tex_024510" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
-        <Texture Name="object_tw_Tex_024710" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
-        <Texture Name="object_tw_Tex_024910" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
-        <Texture Name="object_tw_Tex_024B10" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
-        <DList Name="object_tw_DL_027720" Offset="0x27720"/>
-        <DList Name="object_tw_DL_027820" Offset="0x27820"/>
-        <DList Name="object_tw_DL_027970" Offset="0x27970"/>
-        <DList Name="object_tw_DL_027A60" Offset="0x27A60"/>
-        <DList Name="object_tw_DL_027B78" Offset="0x27B78"/>
-        <DList Name="object_tw_DL_027C98" Offset="0x27C98"/>
-        <DList Name="object_tw_DL_027DE8" Offset="0x27DE8"/>
-        <DList Name="object_tw_DL_027EE0" Offset="0x27EE0"/>
-        <DList Name="object_tw_DL_027FE8" Offset="0x27FE8"/>
-        <DList Name="object_tw_DL_028100" Offset="0x28100"/>
-        <DList Name="object_tw_DL_028220" Offset="0x28220"/>
-        <DList Name="object_tw_DL_028370" Offset="0x28370"/>
-        <DList Name="object_tw_DL_028468" Offset="0x28468"/>
-        <DList Name="object_tw_DL_028570" Offset="0x28570"/>
-        <DList Name="object_tw_DL_028668" Offset="0x28668"/>
-        <DList Name="object_tw_DL_028778" Offset="0x28778"/>
-        <DList Name="object_tw_DL_028870" Offset="0x28870"/>
-        <DList Name="object_tw_DL_028980" Offset="0x28980"/>
-        <DList Name="object_tw_DL_028B78" Offset="0x28B78"/>
-        <DList Name="object_tw_DL_028D70" Offset="0x28D70"/>
-        <DList Name="object_tw_DL_029268" Offset="0x29268"/>
-        <DList Name="object_tw_DL_0293E0" Offset="0x293E0"/>
-        <DList Name="object_tw_DL_029530" Offset="0x29530"/>
-        <DList Name="object_tw_DL_029620" Offset="0x29620"/>
-        <DList Name="object_tw_DL_029738" Offset="0x29738"/>
-        <DList Name="object_tw_DL_029900" Offset="0x29900"/>
-        <DList Name="object_tw_DL_0299F8" Offset="0x299F8"/>
-        <DList Name="object_tw_DL_029B10" Offset="0x29B10"/>
-        <Texture Name="object_tw_TLUT_029E50" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
-        <Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02A470" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02A870" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02A970" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
-        <Texture Name="object_tw_Tex_02A9B0" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02ADB0" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
-        <Texture Name="object_tw_Tex_02ADF0" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02AE30" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02AF30" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
-        <DList Name="object_tw_DL_02CAF0" Offset="0x2CAF0"/>
-        <DList Name="object_tw_DL_02CB50" Offset="0x2CB50"/>
-        <DList Name="object_tw_DL_02CBB0" Offset="0x2CBB0"/>
-        <DList Name="object_tw_DL_02D320" Offset="0x2D320"/>
-        <DList Name="object_tw_DL_02D4A0" Offset="0x2D4A0"/>
-        <DList Name="object_tw_DL_02D5D8" Offset="0x2D5D8"/>
-        <DList Name="object_tw_DL_02D710" Offset="0x2D710"/>
-        <DList Name="object_tw_DL_02D890" Offset="0x2D890"/>
-        <DList Name="object_tw_DL_02D940" Offset="0x2D940"/>
-        <DList Name="object_tw_DL_02D9F0" Offset="0x2D9F0"/>
-        <DList Name="object_tw_DL_02DAE0" Offset="0x2DAE0"/>
-        <DList Name="object_tw_DL_02DBC8" Offset="0x2DBC8"/>
-        <DList Name="object_tw_DL_02DCB8" Offset="0x2DCB8"/>
-        <DList Name="object_tw_DL_02DDD8" Offset="0x2DDD8"/>
-        <DList Name="object_tw_DL_02DEB0" Offset="0x2DEB0"/>
-        <DList Name="object_tw_DL_02DFB0" Offset="0x2DFB0"/>
-        <DList Name="object_tw_DL_02E098" Offset="0x2E098"/>
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
         <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
-        <Limb Name="object_tw_Limb_031D70" LimbType="Standard" Offset="0x31D70"/>
-        <Limb Name="object_tw_Limb_031D7C" LimbType="Standard" Offset="0x31D7C"/>
-        <Limb Name="object_tw_Limb_031D88" LimbType="Standard" Offset="0x31D88"/>
-        <Limb Name="object_tw_Limb_031D94" LimbType="Standard" Offset="0x31D94"/>
-        <Limb Name="object_tw_Limb_031DA0" LimbType="Standard" Offset="0x31DA0"/>
-        <Limb Name="object_tw_Limb_031DAC" LimbType="Standard" Offset="0x31DAC"/>
-        <Limb Name="object_tw_Limb_031DB8" LimbType="Standard" Offset="0x31DB8"/>
-        <Limb Name="object_tw_Limb_031DC4" LimbType="Standard" Offset="0x31DC4"/>
-        <Limb Name="object_tw_Limb_031DD0" LimbType="Standard" Offset="0x31DD0"/>
-        <Limb Name="object_tw_Limb_031DDC" LimbType="Standard" Offset="0x31DDC"/>
-        <Limb Name="object_tw_Limb_031DE8" LimbType="Standard" Offset="0x31DE8"/>
-        <Limb Name="object_tw_Limb_031DF4" LimbType="Standard" Offset="0x31DF4"/>
-        <Limb Name="object_tw_Limb_031E00" LimbType="Standard" Offset="0x31E00"/>
-        <Limb Name="object_tw_Limb_031E0C" LimbType="Standard" Offset="0x31E0C"/>
-        <Limb Name="object_tw_Limb_031E18" LimbType="Standard" Offset="0x31E18"/>
-        <Limb Name="object_tw_Limb_031E24" LimbType="Standard" Offset="0x31E24"/>
-        <Limb Name="object_tw_Limb_031E30" LimbType="Standard" Offset="0x31E30"/>
-        <Limb Name="object_tw_Limb_031E3C" LimbType="Standard" Offset="0x31E3C"/>
-        <Limb Name="object_tw_Limb_031E48" LimbType="Standard" Offset="0x31E48"/>
-        <Limb Name="object_tw_Limb_031E54" LimbType="Standard" Offset="0x31E54"/>
-        <Limb Name="object_tw_Limb_031E60" LimbType="Standard" Offset="0x31E60"/>
-        <Limb Name="object_tw_Limb_031E6C" LimbType="Standard" Offset="0x31E6C"/>
-        <Limb Name="object_tw_Limb_031E78" LimbType="Standard" Offset="0x31E78"/>
-        <Limb Name="object_tw_Limb_031E84" LimbType="Standard" Offset="0x31E84"/>
-        <Limb Name="object_tw_Limb_031E90" LimbType="Standard" Offset="0x31E90"/>
-        <Limb Name="object_tw_Limb_031E9C" LimbType="Standard" Offset="0x31E9C"/>
-        <Limb Name="object_tw_Limb_031EA8" LimbType="Standard" Offset="0x31EA8"/>
-        <Limb Name="object_tw_Limb_031EB4" LimbType="Standard" Offset="0x31EB4"/>
-        <Limb Name="object_tw_Limb_031EC0" LimbType="Standard" Offset="0x31EC0"/>
-        <Limb Name="object_tw_Limb_031ECC" LimbType="Standard" Offset="0x31ECC"/>
-        <Limb Name="object_tw_Limb_031ED8" LimbType="Standard" Offset="0x31ED8"/>
-        <Limb Name="object_tw_Limb_031EE4" LimbType="Standard" Offset="0x31EE4"/>
-        <Limb Name="object_tw_Limb_031EF0" LimbType="Standard" Offset="0x31EF0"/>
-        <Limb Name="object_tw_Limb_031EFC" LimbType="Standard" Offset="0x31EFC"/>
-        <Limb Name="object_tw_Limb_031F08" LimbType="Standard" Offset="0x31F08"/>
-        <Limb Name="object_tw_Limb_031F14" LimbType="Standard" Offset="0x31F14"/>
-        <Limb Name="object_tw_Limb_031F20" LimbType="Standard" Offset="0x31F20"/>
-        <Limb Name="object_tw_Limb_031F2C" LimbType="Standard" Offset="0x31F2C"/>
-        <Limb Name="object_tw_Limb_031F38" LimbType="Standard" Offset="0x31F38"/>
-        <Limb Name="object_tw_Limb_031F44" LimbType="Standard" Offset="0x31F44"/>
-        <Limb Name="object_tw_Limb_031F50" LimbType="Standard" Offset="0x31F50"/>
-        <Limb Name="object_tw_Limb_031F5C" LimbType="Standard" Offset="0x31F5C"/>
-        <Limb Name="object_tw_Limb_031F68" LimbType="Standard" Offset="0x31F68"/>
-        <Skeleton Name="object_tw_Skel_032020" Type="Flex" LimbType="Standard" Offset="0x32020"/>
-        <Animation Name="object_tw_Anim_032BF8" Offset="0x32BF8"/>
-        <Animation Name="object_tw_Anim_0338F0" Offset="0x338F0"/>
-        <Animation Name="object_tw_Anim_0343B4" Offset="0x343B4"/>
-        <Animation Name="object_tw_Anim_035030" Offset="0x35030"/>
-        <Animation Name="object_tw_Anim_035988" Offset="0x35988"/>
-        <Animation Name="object_tw_Anim_036FBC" Offset="0x36FBC"/>
-        <Animation Name="object_tw_Anim_038E2C" Offset="0x38E2C"/>
-        <Animation Name="object_tw_Anim_03A2D0" Offset="0x3A2D0"/>
-        <DList Name="object_tw_DL_03A680" Offset="0x3A680"/>
-        <Texture Name="object_tw_Tex_03A7B0" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x31D70"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x31D7C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x31D88"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x31D94"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x31DA0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x31DAC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x31DB8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x31DC4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x31DD0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x31DDC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x31DE8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x31DF4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x31E00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x31E0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x31E18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x31E24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x31E30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x31E3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x31E48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x31E54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x31E60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x31E6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x31E78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x31E84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x31E90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x31E9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x31EA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x31EB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x31EC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x31ECC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x31ED8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x31EE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x31EF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x31EFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x31F08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x31F14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x31F20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x31F2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x31F38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x31F44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x31F50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x31F5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x31F68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x32020"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x32BF8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x338F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x343B4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x35030"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x35988"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x36FBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x38E2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x3A2D0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x3A680"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="ovl_Boss_Ganon2" BaseAddress="0x808F1DB0" RangeStart="0x9F88" RangeEnd="0x10778">
-        <Texture Name="ovl_Boss_Ganon2_Tex_00A2C8" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF88">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B308" Offset="0x00AFC8"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B378" Offset="0x00B038"/>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AFC8"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B038"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B050">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3D0" Offset="0x00B090"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3F0" Offset="0x00B0B0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B420" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B820" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
-        <Array Name="ovl_Boss_Ganon2_Vtx_00BA20" Count="22" Offset="0x00B6E0">
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B090"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B0B0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B6E0">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00BB80" Offset="0x00B840"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00BC98" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B840"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C958">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00CCD8" Offset="0x00C998"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00CD58" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
+        <DList Name="gGanonTriforceDL" Offset="0x00C998"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D418">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00D798" Offset="0x00D458"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00D820" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
+        <DList Name="gGanonLightningDL" Offset="0x00D458"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DCE0">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00E1C0" Offset="0x00DE80"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00E2E0" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE80"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E7A0">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00EC40" Offset="0x00E900"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00ED48" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E900"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EE08">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00F188" Offset="0x00EE48"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F208" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F408" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EE48"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F8C8">
             <Vtx/>
         </Array>
@@ -71,6 +71,6 @@
         <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF58">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_0103A8" Offset="0x010168"/>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010168"/>
     </File>
 </Root>
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..e9c8d7ef5 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
@@ -2,7 +2,7 @@
     <File Name="daiyousei_izumi_scene" Segment="2">
         <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
         <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
-        <Cutscene Name="gGreatFairyDoubleDefenceCs" Offset="0x25D0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
         <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
     </File>
     <File Name="daiyousei_izumi_room_0" Segment="3">
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 @@
 <Root>
     <File Name="icon_item_24_static" Segment="9">
-        <Texture Name="gForestMedallionIconTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
-        <Texture Name="gFireMedallionIconTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
-        <Texture Name="gWaterMedallionIconTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
-        <Texture Name="gSpiritMedallionIconTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
-        <Texture Name="gShadowMedallionIconTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
-        <Texture Name="gLightMedallionIconTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
-        <Texture Name="gKokiriEmeraldIconTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
-        <Texture Name="gGoronRubyIconTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
-        <Texture Name="gZoraSapphireIconTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
-        <Texture Name="gStoneOfAgonyIconTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
-        <Texture Name="gGerudosCardIconTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
-        <Texture Name="gGoldSkulltulaIconTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
-        <Texture Name="gHeartContainerIconTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
-        <Texture Name="gUnusedPieceOfHeartIconTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
-        <Texture Name="gBossKeyIconTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
-        <Texture Name="gCompassIconTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
-        <Texture Name="gDungeonMapIconTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
-        <Texture Name="gSmallKeyIconTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
-        <Texture Name="gSmallMagicJarIconTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
-        <Texture Name="gBigMagicJarIconTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="icon_item_static" Segment="8">
-        <Texture Name="gDekuStickIconTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="gDekuNutIconTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="gBombIconTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="gFairyBowIconTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
-        <Texture Name="gFireArrowIconTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="gDinsFireIconTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
-        <Texture Name="gFairySlingshotIconTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
-        <Texture Name="gFairyOcarinaIconTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
-        <Texture Name="gOcarinaofTimeIconTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
-        <Texture Name="gBombchuIconTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
-        <Texture Name="gHookshotIconTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
-        <Texture Name="gLongshotIconTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
-        <Texture Name="gIceArrowIconTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
-        <Texture Name="gFaroresWindIconTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
-        <Texture Name="gBoomerangIconTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
-        <Texture Name="gLensofTruthIconTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
-        <Texture Name="gMagicBeansIconTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
-        <Texture Name="gMegatonHammerIconTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
-        <Texture Name="gLightArrowIconTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
-        <Texture Name="gNayrusLoveIconTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
-        <Texture Name="gEmptyBottleIconTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
-        <Texture Name="gRedPotionIconTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
-        <Texture Name="gGreenPotionIconTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
-        <Texture Name="gBluePotionIconTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
-        <Texture Name="gBottledFairyIconTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
-        <Texture Name="gFishIconTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
-        <Texture Name="gMilkFullIconTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
-        <Texture Name="gRutosLetterIconTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
-        <Texture Name="gBlueFireIconTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
-        <Texture Name="gBugIconTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
-        <Texture Name="gBigPoeIconTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
-        <Texture Name="gMilkhalfIconTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
-        <Texture Name="gPoeIconTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
-        <Texture Name="gWeirdEggIconTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
-        <Texture Name="gCuccoIconTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
-        <Texture Name="gZeldasLetterIconTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
-        <Texture Name="gKeatonMaskIconTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
-        <Texture Name="gSkullMaskIconTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
-        <Texture Name="gSpookyMaskIconTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
-        <Texture Name="gBunnyHoodIconTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
-        <Texture Name="gGoronMaskIconTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
-        <Texture Name="gZoraMaskIconTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
-        <Texture Name="gGerudoMaskIconTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
-        <Texture Name="gMaskofTruthIconTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
-        <Texture Name="gSoldOutIconTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
-        <Texture Name="gPocketEggIconTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
-        <Texture Name="gPocketCuccoIconTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
-        <Texture Name="gCojiroIconTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
-        <Texture Name="gOddMushroomIconTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
-        <Texture Name="gOddPotionIconTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
-        <Texture Name="gPoachersSawIconTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
-        <Texture Name="gBrokenBiggoronSwordIconTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
-        <Texture Name="gPrescriptionIconTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
-        <Texture Name="gEyeBallFrogIconTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
-        <Texture Name="gEyeDropsIconTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
-        <Texture Name="gClaimCheckIconTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
-        <Texture Name="gFairyBowFireIconTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
-        <Texture Name="gFairyBowIceIconTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
-        <Texture Name="gFairyBowLightIconTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
-        <Texture Name="gKokiriSwordIconTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
-        <Texture Name="gMasterSwordIconTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
-        <Texture Name="gBiggoronSwordIconTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
-        <Texture Name="gDekuShieldIconTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
-        <Texture Name="gHylianShieldIconTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
-        <Texture Name="gMirrorShieldIconTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
-        <Texture Name="gKokiriTunicIconTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
-        <Texture Name="gGoronTunicIconTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
-        <Texture Name="gZoraTunicIconTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
-        <Texture Name="gKokiriBootsIconTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
-        <Texture Name="gIronBootsIconTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
-        <Texture Name="gHoverBootsIconTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
-        <Texture Name="gBulletBag30IconTex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
-        <Texture Name="gBulletBag40IconTex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
-        <Texture Name="gBulletBag50IconTex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
-        <Texture Name="gQuiver30IconTex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
-        <Texture Name="gQuiver40IconTex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
-        <Texture Name="gQuiver50IconTex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
-        <Texture Name="gBombBag20IconTex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
-        <Texture Name="gBombBag30IconTex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
-        <Texture Name="gBombBag40IconTex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
-        <Texture Name="gGoronsBraceletIconTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
-        <Texture Name="gSilverGauntletsIconTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
-        <Texture Name="gGoldenGauntletsIconTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
-        <Texture Name="gSilverScaleIconTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
-        <Texture Name="gGoldenScaleIconTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
-        <Texture Name="gBrokenGiantsKnifeIconTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
-        <Texture Name="gAdultsWalletIconTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
-        <Texture Name="gGiantsWalletIconTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
-        <Texture Name="gDekuSeedsIconTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
-        <Texture Name="gFishingPoleIconTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
         <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
         <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
         <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
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 @@
         <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
         <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
         <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
-        <Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
-        <Texture Name="gOcarinaCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
-        <Texture Name="gOcarinaCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
-        <Texture Name="gOcarinaCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
-        <Texture Name="gOcarinaCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
         <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
         <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
         <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
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 @@
         <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xE9E08"/>
         <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEA208"/>
         <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xEA608"/>
-        <Array Name="sCircleWipeVtx" Count="34" Offset="0xEAA08">
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xEAA08">
             <Vtx/>
         </Array>
         <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
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 @@
 <Root>
     <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xE8E90" RangeEnd="0x10E2A0">
-        <DList Name="sTriforceWipeDL" Offset="0xE8E90"/>
-        <Array Name="sTriforceWipeVtx" Count="10" Offset="0xE8EC0">
+        <DList Name="sTransTriforceDL" Offset="0xE8E90"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xE8EC0">
             <Vtx/>
         </Array>
     </File>
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 @@
 <Root>
-    <!-- ZAPD isn't finding sWipe1Vtx and sWipe1Tex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
     <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xE8620" RangeEnd="0x10EC30" Segment="0">
-        <Array Name="sWipe1Vtx" Count="25" Offset="0xE8620">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xE8620">
             <Vtx/>
         </Array>
-        <Texture Name="sWipe1Tex" Format="i4" Width="64" Height="64" Offset="0xE87B0"/>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xE87B0"/>
        <!-- <DList Name="sWipe1DL" Offset="0x10EC30"/>-->
     </File>
 </Root>
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..2670b752d 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
@@ -4,7 +4,7 @@
         <DList Name="gBrownFragmentDL" Offset="0x530"/>
         <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
         <DList Name="gDoorLockDL" Offset="0x1100"/>
-        <DList Name="gDoorChainsDL" Offset="0x11F0"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
         <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
         <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
         <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
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..b0dcb9640 100644
--- a/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml
+++ b/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml
@@ -930,10 +930,10 @@
         <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4A090"/>
         <DList Name="gDoorMetalBarsDL" Offset="0x4B0D0"/>
         <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x4B160"/>
-        <Texture Name="gSunTex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
-        <Texture Name="gSunEveningTex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
-        <DList Name="gKokiriDustMoteTextureLoadDL" Offset="0x4D160"/>
-        <DList Name="gKokiriDustMoteDL" Offset="0x4D1A8"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x4C160"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x4C960"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x4D160"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x4D1A8"/>
         <DList Name="gSunDL" Offset="0x4D1C0"/>
         <DList Name="gZTargetLockOnTriangleDL" Offset="0x4D450"/>
         <DList Name="gEffFire1DL" Offset="0x4D4E0"/>
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 @@
 <Root>
     <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
     <File Name="object_bdoor" Segment="6">
-        <Texture Name="object_bdoor_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
-        <DList Name="object_bdoor_DL_0010C0" Offset="0x10C0"/>
-        <DList Name="object_bdoor_DL_001400" Offset="0x1400"/>
-        <DList Name="object_bdoor_DL_001530" Offset="0x1530"/>
-        <Texture Name="object_bdoor_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
-        <Texture Name="object_bdoor_Tex_0025C0" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
-        <Texture Name="object_bdoor_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
-        <Texture Name="object_bdoor_Tex_0045C0" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
-        <Texture Name="object_bdoor_Tex_0055C0" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
-        <Texture Name="object_bdoor_Tex_0065C0" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_bw" Segment="6">
-        <Animation Name="object_bw_Anim_000228" Offset="0x228"/>
-        <DList Name="object_bw_DL_0002C0" Offset="0x2C0"/>
-        <DList Name="object_bw_DL_0003E8" Offset="0x3E8"/>
-        <DList Name="object_bw_DL_000558" Offset="0x558"/>
-        <DList Name="object_bw_DL_000680" Offset="0x680"/>
-        <DList Name="object_bw_DL_001050" Offset="0x1050"/>
-        <Texture Name="object_bw_Tex_001240" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
-        <Texture Name="object_bw_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
-        <Texture Name="object_bw_TLUT_001640" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
-        <Texture Name="object_bw_Tex_001840" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
-        <Texture Name="object_bw_Tex_001C40" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
-        <Limb Name="object_bw_Limb_002040" LimbType="Standard" Offset="0x2040"/>
-        <Limb Name="object_bw_Limb_00204C" LimbType="Standard" Offset="0x204C"/>
-        <Limb Name="object_bw_Limb_002058" LimbType="Standard" Offset="0x2058"/>
-        <Limb Name="object_bw_Limb_002064" LimbType="Standard" Offset="0x2064"/>
-        <Limb Name="object_bw_Limb_002070" LimbType="Standard" Offset="0x2070"/>
-        <Limb Name="object_bw_Limb_00207C" LimbType="Standard" Offset="0x207C"/>
-        <Limb Name="object_bw_Limb_002088" LimbType="Standard" Offset="0x2088"/>
-        <Limb Name="object_bw_Limb_002094" LimbType="Standard" Offset="0x2094"/>
-        <Limb Name="object_bw_Limb_0020A0" LimbType="Standard" Offset="0x20A0"/>
-        <Limb Name="object_bw_Limb_0020AC" LimbType="Standard" Offset="0x20AC"/>
-        <Limb Name="object_bw_Limb_0020B8" LimbType="Standard" Offset="0x20B8"/>
-        <Skeleton Name="object_bw_Skel_0020F0" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
-        <Animation Name="object_bw_Anim_0021A0" Offset="0x21A0"/>
-        <Animation Name="object_bw_Anim_002250" Offset="0x2250"/>
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
     </File>
 </Root>
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..6ff8bbe8c 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,7 @@
 <Root>
     <File Name="object_fd" Segment="6">
         <!-- Boss title card -->
-        <Texture Name="gVolvagiaBossTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
+        <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
 
         <!-- Skeletons -->
         <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x114E0"/>
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 @@
     <File Name="object_ice_objects" Segment="6">
         <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
         <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
-        <DList Name="object_ice_objects_DL_0006F0" Offset="0x6F0"/>
-        <DList Name="object_ice_objects_DL_0012A0" Offset="0x12A0"/>
-        <Collision Name="object_ice_objects_Col_001C1C" Offset="0x1C1C"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
         <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
         <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
         <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
         <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
-        <DList Name="object_ice_objects_DL_002640" Offset="0x2640"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
         <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
         <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
-        <Collision Name="object_ice_objects_Col_002920" Offset="0x2920"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
         <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
-        <Texture Name="object_ice_objects_Tex_003150" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
         <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
         <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
-        <Texture Name="object_ice_objects_Tex_005150" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
-        <Texture Name="object_ice_objects_Tex_005550" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
         <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
         <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
         <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
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 @@
         <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
         <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
         <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
-        <Skeleton Name="object_ik_Skel_01E178" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
-        <Skeleton Name="object_ik_Skel_0205C0" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
 
         <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
         <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
         <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
         <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
         <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
-        <Animation Name="object_ik_Anim_001C28" Offset="0x1C28"/>
-        <Animation Name="object_ik_Anim_002538" Offset="0x2538"/>
-        <Animation Name="object_ik_Anim_0029FC" Offset="0x29FC"/>
-        <Animation Name="object_ik_Anim_0033C4" Offset="0x33C4"/>
-        <Animation Name="object_ik_Anim_003DBC" Offset="0x3DBC"/>
-        <Animation Name="object_ik_Anim_0045BC" Offset="0x45BC"/>
-        <Animation Name="object_ik_Anim_00485C" Offset="0x485C"/>
-        <Animation Name="object_ik_Anim_005944" Offset="0x5944"/>
-        <Animation Name="object_ik_Anim_006194" Offset="0x6194"/>
-        <Animation Name="object_ik_Anim_006734" Offset="0x6734"/>
-        <Animation Name="object_ik_Anim_00C114" Offset="0xC114"/>
-        <Animation Name="object_ik_Anim_00CD70" Offset="0xCD70"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
         <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
-        <Animation Name="object_ik_Anim_00ED24" Offset="0xED24"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
         <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
         <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
-        <Animation Name="object_ik_Anim_0203D8" Offset="0x203D8"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
 
         <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
-        <Texture Name="object_ik_Tex_00F7A0" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
         <!-- This is a duplicate texture to accound for authentic texture overflowing -->
         <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
              duplicate offset values -->
         <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
-        <Texture Name="object_ik_Tex_00FBA0" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
-        <Texture Name="object_ik_Tex_00FFA0" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
-        <Texture Name="object_ik_Tex_0101A0" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
         <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
-        <Texture Name="object_ik_Tex_010BA0" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
-        <Texture Name="object_ik_Tex_0113A0" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
-        <Texture Name="object_ik_Tex_011420" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011520" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011660" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
         <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
         <DList Name="object_ik_DL_015380" Offset="0x15380"/>
-        <DList Name="object_ik_DL_0154E0" Offset="0x154E0"/>
-        <DList Name="object_ik_DL_015840" Offset="0x15840"/>
-        <DList Name="object_ik_DL_015B00" Offset="0x15B00"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
         <DList Name="object_ik_DL_016118" Offset="0x16118"/>
         <DList Name="object_ik_DL_016278" Offset="0x16278"/>
         <DList Name="object_ik_DL_016340" Offset="0x16340"/>
         <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
         <DList Name="object_ik_DL_016568" Offset="0x16568"/>
         <DList Name="object_ik_DL_016658" Offset="0x16658"/>
-        <DList Name="object_ik_DL_016748" Offset="0x16748"/>
-        <DList Name="object_ik_DL_0169E8" Offset="0x169E8"/>
-        <DList Name="object_ik_DL_016BE0" Offset="0x16BE0"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
         <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
         <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
         <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
@@ -79,14 +79,14 @@
         <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
         <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
-        <Texture Name="object_ik_Tex_0174B8" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
-        <DList Name="object_ik_DL_018E78" Offset="0x18E78"/>
-        <DList Name="object_ik_DL_019100" Offset="0x19100"/>
-        <DList Name="object_ik_DL_019E08" Offset="0x19E08"/>
-        <DList Name="object_ik_DL_01BA78" Offset="0x1BA78"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
         <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
         <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
         <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
@@ -101,8 +101,8 @@
         <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
         <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
         <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
-        <Texture Name="object_ik_Tex_01DDA8" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
-        <Texture Name="object_ik_Tex_01DEA8" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
         <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
     </File>
 </Root>
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 @@
         <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
         <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
 
-        <Texture Name="gMorieStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
         <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
         <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
 
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 @@
 <Root>
     <File Name="object_os" Segment="6">
-        <Animation Name="object_os_Anim_0002E4" Offset="0x2E4"/>
-        <DList Name="object_os_DL_001D80" Offset="0x1D80"/>
-        <DList Name="object_os_DL_0020A8" Offset="0x20A8"/>
-        <DList Name="object_os_DL_0025E8" Offset="0x25E8"/>
-        <DList Name="object_os_DL_002718" Offset="0x2718"/>
-        <DList Name="object_os_DL_002848" Offset="0x2848"/>
-        <DList Name="object_os_DL_002A00" Offset="0x2A00"/>
-        <DList Name="object_os_DL_002B30" Offset="0x2B30"/>
-        <DList Name="object_os_DL_002C60" Offset="0x2C60"/>
-        <Texture Name="object_os_TLUT_002E18" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
-        <Texture Name="object_os_TLUT_003018" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
-        <Texture Name="object_os_Tex_003218" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003258" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003358" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003398" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0033D8" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
-        <Texture Name="gOsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
-        <Texture Name="object_os_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0040D8" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_0044D8" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
-        <Texture Name="object_os_Tex_004558" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
-        <Limb Name="object_os_Limb_0045D8" LimbType="Standard" Offset="0x45D8"/>
-        <Limb Name="object_os_Limb_0045E4" LimbType="Standard" Offset="0x45E4"/>
-        <Limb Name="object_os_Limb_0045F0" LimbType="Standard" Offset="0x45F0"/>
-        <Limb Name="object_os_Limb_0045FC" LimbType="Standard" Offset="0x45FC"/>
-        <Limb Name="object_os_Limb_004608" LimbType="Standard" Offset="0x4608"/>
-        <Limb Name="object_os_Limb_004614" LimbType="Standard" Offset="0x4614"/>
-        <Limb Name="object_os_Limb_004620" LimbType="Standard" Offset="0x4620"/>
-        <Limb Name="object_os_Limb_00462C" LimbType="Standard" Offset="0x462C"/>
-        <Skeleton Name="object_os_Skel_004658" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
     </File>
 </Root>
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 @@
         <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
         <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
         <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
-        <Animation Name="gObjOsAnim_5808" Offset="0x5808"/>
-        <Animation Name="gObjOsAnim_62DC" Offset="0x62DC"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
         <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
         <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
-        <Animation Name="gObjOsAnim_65E0" Offset="0x65E0"/>
-        <Animation Name="gObjOsAnim_6A60" Offset="0x6A60"/>
-        <Animation Name="gObjOsAnim_6EE0" Offset="0x6EE0"/>
-        <Animation Name="gObjOsAnim_6F9C" Offset="0x6F9C"/>
-        <Animation Name="gObjOsAnim_7064" Offset="0x7064"/>
-        <Animation Name="gObjOsAnim_7120" Offset="0x7120"/>
-        <Animation Name="gObjOsAnim_7454" Offset="0x7454"/>
-        <Animation Name="gObjOsAnim_7830" Offset="0x7830"/>
-        <Animation Name="gObjOsAnim_7D94" Offset="0x7D94"/>
-        <Animation Name="gObjOsAnim_7E64" Offset="0x7E64"/>
-        <Animation Name="gObjOsAnim_7F38" Offset="0x7F38"/>
-        <Animation Name="gObjOsAnim_7FFC" Offset="0x7FFC"/>
-        <Animation Name="gObjOsAnim_80B4" Offset="0x80B4"/>
-        <Animation Name="gObjOsAnim_8178" Offset="0x8178"/>
-        <Animation Name="gObjOsAnim_879C" Offset="0x879C"/>
-        <Animation Name="gObjOsAnim_8F6C" Offset="0x8F6C"/>
-        <Animation Name="gObjOsAnim_9028" Offset="0x9028"/>
-        <Animation Name="gObjOsAnim_90EC" Offset="0x90EC"/>
-        <Animation Name="gObjOsAnim_91AC" Offset="0x91AC"/>
-        <Animation Name="gObjOsAnim_9274" Offset="0x9274"/>
-        <Animation Name="gObjOsAnim_982C" Offset="0x982C"/>
-        <Animation Name="gObjOsAnim_98EC" Offset="0x98EC"/>
-        <Animation Name="gObjOsAnim_99A4" Offset="0x99A4"/>
-        <Animation Name="gObjOsAnim_9B64" Offset="0x9B64"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
         <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
         <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
     </File>
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 @@
 <Root>
     <File Name="object_rs" Segment="6">
-        <Animation Name="object_rs_Anim_00065C" Offset="0x65C"/>
-        <DList Name="object_rs_DL_001FA0" Offset="0x1FA0"/>
-        <DList Name="object_rs_DL_0021F8" Offset="0x21F8"/>
-        <DList Name="object_rs_DL_0025F8" Offset="0x25F8"/>
-        <DList Name="object_rs_DL_002730" Offset="0x2730"/>
-        <DList Name="object_rs_DL_002860" Offset="0x2860"/>
-        <DList Name="object_rs_DL_002A70" Offset="0x2A70"/>
-        <DList Name="object_rs_DL_002BA8" Offset="0x2BA8"/>
-        <DList Name="object_rs_DL_002CD8" Offset="0x2CD8"/>
-        <Texture Name="object_rs_TLUT_002EE8" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_0030E8" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003128" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_003168" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
         <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004568" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
-        <Texture Name="object_rs_Tex_004668" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
-        <Texture Name="object_rs_Tex_0046E8" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
-        <Limb Name="object_rs_Limb_0047E8" LimbType="Standard" Offset="0x47E8"/>
-        <Limb Name="object_rs_Limb_0047F4" LimbType="Standard" Offset="0x47F4"/>
-        <Limb Name="object_rs_Limb_004800" LimbType="Standard" Offset="0x4800"/>
-        <Limb Name="object_rs_Limb_00480C" LimbType="Standard" Offset="0x480C"/>
-        <Limb Name="object_rs_Limb_004818" LimbType="Standard" Offset="0x4818"/>
-        <Limb Name="object_rs_Limb_004824" LimbType="Standard" Offset="0x4824"/>
-        <Limb Name="object_rs_Limb_004830" LimbType="Standard" Offset="0x4830"/>
-        <Limb Name="object_rs_Limb_00483C" LimbType="Standard" Offset="0x483C"/>
-        <Skeleton Name="object_rs_Skel_004868" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tr" Segment="6">
-        <Animation Name="object_tr_Anim_000BFC" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
-        <Animation Name="object_tr_Anim_0013CC" Offset="0x13CC"/> <!-- Looking over right shoulder -->
-        <Animation Name="object_tr_Anim_001CDC" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
-        <Animation Name="object_tr_Anim_002BC4" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
-        <Animation Name="object_tr_Anim_0035CC" Offset="0x35CC"/> <!-- Looking over left shoulder -->
-        <Animation Name="object_tr_Anim_003FC8" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
-        <Animation Name="object_tr_Anim_0049C8" Offset="0x49C8"/> <!-- Floating on broom -->
-        <Animation Name="object_tr_Anim_005308" Offset="0x5308"/>
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
         <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
-        <DList Name="object_tr_DL_006520" Offset="0x6520"/>
-        <DList Name="object_tr_DL_0066A0" Offset="0x66A0"/>
-        <DList Name="object_tr_DL_006800" Offset="0x6800"/>
-        <DList Name="object_tr_DL_006940" Offset="0x6940"/>
-        <DList Name="object_tr_DL_006A50" Offset="0x6A50"/>
-        <DList Name="object_tr_DL_006B48" Offset="0x6B48"/>
-        <DList Name="object_tr_DL_006C58" Offset="0x6C58"/>
-        <DList Name="object_tr_DL_006D50" Offset="0x6D50"/>
-        <DList Name="object_tr_DL_006E70" Offset="0x6E70"/>
-        <DList Name="object_tr_DL_006FF0" Offset="0x6FF0"/>
-        <DList Name="object_tr_DL_007118" Offset="0x7118"/>
-        <DList Name="object_tr_DL_007238" Offset="0x7238"/>
-        <DList Name="object_tr_DL_007358" Offset="0x7358"/>
-        <DList Name="object_tr_DL_0074D8" Offset="0x74D8"/>
-        <DList Name="object_tr_DL_007600" Offset="0x7600"/>
-        <DList Name="object_tr_DL_007720" Offset="0x7720"/>
-        <DList Name="object_tr_DL_007728" Offset="0x7728"/>
-        <Texture Name="object_tr_TLUT_007730" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
-        <Texture Name="object_tr_Tex_0078D8" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
-        <Texture Name="object_tr_Tex_0080D8" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
-        <Texture Name="object_tr_Tex_0082D8" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
-        <Texture Name="object_tr_Tex_0084D8" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
-        <Texture Name="object_tr_Tex_0086D8" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
-        <Texture Name="object_tr_Tex_008AD8" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B58" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008B98" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
-        <Texture Name="object_tr_Tex_008D98" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008DD8" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_008E58" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
-        <Texture Name="object_tr_Tex_008ED8" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
-        <Texture Name="object_tr_Tex_0092D8" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
-        <Texture Name="object_tr_Tex_0093D8" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
-        <Texture Name="object_tr_Tex_009458" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_009498" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
-        <Texture Name="object_tr_Tex_0094D8" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
-        <Texture Name="object_tr_Tex_0098D8" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
-        <DList Name="object_tr_DL_00AF38" Offset="0xAF38"/>
-        <DList Name="object_tr_DL_00B568" Offset="0xB568"/>
-        <DList Name="object_tr_DL_00B5C8" Offset="0xB5C8"/>
-        <DList Name="object_tr_DL_00B678" Offset="0xB678"/>
-        <DList Name="object_tr_DL_00B728" Offset="0xB728"/>
-        <DList Name="object_tr_DL_00B8D0" Offset="0xB8D0"/>
-        <DList Name="object_tr_DL_00B968" Offset="0xB968"/>
-        <DList Name="object_tr_DL_00BA00" Offset="0xBA00"/>
-        <DList Name="object_tr_DL_00BB68" Offset="0xBB68"/>
-        <Texture Name="object_tr_Tex_00BCD0" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
         <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
-        <Texture Name="object_tr_Tex_00C2D0" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
         <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
-        <Limb Name="object_tr_Limb_00C390" LimbType="Standard" Offset="0xC390"/>
-        <Limb Name="object_tr_Limb_00C39C" LimbType="Standard" Offset="0xC39C"/>
-        <Limb Name="object_tr_Limb_00C3A8" LimbType="Standard" Offset="0xC3A8"/>
-        <Limb Name="object_tr_Limb_00C3B4" LimbType="Standard" Offset="0xC3B4"/>
-        <Limb Name="object_tr_Limb_00C3C0" LimbType="Standard" Offset="0xC3C0"/>
-        <Limb Name="object_tr_Limb_00C3CC" LimbType="Standard" Offset="0xC3CC"/>
-        <Limb Name="object_tr_Limb_00C3D8" LimbType="Standard" Offset="0xC3D8"/>
-        <Limb Name="object_tr_Limb_00C3E4" LimbType="Standard" Offset="0xC3E4"/>
-        <Limb Name="object_tr_Limb_00C3F0" LimbType="Standard" Offset="0xC3F0"/>
-        <Limb Name="object_tr_Limb_00C3FC" LimbType="Standard" Offset="0xC3FC"/>
-        <Limb Name="object_tr_Limb_00C408" LimbType="Standard" Offset="0xC408"/>
-        <Limb Name="object_tr_Limb_00C414" LimbType="Standard" Offset="0xC414"/>
-        <Limb Name="object_tr_Limb_00C420" LimbType="Standard" Offset="0xC420"/>
-        <Limb Name="object_tr_Limb_00C42C" LimbType="Standard" Offset="0xC42C"/>
-        <Limb Name="object_tr_Limb_00C438" LimbType="Standard" Offset="0xC438"/>
-        <Limb Name="object_tr_Limb_00C444" LimbType="Standard" Offset="0xC444"/>
-        <Limb Name="object_tr_Limb_00C450" LimbType="Standard" Offset="0xC450"/>
-        <Limb Name="object_tr_Limb_00C45C" LimbType="Standard" Offset="0xC45C"/>
-        <Limb Name="object_tr_Limb_00C468" LimbType="Standard" Offset="0xC468"/>
-        <Limb Name="object_tr_Limb_00C474" LimbType="Standard" Offset="0xC474"/>
-        <Limb Name="object_tr_Limb_00C480" LimbType="Standard" Offset="0xC480"/>
-        <Limb Name="object_tr_Limb_00C48C" LimbType="Standard" Offset="0xC48C"/>
-        <Limb Name="object_tr_Limb_00C498" LimbType="Standard" Offset="0xC498"/>
-        <Limb Name="object_tr_Limb_00C4A4" LimbType="Standard" Offset="0xC4A4"/>
-        <Limb Name="object_tr_Limb_00C4B0" LimbType="Standard" Offset="0xC4B0"/>
-        <Limb Name="object_tr_Limb_00C4BC" LimbType="Standard" Offset="0xC4BC"/>
-        <Skeleton Name="object_tr_Skel_00C530" Type="Flex" LimbType="Standard" Offset="0xC530"/>
-        <Animation Name="object_tr_Anim_00C60C" Offset="0xC60C"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
         <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
-        <DList Name="object_tr_DL_00D820" Offset="0xD820"/>
-        <DList Name="object_tr_DL_00D9A0" Offset="0xD9A0"/>
-        <DList Name="object_tr_DL_00DB00" Offset="0xDB00"/>
-        <DList Name="object_tr_DL_00DC40" Offset="0xDC40"/>
-        <DList Name="object_tr_DL_00DD50" Offset="0xDD50"/>
-        <DList Name="object_tr_DL_00DE48" Offset="0xDE48"/>
-        <DList Name="object_tr_DL_00DF58" Offset="0xDF58"/>
-        <DList Name="object_tr_DL_00E050" Offset="0xE050"/>
-        <DList Name="object_tr_DL_00E170" Offset="0xE170"/>
-        <DList Name="object_tr_DL_00E2F0" Offset="0xE2F0"/>
-        <DList Name="object_tr_DL_00E418" Offset="0xE418"/>
-        <DList Name="object_tr_DL_00E538" Offset="0xE538"/>
-        <DList Name="object_tr_DL_00E658" Offset="0xE658"/>
-        <DList Name="object_tr_DL_00E7D8" Offset="0xE7D8"/>
-        <DList Name="object_tr_DL_00E900" Offset="0xE900"/>
-        <DList Name="object_tr_DL_00EA20" Offset="0xEA20"/>
-        <DList Name="object_tr_DL_00EA28" Offset="0xEA28"/>
-        <Texture Name="object_tr_Tex_00EA30" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
-        <Texture Name="object_tr_Tex_00F230" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
-        <Texture Name="object_tr_Tex_00F430" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
-        <DList Name="object_tr_DL_010710" Offset="0x10710"/>
-        <DList Name="object_tr_DL_010D40" Offset="0x10D40"/>
-        <DList Name="object_tr_DL_010DA0" Offset="0x10DA0"/>
-        <DList Name="object_tr_DL_010E50" Offset="0x10E50"/>
-        <DList Name="object_tr_DL_010F00" Offset="0x10F00"/>
-        <DList Name="object_tr_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tr_DL_011140" Offset="0x11140"/>
-        <DList Name="object_tr_DL_0111D8" Offset="0x111D8"/>
-        <DList Name="object_tr_DL_011340" Offset="0x11340"/>
-        <Texture Name="object_tr_Tex_0114A8" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
-        <Limb Name="object_tr_Limb_0114E8" LimbType="Standard" Offset="0x114E8"/>
-        <Limb Name="object_tr_Limb_0114F4" LimbType="Standard" Offset="0x114F4"/>
-        <Limb Name="object_tr_Limb_011500" LimbType="Standard" Offset="0x11500"/>
-        <Limb Name="object_tr_Limb_01150C" LimbType="Standard" Offset="0x1150C"/>
-        <Limb Name="object_tr_Limb_011518" LimbType="Standard" Offset="0x11518"/>
-        <Limb Name="object_tr_Limb_011524" LimbType="Standard" Offset="0x11524"/>
-        <Limb Name="object_tr_Limb_011530" LimbType="Standard" Offset="0x11530"/>
-        <Limb Name="object_tr_Limb_01153C" LimbType="Standard" Offset="0x1153C"/>
-        <Limb Name="object_tr_Limb_011548" LimbType="Standard" Offset="0x11548"/>
-        <Limb Name="object_tr_Limb_011554" LimbType="Standard" Offset="0x11554"/>
-        <Limb Name="object_tr_Limb_011560" LimbType="Standard" Offset="0x11560"/>
-        <Limb Name="object_tr_Limb_01156C" LimbType="Standard" Offset="0x1156C"/>
-        <Limb Name="object_tr_Limb_011578" LimbType="Standard" Offset="0x11578"/>
-        <Limb Name="object_tr_Limb_011584" LimbType="Standard" Offset="0x11584"/>
-        <Limb Name="object_tr_Limb_011590" LimbType="Standard" Offset="0x11590"/>
-        <Limb Name="object_tr_Limb_01159C" LimbType="Standard" Offset="0x1159C"/>
-        <Limb Name="object_tr_Limb_0115A8" LimbType="Standard" Offset="0x115A8"/>
-        <Limb Name="object_tr_Limb_0115B4" LimbType="Standard" Offset="0x115B4"/>
-        <Limb Name="object_tr_Limb_0115C0" LimbType="Standard" Offset="0x115C0"/>
-        <Limb Name="object_tr_Limb_0115CC" LimbType="Standard" Offset="0x115CC"/>
-        <Limb Name="object_tr_Limb_0115D8" LimbType="Standard" Offset="0x115D8"/>
-        <Limb Name="object_tr_Limb_0115E4" LimbType="Standard" Offset="0x115E4"/>
-        <Limb Name="object_tr_Limb_0115F0" LimbType="Standard" Offset="0x115F0"/>
-        <Limb Name="object_tr_Limb_0115FC" LimbType="Standard" Offset="0x115FC"/>
-        <Limb Name="object_tr_Limb_011608" LimbType="Standard" Offset="0x11608"/>
-        <Limb Name="object_tr_Limb_011614" LimbType="Standard" Offset="0x11614"/>
-        <Skeleton Name="object_tr_Skel_011688" Type="Flex" LimbType="Standard" Offset="0x11688"/>
-        <Animation Name="object_tr_Anim_012E1C" Offset="0x12E1C"/> <!-- Casting magic -->
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
     </File>
 </Root>
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 @@
 <Root>
     <File Name="object_tw" Segment="6">
-        <Animation Name="object_tw_Anim_0004A4" Offset="0x4A4"/>
-        <Animation Name="object_tw_Anim_000AAC" Offset="0xAAC"/>
-        <Animation Name="object_tw_Anim_0012A4" Offset="0x12A4"/>
-        <Animation Name="object_tw_Anim_0017E0" Offset="0x17E0"/>
-        <Animation Name="object_tw_Anim_001D10" Offset="0x1D10"/>
-        <Animation Name="object_tw_Anim_00230C" Offset="0x230C"/>
-        <Animation Name="object_tw_Anim_003614" Offset="0x3614"/>
-        <Animation Name="object_tw_Anim_003E34" Offset="0x3E34"/>
-        <Animation Name="object_tw_Anim_004548" Offset="0x4548"/>
-        <Animation Name="object_tw_Anim_00578C" Offset="0x578C"/>
-        <Animation Name="object_tw_Anim_006530" Offset="0x6530"/>
-        <Animation Name="object_tw_Anim_006F28" Offset="0x6F28"/>
-        <Limb Name="object_tw_Limb_006F40" LimbType="Standard" Offset="0x6F40"/>
-        <Limb Name="object_tw_Limb_006F4C" LimbType="Standard" Offset="0x6F4C"/>
-        <Limb Name="object_tw_Limb_006F58" LimbType="Standard" Offset="0x6F58"/>
-        <Limb Name="object_tw_Limb_006F64" LimbType="Standard" Offset="0x6F64"/>
-        <Limb Name="object_tw_Limb_006F70" LimbType="Standard" Offset="0x6F70"/>
-        <Limb Name="object_tw_Limb_006F7C" LimbType="Standard" Offset="0x6F7C"/>
-        <Limb Name="object_tw_Limb_006F88" LimbType="Standard" Offset="0x6F88"/>
-        <Limb Name="object_tw_Limb_006F94" LimbType="Standard" Offset="0x6F94"/>
-        <Limb Name="object_tw_Limb_006FA0" LimbType="Standard" Offset="0x6FA0"/>
-        <Limb Name="object_tw_Limb_006FAC" LimbType="Standard" Offset="0x6FAC"/>
-        <Limb Name="object_tw_Limb_006FB8" LimbType="Standard" Offset="0x6FB8"/>
-        <Limb Name="object_tw_Limb_006FC4" LimbType="Standard" Offset="0x6FC4"/>
-        <Limb Name="object_tw_Limb_006FD0" LimbType="Standard" Offset="0x6FD0"/>
-        <Limb Name="object_tw_Limb_006FDC" LimbType="Standard" Offset="0x6FDC"/>
-        <Limb Name="object_tw_Limb_006FE8" LimbType="Standard" Offset="0x6FE8"/>
-        <Limb Name="object_tw_Limb_006FF4" LimbType="Standard" Offset="0x6FF4"/>
-        <Limb Name="object_tw_Limb_007000" LimbType="Standard" Offset="0x7000"/>
-        <Limb Name="object_tw_Limb_00700C" LimbType="Standard" Offset="0x700C"/>
-        <Limb Name="object_tw_Limb_007018" LimbType="Standard" Offset="0x7018"/>
-        <Limb Name="object_tw_Limb_007024" LimbType="Standard" Offset="0x7024"/>
-        <Limb Name="object_tw_Limb_007030" LimbType="Standard" Offset="0x7030"/>
-        <Limb Name="object_tw_Limb_00703C" LimbType="Standard" Offset="0x703C"/>
-        <Limb Name="object_tw_Limb_007048" LimbType="Standard" Offset="0x7048"/>
-        <Limb Name="object_tw_Limb_007054" LimbType="Standard" Offset="0x7054"/>
-        <Limb Name="object_tw_Limb_007060" LimbType="Standard" Offset="0x7060"/>
-        <Limb Name="object_tw_Limb_00706C" LimbType="Standard" Offset="0x706C"/>
-        <Skeleton Name="object_tw_Skel_0070E0" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
-        <Animation Name="object_tw_Anim_007688" Offset="0x7688"/>
-        <Animation Name="object_tw_Anim_007CA8" Offset="0x7CA8"/>
-        <Animation Name="object_tw_Anim_0088C8" Offset="0x88C8"/>
-        <Animation Name="object_tw_Anim_009398" Offset="0x9398"/>
-        <Animation Name="object_tw_Anim_00947C" Offset="0x947C"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
         <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
-        <Texture Name="object_tw_TLUT_009490" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
-        <Texture Name="object_tw_Tex_009638" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
-        <Texture Name="object_tw_Tex_009E38" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
-        <Texture Name="object_tw_Tex_00A038" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
-        <Texture Name="object_tw_Tex_00A238" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
-        <Texture Name="object_tw_Tex_00A438" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A838" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8B8" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8F8" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
-        <Texture Name="object_tw_Tex_00AAF8" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00AB38" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00ABB8" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
-        <Texture Name="object_tw_Tex_00AC38" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
-        <Texture Name="object_tw_Tex_00B038" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
-        <Texture Name="object_tw_Tex_00B138" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
-        <Texture Name="object_tw_Tex_00B1B8" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B1F8" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B238" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00B638" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00BA38" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
-        <Texture Name="object_tw_Tex_00BE38" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
-        <Texture Name="object_tw_Tex_00C238" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
-        <Texture Name="object_tw_Tex_00CA38" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
-        <Texture Name="object_tw_Tex_00CAB8" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
-        <DList Name="object_tw_DL_0110A8" Offset="0x110A8"/>
-        <DList Name="object_tw_DL_0116A0" Offset="0x116A0"/>
-        <DList Name="object_tw_DL_011C98" Offset="0x11C98"/>
-        <DList Name="object_tw_DL_011E28" Offset="0x11E28"/>
-        <DList Name="object_tw_DL_011FB8" Offset="0x11FB8"/>
-        <DList Name="object_tw_DL_012018" Offset="0x12018"/>
-        <DList Name="object_tw_DL_0120C8" Offset="0x120C8"/>
-        <DList Name="object_tw_DL_012178" Offset="0x12178"/>
-        <DList Name="object_tw_DL_012210" Offset="0x12210"/>
-        <DList Name="object_tw_DL_0122A8" Offset="0x122A8"/>
-        <DList Name="object_tw_DL_012410" Offset="0x12410"/>
-        <DList Name="object_tw_DL_012578" Offset="0x12578"/>
-        <DList Name="object_tw_DL_0126E0" Offset="0x126E0"/>
-        <DList Name="object_tw_DL_012848" Offset="0x12848"/>
-        <DList Name="object_tw_DL_0128E0" Offset="0x128E0"/>
-        <DList Name="object_tw_DL_012978" Offset="0x12978"/>
-        <DList Name="object_tw_DL_012A28" Offset="0x12A28"/>
-        <DList Name="object_tw_DL_012AD8" Offset="0x12AD8"/>
-        <DList Name="object_tw_DL_012B38" Offset="0x12B38"/>
-        <DList Name="object_tw_DL_012CE0" Offset="0x12CE0"/>
-        <DList Name="object_tw_DL_013310" Offset="0x13310"/>
-        <DList Name="object_tw_DL_0134B8" Offset="0x134B8"/>
-        <DList Name="object_tw_DL_013AE8" Offset="0x13AE8"/>
-        <DList Name="object_tw_DL_013D68" Offset="0x13D68"/>
-        <DList Name="object_tw_DL_013E98" Offset="0x13E98"/>
-        <DList Name="object_tw_DL_013F98" Offset="0x13F98"/>
-        <DList Name="object_tw_DL_014070" Offset="0x14070"/>
-        <DList Name="object_tw_DL_014158" Offset="0x14158"/>
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
         <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
-        <DList Name="object_tw_DL_015440" Offset="0x15440"/>
-        <DList Name="object_tw_DL_015538" Offset="0x15538"/>
-        <DList Name="object_tw_DL_015648" Offset="0x15648"/>
-        <DList Name="object_tw_DL_015740" Offset="0x15740"/>
-        <DList Name="object_tw_DL_015850" Offset="0x15850"/>
-        <DList Name="object_tw_DL_015990" Offset="0x15990"/>
-        <DList Name="object_tw_DL_015B10" Offset="0x15B10"/>
-        <DList Name="object_tw_DL_015C30" Offset="0x15C30"/>
-        <DList Name="object_tw_DL_015D58" Offset="0x15D58"/>
-        <DList Name="object_tw_DL_015E78" Offset="0x15E78"/>
-        <DList Name="object_tw_DL_015FF8" Offset="0x15FF8"/>
-        <DList Name="object_tw_DL_016118" Offset="0x16118"/>
-        <DList Name="object_tw_DL_016240" Offset="0x16240"/>
-        <DList Name="object_tw_DL_016360" Offset="0x16360"/>
-        <DList Name="object_tw_DL_0164C0" Offset="0x164C0"/>
-        <DList Name="object_tw_DL_0164C8" Offset="0x164C8"/>
-        <DList Name="object_tw_DL_0164D0" Offset="0x164D0"/>
-        <Texture Name="object_tw_Tex_016650" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
-        <Texture Name="object_tw_Tex_0166D0" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
         <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
-        <DList Name="object_tw_DL_017910" Offset="0x17910"/>
-        <DList Name="object_tw_DL_017A08" Offset="0x17A08"/>
-        <DList Name="object_tw_DL_017B18" Offset="0x17B18"/>
-        <DList Name="object_tw_DL_017C10" Offset="0x17C10"/>
-        <DList Name="object_tw_DL_017D20" Offset="0x17D20"/>
-        <DList Name="object_tw_DL_017E60" Offset="0x17E60"/>
-        <DList Name="object_tw_DL_017FE0" Offset="0x17FE0"/>
-        <DList Name="object_tw_DL_018100" Offset="0x18100"/>
-        <DList Name="object_tw_DL_018228" Offset="0x18228"/>
-        <DList Name="object_tw_DL_018348" Offset="0x18348"/>
-        <DList Name="object_tw_DL_0184C8" Offset="0x184C8"/>
-        <DList Name="object_tw_DL_0185E8" Offset="0x185E8"/>
-        <DList Name="object_tw_DL_018710" Offset="0x18710"/>
-        <DList Name="object_tw_DL_018830" Offset="0x18830"/>
-        <DList Name="object_tw_DL_018990" Offset="0x18990"/>
-        <DList Name="object_tw_DL_018998" Offset="0x18998"/>
-        <DList Name="object_tw_DL_0189A0" Offset="0x189A0"/>
-        <Texture Name="object_tw_Tex_018B20" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
-        <Texture Name="object_tw_Tex_018B60" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
-        <DList Name="object_tw_DL_018FC0" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
-        <Texture Name="object_tw_Tex_019078" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
-        <Texture Name="object_tw_Tex_019478" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
-        <DList Name="object_tw_DL_019938" Offset="0x19938"/> <!-- koume Ground Flame -->
-        <Texture Name="object_tw_Tex_019A20" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
-        <DList Name="object_tw_DL_019D40" Offset="0x19D40"/> <!-- Koume Ground Crater -->
-        <Texture Name="object_tw_Tex_019E00" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
-        <Texture Name="object_tw_Tex_01A200" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
-        <DList Name="object_tw_DL_01A430" Offset="0x1A430"/>
-        <DList Name="object_tw_DL_01A528" Offset="0x1A528"/>
-        <DList Name="object_tw_DL_01A5A8" Offset="0x1A5A8"/>
-        <Texture Name="object_tw_Tex_01A5C0" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
-        <DList Name="object_tw_DL_01A790" Offset="0x1A790"/>
-        <DList Name="object_tw_DL_01A8A0" Offset="0x1A8A0"/>
-        <DList Name="object_tw_DL_01A998" Offset="0x1A998"/>
-        <DList Name="object_tw_DL_01AA50" Offset="0x1AA50"/>
-        <DList Name="object_tw_DL_01AB00" Offset="0x1AB00"/>
-        <Texture Name="object_tw_Tex_01AB20" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
         <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
-        <DList Name="object_tw_DL_01BC00" Offset="0x1BC00"/>
-        <Texture Name="object_tw_Tex_01BCA0" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
-        <Texture Name="object_tw_Tex_01C0A0" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
-        <DList Name="object_tw_DL_01C1C0" Offset="0x1C1C0"/>
-        <Texture Name="object_tw_Tex_01C2A0" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
-        <Texture Name="object_tw_Tex_01C6A0" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
-        <DList Name="object_tw_DL_01CEE0" Offset="0x1CEE0"/>
-        <Texture Name="object_tw_Tex_01CFA8" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
-        <Texture Name="object_tw_Tex_01D3A8" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
-        <DList Name="object_tw_DL_01DBE8" Offset="0x1DBE8"/>
-        <DList Name="object_tw_DL_01DDF0" Offset="0x1DDF0"/>
-        <DList Name="object_tw_DL_01E020" Offset="0x1E020"/>
-        <DList Name="object_tw_DL_01E0E0" Offset="0x1E0E0"/>
-        <DList Name="object_tw_DL_01E2C0" Offset="0x1E2C0"/>
-        <DList Name="object_tw_DL_01E3A0" Offset="0x1E3A0"/>
-        <Texture Name="object_tw_Tex_01E430" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
-        <DList Name="object_tw_DL_01E9F0" Offset="0x1E9F0"/>
-        <Texture Name="object_tw_Tex_01EB28" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
-        <DList Name="object_tw_DL_01EC68" Offset="0x1EC68"/>
-        <Texture Name="object_tw_Tex_01ECF0" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
-        <DList Name="object_tw_DL_01EEB0" Offset="0x1EEB0"/>
-        <DList Name="object_tw_DL_01F238" Offset="0x1F238"/>
-        <DList Name="object_tw_DL_01F390" Offset="0x1F390"/>
-        <DList Name="object_tw_DL_01F608" Offset="0x1F608"/>
-        <Limb Name="object_tw_Limb_01F6E8" LimbType="Standard" Offset="0x1F6E8"/>
-        <Limb Name="object_tw_Limb_01F6F4" LimbType="Standard" Offset="0x1F6F4"/>
-        <Limb Name="object_tw_Limb_01F700" LimbType="Standard" Offset="0x1F700"/>
-        <Limb Name="object_tw_Limb_01F70C" LimbType="Standard" Offset="0x1F70C"/>
-        <Limb Name="object_tw_Limb_01F718" LimbType="Standard" Offset="0x1F718"/>
-        <Limb Name="object_tw_Limb_01F724" LimbType="Standard" Offset="0x1F724"/>
-        <Limb Name="object_tw_Limb_01F730" LimbType="Standard" Offset="0x1F730"/>
-        <Limb Name="object_tw_Limb_01F73C" LimbType="Standard" Offset="0x1F73C"/>
-        <Limb Name="object_tw_Limb_01F748" LimbType="Standard" Offset="0x1F748"/>
-        <Limb Name="object_tw_Limb_01F754" LimbType="Standard" Offset="0x1F754"/>
-        <Limb Name="object_tw_Limb_01F760" LimbType="Standard" Offset="0x1F760"/>
-        <Limb Name="object_tw_Limb_01F76C" LimbType="Standard" Offset="0x1F76C"/>
-        <Limb Name="object_tw_Limb_01F778" LimbType="Standard" Offset="0x1F778"/>
-        <Limb Name="object_tw_Limb_01F784" LimbType="Standard" Offset="0x1F784"/>
-        <Limb Name="object_tw_Limb_01F790" LimbType="Standard" Offset="0x1F790"/>
-        <Limb Name="object_tw_Limb_01F79C" LimbType="Standard" Offset="0x1F79C"/>
-        <Limb Name="object_tw_Limb_01F7A8" LimbType="Standard" Offset="0x1F7A8"/>
-        <Limb Name="object_tw_Limb_01F7B4" LimbType="Standard" Offset="0x1F7B4"/>
-        <Limb Name="object_tw_Limb_01F7C0" LimbType="Standard" Offset="0x1F7C0"/>
-        <Limb Name="object_tw_Limb_01F7CC" LimbType="Standard" Offset="0x1F7CC"/>
-        <Limb Name="object_tw_Limb_01F7D8" LimbType="Standard" Offset="0x1F7D8"/>
-        <Limb Name="object_tw_Limb_01F7E4" LimbType="Standard" Offset="0x1F7E4"/>
-        <Limb Name="object_tw_Limb_01F7F0" LimbType="Standard" Offset="0x1F7F0"/>
-        <Limb Name="object_tw_Limb_01F7FC" LimbType="Standard" Offset="0x1F7FC"/>
-        <Limb Name="object_tw_Limb_01F808" LimbType="Standard" Offset="0x1F808"/>
-        <Limb Name="object_tw_Limb_01F814" LimbType="Standard" Offset="0x1F814"/>
-        <Skeleton Name="object_tw_Skel_01F888" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
-        <Texture Name="object_tw_Tex_02A070" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
-        <Animation Name="object_tw_Anim_0216DC" Offset="0x216DC"/>
-        <Animation Name="object_tw_Anim_022700" Offset="0x22700"/>
-        <Animation Name="object_tw_Anim_023750" Offset="0x23750"/>
-        <Animation Name="object_tw_Anim_024374" Offset="0x24374"/>
-        <Animation Name="object_tw_Anim_0244B4" Offset="0x244B4"/>
-        <Texture Name="object_tw_Tex_0244D0" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
-        <Texture Name="object_tw_Tex_024510" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
-        <Texture Name="object_tw_Tex_024710" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
-        <Texture Name="object_tw_Tex_024910" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
-        <Texture Name="object_tw_Tex_024B10" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
-        <DList Name="object_tw_DL_027720" Offset="0x27720"/>
-        <DList Name="object_tw_DL_027820" Offset="0x27820"/>
-        <DList Name="object_tw_DL_027970" Offset="0x27970"/>
-        <DList Name="object_tw_DL_027A60" Offset="0x27A60"/>
-        <DList Name="object_tw_DL_027B78" Offset="0x27B78"/>
-        <DList Name="object_tw_DL_027C98" Offset="0x27C98"/>
-        <DList Name="object_tw_DL_027DE8" Offset="0x27DE8"/>
-        <DList Name="object_tw_DL_027EE0" Offset="0x27EE0"/>
-        <DList Name="object_tw_DL_027FE8" Offset="0x27FE8"/>
-        <DList Name="object_tw_DL_028100" Offset="0x28100"/>
-        <DList Name="object_tw_DL_028220" Offset="0x28220"/>
-        <DList Name="object_tw_DL_028370" Offset="0x28370"/>
-        <DList Name="object_tw_DL_028468" Offset="0x28468"/>
-        <DList Name="object_tw_DL_028570" Offset="0x28570"/>
-        <DList Name="object_tw_DL_028668" Offset="0x28668"/>
-        <DList Name="object_tw_DL_028778" Offset="0x28778"/>
-        <DList Name="object_tw_DL_028870" Offset="0x28870"/>
-        <DList Name="object_tw_DL_028980" Offset="0x28980"/>
-        <DList Name="object_tw_DL_028B78" Offset="0x28B78"/>
-        <DList Name="object_tw_DL_028D70" Offset="0x28D70"/>
-        <DList Name="object_tw_DL_029268" Offset="0x29268"/>
-        <DList Name="object_tw_DL_0293E0" Offset="0x293E0"/>
-        <DList Name="object_tw_DL_029530" Offset="0x29530"/>
-        <DList Name="object_tw_DL_029620" Offset="0x29620"/>
-        <DList Name="object_tw_DL_029738" Offset="0x29738"/>
-        <DList Name="object_tw_DL_029900" Offset="0x29900"/>
-        <DList Name="object_tw_DL_0299F8" Offset="0x299F8"/>
-        <DList Name="object_tw_DL_029B10" Offset="0x29B10"/>
-        <Texture Name="object_tw_TLUT_029E50" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
-        <Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02A470" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02A870" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02A970" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
-        <Texture Name="object_tw_Tex_02A9B0" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
-        <Texture Name="object_tw_Tex_02ADB0" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
-        <Texture Name="object_tw_Tex_02ADF0" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
-        <Texture Name="object_tw_Tex_02AE30" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02AF30" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
-        <DList Name="object_tw_DL_02CAF0" Offset="0x2CAF0"/>
-        <DList Name="object_tw_DL_02CB50" Offset="0x2CB50"/>
-        <DList Name="object_tw_DL_02CBB0" Offset="0x2CBB0"/>
-        <DList Name="object_tw_DL_02D320" Offset="0x2D320"/>
-        <DList Name="object_tw_DL_02D4A0" Offset="0x2D4A0"/>
-        <DList Name="object_tw_DL_02D5D8" Offset="0x2D5D8"/>
-        <DList Name="object_tw_DL_02D710" Offset="0x2D710"/>
-        <DList Name="object_tw_DL_02D890" Offset="0x2D890"/>
-        <DList Name="object_tw_DL_02D940" Offset="0x2D940"/>
-        <DList Name="object_tw_DL_02D9F0" Offset="0x2D9F0"/>
-        <DList Name="object_tw_DL_02DAE0" Offset="0x2DAE0"/>
-        <DList Name="object_tw_DL_02DBC8" Offset="0x2DBC8"/>
-        <DList Name="object_tw_DL_02DCB8" Offset="0x2DCB8"/>
-        <DList Name="object_tw_DL_02DDD8" Offset="0x2DDD8"/>
-        <DList Name="object_tw_DL_02DEB0" Offset="0x2DEB0"/>
-        <DList Name="object_tw_DL_02DFB0" Offset="0x2DFB0"/>
-        <DList Name="object_tw_DL_02E098" Offset="0x2E098"/>
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
         <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
-        <Limb Name="object_tw_Limb_031D70" LimbType="Standard" Offset="0x31D70"/>
-        <Limb Name="object_tw_Limb_031D7C" LimbType="Standard" Offset="0x31D7C"/>
-        <Limb Name="object_tw_Limb_031D88" LimbType="Standard" Offset="0x31D88"/>
-        <Limb Name="object_tw_Limb_031D94" LimbType="Standard" Offset="0x31D94"/>
-        <Limb Name="object_tw_Limb_031DA0" LimbType="Standard" Offset="0x31DA0"/>
-        <Limb Name="object_tw_Limb_031DAC" LimbType="Standard" Offset="0x31DAC"/>
-        <Limb Name="object_tw_Limb_031DB8" LimbType="Standard" Offset="0x31DB8"/>
-        <Limb Name="object_tw_Limb_031DC4" LimbType="Standard" Offset="0x31DC4"/>
-        <Limb Name="object_tw_Limb_031DD0" LimbType="Standard" Offset="0x31DD0"/>
-        <Limb Name="object_tw_Limb_031DDC" LimbType="Standard" Offset="0x31DDC"/>
-        <Limb Name="object_tw_Limb_031DE8" LimbType="Standard" Offset="0x31DE8"/>
-        <Limb Name="object_tw_Limb_031DF4" LimbType="Standard" Offset="0x31DF4"/>
-        <Limb Name="object_tw_Limb_031E00" LimbType="Standard" Offset="0x31E00"/>
-        <Limb Name="object_tw_Limb_031E0C" LimbType="Standard" Offset="0x31E0C"/>
-        <Limb Name="object_tw_Limb_031E18" LimbType="Standard" Offset="0x31E18"/>
-        <Limb Name="object_tw_Limb_031E24" LimbType="Standard" Offset="0x31E24"/>
-        <Limb Name="object_tw_Limb_031E30" LimbType="Standard" Offset="0x31E30"/>
-        <Limb Name="object_tw_Limb_031E3C" LimbType="Standard" Offset="0x31E3C"/>
-        <Limb Name="object_tw_Limb_031E48" LimbType="Standard" Offset="0x31E48"/>
-        <Limb Name="object_tw_Limb_031E54" LimbType="Standard" Offset="0x31E54"/>
-        <Limb Name="object_tw_Limb_031E60" LimbType="Standard" Offset="0x31E60"/>
-        <Limb Name="object_tw_Limb_031E6C" LimbType="Standard" Offset="0x31E6C"/>
-        <Limb Name="object_tw_Limb_031E78" LimbType="Standard" Offset="0x31E78"/>
-        <Limb Name="object_tw_Limb_031E84" LimbType="Standard" Offset="0x31E84"/>
-        <Limb Name="object_tw_Limb_031E90" LimbType="Standard" Offset="0x31E90"/>
-        <Limb Name="object_tw_Limb_031E9C" LimbType="Standard" Offset="0x31E9C"/>
-        <Limb Name="object_tw_Limb_031EA8" LimbType="Standard" Offset="0x31EA8"/>
-        <Limb Name="object_tw_Limb_031EB4" LimbType="Standard" Offset="0x31EB4"/>
-        <Limb Name="object_tw_Limb_031EC0" LimbType="Standard" Offset="0x31EC0"/>
-        <Limb Name="object_tw_Limb_031ECC" LimbType="Standard" Offset="0x31ECC"/>
-        <Limb Name="object_tw_Limb_031ED8" LimbType="Standard" Offset="0x31ED8"/>
-        <Limb Name="object_tw_Limb_031EE4" LimbType="Standard" Offset="0x31EE4"/>
-        <Limb Name="object_tw_Limb_031EF0" LimbType="Standard" Offset="0x31EF0"/>
-        <Limb Name="object_tw_Limb_031EFC" LimbType="Standard" Offset="0x31EFC"/>
-        <Limb Name="object_tw_Limb_031F08" LimbType="Standard" Offset="0x31F08"/>
-        <Limb Name="object_tw_Limb_031F14" LimbType="Standard" Offset="0x31F14"/>
-        <Limb Name="object_tw_Limb_031F20" LimbType="Standard" Offset="0x31F20"/>
-        <Limb Name="object_tw_Limb_031F2C" LimbType="Standard" Offset="0x31F2C"/>
-        <Limb Name="object_tw_Limb_031F38" LimbType="Standard" Offset="0x31F38"/>
-        <Limb Name="object_tw_Limb_031F44" LimbType="Standard" Offset="0x31F44"/>
-        <Limb Name="object_tw_Limb_031F50" LimbType="Standard" Offset="0x31F50"/>
-        <Limb Name="object_tw_Limb_031F5C" LimbType="Standard" Offset="0x31F5C"/>
-        <Limb Name="object_tw_Limb_031F68" LimbType="Standard" Offset="0x31F68"/>
-        <Skeleton Name="object_tw_Skel_032020" Type="Flex" LimbType="Standard" Offset="0x32020"/>
-        <Animation Name="object_tw_Anim_032BF8" Offset="0x32BF8"/>
-        <Animation Name="object_tw_Anim_0338F0" Offset="0x338F0"/>
-        <Animation Name="object_tw_Anim_0343B4" Offset="0x343B4"/>
-        <Animation Name="object_tw_Anim_035030" Offset="0x35030"/>
-        <Animation Name="object_tw_Anim_035988" Offset="0x35988"/>
-        <Animation Name="object_tw_Anim_036FBC" Offset="0x36FBC"/>
-        <Animation Name="object_tw_Anim_038E2C" Offset="0x38E2C"/>
-        <Animation Name="object_tw_Anim_03A2D0" Offset="0x3A2D0"/>
-        <DList Name="object_tw_DL_03A680" Offset="0x3A680"/>
-        <Texture Name="object_tw_Tex_03A7B0" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x31D70"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x31D7C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x31D88"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x31D94"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x31DA0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x31DAC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x31DB8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x31DC4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x31DD0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x31DDC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x31DE8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x31DF4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x31E00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x31E0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x31E18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x31E24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x31E30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x31E3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x31E48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x31E54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x31E60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x31E6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x31E78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x31E84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x31E90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x31E9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x31EA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x31EB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x31EC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x31ECC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x31ED8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x31EE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x31EF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x31EFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x31F08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x31F14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x31F20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x31F2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x31F38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x31F44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x31F50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x31F5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x31F68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x32020"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x32BF8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x338F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x343B4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x35030"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x35988"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x36FBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x38E2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x3A2D0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x3A680"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="ovl_Boss_Ganon2" BaseAddress="0x80B06170" RangeStart="0x9F38" RangeEnd="0x10778">
-        <Texture Name="ovl_Boss_Ganon2_Tex_00A2C8" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F38"/>
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F38"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF38">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B308" Offset="0x00AF78"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B378" Offset="0x00AFE8"/>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AF78"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00AFE8"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B000">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3D0" Offset="0x00B040"/>
-        <DList Name="ovl_Boss_Ganon2_DL_00B3F0" Offset="0x00B060"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B420" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B090"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00B820" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B490"/>
-        <Array Name="ovl_Boss_Ganon2_Vtx_00BA20" Count="22" Offset="0x00B690">
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B040"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B060"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B090"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B490"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B690">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00BB80" Offset="0x00B7F0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00BC98" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B908"/>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B7F0"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B908"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C908">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00CCD8" Offset="0x00C948"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00CD58" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00C9C8"/>
+        <DList Name="gGanonTriforceDL" Offset="0x00C948"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00C9C8"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D3C8">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00D798" Offset="0x00D408"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00D820" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D490"/>
+        <DList Name="gGanonLightningDL" Offset="0x00D408"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D490"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DC90">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00E1C0" Offset="0x00DE30"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00E2E0" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DF50"/>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE30"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DF50"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E750">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00EC40" Offset="0x00E8B0"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00ED48" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00E9B8"/>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E8B0"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00E9B8"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EDB8">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_00F188" Offset="0x00EDF8"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F208" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EE78"/>
-        <Texture Name="ovl_Boss_Ganon2_Tex_00F408" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F078"/>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EDF8"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EE78"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F078"/>
         <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F878">
             <Vtx/>
         </Array>
@@ -71,6 +71,6 @@
         <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF08">
             <Vtx/>
         </Array>
-        <DList Name="ovl_Boss_Ganon2_DL_0103A8" Offset="0x010118"/>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010118"/>
     </File>
 </Root>
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..e9c8d7ef5 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
@@ -2,7 +2,7 @@
     <File Name="daiyousei_izumi_scene" Segment="2">
         <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
         <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
-        <Cutscene Name="gGreatFairyDoubleDefenceCs" Offset="0x25D0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
         <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
     </File>
     <File Name="daiyousei_izumi_room_0" Segment="3">
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 @@
 <Root>
     <File Name="icon_item_24_static" Segment="9">
-        <Texture Name="gForestMedallionIconTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
-        <Texture Name="gFireMedallionIconTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
-        <Texture Name="gWaterMedallionIconTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
-        <Texture Name="gSpiritMedallionIconTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
-        <Texture Name="gShadowMedallionIconTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
-        <Texture Name="gLightMedallionIconTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
-        <Texture Name="gKokiriEmeraldIconTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
-        <Texture Name="gGoronRubyIconTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
-        <Texture Name="gZoraSapphireIconTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
-        <Texture Name="gStoneOfAgonyIconTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
-        <Texture Name="gGerudosCardIconTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
-        <Texture Name="gGoldSkulltulaIconTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
-        <Texture Name="gHeartContainerIconTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
-        <Texture Name="gUnusedPieceOfHeartIconTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
-        <Texture Name="gBossKeyIconTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
-        <Texture Name="gCompassIconTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
-        <Texture Name="gDungeonMapIconTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
-        <Texture Name="gSmallKeyIconTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
-        <Texture Name="gSmallMagicJarIconTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
-        <Texture Name="gBigMagicJarIconTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
     </File>
 </Root>
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 @@
 <Root>
     <File Name="icon_item_static" Segment="8">
-        <Texture Name="gDekuStickIconTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="gDekuNutIconTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
-        <Texture Name="gBombIconTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
-        <Texture Name="gFairyBowIconTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
-        <Texture Name="gFireArrowIconTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
-        <Texture Name="gDinsFireIconTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
-        <Texture Name="gFairySlingshotIconTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
-        <Texture Name="gFairyOcarinaIconTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
-        <Texture Name="gOcarinaofTimeIconTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
-        <Texture Name="gBombchuIconTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
-        <Texture Name="gHookshotIconTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
-        <Texture Name="gLongshotIconTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
-        <Texture Name="gIceArrowIconTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
-        <Texture Name="gFaroresWindIconTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
-        <Texture Name="gBoomerangIconTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
-        <Texture Name="gLensofTruthIconTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
-        <Texture Name="gMagicBeansIconTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
-        <Texture Name="gMegatonHammerIconTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
-        <Texture Name="gLightArrowIconTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
-        <Texture Name="gNayrusLoveIconTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
-        <Texture Name="gEmptyBottleIconTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
-        <Texture Name="gRedPotionIconTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
-        <Texture Name="gGreenPotionIconTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
-        <Texture Name="gBluePotionIconTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
-        <Texture Name="gBottledFairyIconTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
-        <Texture Name="gFishIconTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
-        <Texture Name="gMilkFullIconTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
-        <Texture Name="gRutosLetterIconTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
-        <Texture Name="gBlueFireIconTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
-        <Texture Name="gBugIconTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
-        <Texture Name="gBigPoeIconTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
-        <Texture Name="gMilkhalfIconTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
-        <Texture Name="gPoeIconTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
-        <Texture Name="gWeirdEggIconTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
-        <Texture Name="gCuccoIconTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
-        <Texture Name="gZeldasLetterIconTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
-        <Texture Name="gKeatonMaskIconTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
-        <Texture Name="gSkullMaskIconTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
-        <Texture Name="gSpookyMaskIconTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
-        <Texture Name="gBunnyHoodIconTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
-        <Texture Name="gGoronMaskIconTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
-        <Texture Name="gZoraMaskIconTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
-        <Texture Name="gGerudoMaskIconTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
-        <Texture Name="gMaskofTruthIconTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
-        <Texture Name="gSoldOutIconTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
-        <Texture Name="gPocketEggIconTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
-        <Texture Name="gPocketCuccoIconTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
-        <Texture Name="gCojiroIconTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
-        <Texture Name="gOddMushroomIconTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
-        <Texture Name="gOddPotionIconTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
-        <Texture Name="gPoachersSawIconTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
-        <Texture Name="gBrokenBiggoronSwordIconTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
-        <Texture Name="gPrescriptionIconTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
-        <Texture Name="gEyeBallFrogIconTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
-        <Texture Name="gEyeDropsIconTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
-        <Texture Name="gClaimCheckIconTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
-        <Texture Name="gFairyBowFireIconTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
-        <Texture Name="gFairyBowIceIconTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
-        <Texture Name="gFairyBowLightIconTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
-        <Texture Name="gKokiriSwordIconTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
-        <Texture Name="gMasterSwordIconTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
-        <Texture Name="gBiggoronSwordIconTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
-        <Texture Name="gDekuShieldIconTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
-        <Texture Name="gHylianShieldIconTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
-        <Texture Name="gMirrorShieldIconTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
-        <Texture Name="gKokiriTunicIconTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
-        <Texture Name="gGoronTunicIconTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
-        <Texture Name="gZoraTunicIconTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
-        <Texture Name="gKokiriBootsIconTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
-        <Texture Name="gIronBootsIconTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
-        <Texture Name="gHoverBootsIconTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
-        <Texture Name="gBulletBag30IconTex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
-        <Texture Name="gBulletBag40IconTex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
-        <Texture Name="gBulletBag50IconTex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
-        <Texture Name="gQuiver30IconTex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
-        <Texture Name="gQuiver40IconTex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
-        <Texture Name="gQuiver50IconTex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
-        <Texture Name="gBombBag20IconTex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
-        <Texture Name="gBombBag30IconTex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
-        <Texture Name="gBombBag40IconTex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
-        <Texture Name="gGoronsBraceletIconTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
-        <Texture Name="gSilverGauntletsIconTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
-        <Texture Name="gGoldenGauntletsIconTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
-        <Texture Name="gSilverScaleIconTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
-        <Texture Name="gGoldenScaleIconTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
-        <Texture Name="gBrokenGiantsKnifeIconTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
-        <Texture Name="gAdultsWalletIconTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
-        <Texture Name="gGiantsWalletIconTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
-        <Texture Name="gDekuSeedsIconTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
-        <Texture Name="gFishingPoleIconTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
         <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
         <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
         <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
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 @@
         <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
         <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
         <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
-        <Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
-        <Texture Name="gOcarinaCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
-        <Texture Name="gOcarinaCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
-        <Texture Name="gOcarinaCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
-        <Texture Name="gOcarinaCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
         <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
         <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
         <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
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/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index 0efbe4ac3..d88771353 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<uint32_t, QuestMapEntry> 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 {
diff --git a/soh/soh/Enhancements/randomizer/rando_hash.h b/soh/soh/Enhancements/randomizer/rando_hash.h
index 236bf2460..12d9a13a9 100644
--- a/soh/soh/Enhancements/randomizer/rando_hash.h
+++ b/soh/soh/Enhancements/randomizer/rando_hash.h
@@ -8,104 +8,104 @@
 #include <textures/icon_item_24_static/icon_item_24_static.h>
 
 std::array<Sprite, 100> gSeedTextures = { {
-    { dgDekuNutIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0 },
-    { dgDekuStickIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1 },
-    { dgBombIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 2 },
-    { dgFairyBowIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 3 },
-    { dgFireArrowIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 4 },
-    { dgDinsFireIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 5 },
-    { dgFairySlingshotIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 6 },
-    { dgFairyOcarinaIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 7 },
-    { dgOcarinaofTimeIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 8 },
-    { dgBombchuIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 9 },
-    { dgHookshotIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 10 },
-    { dgLongshotIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 11 },
-    { dgIceArrowIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 12 },
-    { dgFaroresWindIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 13 },
-    { dgBoomerangIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 14 },
-    { dgLensofTruthIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 15 },
-    { dgMagicBeansIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 16 },
-    { dgMegatonHammerIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 17 },
-    { dgLightArrowIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 18 },
-    { dgNayrusLoveIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 19 },
-    { dgEmptyBottleIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 20 },
-    { dgRedPotionIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 21 },
-    { dgGreenPotionIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 22 },
-    { dgBluePotionIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 23 },
-    { dgBottledFairyIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24 },
-    { dgFishIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 25 },
-    { dgMilkFullIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 26 },
-    { dgRutosLetterIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 27 },
-    { dgBlueFireIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 28 },
-    { dgBugIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 29 },
-    { dgBigPoeIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 30 },
-    { dgMilkhalfIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 31 },
-    { dgPoeIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32 },
-    { dgZeldasLetterIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 33 },
-    { dgKeatonMaskIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 34 },
-    { dgSkullMaskIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 35 },
-    { dgSpookyMaskIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 36 },
-    { dgBunnyHoodIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 37 },
-    { dgGoronMaskIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 38 },
-    { dgZoraMaskIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 39 },
-    { dgGerudoMaskIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 40 },
-    { dgMaskofTruthIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 41 },
-    { dgSoldOutIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 42 },
-    { dgPocketEggIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 43 },
-    { dgPocketCuccoIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 44 },
-    { dgCojiroIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 45 },
-    { dgOddMushroomIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 46 },
-    { dgOddPotionIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 47 },
-    { dgPoachersSawIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 48 },
-    { dgBrokenBiggoronSwordIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 49 },
-    { dgPrescriptionIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 50 },
-    { dgEyeBallFrogIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 51 },
-    { dgEyeDropsIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 52 },
-    { dgClaimCheckIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 53 },
-    { dgKokiriSwordIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 54 },
-    { dgMasterSwordIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 55 },
-    { dgBiggoronSwordIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 56 },
-    { dgDekuShieldIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 57 },
-    { dgHylianShieldIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 58 },
-    { dgMirrorShieldIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 59 },
-    { dgKokiriTunicIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 60 },
-    { dgGoronTunicIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 61 },
-    { dgZoraTunicIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 62 },
-    { dgKokiriBootsIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 63 },
-    { dgIronBootsIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64 },
-    { dgHoverBootsIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 65 },
-    { dgBulletBag30IconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 66 },
-    { dgBulletBag40IconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 67 },
-    { dgBulletBag50IconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 68 },
-    { dgQuiver30IconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 69 },
-    { dgBombBag20IconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 70 },
-    { dgGoronsBraceletIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 71 },
-    { dgSilverGauntletsIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 72 },
-    { dgGoldenGauntletsIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 73 },
-    { dgSilverScaleIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 74 },
-    { dgGoldenScaleIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 75 },
-    { dgBrokenGiantsKnifeIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 76 },
-    { dgAdultsWalletIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 77 },
-    { dgGiantsWalletIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 78 },
-    { dgDekuSeedsIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 79 },
-    { dgFishingPoleIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 80 },
-    { dgForestMedallionIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 81 },
-    { dgFireMedallionIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 82 },
-    { dgWaterMedallionIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 83 },
-    { dgSpiritMedallionIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 84 },
-    { dgShadowMedallionIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 85 },
-    { dgLightMedallionIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 86 },
-    { dgKokiriEmeraldIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 87 },
-    { dgGoronRubyIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 88 },
-    { dgZoraSapphireIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 89 },
-    { dgStoneOfAgonyIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 90 },
-    { dgGerudosCardIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 91 },
-    { dgGoldSkulltulaIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 92 },
-    { dgHeartContainerIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 93 },
-    { dgBossKeyIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 94 },
-    { dgCompassIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 95 },
-    { dgDungeonMapIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 96 },
-    { dgSmallKeyIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 97 },
-    { dgSmallMagicJarIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 98 },
-    { dgBigMagicJarIconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 99 },
+    { dgItemIconDekuNutTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0 },
+    { dgItemIconDekuStickTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1 },
+    { dgItemIconBombTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 2 },
+    { dgItemIconBowTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 3 },
+    { dgItemIconArrowFireTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 4 },
+    { dgItemIconDinsFireTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 5 },
+    { dgItemIconSlingshotTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 6 },
+    { dgItemIconOcarinaFairyTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 7 },
+    { dgItemIconOcarinaOfTimeTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 8 },
+    { dgItemIconBombchuTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 9 },
+    { dgItemIconHookshotTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 10 },
+    { dgItemIconLongshotTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 11 },
+    { dgItemIconArrowIceTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 12 },
+    { dgItemIconFaroresWindTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 13 },
+    { dgItemIconBoomerangTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 14 },
+    { dgItemIconLensOfTruthTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 15 },
+    { dgItemIconMagicBeanTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 16 },
+    { dgItemIconHammerTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 17 },
+    { dgItemIconArrowLightTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 18 },
+    { dgItemIconNayrusLoveTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 19 },
+    { dgItemIconBottleEmptyTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 20 },
+    { dgItemIconBottlePotionRedTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 21 },
+    { dgItemIconBottlePotionGreenTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 22 },
+    { dgItemIconBottlePotionBlueTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 23 },
+    { dgItemIconBottleFairyTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24 },
+    { dgItemIconBottleFishTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 25 },
+    { dgItemIconBottleMilkFullTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 26 },
+    { dgItemIconBottleRutosLetterTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 27 },
+    { dgItemIconBottleBlueFireTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 28 },
+    { dgItemIconBottleBugTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 29 },
+    { dgItemIconBottleBigPoeTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 30 },
+    { dgItemIconBottleMilkHalfTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 31 },
+    { dgItemIconBottlePoeTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32 },
+    { dgItemIconZeldasLetterTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 33 },
+    { dgItemIconMaskKeatonTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 34 },
+    { dgItemIconMaskSkullTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 35 },
+    { dgItemIconMaskSpookyTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 36 },
+    { dgItemIconMaskBunnyHoodTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 37 },
+    { dgItemIconMaskGoronTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 38 },
+    { dgItemIconMaskZoraTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 39 },
+    { dgItemIconMaskGerudoTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 40 },
+    { dgItemIconMaskTruthTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 41 },
+    { dgItemIconSoldOutTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 42 },
+    { dgItemIconPocketEggTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 43 },
+    { dgItemIconPocketCuccoTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 44 },
+    { dgItemIconCojiroTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 45 },
+    { dgItemIconOddMushroomTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 46 },
+    { dgItemIconOddPotionTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 47 },
+    { dgItemIconPoachersSawTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 48 },
+    { dgItemIconBrokenGoronsSwordTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 49 },
+    { dgItemIconPrescriptionTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 50 },
+    { dgItemIconEyeballFrogTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 51 },
+    { dgItemIconEyeDropsTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 52 },
+    { dgItemIconClaimCheckTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 53 },
+    { dgItemIconSwordKokiriTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 54 },
+    { dgItemIconSwordMasterTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 55 },
+    { dgItemIconSwordBiggoronTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 56 },
+    { dgItemIconShieldDekuTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 57 },
+    { dgItemIconShieldHylianTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 58 },
+    { dgItemIconShieldMirrorTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 59 },
+    { dgItemIconTunicKokiriTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 60 },
+    { dgItemIconTunicGoronTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 61 },
+    { dgItemIconTunicZoraTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 62 },
+    { dgItemIconBootsKokiriTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 63 },
+    { dgItemIconBootsIronTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64 },
+    { dgItemIconBootsHoverTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 65 },
+    { dgItemIconBulletBag30Tex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 66 },
+    { dgItemIconBulletBag40Tex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 67 },
+    { dgItemIconBulletBag50Tex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 68 },
+    { dgItemIconQuiver30Tex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 69 },
+    { dgItemIconBombBag20Tex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 70 },
+    { dgItemIconGoronsBraceletTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 71 },
+    { dgItemIconSilverGauntletsTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 72 },
+    { dgItemIconGoldenGauntletsTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 73 },
+    { dgItemIconScaleSilverTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 74 },
+    { dgItemIconScaleGoldenTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 75 },
+    { dgItemIconBrokenGiantsKnifeTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 76 },
+    { dgItemIconAdultsWalletTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 77 },
+    { dgItemIconGiantsWalletTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 78 },
+    { dgItemIconDekuSeedsTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 79 },
+    { dgItemIconFishingPoleTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 80 },
+    { dgQuestIconMedallionForestTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 81 },
+    { dgQuestIconMedallionFireTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 82 },
+    { dgQuestIconMedallionWaterTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 83 },
+    { dgQuestIconMedallionSpiritTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 84 },
+    { dgQuestIconMedallionShadowTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 85 },
+    { dgQuestIconMedallionLightTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 86 },
+    { dgQuestIconKokiriEmeraldTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 87 },
+    { dgQuestIconGoronRubyTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 88 },
+    { dgQuestIconZoraSapphireTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 89 },
+    { dgQuestIconStoneOfAgonyTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 90 },
+    { dgQuestIconGerudosCardTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 91 },
+    { dgQuestIconGoldSkulltulaTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 92 },
+    { dgQuestIconHeartContainerTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 93 },
+    { dgQuestIconDungeonBossKeyTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 94 },
+    { dgQuestIconDungeonCompassTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 95 },
+    { dgQuestIconDungeonMapTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 96 },
+    { dgQuestIconSmallKeyTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 97 },
+    { dgQuestIconMagicJarSmallTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 98 },
+    { dgQuestIconMagicJarBigTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 99 },
 } };
\ No newline at end of file
diff --git a/soh/src/code/code_80097A00.c b/soh/src/code/code_80097A00.c
index 00fdb0a4d..e2c8a61ef 100644
--- a/soh/src/code/code_80097A00.c
+++ b/soh/src/code/code_80097A00.c
@@ -37,96 +37,96 @@ u32 gGsFlagsMasks[] = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 };
 u32 gGsFlagsShifts[] = { 0, 8, 16, 24 };
 
 void* gItemIcons[] = {
-    gDekuStickIconTex,
-    gDekuNutIconTex,
-    gBombIconTex,
-    gFairyBowIconTex,
-    gFireArrowIconTex,
-    gDinsFireIconTex,
-    gFairySlingshotIconTex,
-    gFairyOcarinaIconTex,
-    gOcarinaofTimeIconTex,
-    gBombchuIconTex,
-    gHookshotIconTex,
-    gLongshotIconTex,
-    gIceArrowIconTex,
-    gFaroresWindIconTex,
-    gBoomerangIconTex,
-    gLensofTruthIconTex,
-    gMagicBeansIconTex,
-    gMegatonHammerIconTex,
-    gLightArrowIconTex,
-    gNayrusLoveIconTex,
-    gEmptyBottleIconTex,
-    gRedPotionIconTex,
-    gGreenPotionIconTex,
-    gBluePotionIconTex,
-    gBottledFairyIconTex,
-    gFishIconTex,
-    gMilkFullIconTex,
-    gRutosLetterIconTex,
-    gBlueFireIconTex,
-    gBugIconTex,
-    gBigPoeIconTex,
-    gMilkhalfIconTex,
-    gPoeIconTex,
-    gWeirdEggIconTex,
-    gCuccoIconTex,
-    gZeldasLetterIconTex,
-    gKeatonMaskIconTex,
-    gSkullMaskIconTex,
-    gSpookyMaskIconTex,
-    gBunnyHoodIconTex,
-    gGoronMaskIconTex,
-    gZoraMaskIconTex,
-    gGerudoMaskIconTex,
-    gMaskofTruthIconTex,
-    gSoldOutIconTex,
-    gPocketEggIconTex,
-    gPocketCuccoIconTex,
-    gCojiroIconTex,
-    gOddMushroomIconTex,
-    gOddPotionIconTex,
-    gPoachersSawIconTex,
-    gBrokenBiggoronSwordIconTex,
-    gPrescriptionIconTex,
-    gEyeBallFrogIconTex,
-    gEyeDropsIconTex,
-    gClaimCheckIconTex,
-    gFairyBowFireIconTex,
-    gFairyBowIceIconTex,
-    gFairyBowLightIconTex,
-    gKokiriSwordIconTex,
-    gMasterSwordIconTex,
-    gBiggoronSwordIconTex,
-    gDekuShieldIconTex,
-    gHylianShieldIconTex,
-    gMirrorShieldIconTex,
-    gKokiriTunicIconTex,
-    gGoronTunicIconTex,
-    gZoraTunicIconTex,
-    gKokiriBootsIconTex,
-    gIronBootsIconTex,
-    gHoverBootsIconTex,
-    gBulletBag30IconTex,
-    gBulletBag40IconTex,
-    gBulletBag50IconTex,
-    gQuiver30IconTex,
-    gQuiver40IconTex,
-    gQuiver50IconTex,
-    gBombBag20IconTex,
-    gBombBag30IconTex,
-    gBombBag40IconTex,
-    gGoronsBraceletIconTex,
-    gSilverGauntletsIconTex,
-    gGoldenGauntletsIconTex,
-    gSilverScaleIconTex,
-    gGoldenScaleIconTex,
-    gBrokenGiantsKnifeIconTex,
-    gAdultsWalletIconTex,
-    gGiantsWalletIconTex,
-    gDekuSeedsIconTex,
-    gFishingPoleIconTex,
+    gItemIconDekuStickTex,
+    gItemIconDekuNutTex,
+    gItemIconBombTex,
+    gItemIconBowTex,
+    gItemIconArrowFireTex,
+    gItemIconDinsFireTex,
+    gItemIconSlingshotTex,
+    gItemIconOcarinaFairyTex,
+    gItemIconOcarinaOfTimeTex,
+    gItemIconBombchuTex,
+    gItemIconHookshotTex,
+    gItemIconLongshotTex,
+    gItemIconArrowIceTex,
+    gItemIconFaroresWindTex,
+    gItemIconBoomerangTex,
+    gItemIconLensOfTruthTex,
+    gItemIconMagicBeanTex,
+    gItemIconHammerTex,
+    gItemIconArrowLightTex,
+    gItemIconNayrusLoveTex,
+    gItemIconBottleEmptyTex,
+    gItemIconBottlePotionRedTex,
+    gItemIconBottlePotionGreenTex,
+    gItemIconBottlePotionBlueTex,
+    gItemIconBottleFairyTex,
+    gItemIconBottleFishTex,
+    gItemIconBottleMilkFullTex,
+    gItemIconBottleRutosLetterTex,
+    gItemIconBottleBlueFireTex,
+    gItemIconBottleBugTex,
+    gItemIconBottleBigPoeTex,
+    gItemIconBottleMilkHalfTex,
+    gItemIconBottlePoeTex,
+    gItemIconWeirdEggTex,
+    gItemIconChickenTex,
+    gItemIconZeldasLetterTex,
+    gItemIconMaskKeatonTex,
+    gItemIconMaskSkullTex,
+    gItemIconMaskSpookyTex,
+    gItemIconMaskBunnyHoodTex,
+    gItemIconMaskGoronTex,
+    gItemIconMaskZoraTex,
+    gItemIconMaskGerudoTex,
+    gItemIconMaskTruthTex,
+    gItemIconSoldOutTex,
+    gItemIconPocketEggTex,
+    gItemIconPocketCuccoTex,
+    gItemIconCojiroTex,
+    gItemIconOddMushroomTex,
+    gItemIconOddPotionTex,
+    gItemIconPoachersSawTex,
+    gItemIconBrokenGoronsSwordTex,
+    gItemIconPrescriptionTex,
+    gItemIconEyeballFrogTex,
+    gItemIconEyeDropsTex,
+    gItemIconClaimCheckTex,
+    gItemIconBowFireTex,
+    gItemIconBowIceTex,
+    gItemIconBowLightTex,
+    gItemIconSwordKokiriTex,
+    gItemIconSwordMasterTex,
+    gItemIconSwordBiggoronTex,
+    gItemIconShieldDekuTex,
+    gItemIconShieldHylianTex,
+    gItemIconShieldMirrorTex,
+    gItemIconTunicKokiriTex,
+    gItemIconTunicGoronTex,
+    gItemIconTunicZoraTex,
+    gItemIconBootsKokiriTex,
+    gItemIconBootsIronTex,
+    gItemIconBootsHoverTex,
+    gItemIconBulletBag30Tex,
+    gItemIconBulletBag40Tex,
+    gItemIconBulletBag50Tex,
+    gItemIconQuiver30Tex,
+    gItemIconQuiver40Tex,
+    gItemIconQuiver50Tex,
+    gItemIconBombBag20Tex,
+    gItemIconBombBag30Tex,
+    gItemIconBombBag40Tex,
+    gItemIconGoronsBraceletTex,
+    gItemIconSilverGauntletsTex,
+    gItemIconGoldenGauntletsTex,
+    gItemIconScaleSilverTex,
+    gItemIconScaleGoldenTex,
+    gItemIconBrokenGiantsKnifeTex,
+    gItemIconAdultsWalletTex,
+    gItemIconGiantsWalletTex,
+    gItemIconDekuSeedsTex,
+    gItemIconFishingPoleTex,
     gSongNoteTex,
     gSongNoteTex,
     gSongNoteTex,
@@ -139,34 +139,34 @@ void* gItemIcons[] = {
     gSongNoteTex,
     gSongNoteTex,
     gSongNoteTex,
-    gForestMedallionIconTex,
-    gFireMedallionIconTex,
-    gWaterMedallionIconTex,
-    gSpiritMedallionIconTex,
-    gShadowMedallionIconTex,
-    gLightMedallionIconTex,
-    gKokiriEmeraldIconTex,
-    gGoronRubyIconTex,
-    gZoraSapphireIconTex,
-    gStoneOfAgonyIconTex,
-    gGerudosCardIconTex,
-    gGoldSkulltulaIconTex,
-    gHeartContainerIconTex,
-    gUnusedPieceOfHeartIconTex,
-    gBossKeyIconTex,
-    gCompassIconTex,
-    gDungeonMapIconTex,
-    gSmallKeyIconTex,
-    gSmallMagicJarIconTex,
-    gBigMagicJarIconTex,
+    gQuestIconMedallionForestTex,
+    gQuestIconMedallionFireTex,
+    gQuestIconMedallionWaterTex,
+    gQuestIconMedallionSpiritTex,
+    gQuestIconMedallionShadowTex,
+    gQuestIconMedallionLightTex,
+    gQuestIconKokiriEmeraldTex,
+    gQuestIconGoronRubyTex,
+    gQuestIconZoraSapphireTex,
+    gQuestIconStoneOfAgonyTex,
+    gQuestIconGerudosCardTex,
+    gQuestIconGoldSkulltulaTex,
+    gQuestIconHeartContainerTex,
+    gQuestIconHeartPieceTex,
+    gQuestIconDungeonBossKeyTex,
+    gQuestIconDungeonCompassTex,
+    gQuestIconDungeonMapTex,
+    gQuestIconSmallKeyTex,
+    gQuestIconMagicJarSmallTex,
+    gQuestIconMagicJarBigTex,
     gHeartPieceIcon1Tex,
     gHeartPieceIcon2Tex,
     gHeartPieceIcon3Tex,
-    gOcarinaCUpTex,
-    gOcarinaCDownTex,
-    gOcarinaCLeftTex,
-    gOcarinaCRightTex,
-    gOcarinaATex,
+    gOcarinaBtnIconCUpTex,
+    gOcarinaBtnIconCDownTex,
+    gOcarinaBtnIconCLeftTex,
+    gOcarinaBtnIconCRightTex,
+    gOcarinaBtnIconATex,
 };
 
 // Used to map item IDs to inventory slots
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index e8d2d9791..e39a29abd 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -3965,9 +3965,9 @@ typedef struct {
 } DoorLockInfo; // size = 0x1C
 
 static DoorLockInfo sDoorLocksInfo[] = {
-    /* DOORLOCK_NORMAL */ { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, gDoorChainsDL, gDoorLockDL },
-    /* DOORLOCK_BOSS */ { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, object_bdoor_DL_001530, object_bdoor_DL_001400 },
-    /* DOORLOCK_NORMAL_SPIRIT */ { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, gDoorChainsDL, gDoorLockDL },
+    /* DOORLOCK_NORMAL */ { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, gDoorChainDL, gDoorLockDL },
+    /* DOORLOCK_BOSS */ { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, gBossDoorChainDL, gBossDoorLockDL },
+    /* DOORLOCK_NORMAL_SPIRIT */ { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, gDoorChainDL, gDoorLockDL },
 };
 
 /**
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index ad7c93ea4..22a03ea32 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -1397,7 +1397,7 @@ void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) {
         gDPSetTextureFilter(POLY_OPA_DISP++, G_TF_BILERP);
         gDPSetTextureConvert(POLY_OPA_DISP++, G_TC_FILT);
         gDPSetTextureLUT(POLY_OPA_DISP++, G_TT_NONE);
-        gDPLoadTextureBlock(POLY_OPA_DISP++, gBombchuIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0,
+        gDPLoadTextureBlock(POLY_OPA_DISP++, gItemIconBombchuTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
         gSPVertex(POLY_OPA_DISP++, customDropVtx, 4, 0);
diff --git a/soh/src/code/z_fbdemo_circle.c b/soh/src/code/z_fbdemo_circle.c
index b9e71d7ab..a3ebbabd4 100644
--- a/soh/src/code/z_fbdemo_circle.c
+++ b/soh/src/code/z_fbdemo_circle.c
@@ -22,7 +22,7 @@ Gfx __sCircleDList[] = {
     gsDPLoadTextureBlock(SEG_ADDR(8, 0), G_IM_FMT_I, G_IM_SIZ_8b, 16, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,                 // 7
                          G_TX_NOMIRROR | G_TX_CLAMP, 4, 6, G_TX_NOLOD, G_TX_NOLOD),
     gsSPDisplayList(SEG_ADDR(9, 0)),                                                                                    // 8
-    gsSPVertex(sCircleWipeVtx, 32, 0),                                                                              // 9
+    gsSPVertex(sTransCircleVtx, 32, 0),                                                                              // 9
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),                                                                         // 10
     gsSP2Triangles(3, 5, 6, 0, 5, 7, 8, 0),                                                                         // 11
     gsSP2Triangles(7, 9, 10, 0, 9, 11, 12, 0),                                                                      // 12
@@ -31,7 +31,7 @@ Gfx __sCircleDList[] = {
     gsSP2Triangles(19, 21, 22, 0, 21, 23, 24, 0),                                                                   // 15
     gsSP2Triangles(23, 25, 26, 0, 25, 27, 28, 0),                                                                   // 16
     gsSP1Triangle(27, 29, 30, 0),                                                                                   // 17
-    gsSPVertex(&sCircleWipeVtx[31], 3, 0),                                                                          // 18
+    gsSPVertex(&sTransCircleVtx[31], 3, 0),                                                                          // 18
     gsSP1Triangle(0, 1, 2, 0),                                                                                      // 19
     gsSPEndDisplayList(),                                                                                           // 20
 };
@@ -174,7 +174,7 @@ void TransitionCircle_Draw(void* thisx, Gfx** gfxP) {
     }
 
     // OTRTODO: This is an ugly hack but it will do for now...
-    Vtx* vtx = ResourceMgr_LoadVtxByName(sCircleWipeVtx);
+    Vtx* vtx = ResourceMgr_LoadVtxByName(sTransCircleVtx);
     Gfx var1 = gsSPVertex(vtx, 32, 0);
     Gfx var2 = gsSPVertex(&vtx[31], 3, 0);
     __sCircleDList[0xe] = var1;
diff --git a/soh/src/code/z_fbdemo_triforce.c b/soh/src/code/z_fbdemo_triforce.c
index 417ae3d8a..66268836e 100644
--- a/soh/src/code/z_fbdemo_triforce.c
+++ b/soh/src/code/z_fbdemo_triforce.c
@@ -83,14 +83,14 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) {
     guRotate(&modelView[1], rotation, 0.0f, 0.0f, 1.0f);
     guTranslate(&modelView[2], 0.0f, 0.0f, 0.0f);
     gDPPipeSync(gfx++);
-    gSPDisplayList(gfx++, sTriforceWipeDL);
+    gSPDisplayList(gfx++, sTransTriforceDL);
     gDPSetColor(gfx++, G_SETPRIMCOLOR, this->color.rgba);
     gDPSetCombineMode(gfx++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
     gSPMatrix(gfx++, &this->projection, G_MTX_LOAD | G_MTX_PROJECTION);
     gSPMatrix(gfx++, &modelView[0], G_MTX_LOAD);
     gSPMatrix(gfx++, &modelView[1], G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_MUL);
     gSPMatrix(gfx++, &modelView[2], G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_MUL);
-    gSPVertex(gfx++, sTriforceWipeVtx, 10, 0);
+    gSPVertex(gfx++, sTransTriforceVtx, 10, 0);
     if (!TransitionTriforce_IsDone(this)) {
         switch (this->fadeDirection) {
             case 1:
diff --git a/soh/src/code/z_fbdemo_wipe1.c b/soh/src/code/z_fbdemo_wipe1.c
index da473d8af..df5cbbc2d 100644
--- a/soh/src/code/z_fbdemo_wipe1.c
+++ b/soh/src/code/z_fbdemo_wipe1.c
@@ -14,14 +14,14 @@ Gfx sWipeDList[] = {
     gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, COMBINED, 0,
                        PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0),
     gsDPSetPrimDepth(0, 0),
-    gsDPLoadTextureBlock_4b(sWipe1Tex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6,
+    gsDPLoadTextureBlock_4b(sTransWipeTex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6,
                             11, G_TX_NOLOD),
-    gsDPLoadMultiBlock_4b(sWipe1Tex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
+    gsDPLoadMultiBlock_4b(sTransWipeTex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
                           G_TX_MIRROR | G_TX_WRAP, 6, 6, 11, 1),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPDisplayList(SEG_ADDR(8, 0)),
-    gsSPVertex(sWipe1Vtx, 25, 0),
+    gsSPVertex(sTransWipeVtx, 25, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 6, 8, 9, 0),
     gsSP2Triangles(8, 10, 11, 0, 10, 12, 13, 0),
diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c
index 0745a76d3..4474c2d8b 100644
--- a/soh/src/code/z_kankyo.c
+++ b/soh/src/code/z_kankyo.c
@@ -1367,10 +1367,10 @@ void Environment_DrawSunAndMoon(PlayState* play) {
         // Replacement for gSunDL
         gSPMatrix(POLY_OPA_DISP++, SEG_ADDR(1, 0), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
         gDPPipeSync(POLY_OPA_DISP++);
-        gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gSunTex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
+        gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gSun1Tex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                                G_TX_NOMIRROR | G_TX_CLAMP,
                                6, 6, G_TX_NOLOD, G_TX_NOLOD);
-        gDPLoadMultiBlock_4b(POLY_OPA_DISP++, gSunEveningTex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0,
+        gDPLoadMultiBlock_4b(POLY_OPA_DISP++, gSunEvening1Tex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0,
                              G_TX_NOMIRROR | G_TX_CLAMP,
                              G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
         gSPVertex(POLY_OPA_DISP++, vertices, 4, 0);
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 6ba8712b4..c595f4516 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -2003,7 +2003,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
     };
     static s16 sOcarinaEffectActorParams[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000 };
     static void* sOcarinaNoteTextures[] = {
-        gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex,
+        gOcarinaBtnIconATex, gOcarinaBtnIconCDownTex, gOcarinaBtnIconCRightTex, gOcarinaBtnIconCLeftTex, gOcarinaBtnIconCUpTex,
     };
     static Color_RGB8 sOcarinaNoteAPrimColors[2] = {
         { 80, 150, 255 },
diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index 6953f64bf..c5a50a87c 100644
--- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -309,7 +309,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) {
                         gSaveContext.cutsceneTrigger = 1;
                         break;
                     case FAIRY_UPGRADE_HALF_DAMAGE:
-                        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyDoubleDefenceCs);
+                        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyDoubleDefenseCs);
                         gSaveContext.cutsceneTrigger = 1;
                         break;
                 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
index 847cf1dcf..04018c9a8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
@@ -186,10 +186,10 @@ void BgIceShelter_Init(Actor* thisx, PlayState* play) {
 
     switch (type) {
         case 2:
-            func_80890874(this, play, &object_ice_objects_Col_001C1C, 0);
+            func_80890874(this, play, &gRedIcePlatformCol, 0);
             break;
         case 3:
-            func_80890874(this, play, &object_ice_objects_Col_002920, 0);
+            func_80890874(this, play, &gRedIceWallCol, 0);
             break;
     }
 
@@ -477,7 +477,7 @@ void BgIceShelter_Draw(Actor* thisx, PlayState* play2) {
                                         -play->gameplayFrames & 0x7F, 0x20, 0x20, 1,
                                         -play->gameplayFrames & 0x7F, play->gameplayFrames & 0x7F, 0x20,
                                         0x20));
-            gSPDisplayList(POLY_XLU_DISP++, object_ice_objects_DL_0006F0);
+            gSPDisplayList(POLY_XLU_DISP++, gRedIceBlockDL);
             break;
 
         case 2:
@@ -489,11 +489,11 @@ void BgIceShelter_Draw(Actor* thisx, PlayState* play2) {
                                         play->gameplayFrames & 0xFF, 0x40, 0x40, 1,
                                         play->gameplayFrames & 0xFF, play->gameplayFrames & 0xFF, 0x40,
                                         0x40));
-            gSPDisplayList(POLY_XLU_DISP++, object_ice_objects_DL_0012A0);
+            gSPDisplayList(POLY_XLU_DISP++, gRedIcePlatformDL);
             break;
 
         case 3:
-            gSPDisplayList(POLY_XLU_DISP++, object_ice_objects_DL_002640);
+            gSPDisplayList(POLY_XLU_DISP++, gRedIceWallDL);
             break;
     }
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index 6d5256b9f..a2a52453a 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -2418,7 +2418,7 @@ void func_809034E4(Vec3f* arg0, Vec3f* arg1) {
         }
     }
 
-    vtx = ResourceMgr_LoadVtxByName(SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_Vtx_00BA20));
+    vtx = ResourceMgr_LoadVtxByName(SEGMENTED_TO_VIRTUAL(gGanonSwordTrailVtx));
     for (i = 0; i < 11; i++) {
         if ((temp_s4 - i) > 0) {
             vtx[D_80907084[i]].n.ob[0] = sp18C[temp_s4 - i - 1].x;
@@ -2450,7 +2450,7 @@ void func_80903F38(BossGanon2* this, PlayState* play) {
         Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00BB80);
+        gSPDisplayList(POLY_XLU_DISP++, gGanonSwordTrailDL);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -2473,7 +2473,7 @@ void func_80904108(BossGanon2* this, PlayState* play) {
         Matrix_Scale(0.098000005f, 0.1f, 0.098000005f, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00E1C0));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonFireRingDL));
         Matrix_Pop();
 
         CLOSE_DISPS(play->state.gfxCtx);
@@ -2523,7 +2523,7 @@ void func_80904340(BossGanon2* this, PlayState* play) {
 
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00D798));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightningDL));
             FrameInterpolation_RecordCloseChild();
         }
     }
@@ -2548,7 +2548,7 @@ void func_8090464C(BossGanon2* this, PlayState* play) {
         Matrix_Scale(0.6f, 0.6f, 1.0f, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00CCD8));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonTriforceDL));
         Matrix_Pop();
 
         CLOSE_DISPS(play->state.gfxCtx);
@@ -2669,7 +2669,7 @@ void func_80904D88(BossGanon2* this, PlayState* play) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
             gDPSetEnvColor(POLY_XLU_DISP++, 100, 255, 255, 0);
         }
-        gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B308);
+        gSPDisplayList(POLY_XLU_DISP++, gGanonLightOrbMaterialDL);
 
         for (i = 0; i < 15; i++) {
             FrameInterpolation_RecordOpenChild("Ganon 80904D88", i);
@@ -2680,7 +2680,7 @@ void func_80904D88(BossGanon2* this, PlayState* play) {
             Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B378);
+            gSPDisplayList(POLY_XLU_DISP++, gGanonLightOrbModelDL);
             
             FrameInterpolation_RecordCloseChild();
         }
@@ -2698,7 +2698,7 @@ void func_80904FC8(BossGanon2* this, PlayState* play) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 200);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 0);
-        gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B308);
+        gSPDisplayList(POLY_XLU_DISP++, gGanonLightOrbMaterialDL);
         Matrix_Translate(sBossGanon2Zelda->actor.world.pos.x, sBossGanon2Zelda->actor.world.pos.y + 80.0f, sBossGanon2Zelda->actor.world.pos.z,
                          MTXMODE_NEW);
         Matrix_ReplaceRotation(&play->billboardMtxF);
@@ -2706,11 +2706,11 @@ void func_80904FC8(BossGanon2* this, PlayState* play) {
         Matrix_RotateZ(this->unk_388, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightOrbModelDL));
         Matrix_RotateZ(this->unk_388 * -2.0f, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightOrbModelDL));
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -2729,7 +2729,7 @@ void func_8090523C(BossGanon2* this, PlayState* play) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->unk_38C);
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 0);
-        gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B308);
+        gSPDisplayList(POLY_XLU_DISP++, gGanonLightOrbMaterialDL);
 
         for (i = 0; i < 11; i++) {
             FrameInterpolation_RecordOpenChild("Ganon 8090523C", i);
@@ -2748,7 +2748,7 @@ void func_8090523C(BossGanon2* this, PlayState* play) {
             Matrix_RotateZ(Rand_ZeroFloat(2.0f * M_PI), MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightOrbModelDL));
             
             FrameInterpolation_RecordCloseChild();
         }
@@ -2797,7 +2797,7 @@ void func_80905674(BossGanon2* this, PlayState* play) {
         Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00EC40));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonZeldaMagicDL));
         Matrix_Pop();
 
         CLOSE_DISPS(play->state.gfxCtx);
@@ -2977,7 +2977,7 @@ void func_809060E8(PlayState* play) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_OPA_DISP++, 0x08,
                        Gfx_TexScroll(play->state.gfxCtx, 0, 0 - (play->gameplayFrames & 0x7F), 32, 32));
-            gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_0103A8);
+            gSPDisplayList(POLY_OPA_DISP++, gGanonMasterSwordDL);
             if ((play->envCtx.unk_BD == 1) || (play->envCtx.unk_BD == 2)) {
                 alpha = (s16)(play->envCtx.unk_D8 * 150.0f) + 50;
                 angle = M_PI / 5.0f;
@@ -2992,7 +2992,7 @@ void func_809060E8(PlayState* play) {
             Matrix_Scale(1.0f, 0.0f, 1.0f, MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00F188);
+            gSPDisplayList(POLY_XLU_DISP++, gGanonMasterSwordShadowDL);
             
             FrameInterpolation_RecordCloseChild();
         }
@@ -3137,10 +3137,10 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, PlaySta
     Matrix_Scale(1.65f, 1.0f, 1.65f, MTXMODE_APPLY);
     gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3D0);
+    gSPDisplayList(POLY_OPA_DISP++, gGanonShadowMaterialDL);
     gDPLoadTextureBlock(POLY_OPA_DISP++, shadowTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                         G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
-    gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3F0);
+    gSPDisplayList(POLY_OPA_DISP++, gGanonShadowModelDL);
 
     CLOSE_DISPS(gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 58b16feb8..dd222db2b 100644
--- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -477,7 +477,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
     if (this->actor.params == TW_KOTAKE) {
         Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInitKoumeKotake);
         this->actor.naviEnemyId = 0x33;
-        SkelAnime_InitFlex(play, &this->skelAnime, &object_tw_Skel_0070E0, &object_tw_Anim_006F28, NULL, NULL, 0);
+        SkelAnime_InitFlex(play, &this->skelAnime, &gTwinrovaKotakeSkel, &gTwinrovaKotakeKoumeFlyAnim, NULL, NULL, 0);
 
         if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) {
             // began twinrova battle
@@ -490,12 +490,12 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
             BossTw_SetupCSWait(this, play);
         }
 
-        Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -3.0f);
+        Animation_MorphToLoop(&this->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, -3.0f);
         this->visible = true;
     } else if (this->actor.params == TW_KOUME) {
         Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInitKoumeKotake);
         this->actor.naviEnemyId = 0x32;
-        SkelAnime_InitFlex(play, &this->skelAnime, &object_tw_Skel_01F888, &object_tw_Anim_006F28, NULL, NULL, 0);
+        SkelAnime_InitFlex(play, &this->skelAnime, &gTwinrovaKoumeSkel, &gTwinrovaKotakeKoumeFlyAnim, NULL, NULL, 0);
 
         if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) {
             // began twinrova battle
@@ -507,7 +507,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
             BossTw_SetupCSWait(this, play);
         }
 
-        Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -3.0f);
+        Animation_MorphToLoop(&this->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, -3.0f);
         this->visible = true;
     } else {
         // Twinrova
@@ -516,8 +516,8 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
         this->actor.colChkInfo.health = 24;
         this->actor.update = BossTw_TwinrovaUpdate;
         this->actor.draw = BossTw_TwinrovaDraw;
-        SkelAnime_InitFlex(play, &this->skelAnime, &object_tw_Skel_032020, &object_tw_Anim_0244B4, NULL, NULL, 0);
-        Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_0244B4, -3.0f);
+        SkelAnime_InitFlex(play, &this->skelAnime, &gTwinrovaSkel, &gTwinrovaTPoseAnim, NULL, NULL, 0);
+        Animation_MorphToLoop(&this->skelAnime, &gTwinrovaTPoseAnim, -3.0f);
 
         if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) {
             // began twinrova battle
@@ -615,7 +615,7 @@ void BossTw_SetupFlyTo(BossTw* this, PlayState* play) {
     this->actor.flags |= ACTOR_FLAG_TARGETABLE;
     this->actionFunc = BossTw_FlyTo;
     this->rotateSpeed = 0.0f;
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -10.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, -10.0f);
     if ((Rand_ZeroOne() < 0.5f) && (otherTw != NULL && otherTw->actionFunc == BossTw_ShootBeam)) {
         // Other Sister is shooting a beam, go near them.
         this->targetPos.x = otherTw->actor.world.pos.x + Rand_CenteredFloat(200.0f);
@@ -676,8 +676,8 @@ void BossTw_SetupShootBeam(BossTw* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     this->actionFunc = BossTw_ShootBeam;
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_007688, -5.0f);
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_007688);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaKotakeKoumeChargeUpAttackStartAnim, -5.0f);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeChargeUpAttackStartAnim);
     this->timers[1] = 70;
     this->targetPos = player->actor.world.pos;
     this->csState1 = 0;
@@ -1017,13 +1017,13 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
         }
 
         if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) {
-            Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_009398, 0.0f);
+            Animation_MorphToLoop(&this->skelAnime, &gTwinrovaKotakeKoumeChargeUpAttackLoopAnim, 0.0f);
             this->workf[ANIM_SW_TGT] = 10000.0f;
         }
 
         if (this->timers[1] == 1) {
-            Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_003614, 0.0f);
-            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_003614);
+            Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaKotakeKoumeAttackStartAnim, 0.0f);
+            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeAttackStartAnim);
             this->unk_4DC = 0.0f;
             this->spawnPortalAlpha = 0.0f;
             this->flameAlpha = 0.0f;
@@ -1031,7 +1031,7 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
         }
     } else {
         if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) {
-            Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_003E34, 0.0f);
+            Animation_MorphToLoop(&this->skelAnime, &gTwinrovaKotakeKoumeAttackLoopAnim, 0.0f);
             this->workf[ANIM_SW_TGT] = 10000.0f;
         }
 
@@ -1286,8 +1286,8 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
 
 void BossTw_SetupFinishBeamShoot(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_FinishBeamShoot;
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_004548, 0.0f);
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_004548);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaKotakeKoumeAttackEndAnim, 0.0f);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeAttackEndAnim);
 }
 
 void BossTw_FinishBeamShoot(BossTw* this, PlayState* play) {
@@ -1307,7 +1307,7 @@ void BossTw_FinishBeamShoot(BossTw* this, PlayState* play) {
 
 void BossTw_SetupHitByBeam(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_HitByBeam;
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_00578C, 0.0f);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaKotakeKoumeDamageStartAnim, 0.0f);
     this->timers[0] = 53;
     this->actor.speedXZ = 0.0f;
 
@@ -1361,8 +1361,8 @@ void BossTw_HitByBeam(BossTw* this, PlayState* play) {
     }
 
     if (this->timers[0] == 1) {
-        Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_006530, 0.0f);
-        this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_006530);
+        Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaKotakeKoumeDamageEndAnim, 0.0f);
+        this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeDamageEndAnim);
     }
 
     if ((this->timers[0] == 0) && Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) {
@@ -1372,8 +1372,8 @@ void BossTw_HitByBeam(BossTw* this, PlayState* play) {
 
 void BossTw_SetupLaugh(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_Laugh;
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_0088C8, 0.0f);
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0088C8);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaKotakeKoumeLaughAnim, 0.0f);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeLaughAnim);
     this->actor.speedXZ = 0.0f;
 }
 
@@ -1395,8 +1395,8 @@ void BossTw_Laugh(BossTw* this, PlayState* play) {
 
 void BossTw_SetupSpin(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_Spin;
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_007CA8, -3.0f);
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_007CA8);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaKotakeKoumeSpinAnim, -3.0f);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeSpinAnim);
     this->actor.speedXZ = 0.0f;
     SkelAnime_Update(&this->skelAnime);
     this->timers[0] = 20;
@@ -1424,7 +1424,7 @@ void BossTw_SetupMergeCS(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_MergeCS;
     this->rotateSpeed = 0.0f;
     this->actor.speedXZ = 0.0f;
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -10.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, -10.0f);
 }
 
 void BossTw_MergeCS(BossTw* this, PlayState* play) {
@@ -1603,8 +1603,8 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
                     BossTw_SetupWait(sKotakePtr, play);
                     BossTw_SetupWait(sKoumePtr, play);
                     Actor_SetScale(&this->actor, 0.0f);
-                    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_038E2C, 0.0f);
-                    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_038E2C);
+                    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaIntroAnim, 0.0f);
+                    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaIntroAnim);
                     this->timers[0] = 50;
                     func_8002DF54(play, &this->actor, 2);
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_TRANSFORM);
@@ -1618,7 +1618,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
 
         case 1:
             if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) {
-                Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -15.0f);
+                Animation_MorphToLoop(&this->skelAnime, &gTwinrovaHoverAnim, -15.0f);
             }
 
             sEnvType = -1;
@@ -1693,7 +1693,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
 
 void BossTw_SetupDeathCS(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_DeathCS;
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_0004A4, -3.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaKotakeKoumeIdleLoopAnim, -3.0f);
     this->unk_5F8 = 0;
     this->work[CS_TIMER_2] = Rand_ZeroFloat(20.0f);
 }
@@ -1819,7 +1819,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 if (this->work[CS_TIMER_1] >= 236) {
                     this->csState2 = 2;
                     sKoumePtr->visible = 1;
-                    Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_0004A4, 0.0f);
+                    Animation_MorphToLoop(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeIdleLoopAnim, 0.0f);
                     sKoumePtr->actor.world.pos.x = 0.0f;
                     sKoumePtr->actor.world.pos.y = 80.0f;
                     sKoumePtr->actor.world.pos.z = 600.0f;
@@ -1899,8 +1899,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 this->subCamAtStep.z = fabsf(this->subCamAtTarget.z - this->subCamAt.z);
                 this->subCamUpdateRate = 0.0f;
                 this->subCamDistStep = 0.05f;
-                Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &object_tw_Anim_000AAC, 0.0f);
-                this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_000AAC);
+                Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeIdleEndAnim, 0.0f);
+                this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeIdleEndAnim);
                 this->work[CS_TIMER_1] = 0;
             }
             break;
@@ -1948,8 +1948,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                                        1.0f, 0.005f);
                     } else {
                         if (this->work[CS_TIMER_1] == 50) {
-                            Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &object_tw_Anim_0088C8, -5);
-                            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0088C8);
+                            Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeLaughAnim, -5);
+                            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeLaughAnim);
                         }
 
                         if (this->work[CS_TIMER_1] == 60) {
@@ -1957,7 +1957,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                         }
 
                         if (Animation_OnFrame(&sKoumePtr->skelAnime, this->workf[ANIM_SW_TGT])) {
-                            Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_006F28, 0.f);
+                            Animation_MorphToLoop(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, 0.f);
                             this->workf[ANIM_SW_TGT] = 1000.0f;
                         }
 
@@ -1973,7 +1973,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                         this->work[CS_TIMER_1] = 0;
                         this->subCamYawStep = 0.0f;
                         sKotakePtr->visible = 1;
-                        Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_0004A4, 0.0f);
+                        Animation_MorphToLoop(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeIdleLoopAnim, 0.0f);
                         sKotakePtr->actor.world.pos.x = 0.0f;
                         sKotakePtr->actor.world.pos.y = 80.0f;
                         sKotakePtr->actor.world.pos.z = -600.0f;
@@ -2001,7 +2001,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 Math_ApproachF(&this->subCamYawStep, 12288.0f, 1.0f, 384.0f);
 
                 if (Animation_OnFrame(&sKoumePtr->skelAnime, this->workf[ANIM_SW_TGT])) {
-                    Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_006F28, 0.0f);
+                    Animation_MorphToLoop(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, 0.0f);
                     this->workf[ANIM_SW_TGT] = 1000.0f;
                 }
             }
@@ -2063,8 +2063,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 this->subCamAtStep.z = fabsf(this->subCamAtTarget.z - this->subCamAt.z);
                 this->subCamUpdateRate = 0;
                 this->subCamDistStep = 0.05f;
-                Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &object_tw_Anim_000AAC, 0);
-                this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_000AAC);
+                Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeIdleEndAnim, 0);
+                this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeIdleEndAnim);
                 this->work[CS_TIMER_1] = 0;
             }
             break;
@@ -2110,8 +2110,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                                        1.0f, 0.005f);
                     } else {
                         if (this->work[CS_TIMER_1] == 50) {
-                            Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &object_tw_Anim_0088C8, -5.0f);
-                            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0088C8);
+                            Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeLaughAnim, -5.0f);
+                            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaKotakeKoumeLaughAnim);
                         }
 
                         if (this->work[CS_TIMER_1] == 60) {
@@ -2119,7 +2119,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                         }
 
                         if (Animation_OnFrame(&sKotakePtr->skelAnime, this->workf[ANIM_SW_TGT])) {
-                            Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_006F28, 0.0f);
+                            Animation_MorphToLoop(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, 0.0f);
                             this->workf[ANIM_SW_TGT] = 1000.0f;
                         }
 
@@ -2162,7 +2162,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 Math_ApproachF(&this->subCamYawStep, 12288.0f, 1.0f, 384.0f);
 
                 if (Animation_OnFrame(&sKotakePtr->skelAnime, this->workf[ANIM_SW_TGT])) {
-                    Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_006F28, 0.0f);
+                    Animation_MorphToLoop(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeFlyAnim, 0.0f);
                     this->workf[ANIM_SW_TGT] = 1000.0f;
                 }
             }
@@ -2336,7 +2336,7 @@ void BossTw_DeathBall(BossTw* this, PlayState* play) {
 
 void BossTw_TwinrovaSetupDeathCS(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_TwinrovaDeathCS;
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_024374, -3.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaDamageAnim, -3.0f);
     this->actor.world.rot.y = this->actor.shape.rot.y;
     this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
     this->csState2 = this->csState1 = 0;
@@ -2516,31 +2516,31 @@ void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) {
 
     switch (kotakeAnim) {
         case 1:
-            Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_00230C, -5.0f);
+            Animation_MorphToLoop(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeShakeHandAnim, -5.0f);
             break;
         case 2:
-            Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_001D10, -5.0f);
+            Animation_MorphToLoop(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeFloatLookForwardAnim, -5.0f);
             break;
         case 3:
-            Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_0017E0, -5.0f);
+            Animation_MorphToLoop(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeFloatLookUpAnim, -5.0f);
             break;
         case 4:
-            Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_0012A4, -5.0f);
+            Animation_MorphToLoop(&sKotakePtr->skelAnime, &gTwinrovaKotakeKoumeBickerAnim, -5.0f);
             break;
     }
 
     switch (koumeAnim) {
         case 1:
-            Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_00230C, -5.0f);
+            Animation_MorphToLoop(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeShakeHandAnim, -5.0f);
             break;
         case 2:
-            Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_001D10, -5.0f);
+            Animation_MorphToLoop(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeFloatLookForwardAnim, -5.0f);
             break;
         case 3:
-            Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_0017E0, -5.0f);
+            Animation_MorphToLoop(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeFloatLookUpAnim, -5.0f);
             break;
         case 4:
-            Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_0012A4, -5.0f);
+            Animation_MorphToLoop(&sKoumePtr->skelAnime, &gTwinrovaKotakeKoumeBickerAnim, -5.0f);
             break;
     }
 
@@ -2604,7 +2604,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
     switch (this->csState1) {
         case 0:
             if (this->work[CS_TIMER_1] == 15) {
-                Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_0216DC, -3.0f);
+                Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaDeathAnim, -3.0f);
             }
 
             if (this->work[CS_TIMER_1] >= 15) {
@@ -3165,9 +3165,9 @@ s32 BossTw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
     if (limbIndex == 21) {
         if (this->unk_5F8 == 0) {
             if (this->actor.params == 0) {
-                *dList = object_tw_DL_012CE0;
+                *dList = gTwinrovaKotakeHeadDL;
             } else {
-                *dList = object_tw_DL_0134B8;
+                *dList = gTwinrovaKoumeHeadDL;
             }
         }
     }
@@ -3177,9 +3177,9 @@ s32 BossTw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
             *dList = NULL;
         } else if (this->scepterAlpha == 0.0f) {
             if (this->actor.params == 0) {
-                *dList = object_tw_DL_012B38;
+                *dList = gTwinrovaKotakeBroomDL;
             } else {
-                *dList = object_tw_DL_013310;
+                *dList = gTwinrovaKoumeBroomDL;
             }
         }
     }
@@ -3207,9 +3207,9 @@ void BossTw_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
                 if (this->actor.params == 0) {
-                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013AE8));
+                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeIceHairDL));
                 } else {
-                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013D68));
+                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKoumeFireHairDL));
                 }
             }
             break;
@@ -3225,14 +3225,14 @@ void BossTw_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot
                           G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
                 if (this->actor.params == 0) {
                     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 225, 255, (s16)this->scepterAlpha);
-                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013E98));
+                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeIceBroomHeadDL));
                     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s16)this->scepterAlpha);
-                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013F98));
+                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeIceBroomHeadOuterDL));
                 } else {
                     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 20, 0, (s16)this->scepterAlpha);
-                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_014070));
+                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeFireBroomHeadDL));
                     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 70, 0, (s16)this->scepterAlpha);
-                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_014158));
+                    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeFireBroomHeadOuterDL));
                 }
             }
             break;
@@ -3254,7 +3254,7 @@ void func_80941BC0(BossTw* this, PlayState* play) {
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F11]);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 40, 30, 80);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01BC00));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIcePoolDL));
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 215, 215, 215, (s16)this->workf[UNK_F11] * this->workf[UNK_F14]);
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
     gSPSegment(POLY_XLU_DISP++, 8,
@@ -3264,7 +3264,7 @@ void func_80941BC0(BossTw* this, PlayState* play) {
     Matrix_RotateY(this->workf[UNK_F15], MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01C1C0));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIcePoolShineDL));
     Matrix_Pop();
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
@@ -3279,7 +3279,7 @@ void func_80941BC0(BossTw* this, PlayState* play) {
                          GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA),
                      G_RM_ZB_OVL_SURF2);
     gSPSetGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A790));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaEffectHaloDL));
     Matrix_Pop();
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -3303,7 +3303,7 @@ void func_80942180(BossTw* this, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 40, 00, (s16)this->workf[KM_GRND_CRTR_A]);
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 245, 255, 128);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019D40));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFirePoolDL));
 
     Matrix_ReplaceRotation(&play->billboardMtxF);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
@@ -3315,7 +3315,7 @@ void func_80942180(BossTw* this, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 80, 0, 0, (s16)this->workf[KM_GD_SMOKE_A]);
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 100);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_018FC0));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireSmokeDL));
 
     gSPSegment(POLY_XLU_DISP++, 8,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, (-this->work[CS_TIMER_1] * 3) & 0x7F, 0, 0x20, 0x20, 1, 0,
@@ -3326,7 +3326,7 @@ void func_80942180(BossTw* this, PlayState* play) {
     Matrix_Scale(this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019938));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaBigFlameDL));
 
     Matrix_Pop();
 
@@ -3352,17 +3352,17 @@ void func_809426F0(BossTw* this, PlayState* play) {
 
     if (this->actor.params == 0) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01CEE0));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeMagicSigilDL));
     } else {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DBE8));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKoumeMagicSigilDL));
     }
 
     Matrix_Pop();
 
     if (this->actor.params == 0) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s16)this->flameAlpha);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceMaterialDL));
     } else {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 20, 0, (s16)this->flameAlpha);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 215, 255, 128);
@@ -3382,7 +3382,7 @@ void func_809426F0(BossTw* this, PlayState* play) {
         Matrix_ReplaceRotation(&play->billboardMtxF);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
         Matrix_Pop();
 
         FrameInterpolation_RecordCloseChild();
@@ -3418,7 +3418,7 @@ void func_80942C70(Actor* thisx, PlayState* play) {
         Matrix_Scale(this->beamScale, this->beamScale, (this->beamDist * 0.01f * 98.0f) / 20000.0f, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaBeamDL));
 
         if (this->beamReflectionDist > 10.0f) {
             Matrix_Translate(this->beamReflectionOrigin.x, this->beamReflectionOrigin.y, this->beamReflectionOrigin.z,
@@ -3430,7 +3430,7 @@ void func_80942C70(Actor* thisx, PlayState* play) {
                          MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaBeamDL));
         }
 
         Matrix_Pop();
@@ -3450,7 +3450,7 @@ void func_80943028(Actor* thisx, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F608));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaHaloDL));
     Gfx_SetupDL_44Xlu(play->state.gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 200);
     Matrix_Translate(this->actor.world.pos.x, 240.0f, this->actor.world.pos.z, MTXMODE_NEW);
@@ -3465,9 +3465,9 @@ void func_80943028(Actor* thisx, PlayState* play) {
 }
 
 static void* sEyeTextures[] = {
-    object_tw_Tex_00A438,
-    object_tw_Tex_00B238,
-    object_tw_Tex_00B638,
+    gTwinrovaKotakeKoumeEyeOpenTex,
+    gTwinrovaKotakeKoumeEyeHalfTex,
+    gTwinrovaKotakeKoumeEyeClosedTex,
 };
 
 void BossTw_Draw(Actor* thisx, PlayState* play2) {
@@ -3552,9 +3552,9 @@ void BossTw_Draw(Actor* thisx, PlayState* play2) {
 }
 
 void* D_8094A9B0[] = {
-    object_tw_Tex_02A9B0,
-    object_tw_Tex_02A070,
-    object_tw_Tex_02A470,
+    gTwinrovaEyeOpenTex,
+    gTwinrovaEyeHalfTex,
+    gTwinrovaEyeClosedTex,
 };
 
 s32 BossTw_TwinrovaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
@@ -3600,13 +3600,13 @@ s32 BossTw_TwinrovaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList,
             break;
         case 19:
             if (this->unk_5F8 != 0) {
-                *dList = object_tw_DL_02D940;
+                *dList = gTwinrovaLeftHairBunDL;
             }
             break;
 
         case 20:
             if (this->unk_5F8 != 0) {
-                *dList = object_tw_DL_02D890;
+                *dList = gTwinrovaRightHairBunDL;
             }
             break;
     }
@@ -3707,20 +3707,20 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
             temp_a0 = (Math_SinS(this->work[CS_TIMER_1] * 2730 * temp_t0) * D_8094C854 * 0.5f) + (D_8094C854 * 0.5f);
             if (sShieldFireCharge != 0) {
                 gDPSetEnvColor(POLY_XLU_DISP++, 255, 245, 255, temp_a0);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E0E0));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaMirrorShieldFireChargeSidesDL));
                 gSPSegment(POLY_XLU_DISP++, 8,
                            Gfx_TwoTexScroll(play->state.gfxCtx, 0, (this->work[CS_TIMER_1] * 2) * temp_t0, 0, 0x20,
                                             0x20, 1, (-this->work[CS_TIMER_1] * 2) * temp_t0, 0, 0x20, 0x20));
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 20, 0, (s16)D_8094C854);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E020));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaMirrorShieldFireChargeCenterDL));
             } else {
                 gDPSetEnvColor(POLY_XLU_DISP++, 225, 255, 255, temp_a0);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E3A0));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaMirrorShieldIceChargeSidesDL));
                 gSPSegment(POLY_XLU_DISP++, 8,
                            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (-this->work[CS_TIMER_1] * 5) * temp_t0,
                                             0x20, 0x40, 1, (this->work[CS_TIMER_1] * 4) * temp_t0, 0, 0x20, 0x20));
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 175, 205, 195, (s16)D_8094C854);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E2C0));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaMirrorShieldIceChargeCenterDL));
             }
         }
     }
@@ -3755,7 +3755,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 8,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x40, 1,
                                     0, this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x20));
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E9F0));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaShieldAbsorbAndReflectEffectDL));
     }
 
     Matrix_Pop();
@@ -3780,28 +3780,28 @@ void BossTw_SpawnPortalDraw(BossTw* this, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaSpawnPortalShadowDL));
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha);
     Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY);
     Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01CEE0));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeMagicSigilDL));
 
     Matrix_Translate(0.0f, 232.0f, 600.0f, MTXMODE_NEW);
     Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaSpawnPortalShadowDL));
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha);
     Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY);
     Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DBE8));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKoumeMagicSigilDL));
 
     Matrix_Pop();
 
@@ -3821,7 +3821,7 @@ void func_80944C50(BossTw* this, PlayState* play) {
     Matrix_Scale(this->workf[UNK_F19], this->workf[UNK_F19], this->workf[UNK_F19], MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F390));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaLightCircleDL));
 
     Matrix_Pop();
     gSPSegment(POLY_XLU_DISP++, 8,
@@ -3830,7 +3830,7 @@ void func_80944C50(BossTw* this, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F18] / 2);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F238));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaLightRaysDL));
 
     gSPSegment(POLY_XLU_DISP++, 8,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, -sKoumePtr->work[CS_TIMER_1] * 5,
@@ -3844,7 +3844,7 @@ void func_80944C50(BossTw* this, PlayState* play) {
     Matrix_Scale(scale, 1.0f, scale, MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
               G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EEB0));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaLightPillarDL));
     Matrix_Pop();
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -4448,7 +4448,7 @@ void BossTw_BlastDraw(Actor* thisx, PlayState* play2) {
                 Matrix_ReplaceRotation(&play->billboardMtxF);
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
                 
                 FrameInterpolation_RecordCloseChild();
             }
@@ -4459,7 +4459,7 @@ void BossTw_BlastDraw(Actor* thisx, PlayState* play2) {
 
         case TW_ICE_BLAST:
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s8)this->workf[TAIL_ALPHA]);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceMaterialDL));
             for (i = 9; i >= 0; i--) {
                 FrameInterpolation_RecordOpenChild("Twinrova Ice Blast", i);
 
@@ -4476,7 +4476,7 @@ void BossTw_BlastDraw(Actor* thisx, PlayState* play2) {
                 Matrix_ReplaceRotation(&play->billboardMtxF);
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
 
                 FrameInterpolation_RecordCloseChild();
             }
@@ -4520,13 +4520,13 @@ void BossTw_DrawDeathBall(Actor* thisx, PlayState* play2) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
 
             FrameInterpolation_RecordCloseChild();
         }
     } else {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s8)this->workf[TAIL_ALPHA]);
-        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998));
+        gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceMaterialDL));
 
         for (i = 9; i >= 0; i--) {
             FrameInterpolation_RecordOpenChild("Twinrova Death Ball 1", i);
@@ -4544,7 +4544,7 @@ void BossTw_DrawDeathBall(Actor* thisx, PlayState* play2) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
 
             FrameInterpolation_RecordCloseChild();
         }
@@ -4915,7 +4915,7 @@ void BossTw_DrawEffects(PlayState* play) {
             FrameInterpolation_RecordOpenChild(currentEffect, currentEffect->epoch);
 
             if (sp18F == 0) {
-                gSPDisplayList(POLY_XLU_DISP++, object_tw_DL_01A528);
+                gSPDisplayList(POLY_XLU_DISP++, gTwinrovaMagicParticleMaterialDL);
                 sp18F++;
             }
 
@@ -4926,7 +4926,7 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, object_tw_DL_01A5A8);
+            gSPDisplayList(POLY_XLU_DISP++, gTwinrovaMagicParticleModelDL);
 
             FrameInterpolation_RecordCloseChild();
         }
@@ -4941,7 +4941,7 @@ void BossTw_DrawEffects(PlayState* play) {
             FrameInterpolation_RecordOpenChild(currentEffect, currentEffect->epoch);
 
             if (sp18F == 0) {
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceMaterialDL));
                 sp18F++;
             }
 
@@ -4954,7 +4954,7 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
             
             FrameInterpolation_RecordCloseChild();
         }
@@ -4983,7 +4983,7 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
             
             FrameInterpolation_RecordCloseChild();
         }
@@ -5032,7 +5032,7 @@ void BossTw_DrawEffects(PlayState* play) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2);
             gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG);
-            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A790));
+            gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaEffectHaloDL));
 
             FrameInterpolation_RecordCloseChild();
         }
@@ -5051,7 +5051,7 @@ void BossTw_DrawEffects(PlayState* play) {
             FrameInterpolation_RecordOpenChild(currentEffect, currentEffect->epoch);
 
             if (sp18F == 0) {
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AA50));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceSurroundingPlayerMaterialDL));
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, 255);
                 gSPSegment(POLY_XLU_DISP++, 8,
                            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
@@ -5081,7 +5081,7 @@ void BossTw_DrawEffects(PlayState* play) {
                 Matrix_RotateX((BossTw_RandZeroOne() - 0.5f) * M_PI * 0.5f, MTXMODE_APPLY);
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
             }
 
             FrameInterpolation_RecordCloseChild();
@@ -5099,7 +5099,7 @@ void BossTw_DrawEffects(PlayState* play) {
 
             if (currentEffect->work[EFF_ARGS] == 0) {
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, currentEffect->alpha);
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceMaterialDL));
             } else {
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 20, 0, currentEffect->alpha);
                 gDPPipeSync(POLY_XLU_DISP++);
@@ -5116,9 +5116,9 @@ void BossTw_DrawEffects(PlayState* play) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             if (currentEffect->work[EFF_ARGS] == 0) {
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
             } else {
-                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
+                gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
             }
 
             FrameInterpolation_RecordCloseChild();
@@ -5132,7 +5132,7 @@ void BossTw_DrawEffects(PlayState* play) {
 
 void BossTw_TwinrovaSetupArriveAtTarget(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_TwinrovaArriveAtTarget;
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -3.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaHoverAnim, -3.0f);
     this->work[CS_TIMER_1] = Rand_ZeroFloat(100.0f);
     this->timers[1] = 25;
     this->rotateSpeed = 0.0f;
@@ -5155,8 +5155,8 @@ void BossTw_TwinrovaArriveAtTarget(BossTw* this, PlayState* play) {
 
 void BossTw_TwinrovaSetupChargeBlast(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_TwinrovaChargeBlast;
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_036FBC, -5.0f);
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_036FBC);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaWindUpAnim, -5.0f);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaWindUpAnim);
     this->csState1 = 0;
 }
 
@@ -5188,12 +5188,12 @@ void BossTw_TwinrovaSetupShootBlast(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_TwinrovaShootBlast;
 
     if (sTwinrovaBlastType == 0) {
-        Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_022700, 0.0f);
+        Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaIceAttackAnim, 0.0f);
     } else {
-        Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_023750, 0.0f);
+        Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaFireAttackAnim, 0.0f);
     }
 
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_023750);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaFireAttackAnim);
 }
 
 void BossTw_TwinrovaShootBlast(BossTw* this, PlayState* play) {
@@ -5251,7 +5251,7 @@ void BossTw_TwinrovaShootBlast(BossTw* this, PlayState* play) {
 
 void BossTw_TwinrovaSetupDoneBlastShoot(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_TwinrovaDoneBlastShoot;
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -10.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaHoverAnim, -10.0f);
     this->timers[1] = 60;
 }
 
@@ -5272,7 +5272,7 @@ void BossTw_TwinrovaDoneBlastShoot(BossTw* this, PlayState* play) {
 
 void BossTw_TwinrovaDamage(BossTw* this, PlayState* play, u8 damage) {
     if (this->actionFunc != BossTw_TwinrovaStun) {
-        Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_0338F0, -15.0f);
+        Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaChargedAttackHitAnim, -15.0f);
         this->timers[0] = 150;
         this->timers[1] = 20;
         this->csState1 = 0;
@@ -5280,8 +5280,8 @@ void BossTw_TwinrovaDamage(BossTw* this, PlayState* play, u8 damage) {
     } else {
         this->work[FOG_TIMER] = 10;
         this->work[INVINC_TIMER] = 20;
-        Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_024374, -3.0f);
-        this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_024374);
+        Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaDamageAnim, -3.0f);
+        this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaDamageAnim);
         this->csState1 = 1;
 
         if ((s8)(this->actor.colChkInfo.health -= damage) < 0) {
@@ -5345,12 +5345,12 @@ void BossTw_TwinrovaStun(BossTw* this, PlayState* play) {
     if (this->csState1 == 0) {
         if (this->timers[1] == 0) {
             this->csState1 = 1;
-            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0343B4);
-            Animation_Change(&this->skelAnime, &object_tw_Anim_0343B4, 1.0f, 0.0f, this->workf[ANIM_SW_TGT], 3, 0.0f);
+            this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaStunStartAnim);
+            Animation_Change(&this->skelAnime, &gTwinrovaStunStartAnim, 1.0f, 0.0f, this->workf[ANIM_SW_TGT], 3, 0.0f);
         }
     } else if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) {
         this->workf[ANIM_SW_TGT] = 1000.0f;
-        Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_035030, 0.0f);
+        Animation_MorphToLoop(&this->skelAnime, &gTwinrovaStunLoopAnim, 0.0f);
     }
 
     if (this->actor.bgCheckFlags & 1) {
@@ -5363,8 +5363,8 @@ void BossTw_TwinrovaStun(BossTw* this, PlayState* play) {
 }
 
 void BossTw_TwinrovaSetupGetUp(BossTw* this, PlayState* play) {
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_035988, 0.0f);
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_035988);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaStunEndAnim, 0.0f);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaStunEndAnim);
     this->actionFunc = BossTw_TwinrovaGetUp;
     this->timers[0] = 50;
 }
@@ -5375,7 +5375,7 @@ void BossTw_TwinrovaGetUp(BossTw* this, PlayState* play) {
 
     if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) {
         this->workf[ANIM_SW_TGT] = 1000.0f;
-        Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, 0.0f);
+        Animation_MorphToLoop(&this->skelAnime, &gTwinrovaHoverAnim, 0.0f);
     }
 
     if (this->timers[0] == 0) {
@@ -5409,7 +5409,7 @@ void BossTw_TwinrovaSetupFly(BossTw* this, PlayState* play) {
     this->actor.world.rot.y = Math_FAtan2F(xDiff, zDiff) * (32768 / M_PI);
     xzDist = sqrtf(SQ(xDiff) + SQ(zDiff));
     this->actor.world.rot.x = Math_FAtan2F(yDiff, xzDist) * (32768 / M_PI);
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -10.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaHoverAnim, -10.0f);
 }
 
 void BossTw_TwinrovaFly(BossTw* this, PlayState* play) {
@@ -5448,7 +5448,7 @@ void BossTw_TwinrovaFly(BossTw* this, PlayState* play) {
 
 void BossTw_TwinrovaSetupSpin(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_TwinrovaSpin;
-    Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, 0.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTwinrovaHoverAnim, 0.0f);
     this->timers[0] = 20;
     this->actor.speedXZ = 0.0f;
 }
@@ -5469,8 +5469,8 @@ void BossTw_TwinrovaSpin(BossTw* this, PlayState* play) {
 
 void BossTw_TwinrovaSetupLaugh(BossTw* this, PlayState* play) {
     this->actionFunc = BossTw_TwinrovaLaugh;
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_03A2D0, 0.0f);
-    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_03A2D0);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaLaughAnim, 0.0f);
+    this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaLaughAnim);
     this->actor.speedXZ = 0.0f;
 }
 
diff --git a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
index 3b055a3f2..ca100ea13 100644
--- a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
+++ b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
@@ -1035,7 +1035,7 @@ void DemoEc_DrawPotionShopOwner(DemoEc* this, PlayState* play) {
 
 void DemoEc_InitMaskShopOwner(DemoEc* this, PlayState* play) {
     DemoEc_UseDrawObject(this, play);
-    DemoEc_InitSkelAnime(this, play, &object_os_Skel_004658);
+    DemoEc_InitSkelAnime(this, play, &gHappyMaskSalesmanSkel);
     DemoEc_UseAnimationObject(this, play);
     DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false);
     func_8096D5D4(this, play);
@@ -1051,7 +1051,7 @@ void DemoEc_UpdateMaskShopOwner(DemoEc* this, PlayState* play) {
 }
 
 void DemoEc_DrawMaskShopOwner(DemoEc* this, PlayState* play) {
-    DemoEc_DrawSkeleton(this, play, gOsEyeClosedTex, NULL, NULL, NULL);
+    DemoEc_DrawSkeleton(this, play, gHappyMaskSalesmanEyeClosedTex, NULL, NULL, NULL);
 }
 
 void DemoEc_InitFishingOwner(DemoEc* this, PlayState* play) {
@@ -1095,7 +1095,7 @@ void DemoEc_DrawFishingOwner(DemoEc* this, PlayState* play) {
 
 void DemoEc_InitBombchuShopOwner(DemoEc* this, PlayState* play) {
     DemoEc_UseDrawObject(this, play);
-    DemoEc_InitSkelAnime(this, play, &object_rs_Skel_004868);
+    DemoEc_InitSkelAnime(this, play, &gBombchuShopkeeperSkel);
     DemoEc_UseAnimationObject(this, play);
     DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false);
     func_8096D5D4(this, play);
diff --git a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
index a5abd9948..c6f4cd34f 100644
--- a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
+++ b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
@@ -268,7 +268,7 @@ void DemoIk_Type1PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s
             case 0:
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
+                gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
                 break;
             case 2:
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
@@ -436,7 +436,7 @@ void DemoIk_Type2PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s
             case 5:
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
+                gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
                 break;
             default:
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index dbca67cc4..290e809f6 100644
--- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -103,7 +103,7 @@ static ShutterInfo sShutterInfo[] = {
     { gPhantomGanonBarsDL, NULL, 130, 12, 50, 15 },
     { gGohmaDoorDL, NULL, 130, 12, 50, 15 },
     { gSpiritDoorDL, gJyaDoorMetalBarsDL, 240, 14, 50, 15 },
-    { object_bdoor_DL_0010C0, NULL, 130, 12, 50, 15 },
+    { gBossDoorDL, NULL, 130, 12, 50, 15 },
     { gDungeonDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
     { gFireTempleDoorFrontDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
     { gFireTempleDoorBackDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
@@ -165,8 +165,8 @@ static Gfx* sJabuDoorDLists[] = {
 };
 
 static void* D_809982D4[] = {
-    object_bdoor_Tex_0065C0, object_bdoor_Tex_0035C0, object_bdoor_Tex_0055C0, object_bdoor_Tex_0045C0,
-    object_bdoor_Tex_000000, object_bdoor_Tex_0025C0, object_bdoor_Tex_0015C0,
+    gBossDoorDefaultTex, gBossDoorFireTex, gBossDoorWaterTex, gBossDoorShadowTex,
+    gBossDoorGanonsCastleTex, gBossDoorForestTex, gBossDoorSpiritTex,
 };
 
 void DoorShutter_SetupAction(DoorShutter* this, DoorShutterActionFunc actionFunc) {
diff --git a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
index a480fd51a..b0ff2507b 100644
--- a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
+++ b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
@@ -134,7 +134,7 @@ void EnBw_Init(Actor* thisx, PlayState* play) {
     Actor_SetScale(&this->actor, 0.012999999f);
     this->actor.naviEnemyId = 0x23;
     this->actor.gravity = -2.0f;
-    SkelAnime_Init(play, &this->skelAnime, &object_bw_Skel_0020F0, &object_bw_Anim_000228, this->jointTable,
+    SkelAnime_Init(play, &this->skelAnime, &gTorchSlugSkel, &gTorchSlugEyestalkWaveAnim, this->jointTable,
                    this->morphTable, 12);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
     this->actor.colChkInfo.damageTable = &sDamageTable;
@@ -178,7 +178,7 @@ void func_809CE884(EnBw* this, PlayState* play) {
 }
 
 void func_809CE9A8(EnBw* this) {
-    Animation_MorphToLoop(&this->skelAnime, &object_bw_Anim_000228, -2.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTorchSlugEyestalkWaveAnim, -2.0f);
     this->unk_220 = 2;
     this->unk_222 = Rand_ZeroOne() * 200.0f + 200.0f;
     this->unk_232 = 0;
@@ -393,7 +393,7 @@ void func_809CEA24(EnBw* this, PlayState* play) {
 }
 
 void func_809CF72C(EnBw* this) {
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_bw_Anim_0021A0, -2.0f);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTorchSlugEyestalkRaiseAnim, -2.0f);
     this->unk_220 = 3;
     this->unk_221 = 0;
     this->unk_250 = 0.6f;
@@ -425,7 +425,7 @@ void func_809CF7AC(EnBw* this, PlayState* play) {
 }
 
 void func_809CF8F0(EnBw* this) {
-    Animation_MorphToPlayOnce(&this->skelAnime, &object_bw_Anim_002250, -1.0f);
+    Animation_MorphToPlayOnce(&this->skelAnime, &gTorchSlugEyestalkFlailAnim, -1.0f);
     this->actor.speedXZ = 7.0f;
     this->actor.world.rot.y = this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
     this->unk_220 = 4;
@@ -470,7 +470,7 @@ void func_809CF984(EnBw* this, PlayState* play) {
 }
 
 void func_809CFBA8(EnBw* this) {
-    Animation_MorphToLoop(&this->skelAnime, &object_bw_Anim_002250, -1.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTorchSlugEyestalkFlailAnim, -1.0f);
     this->unk_220 = 5;
     this->unk_222 = 1000;
     this->unk_260 = 0.0f;
@@ -528,7 +528,7 @@ void func_809CFC4C(EnBw* this, PlayState* play) {
 }
 
 void func_809CFF10(EnBw* this) {
-    Animation_MorphToLoop(&this->skelAnime, &object_bw_Anim_002250, -1.0f);
+    Animation_MorphToLoop(&this->skelAnime, &gTorchSlugEyestalkFlailAnim, -1.0f);
     this->unk_220 = 6;
     this->unk_222 = 1000;
     this->unk_221 = 3;
diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index 2801f78d0..095da684b 100644
--- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -276,7 +276,7 @@ Actor* func_80A74674(PlayState* play, Actor* actor) {
 }
 
 void func_80A74714(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_00CD70);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleStandUpAnim);
     f32 frame;
 
     if (this->actor.params >= 2) {
@@ -285,7 +285,7 @@ void func_80A74714(EnIk* this) {
         frame = 0.0f;
     }
 
-    Animation_Change(&this->skelAnime, &object_ik_Anim_00CD70, 0.0f, frame, frames, ANIMMODE_ONCE, 0.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleStandUpAnim, 0.0f, frame, frames, ANIMMODE_ONCE, 0.0f);
     this->unk_2F8 = 3;
     this->actor.speedXZ = 0.0f;
     EnIk_SetupAction(this, func_80A747C0);
@@ -348,12 +348,12 @@ void func_80A7492C(EnIk* this, PlayState* play) {
 void func_80A74AAC(EnIk* this) {
     this->unk_2F8 = 5;
     if (this->unk_2FB == 0) {
-        Animation_Change(&this->skelAnime, &object_ik_Anim_00ED24, 1.0f, 0.0f,
-                         Animation_GetLastFrame(&object_ik_Anim_00ED24), ANIMMODE_LOOP, -4.0f);
+        Animation_Change(&this->skelAnime, &gIronKnuckleWalkAnim, 1.0f, 0.0f,
+                         Animation_GetLastFrame(&gIronKnuckleWalkAnim), ANIMMODE_LOOP, -4.0f);
         this->actor.speedXZ = 0.9f;
     } else {
-        Animation_Change(&this->skelAnime, &object_ik_Anim_006734, 1.0f, 0.0f,
-                         Animation_GetLastFrame(&object_ik_Anim_006734), ANIMMODE_LOOP, -4.0f);
+        Animation_Change(&this->skelAnime, &gIronKnuckleRunAnim, 1.0f, 0.0f,
+                         Animation_GetLastFrame(&gIronKnuckleRunAnim), ANIMMODE_LOOP, -4.0f);
         Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_DASH);
         this->actor.speedXZ = 2.5f;
     }
@@ -420,12 +420,12 @@ void func_80A74BA4(EnIk* this, PlayState* play) {
 }
 
 void func_80A74E2C(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_001C28);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleVerticalAttackAnim);
 
     this->unk_2FF = 1;
     this->unk_2F8 = 6;
     this->actor.speedXZ = 0.0f;
-    Animation_Change(&this->skelAnime, &object_ik_Anim_001C28, 1.5f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleVerticalAttackAnim, 1.5f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
     EnIk_SetupAction(this, func_80A74EBC);
 }
 
@@ -460,13 +460,13 @@ void func_80A74EBC(EnIk* this, PlayState* play) {
 }
 
 void func_80A7506C(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_0029FC);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleAxeStuckAnim);
 
     this->unk_2FE = 0;
     this->unk_2F9 = (s8)frames;
     this->unk_2F8 = 7;
     this->unk_2FF = this->unk_2FE;
-    Animation_Change(&this->skelAnime, &object_ik_Anim_0029FC, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleAxeStuckAnim, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -4.0f);
     Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_PULLOUT);
     EnIk_SetupAction(this, func_80A7510C);
 }
@@ -478,21 +478,21 @@ void func_80A7510C(EnIk* this, PlayState* play) {
         if (this->unk_2F8 == 8) {
             func_80A7489C(this);
         } else {
-            frames = Animation_GetLastFrame(&object_ik_Anim_002538);
+            frames = Animation_GetLastFrame(&gIronKnuckleRecoverFromVerticalAttackAnim);
             this->unk_2F8 = 8;
-            Animation_Change(&this->skelAnime, &object_ik_Anim_002538, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
+            Animation_Change(&this->skelAnime, &gIronKnuckleRecoverFromVerticalAttackAnim, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
         }
     }
 }
 
 void func_80A751C8(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_0033C4);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleHorizontalAttackAnim);
 
     this->unk_2FF = 2;
     this->unk_300 = 0;
     this->unk_2F8 = 6;
     this->actor.speedXZ = 0.0f;
-    Animation_Change(&this->skelAnime, &object_ik_Anim_0033C4, 0.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -6.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleHorizontalAttackAnim, 0.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -6.0f);
     this->unk_2FC = 0;
     EnIk_SetupAction(this, func_80A75260);
 }
@@ -526,11 +526,11 @@ void func_80A75260(EnIk* this, PlayState* play) {
 }
 
 void func_80A753D0(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_003DBC);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleRecoverFromHorizontalAttackAnim);
 
     this->unk_2FF = this->unk_2FE = 0;
     this->unk_2F8 = 8;
-    Animation_Change(&this->skelAnime, &object_ik_Anim_003DBC, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleRecoverFromHorizontalAttackAnim, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
     EnIk_SetupAction(this, func_80A7545C);
 }
 
@@ -542,12 +542,12 @@ void func_80A7545C(EnIk* this, PlayState* play) {
 }
 
 void func_80A754A0(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_0033C4);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleHorizontalAttackAnim);
 
     this->unk_2F8 = 1;
     this->unk_2FF = 3;
     this->actor.speedXZ = 0.0f;
-    Animation_Change(&this->skelAnime, &object_ik_Anim_0033C4, 0.5f, 13.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleHorizontalAttackAnim, 0.5f, 13.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
     EnIk_SetupAction(this, func_80A75530);
 }
 
@@ -569,12 +569,12 @@ void func_80A75530(EnIk* this, PlayState* play) {
 }
 
 void func_80A755F0(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_00485C);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleBlockAnim);
 
     this->unk_2FE = 0;
     this->unk_2F8 = 9;
     this->actor.speedXZ = 0.0f;
-    Animation_Change(&this->skelAnime, &object_ik_Anim_00485C, 1.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleBlockAnim, 1.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
     EnIk_SetupAction(this, func_80A7567C);
 }
 
@@ -602,12 +602,12 @@ void func_80A75790(EnIk* this) {
     this->unk_2F8 = 0;
     yawDiff = yaw - this->actor.shape.rot.y;
     if (ABS(yawDiff) <= 0x4000) {
-        Animation_Change(&this->skelAnime, &object_ik_Anim_006194, 1.0f, 0.0f,
-                         Animation_GetLastFrame(&object_ik_Anim_006194), ANIMMODE_ONCE, -4.0f);
+        Animation_Change(&this->skelAnime, &gIronKnuckleFrontHitAnim, 1.0f, 0.0f,
+                         Animation_GetLastFrame(&gIronKnuckleFrontHitAnim), ANIMMODE_ONCE, -4.0f);
         this->actor.speedXZ = -6.0f;
     } else {
-        Animation_Change(&this->skelAnime, &object_ik_Anim_0045BC, 1.0f, 0.0f,
-                         Animation_GetLastFrame(&object_ik_Anim_0045BC), ANIMMODE_ONCE, -4.0f);
+        Animation_Change(&this->skelAnime, &gIronKnuckleBackHitAnim, 1.0f, 0.0f,
+                         Animation_GetLastFrame(&gIronKnuckleBackHitAnim), ANIMMODE_ONCE, -4.0f);
         this->actor.speedXZ = 6.0f;
     }
     this->unk_2FE = 0;
@@ -630,12 +630,12 @@ void func_80A758B0(EnIk* this, PlayState* play) {
 }
 
 void func_80A7598C(EnIk* this) {
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_005944);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleDeathAnim);
 
     this->unk_2FE = 0;
     this->unk_2F8 = 2;
     this->actor.speedXZ = 0.0f;
-    Animation_Change(&this->skelAnime, &object_ik_Anim_005944, 1.0f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleDeathAnim, 1.0f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
     this->unk_2F9 = 0x18;
     Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_DEAD);
     Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_CUTBODY);
@@ -685,7 +685,7 @@ void func_80A75C38(EnIk* this, PlayState* play) {
         return;
     }
     if (this->shieldCollider.base.acFlags & AC_BOUNCED) {
-        temp_f0 = Animation_GetLastFrame(&object_ik_Anim_00485C) - 2.0f;
+        temp_f0 = Animation_GetLastFrame(&gIronKnuckleBlockAnim) - 2.0f;
         if (this->skelAnime.curFrame < temp_f0) {
             this->skelAnime.curFrame = temp_f0;
         }
@@ -826,11 +826,11 @@ s32 EnIk_OverrideLimbDraw3(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
 
     if (limbIndex == 12) {
         if (this->actor.params != 0) {
-            *dList = object_ik_DL_018E78;
+            *dList = gIronKnuckleHelmetDL;
         }
     } else if (limbIndex == 13) {
         if (this->actor.params != 0) {
-            *dList = object_ik_DL_019100;
+            *dList = gIronKnuckleGerudoHeadDL;
         }
     } else if ((limbIndex == 26) || (limbIndex == 27)) {
         if ((this->unk_2FA & 1)) {
@@ -880,7 +880,7 @@ void EnIk_PostLimbDraw3(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
         gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         if (this->actor.params != 0) {
-            gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_019E08);
+            gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleHelmetMarkingDL);
         } else {
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88);
         }
@@ -929,7 +929,7 @@ void EnIk_PostLimbDraw3(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
             if (!(this->unk_2FA & 1)) {
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
+                gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
             }
             break;
         case 27:
@@ -1086,8 +1086,8 @@ void func_80A77148(EnIk* this) {
 }
 
 void func_80A77158(EnIk* this, PlayState* play) {
-    Animation_Change(&this->skelAnime, &object_ik_Anim_00C114, 1.0f, 0.0f,
-                     Animation_GetLastFrame(&object_ik_Anim_00C114), ANIMMODE_ONCE, 0.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleNabooruSummonAxeAnim, 1.0f, 0.0f,
+                     Animation_GetLastFrame(&gIronKnuckleNabooruSummonAxeAnim), ANIMMODE_ONCE, 0.0f);
     func_80A770C0(this, play, 4);
     this->action = 1;
     this->drawMode = 1;
@@ -1095,8 +1095,8 @@ void func_80A77158(EnIk* this, PlayState* play) {
 }
 
 void func_80A771E4(EnIk* this) {
-    Animation_Change(&this->skelAnime, &object_ik_Anim_00C114, 1.0f, 0.0f,
-                     Animation_GetLastFrame(&object_ik_Anim_00C114), ANIMMODE_ONCE, 0.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleNabooruSummonAxeAnim, 1.0f, 0.0f,
+                     Animation_GetLastFrame(&gIronKnuckleNabooruSummonAxeAnim), ANIMMODE_ONCE, 0.0f);
     this->action = 2;
     this->drawMode = 1;
     this->unk_4D4 = 0;
@@ -1125,11 +1125,11 @@ void func_80A772EC(EnIk* this, PlayState* play) {
 
 void func_80A7735C(EnIk* this, PlayState* play) {
     s32 pad[3];
-    f32 frames = Animation_GetLastFrame(&object_ik_Anim_0203D8);
+    f32 frames = Animation_GetLastFrame(&gIronKnuckleNabooruDeathAnim);
 
-    SkelAnime_InitFlex(play, &this->skelAnime, &object_ik_Skel_0205C0, NULL, this->jointTable, this->morphTable,
+    SkelAnime_InitFlex(play, &this->skelAnime, &gIronKnuckleDefeatSkel, NULL, this->jointTable, this->morphTable,
                        30);
-    Animation_Change(&this->skelAnime, &object_ik_Anim_0203D8, 1.0f, 0.0f, frames, ANIMMODE_ONCE, 0.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleNabooruDeathAnim, 1.0f, 0.0f, frames, ANIMMODE_ONCE, 0.0f);
     this->action = 3;
     this->drawMode = 2;
     func_80A770C0(this, play, 4);
@@ -1210,7 +1210,7 @@ void EnIk_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
             if (EnIk_curFrame(&this->actor) < 30.0f) {
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
+                gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
             }
         } break;
         case 27: {
@@ -1365,7 +1365,7 @@ void EnIk_PostLimbDraw1(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
         case 26:
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
+            gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
             break;
         case 27:
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
@@ -1479,7 +1479,7 @@ void EnIk_Init(Actor* thisx, PlayState* play) {
         Actor_Kill(&this->actor);
     } else {
         ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
-        SkelAnime_InitFlex(play, &this->skelAnime, &object_ik_Skel_01E178, &object_ik_Anim_00C114,
+        SkelAnime_InitFlex(play, &this->skelAnime, &gIronKnuckleSkel, &gIronKnuckleNabooruSummonAxeAnim,
                            this->jointTable, this->morphTable, 30);
         func_80A74398(&this->actor, play);
         func_80A780D0(this, play);
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index ba8bdfe6f..497d7acc9 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -130,40 +130,40 @@ typedef enum {
 } EnKoAnimation;
 
 static AnimationInfo sAnimationInfo[] = {
-    { &gObjOsAnim_8F6C, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
-    { &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
-    { &gObjOsAnim_9B64, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f },
-    { &gObjOsAnim_9B64, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f },
-    { &gObjOsAnim_9B64, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f },
-    { &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
-    { &gObjOsAnim_5808, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
-    { &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_8178, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_65E0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_7FFC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_80B4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_91AC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_6F9C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_7064, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_7120, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_7F38, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_6EE0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_98EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_90EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_982C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_9274, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_99A4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_9028, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_7E64, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_7454, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
-    { &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f },
-    { &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
-    { &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
-    { &gObjOsAnim_6A60, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
-    { &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
+    { &gKokiriBlockingAnim, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
+    { &gKokiriBlockingAnim, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
+    { &gKokiriStandUpAnim, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f },
+    { &gKokiriStandUpAnim, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f },
+    { &gKokiriStandUpAnim, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f },
+    { &gKokiriIdleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriIdleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+    { &gKokiriLaughingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+    { &gKokiriLiftingRockAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriRecliningStandingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriRecliningSittingUpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriPunchingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriStandingHandOnChestAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriStandingHandsOnHipsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriSittingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriSittingCrossedArmsLegsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriStandingApprehensiveAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriLeaningOnArmsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriRecliningLeaningBackAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriCuttingGrassAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriBackflipAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriLeaningForwardAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriStandingRightArmUpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriStandingArmsBehindBackAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriStandingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriSittingCrossedLegsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriSittingArmsUpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriSittingHeadOnHandAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriSittingDiggingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+    { &gKokiriBlockingAnim, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f },
+    { &gKokiriCuttingGrassAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
+    { &gKokiriPunchingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
+    { &gKokiriWipingForeheadAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
+    { &gKokiriLiftingRockAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
 };
 
 static u8 sOsAnimeLookup[13][5] = {
@@ -667,12 +667,12 @@ s32 func_80A97D68(EnKo* this, PlayState* play) {
     s16 trackingMode;
 
     if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
-        if ((this->skelAnime.animation == &gObjOsAnim_6A60) == false) {
+        if ((this->skelAnime.animation == &gKokiriWipingForeheadAnim) == false) {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_32);
         }
         trackingMode = NPC_TRACKING_HEAD_AND_TORSO;
     } else {
-        if ((this->skelAnime.animation == &gObjOsAnim_7830) == false) {
+        if ((this->skelAnime.animation == &gKokiriLiftingRockAnim) == false) {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_33);
         }
         trackingMode = NPC_TRACKING_NONE;
@@ -720,13 +720,13 @@ s32 func_80A97F70(EnKo* this, PlayState* play) {
     s16 trackingMode;
 
     if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
-        if ((this->skelAnime.animation == &gObjOsAnim_8F6C) == false) {
+        if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_29);
         }
         func_80034F54(play, this->unk_2E4, this->unk_304, 16);
         trackingMode = NPC_TRACKING_HEAD_AND_TORSO;
     } else {
-        if ((this->skelAnime.animation == &gObjOsAnim_7D94) == false) {
+        if ((this->skelAnime.animation == &gKokiriCuttingGrassAnim) == false) {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_30);
         }
         trackingMode = NPC_TRACKING_NONE;
@@ -740,14 +740,14 @@ s32 func_80A98034(EnKo* this, PlayState* play) {
     s32 result;
 
     if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
-        if ((this->skelAnime.animation == &gObjOsAnim_8F6C) == false) {
+        if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_29);
         }
         func_80034F54(play, this->unk_2E4, this->unk_304, 16);
         result = EnKo_IsWithinTalkAngle(this);
         trackingMode = (result == true) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE;
     } else {
-        if ((this->skelAnime.animation == &gObjOsAnim_879C) == false) {
+        if ((this->skelAnime.animation == &gKokiriPunchingAnim) == false) {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_31);
         }
         trackingMode = NPC_TRACKING_NONE;
diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 6ffe5478f..df1c64f1e 100644
--- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -2140,13 +2140,13 @@ void EnOssan_InitPotionShopkeeper(EnOssan* this, PlayState* play) {
 }
 
 void EnOssan_InitHappyMaskShopkeeper(EnOssan* this, PlayState* play) {
-    SkelAnime_InitFlex(play, &this->skelAnime, &object_os_Skel_004658, &object_os_Anim_0002E4, NULL, NULL, 0);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gHappyMaskSalesmanSkel, &gHappyMaskSalesmanIdleAnim, NULL, NULL, 0);
     this->actor.draw = EnOssan_DrawHappyMaskShopkeeper;
     this->obj3ToSeg6Func = NULL;
 }
 
 void EnOssan_InitBombchuShopkeeper(EnOssan* this, PlayState* play) {
-    SkelAnime_InitFlex(play, &this->skelAnime, &object_rs_Skel_004868, &object_rs_Anim_00065C, 0, 0, 0);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gBombchuShopkeeperSkel, &gBombchuShopkeeperIdleAnim, 0, 0, 0);
     this->actor.draw = EnOssan_DrawBombchuShopkeeper;
     this->obj3ToSeg6Func = NULL;
 }
@@ -2595,7 +2595,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, PlayState* play) {
 }
 
 void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, PlayState* play) {
-    static void* sHappyMaskShopkeeperEyeTextures[] = { gOsEyeClosedTex, gOsEyeOpenTex };
+    static void* sHappyMaskShopkeeperEyeTextures[] = { gHappyMaskSalesmanEyeClosedTex, gHappyMaskSalesmanEyeOpenTex };
     EnOssan* this = (EnOssan*)thisx;
     s32 pad;
 
diff --git a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c
index cfbee6604..e78405a1a 100644
--- a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c
+++ b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c
@@ -40,28 +40,28 @@ const ActorInit En_Tr_InitVars = {
 // The first elements of these animation arrays are for Koume, the second for Kotake
 
 static AnimationHeader* unused[] = {
-    &object_tr_Anim_003FC8,
-    &object_tr_Anim_001CDC,
+    &gKotakeKoumeStandingBroomOverRightShoulderAnim,
+    &gKotakeKoumeStandingBroomOverLeftShoulderAnim,
 };
 
 static AnimationHeader* D_80B24368[] = {
-    &object_tr_Anim_002BC4,
-    &object_tr_Anim_000BFC,
+    &gKotakeKoumeLookOverLeftShoulderAnim,
+    &gKotakeKoumeLookOverRightShoulderAnim,
 };
 
 static AnimationHeader* D_80B24370[] = {
-    &object_tr_Anim_0035CC,
-    &object_tr_Anim_0013CC,
+    &gKotakeKoumeLookingOverLeftShoulderAnim,
+    &gKotakeKoumeLookingOverRightShoulderAnim,
 };
 
 static AnimationHeader* D_80B24378[] = {
-    &object_tr_Anim_0049C8,
-    &object_tr_Anim_0049C8,
+    &gKotakeKoumeFlyAnim,
+    &gKotakeKoumeFlyAnim,
 };
 
 static AnimationHeader* D_80B24380[] = {
-    &object_tr_Anim_012E1C,
-    &object_tr_Anim_012E1C,
+    &gKotakeKoumeCastMagicAnim,
+    &gKotakeKoumeCastMagicAnim,
 };
 
 static f32 D_80B24388[] = { 0.0f, 20.0f, -30.0f, 20.0f, -20.0f, -20.0f, 30.0f };
@@ -77,9 +77,9 @@ static Color_RGBA8 D_80B243C0[4] = {
 };
 
 static void* sEyeTextures[] = {
-    object_tr_Tex_0086D8,
-    object_tr_Tex_0094D8,
-    object_tr_Tex_0098D8,
+    gKotakeKoumeEyeOpenTex,
+    gKotakeKoumeEyeHalfTex,
+    gKotakeKoumeEyeClosedTex,
 };
 
 void EnTr_SetupAction(EnTr* this, EnTrActionFunc actionFunc) {
@@ -97,18 +97,18 @@ void EnTr_Init(Actor* thisx, PlayState* play) {
 
     switch (this->actor.params) {
         case TR_KOUME:
-            SkelAnime_InitFlex(play, &this->skelAnime, &object_tr_Skel_011688, &object_tr_Anim_003FC8,
+            SkelAnime_InitFlex(play, &this->skelAnime, &gKoumeSkel, &gKotakeKoumeStandingBroomOverRightShoulderAnim,
                                this->jointTable, this->morphTable, 27);
-            Animation_PlayOnce(&this->skelAnime, &object_tr_Anim_003FC8);
+            Animation_PlayOnce(&this->skelAnime, &gKotakeKoumeStandingBroomOverRightShoulderAnim);
             this->animation = NULL;
             EnTr_SetupAction(this, EnTr_ChooseAction1);
             this->actionIndex = 3;
             break;
 
         case TR_KOTAKE:
-            SkelAnime_InitFlex(play, &this->skelAnime, &object_tr_Skel_00C530, &object_tr_Anim_001CDC,
+            SkelAnime_InitFlex(play, &this->skelAnime, &gKotakeSkel, &gKotakeKoumeStandingBroomOverLeftShoulderAnim,
                                this->jointTable, this->morphTable, 27);
-            Animation_PlayOnce(&this->skelAnime, &object_tr_Anim_001CDC);
+            Animation_PlayOnce(&this->skelAnime, &gKotakeKoumeStandingBroomOverLeftShoulderAnim);
             this->animation = NULL;
             EnTr_SetupAction(this, EnTr_ChooseAction1);
             this->actionIndex = 2;
@@ -306,7 +306,7 @@ void EnTr_WaitToReappear(EnTr* this, PlayState* play) {
             this->timer = 34;
             EnTr_SetStartPosRot(this, play, this->actionIndex);
             EnTr_SetupAction(this, EnTr_Reappear);
-            Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8);
+            Animation_PlayLoop(&this->skelAnime, &gKotakeKoumeFlyAnim);
             this->animation = NULL;
             Actor_SetScale(&this->actor, 0.003f);
         }
@@ -355,7 +355,7 @@ void EnTr_ChooseAction1(EnTr* this, PlayState* play) {
                 case 3:
                     EnTr_SetStartPosRot(this, play, this->actionIndex);
                     EnTr_SetupAction(this, EnTr_ChooseAction2);
-                    Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8);
+                    Animation_PlayLoop(&this->skelAnime, &gKotakeKoumeFlyAnim);
                     this->animation = NULL;
                     break;
 
@@ -366,7 +366,7 @@ void EnTr_ChooseAction1(EnTr* this, PlayState* play) {
 
                 case 7:
                     EnTr_SetupAction(this, EnTr_FlyKidnapCutscene);
-                    Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8);
+                    Animation_PlayLoop(&this->skelAnime, &gKotakeKoumeFlyAnim);
                     this->animation = NULL;
                     this->timer =
                         ((this->actor.params != TR_KOUME) ? ((u8)frames * 0x400) + 0x8000 : (u8)frames * 0x400);
@@ -385,17 +385,17 @@ void EnTr_Update(Actor* thisx, PlayState* play) {
 
     if (SkelAnime_Update(&this->skelAnime) != 0) {
         if (this->animation != NULL) {
-            if ((this->animation == &object_tr_Anim_0035CC) || (this->animation == &object_tr_Anim_0013CC)) {
+            if ((this->animation == &gKotakeKoumeLookingOverLeftShoulderAnim) || (this->animation == &gKotakeKoumeLookingOverRightShoulderAnim)) {
                 if (this->actor.params != TR_KOUME) {
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH2);
                 } else {
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH);
                 }
                 Animation_PlayLoop(&this->skelAnime, this->animation);
-            } else if (this->animation == &object_tr_Anim_0049C8) {
+            } else if (this->animation == &gKotakeKoumeFlyAnim) {
                 EnTr_SetupAction(this, EnTr_ChooseAction2);
-                Animation_Change(&this->skelAnime, &object_tr_Anim_0049C8, 1.0f, 0.0f,
-                                 Animation_GetLastFrame(&object_tr_Anim_0049C8), ANIMMODE_LOOP, -5.0f);
+                Animation_Change(&this->skelAnime, &gKotakeKoumeFlyAnim, 1.0f, 0.0f,
+                                 Animation_GetLastFrame(&gKotakeKoumeFlyAnim), ANIMMODE_LOOP, -5.0f);
             } else {
                 Animation_PlayLoop(&this->skelAnime, this->animation);
             }
diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index 3c86841af..1cbc48473 100644
--- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -523,8 +523,8 @@ void ObjectKankyo_DrawFairies(ObjectKankyo* this2, PlayState* play2) {
     if (!(play->cameraPtrs[0]->unk_14C & 0x100)) {
         OPEN_DISPS(play->state.gfxCtx);
         POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 0x14);
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gSunTex));
-        gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteTextureLoadDL);
+        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gSun1Tex));
+        gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteMaterialDL);
 
         for (i = 0; i < play->envCtx.unk_EE[3]; i++) {
             FrameInterpolation_RecordOpenChild(&this->effects[i], this->effects[i].epoch);
@@ -592,7 +592,7 @@ void ObjectKankyo_DrawFairies(ObjectKankyo* this2, PlayState* play2) {
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
             Matrix_RotateZ(DEG_TO_RAD(play->state.frames * 20.0f), MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD);
-            gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteDL);
+            gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteModelDL);
             FrameInterpolation_RecordCloseChild();
         }
         CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 795650251..89caad5bc 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -10561,7 +10561,7 @@ void func_80848EF8(Player* this, PlayState* play) {
                             G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_IA16 | G_TL_TILE |
                                 G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE,
                             G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2);
-            gDPLoadTextureBlock(OVERLAY_DISP++, gStoneOfAgonyIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24, 24, 0,
+            gDPLoadTextureBlock(OVERLAY_DISP++, gQuestIconStoneOfAgonyTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24, 24, 0,
                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                 G_TX_NOLOD, G_TX_NOLOD);
             gDPSetOtherMode(OVERLAY_DISP++,
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 701650f56..f2b5ab8f8 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -67,105 +67,105 @@ typedef struct {
 #define STN_IC_POS(i) {0x29 + ICON_SIZE * i, 0x31}
 
 static ItemData itemData[88] = {
-    {CREATE_SPRITE_32(dgDekuStickIconTex, 1),            ITEM_STICK,            INV_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgDekuNutIconTex, 0),              ITEM_NUT,              INV_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgBombIconTex, 2),                 ITEM_BOMB,             INV_IC_POS(2, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgFairyBowIconTex, 3),             ITEM_BOW,              INV_IC_POS(3, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgFireArrowIconTex, 4),            ITEM_ARROW_FIRE,       INV_IC_POS(4, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgDinsFireIconTex, 5),             ITEM_DINS_FIRE,        INV_IC_POS(5, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgEmptyBottleIconTex, 20),         ITEM_BOTTLE,           INV_IC_POS(6, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconDekuStickTex, 1),          ITEM_STICK,            INV_IC_POS(0, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconDekuNutTex, 0),            ITEM_NUT,              INV_IC_POS(1, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBombTex, 2),               ITEM_BOMB,             INV_IC_POS(2, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBowTex, 3),                ITEM_BOW,              INV_IC_POS(3, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconArrowFireTex, 4),          ITEM_ARROW_FIRE,       INV_IC_POS(4, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconDinsFireTex, 5),           ITEM_DINS_FIRE,        INV_IC_POS(5, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBottleEmptyTex, 20),       ITEM_BOTTLE,           INV_IC_POS(6, 0), SIZE_NORMAL},
 
-    {CREATE_SPRITE_32(dgFairySlingshotIconTex, 6),       ITEM_SLINGSHOT,        INV_IC_POS(0, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgFairyOcarinaIconTex, 7),         ITEM_OCARINA_FAIRY,    INV_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgOcarinaofTimeIconTex, 7),        ITEM_OCARINA_TIME,     INV_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgBombchuIconTex, 9),              ITEM_BOMBCHU,          INV_IC_POS(2, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgHookshotIconTex, 10),            ITEM_HOOKSHOT,         INV_IC_POS(3, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgLongshotIconTex, 10),            ITEM_LONGSHOT,         INV_IC_POS(3, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgIceArrowIconTex, 12),            ITEM_ARROW_ICE,        INV_IC_POS(4, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgFaroresWindIconTex, 13),         ITEM_FARORES_WIND,     INV_IC_POS(5, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgWeirdEggIconTex, 37),            ITEM_WEIRD_EGG,        INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgCuccoIconTex, 37),               ITEM_CHICKEN,          INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgZeldasLetterIconTex, 37),        ITEM_LETTER_ZELDA,     INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgKeatonMaskIconTex, 37),          ITEM_MASK_KEATON,      INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgSkullMaskIconTex, 37),           ITEM_MASK_SKULL,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgSpookyMaskIconTex, 37),          ITEM_MASK_SPOOKY,      INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgBunnyHoodIconTex, 37),           ITEM_MASK_BUNNY,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgGoronMaskIconTex, 37),           ITEM_MASK_GORON,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgZoraMaskIconTex, 37),            ITEM_MASK_ZORA,        INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgGerudoMaskIconTex, 37),          ITEM_MASK_GERUDO,      INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgMaskofTruthIconTex, 37),         ITEM_MASK_TRUTH,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgSoldOutIconTex, 37),             ITEM_SOLD_OUT,         INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconSlingshotTex, 6),          ITEM_SLINGSHOT,        INV_IC_POS(0, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconOcarinaFairyTex, 7),       ITEM_OCARINA_FAIRY,    INV_IC_POS(1, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconOcarinaOfTimeTex, 7),      ITEM_OCARINA_TIME,     INV_IC_POS(1, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBombchuTex, 9),            ITEM_BOMBCHU,          INV_IC_POS(2, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconHookshotTex, 10),          ITEM_HOOKSHOT,         INV_IC_POS(3, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconLongshotTex, 10),          ITEM_LONGSHOT,         INV_IC_POS(3, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconArrowIceTex, 12),          ITEM_ARROW_ICE,        INV_IC_POS(4, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconFaroresWindTex, 13),       ITEM_FARORES_WIND,     INV_IC_POS(5, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconWeirdEggTex, 37),          ITEM_WEIRD_EGG,        INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconChickenTex, 37),           ITEM_CHICKEN,          INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconZeldasLetterTex, 37),      ITEM_LETTER_ZELDA,     INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskKeatonTex, 37),        ITEM_MASK_KEATON,      INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskSkullTex, 37),         ITEM_MASK_SKULL,       INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskSpookyTex, 37),        ITEM_MASK_SPOOKY,      INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskBunnyHoodTex, 37),     ITEM_MASK_BUNNY,       INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskGoronTex, 37),         ITEM_MASK_GORON,       INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskZoraTex, 37),          ITEM_MASK_ZORA,        INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskGerudoTex, 37),        ITEM_MASK_GERUDO,      INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMaskTruthTex, 37),         ITEM_MASK_TRUTH,       INV_IC_POS(6, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconSoldOutTex, 37),           ITEM_SOLD_OUT,         INV_IC_POS(6, 1), SIZE_NORMAL},
     
-    {CREATE_SPRITE_32(dgBoomerangIconTex, 14),           ITEM_BOOMERANG,        INV_IC_POS(0, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgLensofTruthIconTex, 15),         ITEM_LENS,             INV_IC_POS(1, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgMagicBeansIconTex, 16),          ITEM_BEAN,             INV_IC_POS(2, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgMegatonHammerIconTex, 17),       ITEM_HAMMER,           INV_IC_POS(3, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgLightArrowIconTex, 18),          ITEM_ARROW_LIGHT,      INV_IC_POS(4, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgNayrusLoveIconTex, 19),          ITEM_NAYRUS_LOVE,      INV_IC_POS(5, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgPocketEggIconTex, 53),           ITEM_POCKET_EGG,       INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgPocketCuccoIconTex, 53),         ITEM_POCKET_CUCCO,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgCojiroIconTex, 53),              ITEM_COJIRO,           INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgOddMushroomIconTex, 53),         ITEM_ODD_MUSHROOM,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgOddPotionIconTex, 53),           ITEM_ODD_POTION,       INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgPoachersSawIconTex, 53),         ITEM_SAW,              INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgBrokenBiggoronSwordIconTex, 53), ITEM_SWORD_BROKEN,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgPrescriptionIconTex, 53),        ITEM_PRESCRIPTION,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgEyeBallFrogIconTex, 53),         ITEM_FROG,             INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgEyeDropsIconTex, 53),            ITEM_EYEDROPS,         INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgClaimCheckIconTex, 53),          ITEM_CLAIM_CHECK,      INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBoomerangTex, 14),         ITEM_BOOMERANG,        INV_IC_POS(0, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconLensOfTruthTex, 15),       ITEM_LENS,             INV_IC_POS(1, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconMagicBeanTex, 16),         ITEM_BEAN,             INV_IC_POS(2, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconHammerTex, 17),            ITEM_HAMMER,           INV_IC_POS(3, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconArrowLightTex, 18),        ITEM_ARROW_LIGHT,      INV_IC_POS(4, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconNayrusLoveTex, 19),        ITEM_NAYRUS_LOVE,      INV_IC_POS(5, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconPocketEggTex, 53),         ITEM_POCKET_EGG,       INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconPocketCuccoTex, 53),       ITEM_POCKET_CUCCO,     INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconCojiroTex, 53),            ITEM_COJIRO,           INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconOddMushroomTex, 53),       ITEM_ODD_MUSHROOM,     INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconOddPotionTex, 53),         ITEM_ODD_POTION,       INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconPoachersSawTex, 53),       ITEM_SAW,              INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBrokenGoronsSwordTex, 53), ITEM_SWORD_BROKEN,     INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconPrescriptionTex, 53),      ITEM_PRESCRIPTION,     INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconEyeballFrogTex, 53),       ITEM_FROG,             INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconEyeDropsTex, 53),          ITEM_EYEDROPS,         INV_IC_POS(6, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconClaimCheckTex, 53),        ITEM_CLAIM_CHECK,      INV_IC_POS(6, 2), SIZE_NORMAL},
     
-    {CREATE_SPRITE_32(dgKokiriSwordIconTex, 54),         ITEM_SWORD_KOKIRI,     EQP_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgMasterSwordIconTex, 55),         ITEM_SWORD_MASTER,     EQP_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgBiggoronSwordIconTex, 56),       ITEM_SWORD_BGS,        EQP_IC_POS(2, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconSwordKokiriTex, 54),       ITEM_SWORD_KOKIRI,     EQP_IC_POS(0, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconSwordMasterTex, 55),       ITEM_SWORD_MASTER,     EQP_IC_POS(1, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconSwordBiggoronTex, 56),     ITEM_SWORD_BGS,        EQP_IC_POS(2, 0), SIZE_NORMAL},
     
-    {CREATE_SPRITE_32(dgDekuShieldIconTex, 57),          ITEM_SHIELD_DEKU,      EQP_IC_POS(0, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgHylianShieldIconTex, 58),        ITEM_SHIELD_HYLIAN,    EQP_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgMirrorShieldIconTex, 59),        ITEM_SHIELD_MIRROR,    EQP_IC_POS(2, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconShieldDekuTex, 57),        ITEM_SHIELD_DEKU,      EQP_IC_POS(0, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconShieldHylianTex, 58),      ITEM_SHIELD_HYLIAN,    EQP_IC_POS(1, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconShieldMirrorTex, 59),      ITEM_SHIELD_MIRROR,    EQP_IC_POS(2, 1), SIZE_NORMAL},
     
-    {CREATE_SPRITE_32(dgKokiriTunicIconTex, 60),         ITEM_TUNIC_KOKIRI,     EQP_IC_POS(0, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgGoronTunicIconTex, 61),          ITEM_TUNIC_GORON,      EQP_IC_POS(1, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgZoraTunicIconTex, 62),           ITEM_TUNIC_ZORA,       EQP_IC_POS(2, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconTunicKokiriTex, 60),       ITEM_TUNIC_KOKIRI,     EQP_IC_POS(0, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconTunicGoronTex, 61),        ITEM_TUNIC_GORON,      EQP_IC_POS(1, 2), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconTunicZoraTex, 62),         ITEM_TUNIC_ZORA,       EQP_IC_POS(2, 2), SIZE_NORMAL},
     
-    {CREATE_SPRITE_32(dgKokiriBootsIconTex, 63),         ITEM_BOOTS_KOKIRI,     EQP_IC_POS(0, 3), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgIronBootsIconTex, 64),           ITEM_BOOTS_IRON,       EQP_IC_POS(1, 3), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgHoverBootsIconTex, 65),          ITEM_BOOTS_HOVER,      EQP_IC_POS(2, 3), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBootsKokiriTex, 63),       ITEM_BOOTS_KOKIRI,     EQP_IC_POS(0, 3), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBootsIronTex, 64),         ITEM_BOOTS_IRON,       EQP_IC_POS(1, 3), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconBootsHoverTex, 65),        ITEM_BOOTS_HOVER,      EQP_IC_POS(2, 3), SIZE_NORMAL},
 
-    {CREATE_SPRITE_24(dgKokiriEmeraldIconTex, 87),       ITEM_KOKIRI_EMERALD,   STN_IC_POS(-1),   SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgGoronRubyIconTex, 88),           ITEM_GORON_RUBY,       STN_IC_POS(0),    SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgZoraSapphireIconTex, 89),        ITEM_ZORA_SAPPHIRE,    STN_IC_POS(1),    SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconKokiriEmeraldTex, 87),    ITEM_KOKIRI_EMERALD,   STN_IC_POS(-1),   SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconGoronRubyTex, 88),        ITEM_GORON_RUBY,       STN_IC_POS(0),    SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconZoraSapphireTex, 89),     ITEM_ZORA_SAPPHIRE,    STN_IC_POS(1),    SIZE_NORMAL},
     
-    {CREATE_SPRITE_24(dgForestMedallionIconTex, 81),     ITEM_MEDALLION_FOREST, {0x37, 0x0A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgFireMedallionIconTex, 82),       ITEM_MEDALLION_FIRE,   {0x37, 0x1A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgWaterMedallionIconTex, 83),      ITEM_MEDALLION_WATER,  {0x29, 0x22},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgSpiritMedallionIconTex, 84),     ITEM_MEDALLION_SPIRIT, {0x1B, 0x1A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgShadowMedallionIconTex, 85),     ITEM_MEDALLION_SHADOW, {0x1B, 0x0A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgLightMedallionIconTex, 86),      ITEM_MEDALLION_LIGHT,  {0x29, 0x02},     SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMedallionForestTex, 81),  ITEM_MEDALLION_FOREST, {0x37, 0x0A},     SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMedallionFireTex, 82),    ITEM_MEDALLION_FIRE,   {0x37, 0x1A},     SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMedallionWaterTex, 83),   ITEM_MEDALLION_WATER,  {0x29, 0x22},     SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMedallionSpiritTex, 84),  ITEM_MEDALLION_SPIRIT, {0x1B, 0x1A},     SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMedallionShadowTex, 85),  ITEM_MEDALLION_SHADOW, {0x1B, 0x0A},     SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMedallionLightTex, 86),   ITEM_MEDALLION_LIGHT,  {0x29, 0x02},     SIZE_NORMAL},
 
-    {CREATE_SPRITE_32(dgGoronsBraceletIconTex, 71),      ITEM_BRACELET,         UPG_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgSilverGauntletsIconTex, 71),     ITEM_GAUNTLETS_SILVER, UPG_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgGoldenGauntletsIconTex, 71),     ITEM_GAUNTLETS_GOLD,   UPG_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgSilverScaleIconTex, 74),         ITEM_SCALE_SILVER,     UPG_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgGoldenScaleIconTex, 74),         ITEM_SCALE_GOLDEN,     UPG_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgSmallMagicJarIconTex, 97),       ITEM_SINGLE_MAGIC,     UPG_IC_POS(2, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgBigMagicJarIconTex, 97),         ITEM_DOUBLE_MAGIC,     UPG_IC_POS(2, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64),              ITEM_RUPEE_GREEN,      UPG_IC_POS(0, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgGerudosCardIconTex, 91),         ITEM_GERUDO_CARD,      UPG_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgStoneOfAgonyIconTex, 90),        ITEM_STONE_OF_AGONY,   UPG_IC_POS(2, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconGoronsBraceletTex, 71),    ITEM_BRACELET,         UPG_IC_POS(0, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconSilverGauntletsTex, 71),   ITEM_GAUNTLETS_SILVER, UPG_IC_POS(0, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconGoldenGauntletsTex, 71),   ITEM_GAUNTLETS_GOLD,   UPG_IC_POS(0, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconScaleSilverTex, 74),       ITEM_SCALE_SILVER,     UPG_IC_POS(1, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_32(dgItemIconScaleGoldenTex, 74),       ITEM_SCALE_GOLDEN,     UPG_IC_POS(1, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMagicJarSmallTex, 97),    ITEM_SINGLE_MAGIC,     UPG_IC_POS(2, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconMagicJarBigTex, 97),      ITEM_DOUBLE_MAGIC,     UPG_IC_POS(2, 0), SIZE_NORMAL},
+    {CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64),                ITEM_RUPEE_GREEN,      UPG_IC_POS(0, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconGerudosCardTex, 91),      ITEM_GERUDO_CARD,      UPG_IC_POS(1, 1), SIZE_NORMAL},
+    {CREATE_SPRITE_24(dgQuestIconStoneOfAgonyTex, 90),     ITEM_STONE_OF_AGONY,   UPG_IC_POS(2, 1), SIZE_NORMAL},
 
-    {CREATE_SPRITE_SONG(224, 107, 255),                  ITEM_SONG_LULLABY,     SNG_IC_POS(0, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 195, 60),                   ITEM_SONG_EPONA,       SNG_IC_POS(1, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(127, 255, 137),                  ITEM_SONG_SARIA,       SNG_IC_POS(2, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 255, 60),                   ITEM_SONG_SUN,         SNG_IC_POS(3, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(119, 236, 255),                  ITEM_SONG_TIME,        SNG_IC_POS(4, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(165, 165, 165),                  ITEM_SONG_STORMS,      SNG_IC_POS(5, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(150, 255, 100),                  ITEM_SONG_MINUET,      SNG_IC_POS(0, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 80,  40),                   ITEM_SONG_BOLERO,      SNG_IC_POS(1, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(100, 150, 255),                  ITEM_SONG_SERENADE,    SNG_IC_POS(2, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 160, 0),                    ITEM_SONG_REQUIEM,     SNG_IC_POS(3, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 100, 255),                  ITEM_SONG_NOCTURNE,    SNG_IC_POS(4, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 240, 100),                  ITEM_SONG_PRELUDE,     SNG_IC_POS(5, 1), SIZE_SONG},
+    {CREATE_SPRITE_SONG(224, 107, 255),                    ITEM_SONG_LULLABY,     SNG_IC_POS(0, 0), SIZE_SONG},
+    {CREATE_SPRITE_SONG(255, 195, 60),                     ITEM_SONG_EPONA,       SNG_IC_POS(1, 0), SIZE_SONG},
+    {CREATE_SPRITE_SONG(127, 255, 137),                    ITEM_SONG_SARIA,       SNG_IC_POS(2, 0), SIZE_SONG},
+    {CREATE_SPRITE_SONG(255, 255, 60),                     ITEM_SONG_SUN,         SNG_IC_POS(3, 0), SIZE_SONG},
+    {CREATE_SPRITE_SONG(119, 236, 255),                    ITEM_SONG_TIME,        SNG_IC_POS(4, 0), SIZE_SONG},
+    {CREATE_SPRITE_SONG(165, 165, 165),                    ITEM_SONG_STORMS,      SNG_IC_POS(5, 0), SIZE_SONG},
+    {CREATE_SPRITE_SONG(150, 255, 100),                    ITEM_SONG_MINUET,      SNG_IC_POS(0, 1), SIZE_SONG},
+    {CREATE_SPRITE_SONG(255, 80,  40),                     ITEM_SONG_BOLERO,      SNG_IC_POS(1, 1), SIZE_SONG},
+    {CREATE_SPRITE_SONG(100, 150, 255),                    ITEM_SONG_SERENADE,    SNG_IC_POS(2, 1), SIZE_SONG},
+    {CREATE_SPRITE_SONG(255, 160, 0),                      ITEM_SONG_REQUIEM,     SNG_IC_POS(3, 1), SIZE_SONG},
+    {CREATE_SPRITE_SONG(255, 100, 255),                    ITEM_SONG_NOCTURNE,    SNG_IC_POS(4, 1), SIZE_SONG},
+    {CREATE_SPRITE_SONG(255, 240, 100),                    ITEM_SONG_PRELUDE,     SNG_IC_POS(5, 1), SIZE_SONG},
 
-    {CREATE_SPRITE_24(dgHeartContainerIconTex, 101),     ITEM_DOUBLE_DEFENSE,   {0x05, -0x04},    SIZE_COUNTER},
+    {CREATE_SPRITE_24(dgQuestIconHeartContainerTex, 101),  ITEM_DOUBLE_DEFENSE,   {0x05, -0x04},    SIZE_COUNTER},
 };
 
 static u8 color_product(u8 c1, u8 c2) {
@@ -483,13 +483,13 @@ typedef struct {
 } CounterData;
 
 static CounterData counterData[7] = {
-    {CREATE_SPRITE_24(dgHeartContainerIconTex, 101), COUNTER_HEALTH,        {0x05, 0x00}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64),          COUNTER_WALLET_CHILD,  {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0x82, 0x82, 0xFF),          COUNTER_WALLET_ADULT,  {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0xFF, 0x64, 0x64),          COUNTER_WALLET_GIANT,  {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0xFF, 0x5A, 0xFF),          COUNTER_WALLET_TYCOON, {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_24(dgGoldSkulltulaIconTex, 103),  COUNTER_SKULLTULLAS,   {0x05, 0x2A}, SIZE_COUNTER},
-    {CREATE_SPRITE_SKULL,                            COUNTER_DEATHS,        {0x48, 0x2A}, SIZE_COUNTER},
+    {CREATE_SPRITE_24(dgQuestIconHeartContainerTex, 101), COUNTER_HEALTH,        {0x05, 0x00}, SIZE_COUNTER},
+    {CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64),               COUNTER_WALLET_CHILD,  {0x05, 0x15}, SIZE_COUNTER},
+    {CREATE_SPRITE_RUPEE(0x82, 0x82, 0xFF),               COUNTER_WALLET_ADULT,  {0x05, 0x15}, SIZE_COUNTER},
+    {CREATE_SPRITE_RUPEE(0xFF, 0x64, 0x64),               COUNTER_WALLET_GIANT,  {0x05, 0x15}, SIZE_COUNTER},
+    {CREATE_SPRITE_RUPEE(0xFF, 0x5A, 0xFF),               COUNTER_WALLET_TYCOON, {0x05, 0x15}, SIZE_COUNTER},
+    {CREATE_SPRITE_24(dgQuestIconGoldSkulltulaTex, 103),  COUNTER_SKULLTULLAS,   {0x05, 0x2A}, SIZE_COUNTER},
+    {CREATE_SPRITE_SKULL,                                 COUNTER_DEATHS,        {0x48, 0x2A}, SIZE_COUNTER},
 };
 
 static Sprite counterDigitSprites[10] = {
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index d8a678e91..987c004a0 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -61,7 +61,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     };
     static void* D_8082A130[] = {
-        gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex,
+        gOcarinaBtnIconATex, gOcarinaBtnIconCDownTex, gOcarinaBtnIconCRightTex, gOcarinaBtnIconCLeftTex, gOcarinaBtnIconCUpTex,
     };
     static u16 D_8082A144[] = {
         0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC,
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
index be1320d78..d21e35c3c 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
@@ -708,9 +708,9 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                 gSPGrayscale(POLY_KAL_DISP++, true);
             }
             if (((u32)i == 0) && (k == 2) && (gSaveContext.bgsFlag != 0)) {
-                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gBiggoronSwordIconTex, 32, 32, point);
+                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIconSwordBiggoronTex, 32, 32, point);
             } else if ((i == 0) && (k == 2) && (gBitFlags[bit + 1] & gSaveContext.inventory.equipment)) {
-                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gBrokenGiantsKnifeIconTex, 32, 32, point);
+                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIconBrokenGiantsKnifeTex, 32, 32, point);
             } else if (gBitFlags[bit] & gSaveContext.inventory.equipment) {
                 KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[itemId], 32, 32, point);
             }
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
index f8c691f07..238a1e4e2 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
@@ -9,9 +9,9 @@
 
 void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
     static void* dungeonItemTexs[] = {
-        gBossKeyIconTex,
-        gCompassIconTex,
-        gDungeonMapIconTex,
+        gQuestIconDungeonBossKeyTex,
+        gQuestIconDungeonCompassTex,
+        gQuestIconDungeonMapTex,
     };
     static void* dungeonTitleTexs[] = {
         gPauseDekuTitleENGTex, gPauseDodongoTitleENGTex,   gPauseJabuTitleENGTex,   gPauseForestTitleENGTex,
@@ -309,7 +309,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
     gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
 
     if (GET_GS_FLAGS(gSaveContext.mapIndex) == gAreaGsFlags[gSaveContext.mapIndex]) {
-        KaleidoScope_DrawQuadTextureRGBA32(gfxCtx, gGoldSkulltulaIconTex, 24, 24, 8);
+        KaleidoScope_DrawQuadTextureRGBA32(gfxCtx, gQuestIconGoldSkulltulaTex, 24, 24, 8);
     }
 
     if ((play->sceneNum >= SCENE_DEKU_TREE) && (play->sceneNum <= SCENE_TREASURE_BOX_SHOP)) {
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 24f080312..3476020c2 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -1867,7 +1867,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
                 gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
                 gDPSetEnvColor(POLY_KAL_DISP++, 0, 0, 0, 0);
 
-                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gGoldSkulltulaIconTex, 24, 24, 0);
+                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gQuestIconGoldSkulltulaTex, 24, 24, 0);
             }
         }
     } else if ((pauseCtx->unk_1E4 < 3) || (pauseCtx->unk_1E4 == 7) || (pauseCtx->unk_1E4 == 8)) {