3 files changed, 14 insertions, 2 deletions
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index 8c99b694..61d7d69c 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -5,7 +5,7 @@
 #include "RpAnimBlend.h"
 #include "AnimManager.h"
 #include "AnimBlendAssociation.h"
-#include "RwHelper.h"
+#include "MemoryHeap.h"
 
 CAnimBlendAssociation::CAnimBlendAssociation(void)
 {
diff --git a/src/animation/AnimBlendClumpData.cpp b/src/animation/AnimBlendClumpData.cpp
index d40e8357..fd2a58de 100644
--- a/src/animation/AnimBlendClumpData.cpp
+++ b/src/animation/AnimBlendClumpData.cpp
@@ -1,7 +1,7 @@
 #include "common.h"
 
 #include "AnimBlendClumpData.h"
-#include "RwHelper.h"
+#include "MemoryHeap.h"
 
 
 CAnimBlendClumpData::CAnimBlendClumpData(void)
diff --git a/src/animation/AnimBlendSequence.cpp b/src/animation/AnimBlendSequence.cpp
index d35fbc46..5a2fa605 100644
--- a/src/animation/AnimBlendSequence.cpp
+++ b/src/animation/AnimBlendSequence.cpp
@@ -1,6 +1,7 @@
 #include "common.h"
 
 #include "AnimBlendSequence.h"
+#include "MemoryHeap.h"
 
 CAnimBlendSequence::CAnimBlendSequence(void)
 {
@@ -70,6 +71,8 @@ CAnimBlendSequence::Uncompress(void)
 	if(numFrames == 0)
 		return;
 
+	PUSH_MEMID(MEMID_ANIMATION);
+
 	float rotScale = 1.0f/4096.0f;
 	float timeScale = 1.0f/60.0f;
 	float transScale = 1.0f/128.0f;
@@ -105,8 +108,12 @@ CAnimBlendSequence::Uncompress(void)
 		}
 		keyFrames = newKfs;
 	}
+	REGISTER_MEMPTR(&keyFrames);
+
 	RwFree(keyFramesCompressed);
 	keyFramesCompressed = nil;
+
+	POP_MEMID();
 }
 
 void
@@ -117,6 +124,8 @@ CAnimBlendSequence::CompressKeyframes(void)
 	if(numFrames == 0)
 		return;
 
+	PUSH_MEMID(MEMID_ANIMATION);
+
 	float rotScale = 4096.0f;
 	float timeScale = 60.0f;
 	float transScale = 128.0f;
@@ -152,6 +161,9 @@ CAnimBlendSequence::CompressKeyframes(void)
 		}
 		keyFramesCompressed = newKfs;
 	}
+	REGISTER_MEMPTR(&keyFramesCompressed);
+
+	POP_MEMID();
 }
 
 void