3 files changed, 4 insertions, 8 deletions

diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index 8b0001ac..fbca92b7 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -139,7 +139,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *blockName, RpClump *clump,
 		DestroyAssociations();
 
 	animBlock = CAnimManager::GetAnimationBlock(blockName);
-	assocList = new CAnimBlendAssociation[animBlock->numAnims];
+	assocList = new CAnimBlendAssociation[numAssocs];
 
 	numAssociations = 0;
 	for(i = 0; i < numAssocs; i++){
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index eb7019ab..d94fe2c1 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -5,10 +5,7 @@
 #include "RpAnimBlend.h"
 #include "AnimManager.h"
 #include "AnimBlendAssociation.h"
-
-// TODO: implement those
-#define RwFreeAlign RwFree
-#define RwMallocAlign(sz, algn) RwMalloc(sz)
+#include "RwHelper.h"
 
 CAnimBlendAssociation::CAnimBlendAssociation(void)
 {
@@ -57,6 +54,7 @@ CAnimBlendAssociation::AllocateAnimBlendNodeArray(int n)
 void
 CAnimBlendAssociation::FreeAnimBlendNodeArray(void)
 {
+	assert(nodes != nil);
 	RwFreeAlign(nodes);
 }
 
diff --git a/src/animation/AnimBlendClumpData.cpp b/src/animation/AnimBlendClumpData.cpp
index 73e71246..06625eb5 100644
--- a/src/animation/AnimBlendClumpData.cpp
+++ b/src/animation/AnimBlendClumpData.cpp
@@ -1,10 +1,8 @@
 #include "common.h"
 #include "patcher.h"
 #include "AnimBlendClumpData.h"
+#include "RwHelper.h"
 
-// TODO: implement those
-#define RwFreeAlign RwFree
-#define RwMallocAlign(sz, algn) RwMalloc(sz)
 
 CAnimBlendClumpData::CAnimBlendClumpData(void)
 {