1 files changed, 18 insertions, 94 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index 452d3d2..18a09e1 100755
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -524,111 +524,35 @@ TEX_PokeySnowman:
 	slwi r10, r10, 2	# size *= 4 (size of float)
 	lfsx f0, r11, r10	# get it from the array
 	
-	blr
-	
-
-SnowmanPokey:
-
-	lfs f0, 0x54(r31)
-	blr
-
-
-
-
-.global TEX_PokeySnowmanPosF
-TEX_PokeySnowmanPosF:
-
-	lwz r10, 4(r31)
-	andi. r10, r10, 0xF
-
-	lis r11, SnowmanTable@h
-	ori r11, r11, SnowmanTable@l
-	slwi r10, r10, 2	# size *= 4 (size of float)
-	lfsx f2, r11, r10	# get it from the array	
-
-	fmuls f0, f0, f2
-	stfs f0, 0xB0(r30)
-	blr
-
-.global TEX_PokeySnowmanPosE
-TEX_PokeySnowmanPosE:
-
-	lwz r10, 4(r31)
-	andi. r10, r10, 0xF
-
-	lis r11, SnowmanTable@h
-	ori r11, r11, SnowmanTable@l
-	slwi r10, r10, 2	# size *= 4 (size of float)
-	lfsx f2, r11, r10	# get it from the array	
+	# We should probably change ActivePhysics and maybe some other rects here
+	addi r10, r30, 0x148
 
-	fmuls f31, f31, f2
-	stfs f31, 0xB0(r29)
-	blr
+	lfs f10, 0(r10)
+	fmuls f10, f0, f10
+	stfs f10, 0(r10)
 
-.global TEX_PokeySnowmanPosD
-TEX_PokeySnowmanPosD:
+	lfs f10, 4(r10)
+	fmuls f10, f0, f10
+	stfs f10, 4(r10)
 
-	lwz r10, 4(r31)
-	andi. r10, r10, 0xF
+	lfs f10, 8(r10)
+	fmuls f10, f0, f10
+	stfs f10, 8(r10)
 
-	lis r11, SnowmanTable@h
-	ori r11, r11, SnowmanTable@l
-	slwi r10, r10, 2	# size *= 4 (size of float)
-	lfsx f2, r11, r10	# get it from the array	
+	lfs f10, 0xC(r10)
+	fmuls f10, f0, f10
+	stfs f10, 0xC(r10)
 
-	fmuls f1, f1, f2
-	stfs f1, 0xB0(r30)
 	blr
+	
 
+SnowmanPokey:
 
-.global TEX_PokeySnowmanPosC
-TEX_PokeySnowmanPosC:
-
-	lwz r10, 4(r31)
-	andi. r10, r10, 0xF
-
-	lis r11, SnowmanTable@h
-	ori r11, r11, SnowmanTable@l
-	slwi r10, r10, 2	# size *= 4 (size of float)
-	lfsx f2, r11, r10	# get it from the array	
-
-	fmuls f0, f0, f2
-	stfs f0, 0xB0(r31)
-	blr
-
-
-.global TEX_PokeySnowmanPosB
-TEX_PokeySnowmanPosB:
-
-	lwz r10, 4(r31)
-	andi. r10, r10, 0xF
-
-	lis r11, SnowmanTable@h
-	ori r11, r11, SnowmanTable@l
-	slwi r10, r10, 2	# size *= 4 (size of float)
-	lfsx f0, r11, r10	# get it from the array	
-
-	fmuls f1, f1, f0
-	stfs f1, 0x18(r1)
+	lfs f0, 0x54(r31)
 	blr
 
 
 
-.global TEX_PokeySnowmanPosA
-TEX_PokeySnowmanPosA:
-
-	lwz r10, 4(r31)
-	andi. r10, r10, 0xF
-
-	lis r11, SnowmanTable@h
-	ori r11, r11, SnowmanTable@l
-	slwi r10, r10, 2	# size *= 4 (size of float)
-	lfsx f0, r11, r10	# get it from the array	
-
-	fmuls f3, f3, f0
-	stfs f3, 0x168(r31)
-	blr
-
 
 .global TEX_PokeySnowmanPos
 TEX_PokeySnowmanPos:
@@ -1277,7 +1201,7 @@ ConvertFloat:
 
 
 SnowmanTable:
-	.float 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5
+	.float 1.0, 1.333, 1.666, 2.0, 2.333, 2.666, 3.0, 3.333, 3.666, 4.0, 4.333, 4.666
 	
 AddAmount:
 	.float 32.0