Asset cleanup

3 files changed, 6 insertions, 229 deletions

diff --git a/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp b/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp
index cd3b79e17..f66fcd913 100644
--- a/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp
+++ b/mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp
@@ -17,15 +17,6 @@ Gfx* ResourceMgr_LoadGfxByName(const char* path);
 char* ResourceMgr_LoadVtxArrayByName(const char* path);
 }
 
-#define dgameplay_keep_Tex_00CA30_Overflow "__OTR__objects/gameplay_keep/gameplay_keep_Tex_00CA30_Overflow"
-static const ALIGN_ASSET(2) char gameplay_keep_Tex_00CA30_Overflow[] = dgameplay_keep_Tex_00CA30_Overflow;
-
-#define dgEffIceFragmentTex_Overflow "__OTR__objects/gameplay_keep/gEffIceFragmentTex_Overflow"
-static const ALIGN_ASSET(2) char gEffIceFragmentTex_Overflow[] = dgEffIceFragmentTex_Overflow;
-
-#define dgIronKnuckleFireTex_Overflow "__OTR__objects/object_ik/gIronKnuckleFireTex_Overflow"
-static const ALIGN_ASSET(2) char gIronKnuckleFireTex_Overflow[] = dgIronKnuckleFireTex_Overflow;
-
 typedef struct {
     const char* dlist;
     int startInstruction;
diff --git a/mm/assets/N64_US/objects/object_kz/object_kz.h b/mm/assets/N64_US/objects/object_kz/object_kz.h
deleted file mode 100644
index 99a3e9815..000000000
--- a/mm/assets/N64_US/objects/object_kz/object_kz.h
+++ /dev/null
@@ -1,214 +0,0 @@
-#ifndef OBJECTS_OBJECT_KZ_H
-#define OBJECTS_OBJECT_KZ_H 1
-
-#include "align_asset_macro.h"
-
-#define dgFighterPirateSlashAnim "__OTR__objects/object_kz/gFighterPirateSlashAnim"
-static const ALIGN_ASSET(2) char gFighterPirateSlashAnim[] = dgFighterPirateSlashAnim;
-
-#define dgFighterPirateSpinAttackAnim "__OTR__objects/object_kz/gFighterPirateSpinAttackAnim"
-static const ALIGN_ASSET(2) char gFighterPirateSpinAttackAnim[] = dgFighterPirateSpinAttackAnim;
-
-#define dgFighterPirateFlipAnim "__OTR__objects/object_kz/gFighterPirateFlipAnim"
-static const ALIGN_ASSET(2) char gFighterPirateFlipAnim[] = dgFighterPirateFlipAnim;
-
-#define dgFighterPirateBlockAnim "__OTR__objects/object_kz/gFighterPirateBlockAnim"
-static const ALIGN_ASSET(2) char gFighterPirateBlockAnim[] = dgFighterPirateBlockAnim;
-
-#define dgFighterPirateThrowFlashAnim "__OTR__objects/object_kz/gFighterPirateThrowFlashAnim"
-static const ALIGN_ASSET(2) char gFighterPirateThrowFlashAnim[] = dgFighterPirateThrowFlashAnim;
-
-#define dgFighterPirateUnusedDefeatAnim "__OTR__objects/object_kz/gFighterPirateUnusedDefeatAnim"
-static const ALIGN_ASSET(2) char gFighterPirateUnusedDefeatAnim[] = dgFighterPirateUnusedDefeatAnim;
-
-#define dgFighterPirateDefeatIdleAnim "__OTR__objects/object_kz/gFighterPirateDefeatIdleAnim"
-static const ALIGN_ASSET(2) char gFighterPirateDefeatIdleAnim[] = dgFighterPirateDefeatIdleAnim;
-
-#define dgFighterPirateDefeatAnim "__OTR__objects/object_kz/gFighterPirateDefeatAnim"
-static const ALIGN_ASSET(2) char gFighterPirateDefeatAnim[] = dgFighterPirateDefeatAnim;
-
-#define dgFighterPirateDemonstrativeSwordSwingAnim "__OTR__objects/object_kz/gFighterPirateDemonstrativeSwordSwingAnim"
-static const ALIGN_ASSET(2) char gFighterPirateDemonstrativeSwordSwingAnim[] = dgFighterPirateDemonstrativeSwordSwingAnim;
-
-#define dgFighterPirateDamageAnim "__OTR__objects/object_kz/gFighterPirateDamageAnim"
-static const ALIGN_ASSET(2) char gFighterPirateDamageAnim[] = dgFighterPirateDamageAnim;
-
-#define dgFighterPirateUnsheatheAnim "__OTR__objects/object_kz/gFighterPirateUnsheatheAnim"
-static const ALIGN_ASSET(2) char gFighterPirateUnsheatheAnim[] = dgFighterPirateUnsheatheAnim;
-
-#define dgFighterPirateWalkAnim "__OTR__objects/object_kz/gFighterPirateWalkAnim"
-static const ALIGN_ASSET(2) char gFighterPirateWalkAnim[] = dgFighterPirateWalkAnim;
-
-#define dgFighterPirate1TLUT "__OTR__objects/object_kz/gFighterPirate1TLUT"
-static const ALIGN_ASSET(2) char gFighterPirate1TLUT[] = dgFighterPirate1TLUT;
-
-#define dgFighterPirateSkin1Tex "__OTR__objects/object_kz/gFighterPirateSkin1Tex"
-static const ALIGN_ASSET(2) char gFighterPirateSkin1Tex[] = dgFighterPirateSkin1Tex;
-
-#define dgFighterPirateShirtTopRedGradientTex "__OTR__objects/object_kz/gFighterPirateShirtTopRedGradientTex"
-static const ALIGN_ASSET(2) char gFighterPirateShirtTopRedGradientTex[] = dgFighterPirateShirtTopRedGradientTex;
-
-#define dgFighterPirateArmor1Tex "__OTR__objects/object_kz/gFighterPirateArmor1Tex"
-static const ALIGN_ASSET(2) char gFighterPirateArmor1Tex[] = dgFighterPirateArmor1Tex;
-
-#define dgFighterPirateShirtBottomPatternAndVeilTex "__OTR__objects/object_kz/gFighterPirateShirtBottomPatternAndVeilTex"
-static const ALIGN_ASSET(2) char gFighterPirateShirtBottomPatternAndVeilTex[] = dgFighterPirateShirtBottomPatternAndVeilTex;
-
-#define dgFighterPirateBellyButtonTex "__OTR__objects/object_kz/gFighterPirateBellyButtonTex"
-static const ALIGN_ASSET(2) char gFighterPirateBellyButtonTex[] = dgFighterPirateBellyButtonTex;
-
-#define dgFighterPiratePantsTex "__OTR__objects/object_kz/gFighterPiratePantsTex"
-static const ALIGN_ASSET(2) char gFighterPiratePantsTex[] = dgFighterPiratePantsTex;
-
-#define dgFighterPirateZipper1Tex "__OTR__objects/object_kz/gFighterPirateZipper1Tex"
-static const ALIGN_ASSET(2) char gFighterPirateZipper1Tex[] = dgFighterPirateZipper1Tex;
-
-#define dgFighterPirateTorsoDL "__OTR__objects/object_kz/gFighterPirateTorsoDL"
-static const ALIGN_ASSET(2) char gFighterPirateTorsoDL[] = dgFighterPirateTorsoDL;
-
-#define dgFighterPirateRightUpperArmDL "__OTR__objects/object_kz/gFighterPirateRightUpperArmDL"
-static const ALIGN_ASSET(2) char gFighterPirateRightUpperArmDL[] = dgFighterPirateRightUpperArmDL;
-
-#define dgFighterPirateRightForearmDL "__OTR__objects/object_kz/gFighterPirateRightForearmDL"
-static const ALIGN_ASSET(2) char gFighterPirateRightForearmDL[] = dgFighterPirateRightForearmDL;
-
-#define dgFighterPirateLeftUpperArmDL "__OTR__objects/object_kz/gFighterPirateLeftUpperArmDL"
-static const ALIGN_ASSET(2) char gFighterPirateLeftUpperArmDL[] = dgFighterPirateLeftUpperArmDL;
-
-#define dgFighterPirateLeftForearmDL "__OTR__objects/object_kz/gFighterPirateLeftForearmDL"
-static const ALIGN_ASSET(2) char gFighterPirateLeftForearmDL[] = dgFighterPirateLeftForearmDL;
-
-#define dgFighterPirateWaistDL "__OTR__objects/object_kz/gFighterPirateWaistDL"
-static const ALIGN_ASSET(2) char gFighterPirateWaistDL[] = dgFighterPirateWaistDL;
-
-#define dgFighterPirateRightThighDL "__OTR__objects/object_kz/gFighterPirateRightThighDL"
-static const ALIGN_ASSET(2) char gFighterPirateRightThighDL[] = dgFighterPirateRightThighDL;
-
-#define dgFighterPirateRightShinDL "__OTR__objects/object_kz/gFighterPirateRightShinDL"
-static const ALIGN_ASSET(2) char gFighterPirateRightShinDL[] = dgFighterPirateRightShinDL;
-
-#define dgFighterPirateLeftThighDL "__OTR__objects/object_kz/gFighterPirateLeftThighDL"
-static const ALIGN_ASSET(2) char gFighterPirateLeftThighDL[] = dgFighterPirateLeftThighDL;
-
-#define dgFighterPirateLeftShinDL "__OTR__objects/object_kz/gFighterPirateLeftShinDL"
-static const ALIGN_ASSET(2) char gFighterPirateLeftShinDL[] = dgFighterPirateLeftShinDL;
-
-#define dgFighterPirateSkin2Tex "__OTR__objects/object_kz/gFighterPirateSkin2Tex"
-static const ALIGN_ASSET(2) char gFighterPirateSkin2Tex[] = dgFighterPirateSkin2Tex;
-
-#define dgFighterPirateEarTex "__OTR__objects/object_kz/gFighterPirateEarTex"
-static const ALIGN_ASSET(2) char gFighterPirateEarTex[] = dgFighterPirateEarTex;
-
-#define dgFighterPirateEyeOpenTex "__OTR__objects/object_kz/gFighterPirateEyeOpenTex"
-static const ALIGN_ASSET(2) char gFighterPirateEyeOpenTex[] = dgFighterPirateEyeOpenTex;
-
-#define dgFighterPirateShirtBottomPatternAndVeil2Tex "__OTR__objects/object_kz/gFighterPirateShirtBottomPatternAndVeil2Tex"
-static const ALIGN_ASSET(2) char gFighterPirateShirtBottomPatternAndVeil2Tex[] = dgFighterPirateShirtBottomPatternAndVeil2Tex;
-
-#define dgFighterPirateShoesTex "__OTR__objects/object_kz/gFighterPirateShoesTex"
-static const ALIGN_ASSET(2) char gFighterPirateShoesTex[] = dgFighterPirateShoesTex;
-
-#define dgFighterPirateShoeBottomTex "__OTR__objects/object_kz/gFighterPirateShoeBottomTex"
-static const ALIGN_ASSET(2) char gFighterPirateShoeBottomTex[] = dgFighterPirateShoeBottomTex;
-
-#define dgFighterPirateEyeHalfTex "__OTR__objects/object_kz/gFighterPirateEyeHalfTex"
-static const ALIGN_ASSET(2) char gFighterPirateEyeHalfTex[] = dgFighterPirateEyeHalfTex;
-
-#define dgFighterPirateZipper2Tex "__OTR__objects/object_kz/gFighterPirateZipper2Tex"
-static const ALIGN_ASSET(2) char gFighterPirateZipper2Tex[] = dgFighterPirateZipper2Tex;
-
-#define dgFighterPirateHairTex "__OTR__objects/object_kz/gFighterPirateHairTex"
-static const ALIGN_ASSET(2) char gFighterPirateHairTex[] = dgFighterPirateHairTex;
-
-#define dgFighterPirateFingersTex "__OTR__objects/object_kz/gFighterPirateFingersTex"
-static const ALIGN_ASSET(2) char gFighterPirateFingersTex[] = dgFighterPirateFingersTex;
-
-#define dgFighterPirateYellowSwordGuardAndEmblemTex "__OTR__objects/object_kz/gFighterPirateYellowSwordGuardAndEmblemTex"
-static const ALIGN_ASSET(2) char gFighterPirateYellowSwordGuardAndEmblemTex[] = dgFighterPirateYellowSwordGuardAndEmblemTex;
-
-#define dgFighterPirateEyeClosedTex "__OTR__objects/object_kz/gFighterPirateEyeClosedTex"
-static const ALIGN_ASSET(2) char gFighterPirateEyeClosedTex[] = dgFighterPirateEyeClosedTex;
-
-#define dgFighterPirateLeftFootDL "__OTR__objects/object_kz/gFighterPirateLeftFootDL"
-static const ALIGN_ASSET(2) char gFighterPirateLeftFootDL[] = dgFighterPirateLeftFootDL;
-
-#define dgFighterPirateRightFootDL "__OTR__objects/object_kz/gFighterPirateRightFootDL"
-static const ALIGN_ASSET(2) char gFighterPirateRightFootDL[] = dgFighterPirateRightFootDL;
-
-#define dgFighterPirateLeftHandDL "__OTR__objects/object_kz/gFighterPirateLeftHandDL"
-static const ALIGN_ASSET(2) char gFighterPirateLeftHandDL[] = dgFighterPirateLeftHandDL;
-
-#define dgFighterPirateLeftSwordDL "__OTR__objects/object_kz/gFighterPirateLeftSwordDL"
-static const ALIGN_ASSET(2) char gFighterPirateLeftSwordDL[] = dgFighterPirateLeftSwordDL;
-
-#define dgFighterPirateRightHandDL "__OTR__objects/object_kz/gFighterPirateRightHandDL"
-static const ALIGN_ASSET(2) char gFighterPirateRightHandDL[] = dgFighterPirateRightHandDL;
-
-#define dgFighterPirateRightSwordDL "__OTR__objects/object_kz/gFighterPirateRightSwordDL"
-static const ALIGN_ASSET(2) char gFighterPirateRightSwordDL[] = dgFighterPirateRightSwordDL;
-
-#define dgFighterPirateVeilDL "__OTR__objects/object_kz/gFighterPirateVeilDL"
-static const ALIGN_ASSET(2) char gFighterPirateVeilDL[] = dgFighterPirateVeilDL;
-
-#define dgFighterPiratePonytailDL "__OTR__objects/object_kz/gFighterPiratePonytailDL"
-static const ALIGN_ASSET(2) char gFighterPiratePonytailDL[] = dgFighterPiratePonytailDL;
-
-#define dgFighterPirateHeadDL "__OTR__objects/object_kz/gFighterPirateHeadDL"
-static const ALIGN_ASSET(2) char gFighterPirateHeadDL[] = dgFighterPirateHeadDL;
-
-#define dgFighterPirateSkel "__OTR__objects/object_kz/gFighterPirateSkel"
-static const ALIGN_ASSET(2) char gFighterPirateSkel[] = dgFighterPirateSkel;
-
-#define dgFighterPirateSidestepAnim "__OTR__objects/object_kz/gFighterPirateSidestepAnim"
-static const ALIGN_ASSET(2) char gFighterPirateSidestepAnim[] = dgFighterPirateSidestepAnim;
-
-#define dgFighterPirateUnusedJumpAnim "__OTR__objects/object_kz/gFighterPirateUnusedJumpAnim"
-static const ALIGN_ASSET(2) char gFighterPirateUnusedJumpAnim[] = dgFighterPirateUnusedJumpAnim;
-
-#define dgFighterPirateLandAnim "__OTR__objects/object_kz/gFighterPirateLandAnim"
-static const ALIGN_ASSET(2) char gFighterPirateLandAnim[] = dgFighterPirateLandAnim;
-
-#define dgFighterPirateLandTalkAnim "__OTR__objects/object_kz/gFighterPirateLandTalkAnim"
-static const ALIGN_ASSET(2) char gFighterPirateLandTalkAnim[] = dgFighterPirateLandTalkAnim;
-
-#define dgFighterPirateUnusedTalkAnim "__OTR__objects/object_kz/gFighterPirateUnusedTalkAnim"
-static const ALIGN_ASSET(2) char gFighterPirateUnusedTalkAnim[] = dgFighterPirateUnusedTalkAnim;
-
-#define dgFighterPirateLowerWeaponsAnim "__OTR__objects/object_kz/gFighterPirateLowerWeaponsAnim"
-static const ALIGN_ASSET(2) char gFighterPirateLowerWeaponsAnim[] = dgFighterPirateLowerWeaponsAnim;
-
-#define dgFighterPirateFightingIdleAnim "__OTR__objects/object_kz/gFighterPirateFightingIdleAnim"
-static const ALIGN_ASSET(2) char gFighterPirateFightingIdleAnim[] = dgFighterPirateFightingIdleAnim;
-
-#define dobject_kzTLUT_009100 "__OTR__objects/object_kz/object_kzTLUT_009100"
-static const ALIGN_ASSET(2) char object_kzTLUT_009100[] = dobject_kzTLUT_009100;
-
-typedef enum KaizokuLimb {
-    /* 0x00 */ KAIZOKU_LIMB_NONE,
-    /* 0x01 */ KAIZOKU_LIMB_ROOT,
-    /* 0x02 */ KAIZOKU_LIMB_TORSO,
-    /* 0x03 */ KAIZOKU_LIMB_NECK,
-    /* 0x04 */ KAIZOKU_LIMB_PONYTAIL,
-    /* 0x05 */ KAIZOKU_LIMB_VEIL,
-    /* 0x06 */ KAIZOKU_LIMB_HEAD,
-    /* 0x07 */ KAIZOKU_LIMB_RIGHT_UPPER_ARM,
-    /* 0x08 */ KAIZOKU_LIMB_RIGHT_FOREARM,
-    /* 0x09 */ KAIZOKU_LIMB_RIGHT_WRIST,
-    /* 0x0A */ KAIZOKU_LIMB_RIGHT_HAND,
-    /* 0x0B */ KAIZOKU_LIMB_RIGHT_SWORD,
-    /* 0x0C */ KAIZOKU_LIMB_LEFT_UPPER_ARM,
-    /* 0x0D */ KAIZOKU_LIMB_LEFT_FOREARM,
-    /* 0x0E */ KAIZOKU_LIMB_LEFT_WRIST,
-    /* 0x0F */ KAIZOKU_LIMB_LEFT_HAND,
-    /* 0x10 */ KAIZOKU_LIMB_LEFT_SWORD,
-    /* 0x11 */ KAIZOKU_LIMB_LEFT_THIGH,
-    /* 0x12 */ KAIZOKU_LIMB_LEFT_SHIN,
-    /* 0x13 */ KAIZOKU_LIMB_LEFT_FOOT,
-    /* 0x14 */ KAIZOKU_LIMB_RIGHT_THIGH,
-    /* 0x15 */ KAIZOKU_LIMB_RIGHT_SHIN,
-    /* 0x16 */ KAIZOKU_LIMB_RIGHT_FOOT,
-    /* 0x17 */ KAIZOKU_LIMB_WAIST,
-    /* 0x18 */ KAIZOKU_LIMB_MAX
-} KaizokuLimb;
-
-#endif // OBJECTS_OBJECT_KZ_H
diff --git a/mm/assets/objects/object_test3/object_test3.h b/mm/assets/objects/object_test3/object_test3.h
index 3dd950364..e62da82b9 100644
--- a/mm/assets/objects/object_test3/object_test3.h
+++ b/mm/assets/objects/object_test3/object_test3.h
@@ -78,14 +78,14 @@ static const ALIGN_ASSET(2) char gKafeiEyesDownTex[] = dgKafeiEyesDownTex;
 #define dgKafeiEyesWincingTex "__OTR__objects/object_test3/gKafeiEyesWincingTex"
 static const ALIGN_ASSET(2) char gKafeiEyesWincingTex[] = dgKafeiEyesWincingTex;
 
-#define dgKafeiMouthTeethTex "__OTR__objects/object_test3/gKafeiMouthTeethTex"
-static const ALIGN_ASSET(2) char gKafeiMouthTeethTex[] = dgKafeiMouthTeethTex;
+#define dgKafeiMouthHalfTex "__OTR__objects/object_test3/gKafeiMouthHalfTex"
+static const ALIGN_ASSET(2) char gKafeiMouthHalfTex[] = dgKafeiMouthHalfTex;
 
-#define dgKafeiMouthAngryTex "__OTR__objects/object_test3/gKafeiMouthAngryTex"
-static const ALIGN_ASSET(2) char gKafeiMouthAngryTex[] = dgKafeiMouthAngryTex;
+#define dgKafeiMouthOpenTex "__OTR__objects/object_test3/gKafeiMouthOpenTex"
+static const ALIGN_ASSET(2) char gKafeiMouthOpenTex[] = dgKafeiMouthOpenTex;
 
-#define dgKafeiMouthHappyTex "__OTR__objects/object_test3/gKafeiMouthHappyTex"
-static const ALIGN_ASSET(2) char gKafeiMouthHappyTex[] = dgKafeiMouthHappyTex;
+#define dgKafeiMouthSmileTex "__OTR__objects/object_test3/gKafeiMouthSmileTex"
+static const ALIGN_ASSET(2) char gKafeiMouthSmileTex[] = dgKafeiMouthSmileTex;
 
 #define dgKafeiRightThighDL "__OTR__objects/object_test3/gKafeiRightThighDL"
 static const ALIGN_ASSET(2) char gKafeiRightThighDL[] = dgKafeiRightThighDL;