Updated mario animation names and added automatic stashing (#231)

* Updated mario animation names and added automatic stashing

* Breakdamce

* Fixed issues pointed out by thecozies

fast64_internal/oot/oot_anim.py

@@ -12,6 +12,7 @@
     getFrameInterval,
     getTranslationRelativeToRest,
     getRotationRelativeToRest,
+    stashActionInArmature,
 )
 
 from .oot_utility import (
@@ -330,7 +331,10 @@ def ootConvertLinkAnimationData(anim, armatureObj, convertTransformMatrix, *, fr
 def ootExportNonLinkAnimation(armatureObj, convertTransformMatrix, skeletonName):
     if armatureObj.animation_data is None or armatureObj.animation_data.action is None:
         raise PluginError("No active animation selected.")
+
     anim = armatureObj.animation_data.action
+    stashActionInArmature(armatureObj, anim)
+
     ootAnim = OOTAnimation(toAlnum(skeletonName + anim.name.capitalize() + "Anim"))
 
     skeleton = ootConvertArmatureToSkeletonWithoutMesh(armatureObj, convertTransformMatrix, skeletonName)
@@ -377,7 +381,10 @@ def ootExportNonLinkAnimation(armatureObj, convertTransformMatrix, skeletonName)
 def ootExportLinkAnimation(armatureObj, convertTransformMatrix, skeletonName):
     if armatureObj.animation_data is None or armatureObj.animation_data.action is None:
         raise PluginError("No active animation selected.")
+
     anim = armatureObj.animation_data.action
+    stashActionInArmature(armatureObj, anim)
+
     ootAnim = OOTLinkAnimation(toAlnum(skeletonName + anim.name.capitalize() + "Anim"))
 
     frame_start, frame_last = getFrameInterval(anim)
@@ -486,6 +493,8 @@ def ootImportNonLinkAnimationC(armatureObj, filepath, animName, actorScale, isCu
 
     if armatureObj.animation_data is None:
         armatureObj.animation_data_create()
+
+    stashActionInArmature(armatureObj, anim)
     armatureObj.animation_data.action = anim
 
 
@@ -605,6 +614,8 @@ def ootImportLinkAnimationC(
 
     if armatureObj.animation_data is None:
         armatureObj.animation_data_create()
+
+    stashActionInArmature(armatureObj, anim)
     armatureObj.animation_data.action = anim
 
 

fast64_internal/sm64/sm64_anim.py

@@ -33,6 +33,7 @@
     decompFolderMessage,
     makeWriteInfoBox,
     writeBoxExportType,
+    stashActionInArmature,
     enumExportHeaderType,
 )
 
@@ -348,7 +349,10 @@ def exportAnimationInsertableBinary(filepath, armatureObj, isDMA, loopAnim):
 def exportAnimationCommon(armatureObj, loopAnim, name):
     if armatureObj.animation_data is None or armatureObj.animation_data.action is None:
         raise PluginError("No active animation selected.")
+
     anim = armatureObj.animation_data.action
+    stashActionInArmature(armatureObj, anim)
+
     sm64_anim = SM64_Animation(toAlnum(name + "_" + anim.name))
 
     nodeCount = len(armatureObj.data.bones)
@@ -544,8 +548,9 @@ def importAnimationToBlender(romfile, startAddress, armatureObj, segmentData, is
 
     if armatureObj.animation_data is None:
         armatureObj.animation_data_create()
-    armatureObj.animation_data.action = anim
 
+    stashActionInArmature(armatureObj, anim)
+    armatureObj.animation_data.action = anim
 
 def readAnimation(name, romfile, startAddress, segmentData, isDMA):
     animationHeader = readAnimHeader(name, romfile, startAddress, segmentData, isDMA)