diff --git a/client/src/main/java/Class139.java b/client/src/main/java/Class139.java
index f1f5ad0..e9f6072 100644
--- a/client/src/main/java/Class139.java
+++ b/client/src/main/java/Class139.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Class139 {
 
 	@OriginalMember(owner = "client!sm", name = "a", descriptor = "Lclient!ek;")
-	public Class36_Sub1 aClass36_Sub1_3;
+	public SoftwareIndexedSprite aClass36_Sub1_3;
 
 	@OriginalMember(owner = "client!sm", name = "j", descriptor = "Lclient!th;")
 	public Entity aClass8_10;
diff --git a/client/src/main/java/Class165.java b/client/src/main/java/Class165.java
index 6e26b69..fc0d8fe 100644
--- a/client/src/main/java/Class165.java
+++ b/client/src/main/java/Class165.java
@@ -106,7 +106,7 @@ public final class Class165 {
 	}
 
 	@OriginalMember(owner = "client!wm", name = "a", descriptor = "(Lclient!ek;II)Z")
-	public final boolean method4677(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final boolean method4677(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		@Pc(2) byte[] local2 = arg0.aByteArray18;
 		@Pc(5) int local5 = arg0.anInt4270;
 		@Pc(19) int local19 = arg1 * 128 + (arg2 * 128 + 1) * local5 + 1;
diff --git a/client/src/main/java/Class2.java b/client/src/main/java/Class2.java
index e78fb10..8177bd6 100644
--- a/client/src/main/java/Class2.java
+++ b/client/src/main/java/Class2.java
@@ -27,8 +27,8 @@ public final class Class2 {
 	}
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IB)Lclient!ek;")
-	public final Class36_Sub1 method9(@OriginalArg(0) int arg0) {
-		@Pc(17) Class36_Sub1 local17 = (Class36_Sub1) Static219.aClass99_27.method3106((long) (arg0 << 16 | this.anInt12));
+	public final SoftwareIndexedSprite method9(@OriginalArg(0) int arg0) {
+		@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.aClass99_27.method3106((long) (arg0 << 16 | this.anInt12));
 		if (local17 != null) {
 			return local17;
 		}
diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java
index a2b9122..b3163d2 100644
--- a/client/src/main/java/Component.java
+++ b/client/src/main/java/Component.java
@@ -500,7 +500,7 @@ public final class Component {
 		if (this.anIntArray37 != null) {
 			return true;
 		}
-		@Pc(18) Class36_Sub1 local18 = Static164.method3119(this.anInt477, Static23.aClass153_12);
+		@Pc(18) SoftwareIndexedSprite local18 = Static164.method3119(this.anInt477, Static23.aClass153_12);
 		if (local18 == null) {
 			return false;
 		}
diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java
index 7ddedb6..de4b032 100644
--- a/client/src/main/java/GlModel.java
+++ b/client/src/main/java/GlModel.java
@@ -3158,7 +3158,7 @@ public final class GlModel extends Model {
 	}
 
 	@OriginalMember(owner = "client!td", name = "a", descriptor = "(Lclient!ek;)Lclient!ek;")
-	public final Class36_Sub1 method4124(@OriginalArg(0) Class36_Sub1 arg0) {
+	public final SoftwareIndexedSprite method4124(@OriginalArg(0) SoftwareIndexedSprite arg0) {
 		if (this.anInt5296 == 0) {
 			return null;
 		}
@@ -3185,9 +3185,9 @@ public final class GlModel extends Model {
 		}
 		@Pc(134) int local134 = local40 + 1 - local26;
 		@Pc(140) int local140 = local99 + 1 - local85;
-		@Pc(151) Class36_Sub1 local151;
+		@Pc(151) SoftwareIndexedSprite local151;
 		if (arg0 == null || arg0.aByteArray18.length < local134 * local140) {
-			local151 = new Class36_Sub1(local134, local140, 0);
+			local151 = new SoftwareIndexedSprite(local134, local140, 0);
 		} else {
 			local151 = arg0;
 			arg0.anInt4279 = arg0.anInt4270 = local134;
diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java
index 9279587..e81d330 100644
--- a/client/src/main/java/Loc.java
+++ b/client/src/main/java/Loc.java
@@ -22,7 +22,7 @@ public final class Loc extends Entity {
 	private boolean aBoolean81 = true;
 
 	@OriginalMember(owner = "client!dc", name = "Q", descriptor = "Lclient!ek;")
-	private Class36_Sub1 aClass36_Sub1_2 = null;
+	private SoftwareIndexedSprite aClass36_Sub1_2 = null;
 
 	@OriginalMember(owner = "client!dc", name = "T", descriptor = "I")
 	private final int anInt1311 = -32768;
@@ -305,7 +305,7 @@ public final class Loc extends Entity {
 				@Pc(439) int[][] local439 = Static83.anIntArrayArrayArray4[0];
 				local429 = local293 - (local439[local178][local192] + local439[local185][local192] + local439[local185][local201] + local439[local178][local201] >> 2);
 			}
-			@Pc(471) Class36_Sub1 local471 = local389.aClass36_Sub1_3;
+			@Pc(471) SoftwareIndexedSprite local471 = local389.aClass36_Sub1_3;
 			if (this.aBoolean81 && Static242.method4209(local471, local302, local429, local311)) {
 				this.aBoolean81 = false;
 			}
diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java
index fce3bbc..5580d67 100644
--- a/client/src/main/java/LocType.java
+++ b/client/src/main/java/LocType.java
@@ -731,7 +731,7 @@ public final class LocType {
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(II[[III[[IZLclient!ek;BZI)Lclient!sm;")
-	public final Class139 method3428(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) boolean arg6, @OriginalArg(7) Class36_Sub1 arg7, @OriginalArg(9) boolean arg8, @OriginalArg(10) int arg9) {
+	public final Class139 method3428(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) boolean arg6, @OriginalArg(7) SoftwareIndexedSprite arg7, @OriginalArg(9) boolean arg8, @OriginalArg(10) int arg9) {
 		@Pc(29) long local29;
 		if (Static239.aBoolean269) {
 			if (this.anIntArray378 == null) {
@@ -741,7 +741,7 @@ public final class LocType {
 			}
 			@Pc(225) Class139 local225 = (Class139) Static93.aClass99_14.method3106(local29);
 			@Pc(235) GlModel local235;
-			@Pc(265) Class36_Sub1 local265;
+			@Pc(265) SoftwareIndexedSprite local265;
 			if (local225 == null) {
 				local235 = this.method3427(arg0, false, arg3);
 				if (local235 == null) {
@@ -824,7 +824,7 @@ public final class LocType {
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(IILclient!ek;ILclient!tk;I[[IZII[[IIII)Lclient!sm;")
-	public final Class139 method3429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class36_Sub1 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Class144 arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int[][] arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12) {
+	public final Class139 method3429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SoftwareIndexedSprite arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Class144 arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int[][] arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12) {
 		@Pc(30) long local30;
 		if (!Static239.aBoolean269) {
 			if (this.anIntArray378 == null) {
diff --git a/client/src/main/java/Class36_Sub1.java b/client/src/main/java/SoftwareIndexedSprite.java
similarity index 96%
rename from client/src/main/java/Class36_Sub1.java
rename to client/src/main/java/SoftwareIndexedSprite.java
index 4678ec7..126b979 100644
--- a/client/src/main/java/Class36_Sub1.java
+++ b/client/src/main/java/SoftwareIndexedSprite.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ek")
-public final class Class36_Sub1 extends IndexedSprite {
+public final class SoftwareIndexedSprite extends IndexedSprite {
 
 	@OriginalMember(owner = "client!ek", name = "o", descriptor = "[B")
 	public byte[] aByteArray18;
@@ -13,7 +13,7 @@ public final class Class36_Sub1 extends IndexedSprite {
 	private final int[] anIntArray144;
 
 	@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(IIIIII[B[I)V")
-	public Class36_Sub1(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte[] arg6, @OriginalArg(7) int[] arg7) {
+	public SoftwareIndexedSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte[] arg6, @OriginalArg(7) int[] arg7) {
 		this.anInt4279 = arg0;
 		this.anInt4276 = arg1;
 		this.anInt4280 = arg2;
@@ -25,7 +25,7 @@ public final class Class36_Sub1 extends IndexedSprite {
 	}
 
 	@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(III)V")
-	public Class36_Sub1(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public SoftwareIndexedSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		this.anInt4279 = this.anInt4270 = arg0;
 		this.anInt4276 = this.anInt4278 = arg1;
 		this.anInt4280 = this.anInt4273 = 0;
diff --git a/client/src/main/java/Static121.java b/client/src/main/java/Static121.java
index e66d140..65afdf1 100644
--- a/client/src/main/java/Static121.java
+++ b/client/src/main/java/Static121.java
@@ -26,10 +26,10 @@ public final class Static121 {
 	public static final JagString aClass100_590 = Static28.method790("Titelbild geladen)3");
 
 	@OriginalMember(owner = "client!jg", name = "a", descriptor = "(I)[Lclient!ek;")
-	public static Class36_Sub1[] method2406() {
-		@Pc(2) Class36_Sub1[] local2 = new Class36_Sub1[Static165.anInt4038];
+	public static SoftwareIndexedSprite[] method2406() {
+		@Pc(2) SoftwareIndexedSprite[] local2 = new SoftwareIndexedSprite[Static165.anInt4038];
 		for (@Pc(8) int local8 = 0; local8 < Static165.anInt4038; local8++) {
-			local2[local8] = new Class36_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local8], Static269.anIntArray252[local8], Static254.anIntArray488[local8], Static26.anIntArray66[local8], Static7.aByteArrayArray5[local8], Static259.anIntArray513);
+			local2[local8] = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local8], Static269.anIntArray252[local8], Static254.anIntArray488[local8], Static26.anIntArray66[local8], Static7.aByteArrayArray5[local8], Static259.anIntArray513);
 		}
 		Static75.method1631();
 		return local2;
diff --git a/client/src/main/java/Static134.java b/client/src/main/java/Static134.java
index ee134d3..3906c4d 100644
--- a/client/src/main/java/Static134.java
+++ b/client/src/main/java/Static134.java
@@ -14,8 +14,8 @@ public final class Static134 {
 	public static final Class59 aClass59_2 = new Class59();
 
 	@OriginalMember(owner = "client!kh", name = "a", descriptor = "(B)Lclient!ek;")
-	public static Class36_Sub1 method2619() {
-		@Pc(25) Class36_Sub1 local25 = new Class36_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513);
+	public static SoftwareIndexedSprite method2619() {
+		@Pc(25) SoftwareIndexedSprite local25 = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513);
 		Static75.method1631();
 		return local25;
 	}
diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java
index 87b823d..fd186ae 100644
--- a/client/src/main/java/Static144.java
+++ b/client/src/main/java/Static144.java
@@ -227,7 +227,7 @@ public final class Static144 {
 									if (local233 != 0) {
 										local254 = local222 >> 14 & 0x3;
 										@Pc(998) Class2 local998 = Static40.method1013(local233 - 1);
-										@Pc(1003) Class36_Sub1 local1003 = local998.method9(local254);
+										@Pc(1003) SoftwareIndexedSprite local1003 = local998.method9(local254);
 										if (local1003 != null) {
 											local276 = local162 * local1003.anInt4278 / 4;
 											local270 = local62 * local1003.anInt4270 / 4;
diff --git a/client/src/main/java/Static162.java b/client/src/main/java/Static162.java
index f588987..dead666 100644
--- a/client/src/main/java/Static162.java
+++ b/client/src/main/java/Static162.java
@@ -17,7 +17,7 @@ public final class Static162 {
 	public static boolean aBoolean190 = true;
 
 	@OriginalMember(owner = "client!ml", name = "a", descriptor = "(BILclient!ve;)[Lclient!ek;")
-	public static Class36_Sub1[] method3088(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) {
+	public static SoftwareIndexedSprite[] method3088(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) {
 		return Static254.method4346(arg1, arg0) ? Static121.method2406() : null;
 	}
 
diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java
index d472d77..dc624c6 100644
--- a/client/src/main/java/Static164.java
+++ b/client/src/main/java/Static164.java
@@ -178,7 +178,7 @@ public final class Static164 {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
-	public static Class36_Sub1 method3119(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
+	public static SoftwareIndexedSprite method3119(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
 		return Static234.method4016(arg1, 0, arg0) ? Static134.method2619() : null;
 	}
 
diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java
index 5cde747..c9e0971 100644
--- a/client/src/main/java/Static233.java
+++ b/client/src/main/java/Static233.java
@@ -23,7 +23,7 @@ public final class Static233 {
 	public static int anInt5225;
 
 	@OriginalMember(owner = "client!t", name = "G", descriptor = "[Lclient!ek;")
-	public static Class36_Sub1[] aClass36_Sub1Array1;
+	public static SoftwareIndexedSprite[] aClass36_Sub1Array1;
 
 	@OriginalMember(owner = "client!t", name = "m", descriptor = "Z")
 	public static volatile boolean aBoolean253 = true;
diff --git a/client/src/main/java/Static242.java b/client/src/main/java/Static242.java
index 52fd3b6..acd9742 100644
--- a/client/src/main/java/Static242.java
+++ b/client/src/main/java/Static242.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static242 {
 
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "Lclient!ek;")
-	public static Class36_Sub1 aClass36_Sub1_4;
+	public static SoftwareIndexedSprite aClass36_Sub1_4;
 
 	@OriginalMember(owner = "client!tj", name = "b", descriptor = "[[Lclient!wm;")
 	public static Class165[][] aClass165ArrayArray1;
@@ -15,13 +15,13 @@ public final class Static242 {
 	private static int anInt5345;
 
 	@OriginalMember(owner = "client!tj", name = "d", descriptor = "[Lclient!ek;")
-	public static Class36_Sub1[] aClass36_Sub1Array2;
+	public static SoftwareIndexedSprite[] aClass36_Sub1Array2;
 
 	@OriginalMember(owner = "client!tj", name = "e", descriptor = "I")
 	private static int anInt5346;
 
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;Lclient!ek;II)V")
-	private static void method4194(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) Class36_Sub1 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	private static void method4194(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		arg2 += arg0.anInt4280;
 		arg3 += arg0.anInt4273;
 		@Pc(16) int local16 = arg2 + arg3 * arg1.anInt4270;
@@ -183,7 +183,7 @@ public final class Static242 {
 	}
 
 	@OriginalMember(owner = "client!tj", name = "b", descriptor = "(Lclient!ek;Lclient!ek;II)Z")
-	private static boolean method4200(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) Class36_Sub1 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	private static boolean method4200(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		arg2 += arg0.anInt4280;
 		arg3 += arg0.anInt4273;
 		@Pc(16) int local16 = arg2 + arg3 * arg1.anInt4270;
@@ -226,7 +226,7 @@ public final class Static242 {
 	public static void method4201() {
 		anInt5346 = 13;
 		anInt5345 = 13;
-		aClass36_Sub1_4 = new Class36_Sub1(anInt5346 * 128 + 2, anInt5345 * 128 + 2, 0);
+		aClass36_Sub1_4 = new SoftwareIndexedSprite(anInt5346 * 128 + 2, anInt5345 * 128 + 2, 0);
 		aClass165ArrayArray1 = new Class165[anInt5346][anInt5345];
 		for (@Pc(32) int local32 = 0; local32 < anInt5346; local32++) {
 			for (@Pc(37) int local37 = 0; local37 < anInt5345; local37++) {
@@ -236,7 +236,7 @@ public final class Static242 {
 	}
 
 	@OriginalMember(owner = "client!tj", name = "c", descriptor = "(Lclient!ek;Lclient!ek;II)V")
-	private static void method4202(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) Class36_Sub1 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	private static void method4202(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		arg2 += arg0.anInt4280;
 		arg3 += arg0.anInt4273;
 		@Pc(16) int local16 = arg2 + arg3 * arg1.anInt4270;
@@ -334,7 +334,7 @@ public final class Static242 {
 	}
 
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;III)V")
-	public static void method4207(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	public static void method4207(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (arg0 != null) {
 			@Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3;
 			@Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3;
@@ -365,7 +365,7 @@ public final class Static242 {
 	}
 
 	@OriginalMember(owner = "client!tj", name = "b", descriptor = "(Lclient!ek;III)Z")
-	public static boolean method4209(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	public static boolean method4209(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (arg0 == null) {
 			return false;
 		} else {
@@ -376,7 +376,7 @@ public final class Static242 {
 	}
 
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;Lclient!ek;IIIZ)V")
-	private static void method4210(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) Class36_Sub1 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) {
+	private static void method4210(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) {
 		if (arg2 <= 0 || arg3 <= 0 || arg2 + 16 >= arg1.anInt4270 || arg3 + 16 >= arg1.anInt4278) {
 			return;
 		}
@@ -411,7 +411,7 @@ public final class Static242 {
 	}
 
 	@OriginalMember(owner = "client!tj", name = "c", descriptor = "(Lclient!ek;III)V")
-	public static void method4211(@OriginalArg(0) Class36_Sub1 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	public static void method4211(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (arg0 != null) {
 			@Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3;
 			@Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3;
diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java
index 21f2614..63b0860 100644
--- a/client/src/main/java/Static253.java
+++ b/client/src/main/java/Static253.java
@@ -215,7 +215,7 @@ public final class Static253 {
 			if (Static239.aBoolean269) {
 				local8[local10] = new Class36_Sub2(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local10], Static269.anIntArray252[local10], Static254.anIntArray488[local10], Static26.anIntArray66[local10], Static7.aByteArrayArray5[local10], Static259.anIntArray513);
 			} else {
-				local8[local10] = new Class36_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local10], Static269.anIntArray252[local10], Static254.anIntArray488[local10], Static26.anIntArray66[local10], Static7.aByteArrayArray5[local10], Static259.anIntArray513);
+				local8[local10] = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local10], Static269.anIntArray252[local10], Static254.anIntArray488[local10], Static26.anIntArray66[local10], Static7.aByteArrayArray5[local10], Static259.anIntArray513);
 			}
 		}
 		Static75.method1631();
diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java
index 556db09..4f2f656 100644
--- a/client/src/main/java/Static276.java
+++ b/client/src/main/java/Static276.java
@@ -86,7 +86,7 @@ public final class Static276 {
 		if (Static239.aBoolean269) {
 			local27 = new Class36_Sub2(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513);
 		} else {
-			local27 = new Class36_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513);
+			local27 = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513);
 		}
 		Static75.method1631();
 		return local27;
diff --git a/client/src/main/java/Static30.java b/client/src/main/java/Static30.java
index 9af1ac4..ba12e84 100644
--- a/client/src/main/java/Static30.java
+++ b/client/src/main/java/Static30.java
@@ -20,7 +20,7 @@ public final class Static30 {
 	public static final JagString aClass100_185 = Static28.method790(")3");
 
 	@OriginalMember(owner = "client!cg", name = "a", descriptor = "(ZILclient!ve;I)[Lclient!ek;")
-	private static Class36_Sub1[] method837(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) {
+	private static SoftwareIndexedSprite[] method837(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) {
 		return Static234.method4016(arg1, 0, arg0) ? Static121.method2406() : null;
 	}
 
diff --git a/client/src/main/java/Static32.java b/client/src/main/java/Static32.java
index 3a5855b..e4fffb2 100644
--- a/client/src/main/java/Static32.java
+++ b/client/src/main/java/Static32.java
@@ -8,7 +8,7 @@ public final class Static32 {
 	public static int anInt1016;
 
 	@OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;")
-	public static Class36_Sub1 aClass36_Sub1_1 = null;
+	public static SoftwareIndexedSprite aClass36_Sub1_1 = null;
 
 	@OriginalMember(owner = "client!ci", name = "u", descriptor = "[[S")
 	public static final short[][] aShortArrayArray1 = new short[][] { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10339, 10574, 10425, 10398, 10345, 7512, 8507, 7378, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13753, 13737, 13719, 13883, 13863, 13974, 19643, 18601, 16532, 23993, 25121, 24980, 26944, 26921, 24854, 27191, 27171, 26130, 26941, 28696, 30100, 12477, 10407, 10388, 10685, 10665, 10646, 6711, 6693, 6674, 6965, 7073, 7056, 2361, 4387, 3346, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 } };
diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java
index 37d928f..24f1cbc 100644
--- a/client/src/main/java/Static33.java
+++ b/client/src/main/java/Static33.java
@@ -32,7 +32,7 @@ public final class Static33 {
 		} else {
 			arg3 = 0;
 		}
-		@Pc(42) Class36_Sub1 local42 = local10.method9(arg3);
+		@Pc(42) SoftwareIndexedSprite local42 = local10.method9(arg3);
 		if (local42 == null) {
 			return false;
 		}
diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java
index 40957ab..73181a3 100644
--- a/client/src/main/java/Static69.java
+++ b/client/src/main/java/Static69.java
@@ -139,7 +139,7 @@ public final class Static69 {
 	}
 
 	@OriginalMember(owner = "client!fh", name = "a", descriptor = "(BLclient!ek;)V")
-	public static void method1545(@OriginalArg(1) Class36_Sub1 arg0) {
+	public static void method1545(@OriginalArg(1) SoftwareIndexedSprite arg0) {
 		@Pc(5) int local5;
 		for (local5 = 0; local5 < Static270.anIntArray562.length; local5++) {
 			Static270.anIntArray562[local5] = 0;