diff --git a/client/src/main/java/rt4/Camera.java b/client/src/main/java/rt4/Camera.java
index bf0c7de..1477bf7 100644
--- a/client/src/main/java/rt4/Camera.java
+++ b/client/src/main/java/rt4/Camera.java
@@ -1,9 +1,18 @@
 package rt4;
 
+import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 public class Camera {
+    @OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
+    public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
+    @OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I")
+    public static final int[] cameraJitter = new int[5];
+    @OriginalMember(owner = "client!wh", name = "m", descriptor = "[I")
+    public static final int[] cameraAmplitude = new int[5];
+    @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
+    public static final int[] cameraFrequency = new int[5];
     @OriginalMember(owner = "client!fl", name = "s", descriptor = "I")
 	public static double pitchTarget = 128;
 
@@ -17,6 +26,44 @@ public class Camera {
     public static int cameraZ;
     @OriginalMember(owner = "client!gg", name = "bb", descriptor = "I")
     public static int cameraX;
+    @OriginalMember(owner = "client!tg", name = "b", descriptor = "I")
+    public static int cameraPitch;
+    @OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
+	public static int cameraYaw;
+    @OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
+	public static int cameraType;
+    @OriginalMember(owner = "client!g", name = "d", descriptor = "I")
+    public static int anInt2119 = 0;
+    @OriginalMember(owner = "client!eb", name = "t", descriptor = "I")
+    public static int anInt1694 = -1;
+    @OriginalMember(owner = "client!j", name = "K", descriptor = "I")
+    public static int anInt5843 = 0;
+    @OriginalMember(owner = "client!sh", name = "c", descriptor = "I")
+	public static int anInt5101 = 0;
+    @OriginalMember(owner = "client!t", name = "z", descriptor = "I")
+    public static int anInt5224 = 0;
+    @OriginalMember(owner = "client!k", name = "i", descriptor = "I")
+    public static int anInt3125 = 0;
+    @OriginalMember(owner = "client!me", name = "k", descriptor = "I")
+    public static int anInt3718 = -1;
+    @OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
+    public static int originZ;
+    @OriginalMember(owner = "client!se", name = "a", descriptor = "I")
+    public static int originX;
+    @OriginalMember(owner = "client!bc", name = "I", descriptor = "Z")
+    public static boolean aBoolean16 = false;
+    @OriginalMember(owner = "client!km", name = "Pc", descriptor = "I")
+    public static int renderX;
+    @OriginalMember(owner = "client!kh", name = "f", descriptor = "I")
+    public static int renderZ;
+    @OriginalMember(owner = "client!uc", name = "f", descriptor = "I")
+    public static int anInt4232;
+    @OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
+	public static int anInt5449;
+    @OriginalMember(owner = "client!vj", name = "d", descriptor = "I")
+    public static int anInt5765;
+    @OriginalMember(owner = "client!tm", name = "g", descriptor = "I")
+    public static int anInt5375;
 
     public static double mod(double a, double b) {
         return ((a % b) + b) % b;
@@ -43,7 +90,7 @@ public class Camera {
                     if (local80 < 3 && (SceneGraph.tileFlags[1][local64][local73] & 0x2) == 2) {
                         local80++;
                     }
-                    @Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73];
+                    @Pc(117) int local117 = (SceneGraph.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73];
                     if (local117 > local45) {
                         local45 = local117;
                     }
@@ -66,18 +113,18 @@ public class Camera {
 
     @OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V")
     public static void updateLockedCamera() {
-        @Pc(9) int local9 = Static248.anInt4232 * 128 + 64;
-        @Pc(15) int local15 = Static245.anInt5375 * 128 + 64;
+        @Pc(9) int local9 = anInt4232 * 128 + 64;
+        @Pc(15) int local15 = anInt5375 * 128 + 64;
         @Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203;
         if (Static113.anInt4612 >= 100) {
-            Static138.renderX = Static245.anInt5375 * 128 + 64;
-            Static134.renderZ = Static248.anInt4232 * 128 + 64;
-            Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
+            renderX = anInt5375 * 128 + 64;
+            renderZ = anInt4232 * 128 + 64;
+            Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
         } else {
-            if (Static138.renderX < local15) {
-                Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000;
-                if (Static138.renderX > local15) {
-                    Static138.renderX = local15;
+            if (renderX < local15) {
+                renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - renderX) / 1000;
+                if (renderX > local15) {
+                    renderX = local15;
                 }
             }
             if (Static5.anInt40 < local23) {
@@ -86,16 +133,16 @@ public class Camera {
                     Static5.anInt40 = local23;
                 }
             }
-            if (Static138.renderX > local15) {
-                Static138.renderX -= Static233.anInt5225 + (Static138.renderX - local15) * Static113.anInt4612 / 1000;
-                if (Static138.renderX < local15) {
-                    Static138.renderX = local15;
+            if (renderX > local15) {
+                renderX -= Static233.anInt5225 + (renderX - local15) * Static113.anInt4612 / 1000;
+                if (renderX < local15) {
+                    renderX = local15;
                 }
             }
-            if (Static134.renderZ < local9) {
-                Static134.renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.renderZ) / 1000;
-                if (local9 < Static134.renderZ) {
-                    Static134.renderZ = local9;
+            if (renderZ < local9) {
+                renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - renderZ) / 1000;
+                if (local9 < renderZ) {
+                    renderZ = local9;
                 }
             }
             if (local23 < Static5.anInt40) {
@@ -104,19 +151,19 @@ public class Camera {
                     Static5.anInt40 = local23;
                 }
             }
-            if (Static134.renderZ > local9) {
-                Static134.renderZ -= Static233.anInt5225 + (Static134.renderZ - local9) * Static113.anInt4612 / 1000;
-                if (local9 > Static134.renderZ) {
-                    Static134.renderZ = local9;
+            if (renderZ > local9) {
+                renderZ -= Static233.anInt5225 + (renderZ - local9) * Static113.anInt4612 / 1000;
+                if (local9 > renderZ) {
+                    renderZ = local9;
                 }
             }
         }
-        local9 = Static265.anInt5765 * 128 + 64;
-        local15 = Static251.anInt5449 * 128 + 64;
+        local9 = anInt5765 * 128 + 64;
+        local15 = anInt5449 * 128 + 64;
         local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
         @Pc(236) int local236 = local23 - Static5.anInt40;
-        @Pc(241) int local241 = local9 - Static134.renderZ;
-        @Pc(246) int local246 = local15 - Static138.renderX;
+        @Pc(241) int local241 = local9 - renderZ;
+        @Pc(246) int local246 = local15 - renderX;
         @Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241));
         @Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF;
         if (local268 < 128) {
@@ -126,19 +173,19 @@ public class Camera {
             local268 = 383;
         }
         @Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
-        if (Static240.cameraPitch < local268) {
-            Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000;
-            if (Static240.cameraPitch > local268) {
-                Static240.cameraPitch = local268;
+        if (cameraPitch < local268) {
+            cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000;
+            if (cameraPitch > local268) {
+                cameraPitch = local268;
             }
         }
-        if (Static240.cameraPitch > local268) {
-            Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
-            if (Static240.cameraPitch < local268) {
-                Static240.cameraPitch = local268;
+        if (cameraPitch > local268) {
+            cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
+            if (cameraPitch < local268) {
+                cameraPitch = local268;
             }
         }
-        @Pc(350) int local350 = local292 - Static184.cameraYaw;
+        @Pc(350) int local350 = local292 - cameraYaw;
         if (local350 > 1024) {
             local350 -= 2048;
         }
@@ -146,14 +193,14 @@ public class Camera {
             local350 += 2048;
         }
         if (local350 > 0) {
-            Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
-            Static184.cameraYaw &= 0x7FF;
+            cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
+            cameraYaw &= 0x7FF;
         }
         if (local350 < 0) {
-            Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
-            Static184.cameraYaw &= 0x7FF;
+            cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
+            cameraYaw &= 0x7FF;
         }
-        @Pc(404) int local404 = local292 - Static184.cameraYaw;
+        @Pc(404) int local404 = local292 - cameraYaw;
         if (local404 > 1024) {
             local404 -= 2048;
         }
@@ -161,32 +208,32 @@ public class Camera {
             local404 += 2048;
         }
         if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) {
-            Static184.cameraYaw = local292;
+            cameraYaw = local292;
         }
     }
 
     @OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V")
     public static void updateLoginScreenCamera() {
-        if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) {
+        if (anInt3718 == -1 || anInt1694 == -1) {
             return;
         }
-        @Pc(27) int local27 = (Static233.anInt5224 * (Static114.anInt5843 - Static228.anInt5101) >> 16) + Static228.anInt5101;
+        @Pc(27) int local27 = (anInt5224 * (anInt5843 - anInt5101) >> 16) + anInt5101;
         @Pc(30) float[] renderCoordinates = new float[3];
-        Static233.anInt5224 += local27;
-        if (Static233.anInt5224 >= 65535) {
-            Static233.anInt5224 = 65535;
+        anInt5224 += local27;
+        if (anInt5224 >= 65535) {
+            anInt5224 = 65535;
             if (Static186.aBoolean205) {
-                Static13.aBoolean16 = false;
+                aBoolean16 = false;
             } else {
-                Static13.aBoolean16 = true;
+                aBoolean16 = true;
             }
             Static186.aBoolean205 = true;
         } else {
             Static186.aBoolean205 = false;
-            Static13.aBoolean16 = false;
+            aBoolean16 = false;
         }
-        @Pc(66) float local66 = (float) Static233.anInt5224 / 65535.0F;
-        @Pc(70) int local70 = Static127.anInt3125 * 2;
+        @Pc(66) float local66 = (float) anInt5224 / 65535.0F;
+        @Pc(70) int local70 = anInt3125 * 2;
         @Pc(141) int local141;
         @Pc(131) int local131;
         @Pc(111) int local111;
@@ -195,28 +242,28 @@ public class Camera {
         @Pc(155) int local155;
         @Pc(173) int local173;
         for (@Pc(72) int local72 = 0; local72 < 3; local72++) {
-            local111 = (Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] - Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 3][local72]) * 3;
-            local119 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72];
-            local131 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 1][local72] * 3;
-            local141 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72] * 3;
+            local111 = (anIntArrayArrayArray9[anInt3718][local70 + 2][local72] + anIntArrayArrayArray9[anInt3718][local70 + 2][local72] - anIntArrayArrayArray9[anInt3718][local70 + 3][local72]) * 3;
+            local119 = anIntArrayArrayArray9[anInt3718][local70][local72];
+            local131 = anIntArrayArrayArray9[anInt3718][local70 + 1][local72] * 3;
+            local141 = anIntArrayArrayArray9[anInt3718][local70][local72] * 3;
             local146 = local131 - local141;
             local155 = local111 + local141 - local131 * 2;
-            local173 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + local131 - local119 - local111;
+            local173 = anIntArrayArrayArray9[anInt3718][local70 + 2][local72] + local131 - local119 - local111;
             renderCoordinates[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66;
         }
         Static5.anInt40 = (int) renderCoordinates[1] * -1;
-        Static138.renderX = (int) renderCoordinates[0] - Static225.originX * 128;
-        Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128;
+        renderX = (int) renderCoordinates[0] - originX * 128;
+        renderZ = (int) renderCoordinates[2] - originZ * 128;
         @Pc(226) float[] local226 = new float[3];
-        local141 = Static75.anInt2119 * 2;
+        local141 = anInt2119 * 2;
         for (local131 = 0; local131 < 3; local131++) {
-            local111 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131] * 3;
-            local146 = (Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] - Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 3][local131]) * 3;
-            local155 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131];
-            local119 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 1][local131] * 3;
+            local111 = anIntArrayArrayArray9[anInt1694][local141][local131] * 3;
+            local146 = (anIntArrayArrayArray9[anInt1694][local141 + 2][local131] + anIntArrayArrayArray9[anInt1694][local141 + 2][local131] - anIntArrayArrayArray9[anInt1694][local141 + 3][local131]) * 3;
+            local155 = anIntArrayArrayArray9[anInt1694][local141][local131];
+            local119 = anIntArrayArrayArray9[anInt1694][local141 + 1][local131] * 3;
             local173 = local119 - local111;
             @Pc(313) int local313 = local146 + local111 - local119 * 2;
-            @Pc(331) int local331 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + local119 - local146 - local155;
+            @Pc(331) int local331 = anIntArrayArrayArray9[anInt1694][local141 + 2][local131] + local119 - local146 - local155;
             local226[local131] = (float) local155 + local66 * (local66 * (local66 * (float) local331 + (float) local313) + (float) local173);
         }
         @Pc(363) float local363 = local226[0] - renderCoordinates[0];
@@ -225,7 +272,92 @@ public class Camera {
         @Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363));
         Static146.aFloat15 = (float) Math.atan2((double) local382, local392);
         Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
-        Static240.cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
-        Static184.cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
+        cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
+        cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
+    }
+
+    @OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")
+	public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
+		Static133.anInt5230 = arg2;
+		anInt5765 = arg1;
+		Static233.anInt5217 = arg4;
+		anInt5449 = arg3;
+		Static260.anInt1744 = arg0;
+		if (Static233.anInt5217 >= 100) {
+			@Pc(30) int local30 = anInt5449 * 128 + 64;
+			@Pc(36) int local36 = anInt5765 * 128 + 64;
+			@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static260.anInt1744;
+			@Pc(49) int local49 = local44 - Static5.anInt40;
+			@Pc(54) int local54 = local30 - renderX;
+			@Pc(59) int local59 = local36 - renderZ;
+			@Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54));
+			cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF;
+			cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF;
+			if (cameraPitch < 128) {
+				cameraPitch = 128;
+			}
+			if (cameraPitch > 383) {
+				cameraPitch = 383;
+			}
+		}
+		cameraType = 2;
+	}
+
+    @OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
+    public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+        Static113.anInt4612 = arg3;
+        Static231.anInt5203 = arg2;
+        anInt5375 = arg5;
+        Static233.anInt5225 = arg1;
+        anInt4232 = arg4;
+        if (arg0 && Static113.anInt4612 >= 100) {
+            renderX = anInt5375 * 128 + 64;
+            renderZ = anInt4232 * 128 + 64;
+            Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
+        }
+        cameraType = 2;
+    }
+
+    @OriginalMember(owner = "client!cl", name = "e", descriptor = "(I)V")
+    public static void resetCameraEffects() {
+        for (@Pc(3) int local3 = 0; local3 < 5; local3++) {
+            Static176.customCameraActive[local3] = false;
+        }
+        Static133.anInt5230 = 0;
+        Static233.anInt5217 = 0;
+        anInt3718 = -1;
+        anInt1694 = -1;
+        cameraType = 1;
+    }
+
+    @OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V")
+    public static void method4273() {
+        @Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291;
+        @Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774;
+        if (cameraX - playerX < -500 || cameraX - playerX > 500 || cameraZ - playerZ < -500 || cameraZ - playerZ > 500) {
+            cameraX = playerX;
+            cameraZ = playerZ;
+        }
+        if (cameraZ != playerZ) {
+            cameraZ += (playerZ - cameraZ) / 16;
+        }
+        if (cameraX != playerX) {
+            cameraX += (playerX - cameraX) / 16;
+        }
+        if (Preferences.aBoolean63) {
+            for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) {
+                @Pc(104) int code = InterfaceList.keyCodes[local93];
+                if (code == Keyboard.KEY_UP) {
+                    pitchTarget += 47;
+                } else if (code == Keyboard.KEY_DOWN) {
+                    pitchTarget -= 17;
+                } else if (code == Keyboard.KEY_LEFT) {
+                    yawTarget -= 65;
+                } else if (code == Keyboard.KEY_RIGHT) {
+                    yawTarget += 191;
+                }
+            }
+            clampCameraAngle();
+        }
     }
 }
diff --git a/client/src/main/java/rt4/Cheat.java b/client/src/main/java/rt4/Cheat.java
index 60d0a17..e3b0a5a 100644
--- a/client/src/main/java/rt4/Cheat.java
+++ b/client/src/main/java/rt4/Cheat.java
@@ -170,16 +170,16 @@ public class Cheat {
                 displayFps = false;
             }
             if (arg0.equalsIgnoreCase(WM0)) {
-                Static241.setWindowMode(false, 0, -1, -1);
+                DisplayMode.setWindowMode(false, 0, -1, -1);
             }
             if (arg0.equalsIgnoreCase(WM1)) {
-                Static241.setWindowMode(false, 1, -1, -1);
+                DisplayMode.setWindowMode(false, 1, -1, -1);
             }
             if (arg0.equalsIgnoreCase(WM2)) {
-                Static241.setWindowMode(false, 2, -1, -1);
+                DisplayMode.setWindowMode(false, 2, -1, -1);
             }
             if (arg0.equalsIgnoreCase(WM3)) {
-                Static241.setWindowMode(false, 3, 1024, 768);
+                DisplayMode.setWindowMode(false, 3, 1024, 768);
             }
             if (arg0.equalsIgnoreCase(NOCLIP)) {
                 for (local18 = 0; local18 < 4; local18++) {
diff --git a/client/src/main/java/rt4/Class114.java b/client/src/main/java/rt4/Class114.java
deleted file mode 100644
index b6f9b08..0000000
--- a/client/src/main/java/rt4/Class114.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalClass;
-import org.openrs2.deob.annotation.OriginalMember;
-
-@OriginalClass("client!od")
-public final class Class114 {
-
-	@OriginalMember(owner = "client!od", name = "j", descriptor = "I")
-	public int anInt4248;
-
-	@OriginalMember(owner = "client!od", name = "k", descriptor = "I")
-	public int anInt4249;
-
-	@OriginalMember(owner = "client!od", name = "l", descriptor = "I")
-	public int anInt4250;
-
-	@OriginalMember(owner = "client!od", name = "m", descriptor = "I")
-	public int anInt4251;
-}
diff --git a/client/src/main/java/rt4/ClientProt.java b/client/src/main/java/rt4/ClientProt.java
index d0682b8..6449a14 100644
--- a/client/src/main/java/rt4/ClientProt.java
+++ b/client/src/main/java/rt4/ClientProt.java
@@ -7,9 +7,12 @@ import org.openrs2.deob.annotation.Pc;
 import java.io.IOException;
 
 public class ClientProt {
+    @OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
+    public static int anInt5804 = 0;
+
     @OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V")
     public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
-        @Pc(8) Component local8 = Static201.method1418(arg3, arg1);
+        @Pc(8) Component local8 = InterfaceList.method1418(arg3, arg1);
         if (local8 == null) {
             return;
         }
@@ -23,7 +26,7 @@ public class ClientProt {
         }
         @Pc(37) boolean local37 = true;
         if (local8.anInt453 > 0) {
-            local37 = Static249.method4265(local8);
+            local37 = MiniMenu.method4265(local8);
         }
         if (!local37 || !InterfaceList.getServerActiveProperties(local8).method503(arg2 - 1)) {
             return;
@@ -102,10 +105,10 @@ public class ClientProt {
             Protocol.outboundBuffer.p1(local13 + local13 + 3);
         }
         Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0);
-        Protocol.outboundBuffer.p2(Static225.originX + local23);
-        Protocol.outboundBuffer.p2add(Static142.originZ + local27);
-        Static84.anInt2255 = PathFinder.queueZ[0];
-        Static115.mapFlagX = PathFinder.queueX[0];
+        Protocol.outboundBuffer.p2(Camera.originX + local23);
+        Protocol.outboundBuffer.p2add(Camera.originZ + local27);
+        LoginManager.mapFlagZ = PathFinder.queueZ[0];
+        LoginManager.mapFlagX = PathFinder.queueX[0];
         for (@Pc(126) int local126 = 1; local126 < local13; local126++) {
             arg0--;
             Protocol.outboundBuffer.p1a(PathFinder.queueX[arg0] - local23);
@@ -114,7 +117,7 @@ public class ClientProt {
     }
 
     @OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V")
-    public static void method2909() {
+    public static void closeWidget() {
         Protocol.outboundBuffer.p1isaac(184);
         for (@Pc(18) ComponentPointer local18 = (ComponentPointer) InterfaceList.openInterfaces.head(); local18 != null; local18 = (ComponentPointer) InterfaceList.openInterfaces.next()) {
             if (local18.anInt5879 == 0) {
@@ -128,7 +131,7 @@ public class ClientProt {
     }
 
     @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IILclient!na;)V")
-    public static void method4613(@OriginalArg(0) int arg0, @OriginalArg(2) JagString arg1) {
+    public static void clickPlayerOption(@OriginalArg(0) int arg0, @OriginalArg(2) JagString arg1) {
         @Pc(7) JagString local7 = arg1.method3159().toTitleCase();
         @Pc(13) boolean local13 = false;
         for (@Pc(15) int local15 = 0; local15 < PlayerList.size; local15++) {
@@ -160,74 +163,59 @@ public class ClientProt {
         }
     }
 
-    @OriginalMember(owner = "client!gd", name = "a", descriptor = "(JI)V")
-    public static void method1691(@OriginalArg(0) long name) {
-        Protocol.outboundBuffer.offset = 0;
-        Protocol.outboundBuffer.p1(186);
-        if (GlobalConfig.LOGIN_USE_STRINGS) {
-            Protocol.outboundBuffer.pjstr(Base37.decode37(name));
-        } else {
-            Protocol.outboundBuffer.p8(name);
-        }
-        CreateManager.step = 1;
-        CreateManager.loops = 0;
-        CreateManager.errors = 0;
-        CreateManager.reply = -3;
-    }
-
     @OriginalMember(owner = "client!gd", name = "c", descriptor = "(I)V")
     public static void rebuildMap() {
         ping(false);
         Static175.mapFilesMissingCount = 0;
         @Pc(12) boolean fileExists = true;
         @Pc(14) int id;
-        for (id = 0; id < Static273.mapFilesBuffer.length; id++) {
-            if (Static36.mapFileIds[id] != -1 && Static273.mapFilesBuffer[id] == null) {
-                Static273.mapFilesBuffer[id] = client.js5Archive5.getFile(Static36.mapFileIds[id], 0);
-                if (Static273.mapFilesBuffer[id] == null) {
+        for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) {
+            if (LoginManager.mapFileIds[id] != -1 && LoginManager.mapFilesBuffer[id] == null) {
+                LoginManager.mapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.mapFileIds[id], 0);
+                if (LoginManager.mapFilesBuffer[id] == null) {
                     Static175.mapFilesMissingCount++;
                     fileExists = false;
                 }
             }
-            if (Static172.locationsMapFileIds[id] != -1 && Static156.locationMapFilesBuffer[id] == null) {
-                Static156.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static172.locationsMapFileIds[id], Static72.regionsXteaKeys[id], 0);
-                if (Static156.locationMapFilesBuffer[id] == null) {
+            if (LoginManager.locationsMapFileIds[id] != -1 && LoginManager.locationMapFilesBuffer[id] == null) {
+                LoginManager.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.locationsMapFileIds[id], LoginManager.regionsXteaKeys[id], 0);
+                if (LoginManager.locationMapFilesBuffer[id] == null) {
                     fileExists = false;
                     Static175.mapFilesMissingCount++;
                 }
             }
 
             if (GlRenderer.enabled) {
-                if (Static99.underWaterMapFileIds[id] != -1 && Static186.underWaterMapFilesBuffer[id] == null) {
-                    Static186.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(Static99.underWaterMapFileIds[id], 0);
-                    if (Static186.underWaterMapFilesBuffer[id] == null) {
+                if (LoginManager.underWaterMapFileIds[id] != -1 && LoginManager.underWaterMapFilesBuffer[id] == null) {
+                    LoginManager.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterMapFileIds[id], 0);
+                    if (LoginManager.underWaterMapFilesBuffer[id] == null) {
                         fileExists = false;
                         Static175.mapFilesMissingCount++;
                     }
                 }
-                if (Static35.underWaterLocationsMapFileIds[id] != -1 && Static19.underWaterLocationsMapFilesBuffer[id] == null) {
-                    Static19.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(Static35.underWaterLocationsMapFileIds[id], 0);
-                    if (Static19.underWaterLocationsMapFilesBuffer[id] == null) {
+                if (LoginManager.underWaterLocationsMapFileIds[id] != -1 && LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
+                    LoginManager.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterLocationsMapFileIds[id], 0);
+                    if (LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
                         Static175.mapFilesMissingCount++;
                         fileExists = false;
                     }
                 }
             }
 
-            if (Static175.npcSpawnsFileIds != null && Static191.npcSpawnsFilesBuffer[id] == null && Static175.npcSpawnsFileIds[id] != -1) {
-                Static191.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static175.npcSpawnsFileIds[id], Static72.regionsXteaKeys[id], 0);
-                if (Static191.npcSpawnsFilesBuffer[id] == null) {
+            if (LoginManager.npcSpawnsFileIds != null && LoginManager.npcSpawnsFilesBuffer[id] == null && LoginManager.npcSpawnsFileIds[id] != -1) {
+                LoginManager.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.npcSpawnsFileIds[id], LoginManager.regionsXteaKeys[id], 0);
+                if (LoginManager.npcSpawnsFilesBuffer[id] == null) {
                     Static175.mapFilesMissingCount++;
                     fileExists = false;
                 }
             }
         }
 
-        if (Static235.mapElementList == null) {
-            if (Static158.aClass3_Sub2_Sub4_3 == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) {
-                Static235.mapElementList = new MapElementList(0);
-            } else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) {
-                Static235.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }), client.js5Archive23);
+        if (LoginManager.mapElementList == null) {
+            if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
+                LoginManager.mapElementList = new MapElementList(0);
+            } else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
+                LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }), client.js5Archive23);
             } else {
                 fileExists = false;
                 Static175.mapFilesMissingCount++;
@@ -239,15 +227,15 @@ public class ClientProt {
             return;
         }
 
-        Static271.anInt5804 = 0;
+        anInt5804 = 0;
         fileExists = true;
         @Pc(320) int chunkX;
         @Pc(309) int chunkZ;
-        for (id = 0; id < Static273.mapFilesBuffer.length; id++) {
-            @Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id];
+        for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) {
+            @Pc(294) byte[] local294 = LoginManager.locationMapFilesBuffer[id];
             if (local294 != null) {
-                chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ;
-                chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX;
+                chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
+                chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
                 if (Static230.dynamicMapRegion) {
                     chunkZ = 10;
                     chunkX = 10;
@@ -255,10 +243,10 @@ public class ClientProt {
                 fileExists &= Static49.method1201(chunkX, chunkZ, local294);
             }
             if (GlRenderer.enabled) {
-                local294 = Static19.underWaterLocationsMapFilesBuffer[id];
+                local294 = LoginManager.underWaterLocationsMapFilesBuffer[id];
                 if (local294 != null) {
-                    chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX;
-                    chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ;
+                    chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
+                    chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
                     if (Static230.dynamicMapRegion) {
                         chunkZ = 10;
                         chunkX = 10;
@@ -281,8 +269,8 @@ public class ClientProt {
         @Pc(420) boolean hasUnderWaterMap = false;
         @Pc(427) int i;
         if (GlRenderer.enabled && Preferences.highWaterDetail) {
-            for (i = 0; i < Static273.mapFilesBuffer.length; i++) {
-                if (Static19.underWaterLocationsMapFilesBuffer[i] != null || Static186.underWaterMapFilesBuffer[i] != null) {
+            for (i = 0; i < LoginManager.mapFilesBuffer.length; i++) {
+                if (LoginManager.underWaterLocationsMapFilesBuffer[i] != null || LoginManager.underWaterMapFilesBuffer[i] != null) {
                     hasUnderWaterMap = true;
                     break;
                 }
@@ -327,7 +315,7 @@ public class ClientProt {
                 Static73.setLightPosition(chunkX, i);
             }
             Static26.method743(false);
-            if (Static191.npcSpawnsFilesBuffer != null) {
+            if (LoginManager.npcSpawnsFilesBuffer != null) {
                 Static158.decodeNpcFiles();
             }
         }
@@ -361,7 +349,7 @@ public class ClientProt {
         }
         SceneGraph.method2255();
         if (GlRenderer.enabled && hasUnderWaterMap) {
-            Static278.setRenderTiles(true);
+            SceneGraph.setRenderTiles(true);
             SceneGraph.method3535(true);
             if (!Static230.dynamicMapRegion) {
                 Static87.method1805(true);
@@ -378,7 +366,7 @@ public class ClientProt {
             Static45.method1169(PathFinder.collisionMaps, true);
             ping(true);
             SceneGraph.method2255();
-            Static278.setRenderTiles(false);
+            SceneGraph.setRenderTiles(false);
         }
         if (GlRenderer.enabled) {
             for (chunkX = 0; chunkX < 13; chunkX++) {
@@ -402,15 +390,15 @@ public class ClientProt {
             Protocol.outboundBuffer.p4(1057001181);
         }
         if (!Static230.dynamicMapRegion) {
-            @Pc(815) int local815 = (Static52.anInt1695 + 6) / 8;
-            @Pc(821) int local821 = (Static52.anInt1695 - 6) / 8;
-            chunkX = (Static80.centralZoneX - 6) / 8;
-            chunkZ = (Static80.centralZoneX + 6) / 8;
+            @Pc(815) int local815 = (LoginManager.centralZoneZ + 6) / 8;
+            @Pc(821) int local821 = (LoginManager.centralZoneZ - 6) / 8;
+            chunkX = (LoginManager.centralZoneX - 6) / 8;
+            chunkZ = (LoginManager.centralZoneX + 6) / 8;
             for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) {
                 for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) {
                     if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) {
-                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) }));
-                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) }));
+                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) }));
+                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) }));
                     }
                 }
             }
@@ -431,7 +419,7 @@ public class ClientProt {
     @OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V")
     public static void method1373() {
         Protocol.outboundBuffer.p1isaac(243);
-        Protocol.outboundBuffer.p1(Static144.getWindowMode());
+        Protocol.outboundBuffer.p1(DisplayMode.getWindowMode());
         Protocol.outboundBuffer.p2(GameShell.canvasWidth);
         Protocol.outboundBuffer.p2(GameShell.canvasHeight);
         Protocol.outboundBuffer.p1(Preferences.antiAliasingMode);
@@ -462,69 +450,69 @@ public class ClientProt {
 
     @OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V")
     public static void method28() {
-        InterfaceList.redraw(Static105.aClass13_14);
-        Static213.anInt4851++;
+        InterfaceList.redraw(Static40.aClass13_14);
+        Static40.anInt4851++;
         if (Static44.aBoolean83 && Static146.aBoolean174) {
             @Pc(30) int local30 = Mouse.anInt4873;
-            local30 -= Static246.anInt5388;
+            local30 -= Static40.anInt5388;
             if (Static81.anInt2225 > local30) {
                 local30 = Static81.anInt2225;
             }
             @Pc(41) int local41 = Mouse.anInt5032;
-            if (Static81.anInt2225 + Static4.aClass13_1.width < local30 - -Static105.aClass13_14.width) {
-                local30 = Static81.anInt2225 + Static4.aClass13_1.width - Static105.aClass13_14.width;
+            if (Static81.anInt2225 + Static40.aClass13_1.width < local30 - -Static40.aClass13_14.width) {
+                local30 = Static81.anInt2225 + Static40.aClass13_1.width - Static40.aClass13_14.width;
             }
-            local41 -= Static165.anInt4035;
+            local41 -= Static40.anInt4035;
             if (local41 < Static228.anInt5103) {
                 local41 = Static228.anInt5103;
             }
-            if (Static228.anInt5103 + Static4.aClass13_1.height < local41 - -Static105.aClass13_14.height) {
-                local41 = Static228.anInt5103 + Static4.aClass13_1.height - Static105.aClass13_14.height;
+            if (Static228.anInt5103 + Static40.aClass13_1.height < local41 - -Static40.aClass13_14.height) {
+                local41 = Static228.anInt5103 + Static40.aClass13_1.height - Static40.aClass13_14.height;
             }
-            @Pc(109) int local109 = local41 - Static20.anInt660;
+            @Pc(109) int local109 = local41 - Static36.anInt660;
             @Pc(114) int local114 = local30 - Static124.anInt3075;
-            @Pc(122) int local122 = local30 + Static4.aClass13_1.scrollX - Static81.anInt2225;
-            @Pc(130) int local130 = Static4.aClass13_1.scrollY + local41 - Static228.anInt5103;
-            @Pc(133) int local133 = Static105.aClass13_14.dragDeadzone;
-            if (Static213.anInt4851 > Static105.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
-                Static138.aBoolean172 = true;
+            @Pc(122) int local122 = local30 + Static40.aClass13_1.scrollX - Static81.anInt2225;
+            @Pc(130) int local130 = Static40.aClass13_1.scrollY + local41 - Static228.anInt5103;
+            @Pc(133) int local133 = Static40.aClass13_14.dragDeadzone;
+            if (Static40.anInt4851 > Static40.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
+                Static40.aBoolean172 = true;
             }
             @Pc(176) HookRequest local176;
-            if (Static105.aClass13_14.onDragStart != null && Static138.aBoolean172) {
+            if (Static40.aClass13_14.onDragStart != null && Static40.aBoolean172) {
                 local176 = new HookRequest();
-                local176.source = Static105.aClass13_14;
-                local176.arguments = Static105.aClass13_14.onDragStart;
+                local176.source = Static40.aClass13_14;
+                local176.arguments = Static40.aClass13_14.onDragStart;
                 local176.mouseX = local122;
                 local176.mouseY = local130;
                 ScriptRunner.run(local176);
             }
             if (Mouse.pressedButton == 0) {
-                if (Static138.aBoolean172) {
-                    if (Static105.aClass13_14.onDragRelease != null) {
+                if (Static40.aBoolean172) {
+                    if (Static40.aClass13_14.onDragRelease != null) {
                         local176 = new HookRequest();
                         local176.mouseY = local130;
                         local176.target = Static56.aClass13_12;
                         local176.mouseX = local122;
-                        local176.arguments = Static105.aClass13_14.onDragRelease;
-                        local176.source = Static105.aClass13_14;
+                        local176.arguments = Static40.aClass13_14.onDragRelease;
+                        local176.source = Static40.aClass13_14;
                         ScriptRunner.run(local176);
                     }
-                    if (Static56.aClass13_12 != null && Static36.method938(Static105.aClass13_14) != null) {
+                    if (Static56.aClass13_12 != null && Static36.method938(Static40.aClass13_14) != null) {
                         Protocol.outboundBuffer.p1isaac(79);
-                        Protocol.outboundBuffer.p4me(Static105.aClass13_14.id);
+                        Protocol.outboundBuffer.p4me(Static40.aClass13_14.id);
                         Protocol.outboundBuffer.p2le(Static56.aClass13_12.createdComponentId);
                         Protocol.outboundBuffer.p4(Static56.aClass13_12.id);
-                        Protocol.outboundBuffer.p2le(Static105.aClass13_14.createdComponentId);
+                        Protocol.outboundBuffer.p2le(Static40.aClass13_14.createdComponentId);
                     }
-                } else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
+                } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
                     Static226.method3901();
                 } else if (MiniMenu.size > 0) {
                     Static59.method1372();
                 }
-                Static105.aClass13_14 = null;
+                Static40.aClass13_14 = null;
             }
-        } else if (Static213.anInt4851 > 1) {
-            Static105.aClass13_14 = null;
+        } else if (Static40.anInt4851 > 1) {
+            Static40.aClass13_14 = null;
         }
     }
 
diff --git a/client/src/main/java/rt4/ColorUtils.java b/client/src/main/java/rt4/ColorUtils.java
index 6b1c97b..444c84f 100644
--- a/client/src/main/java/rt4/ColorUtils.java
+++ b/client/src/main/java/rt4/ColorUtils.java
@@ -70,8 +70,8 @@ public class ColorUtils {
 
     @OriginalMember(owner = "client!pf", name = "a", descriptor = "(II)[F")
     public static float[] getRgbFloat(@OriginalArg(0) int arg0) {
-        @Pc(7) float local7 = Static161.method3068() + Static161.method3059();
-        @Pc(9) int local9 = Static161.method3064();
+        @Pc(7) float local7 = FogManager.method3068() + FogManager.method3059();
+        @Pc(9) int local9 = FogManager.method3064();
         @Pc(11) float local11 = 0.58823526F;
         Static251.aFloatArray28[3] = 1.0F;
         @Pc(24) float local24 = (float) (local9 >> 16 & 0xFF) / 255.0F;
diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java
index 591fe47..ce69671 100644
--- a/client/src/main/java/rt4/Component.java
+++ b/client/src/main/java/rt4/Component.java
@@ -14,7 +14,9 @@ public final class Component {
 	public static final SoftLruHashTable models = new SoftLruHashTable(50);
 	@OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;")
 	public static final SoftLruHashTable fonts = new SoftLruHashTable(20);
-	@OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;")
+    @OriginalMember(owner = "client!rc", name = "C", descriptor = "Z")
+    public static boolean aBoolean72 = false;
+    @OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;")
 	public Object[] onFriendTransmit;
 
 	@OriginalMember(owner = "client!be", name = "d", descriptor = "[Ljava/lang/Object;")
@@ -225,7 +227,7 @@ public final class Component {
 	public boolean modelOrtho = false;
 
 	@OriginalMember(owner = "client!be", name = "zb", descriptor = "Z")
-	public boolean aBoolean30 = false;
+	public boolean filled = false;
 
 	@OriginalMember(owner = "client!be", name = "y", descriptor = "I")
 	public int dragDeadtime = 0;
@@ -518,7 +520,7 @@ public final class Component {
 		if (this.anIntArray37 != null) {
 			return true;
 		}
-		@Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12);
+		@Pc(18) SoftwareIndexedSprite local18 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12);
 		if (local18 == null) {
 			return false;
 		}
@@ -669,7 +671,7 @@ public final class Component {
 			}
 		}
 		if (this.type == 3) {
-			this.aBoolean30 = arg0.g1() == 1;
+			this.filled = arg0.g1() == 1;
 		}
 		if (this.type == 4 || this.type == 1) {
 			this.anInt460 = arg0.g1();
@@ -784,7 +786,7 @@ public final class Component {
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;")
 	public final Sprite method482(@OriginalArg(1) int arg0) {
-		Static211.aBoolean72 = false;
+		aBoolean72 = false;
 		if (arg0 < 0 || arg0 >= this.anIntArray36.length) {
 			return null;
 		}
@@ -798,7 +800,7 @@ public final class Component {
 		}
 		local43 = SpriteLoader.loadSprites(local29, InterfaceList.aClass153_12);
 		if (local43 == null) {
-			Static211.aBoolean72 = true;
+			aBoolean72 = true;
 		} else {
 			sprites.put(local43, (long) local29);
 		}
@@ -849,7 +851,7 @@ public final class Component {
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;")
 	public final Model method488(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) PlayerAppearance arg5) {
-		Static211.aBoolean72 = false;
+		aBoolean72 = false;
 		@Pc(10) int local10;
 		@Pc(13) int local13;
 		if (arg4) {
@@ -870,7 +872,7 @@ public final class Component {
 				if (local61 == null) {
 					@Pc(69) RawModel local69 = RawModel.create(InterfaceList.aClass153_85, local13);
 					if (local69 == null) {
-						Static211.aBoolean72 = true;
+						aBoolean72 = true;
 						return null;
 					}
 					local61 = local69.createModel(64, 768, -50, -10, -50);
@@ -883,7 +885,7 @@ public final class Component {
 			} else if (local10 == 2) {
 				local61 = NpcTypeList.get(local13).getHeadModel(arg1, arg3, arg0, arg2);
 				if (local61 == null) {
-					Static211.aBoolean72 = true;
+					aBoolean72 = true;
 					return null;
 				} else {
 					return local61;
@@ -894,7 +896,7 @@ public final class Component {
 				}
 				local61 = arg5.method1956(arg3, arg1, arg2, arg0);
 				if (local61 == null) {
-					Static211.aBoolean72 = true;
+					aBoolean72 = true;
 					return null;
 				} else {
 					return local61;
@@ -903,7 +905,7 @@ public final class Component {
 				@Pc(164) ObjType local164 = ObjTypeList.get(local13);
 				@Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2);
 				if (local173 == null) {
-					Static211.aBoolean72 = true;
+					aBoolean72 = true;
 					return null;
 				} else {
 					return local173;
@@ -911,7 +913,7 @@ public final class Component {
 			} else if (local10 == 6) {
 				local61 = NpcTypeList.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1);
 				if (local61 == null) {
-					Static211.aBoolean72 = true;
+					aBoolean72 = true;
 					return null;
 				} else {
 					return local61;
@@ -926,7 +928,7 @@ public final class Component {
 				@Pc(235) int local235 = this.anInt498;
 				@Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232);
 				if (local246 == null) {
-					Static211.aBoolean72 = true;
+					aBoolean72 = true;
 					return null;
 				} else {
 					return local246;
@@ -937,7 +939,7 @@ public final class Component {
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(BZ)Lclient!qf;")
 	public final Sprite method489(@OriginalArg(1) boolean arg0) {
-		Static211.aBoolean72 = false;
+		aBoolean72 = false;
 		@Pc(12) int local12;
 		if (arg0) {
 			local12 = this.anInt519;
@@ -959,7 +961,7 @@ public final class Component {
 			local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12);
 		}
 		if (local85 == null) {
-			Static211.aBoolean72 = true;
+			aBoolean72 = true;
 			return null;
 		}
 		if (this.vFlip) {
@@ -1075,7 +1077,7 @@ public final class Component {
 		}
 		if (this.type == 3) {
 			this.color = buffer.g4();
-			this.aBoolean30 = buffer.g1() == 1;
+			this.filled = buffer.g1() == 1;
 			this.alpha = buffer.g1();
 		}
 		if (this.type == 9) {
@@ -1176,7 +1178,7 @@ public final class Component {
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;")
 	public final Font method491(@OriginalArg(0) IndexedSprite[] arg0) {
-		Static211.aBoolean72 = false;
+		aBoolean72 = false;
 		if (this.font == -1) {
 			return null;
 		}
@@ -1184,9 +1186,9 @@ public final class Component {
 		if (local21 != null) {
 			return local21;
 		}
-		local21 = Static127.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64);
+		local21 = Font.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64);
 		if (local21 == null) {
-			Static211.aBoolean72 = true;
+			aBoolean72 = true;
 		} else {
 			local21.setNameIcons(arg0, null);
 			fonts.put(local21, (long) this.font);
diff --git a/client/src/main/java/rt4/CreateManager.java b/client/src/main/java/rt4/CreateManager.java
index 40b631b..7d33f8a 100644
--- a/client/src/main/java/rt4/CreateManager.java
+++ b/client/src/main/java/rt4/CreateManager.java
@@ -1,5 +1,6 @@
 package rt4;
 
+import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
@@ -122,4 +123,65 @@ public class CreateManager {
             }
         }
     }
+
+    @OriginalMember(owner = "client!gd", name = "a", descriptor = "(JI)V")
+    public static void method1691(@OriginalArg(0) long name) {
+        Protocol.outboundBuffer.offset = 0;
+        Protocol.outboundBuffer.p1(186);
+        if (GlobalConfig.LOGIN_USE_STRINGS) {
+            Protocol.outboundBuffer.pjstr(Base37.decode37(name));
+        } else {
+            Protocol.outboundBuffer.p8(name);
+        }
+        step = 1;
+        loops = 0;
+        errors = 0;
+        reply = -3;
+    }
+
+    @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V")
+	public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+		Protocol.outboundBuffer.offset = 0;
+		Protocol.outboundBuffer.p1(147);
+		Protocol.outboundBuffer.p1(arg2);
+		Protocol.outboundBuffer.p1(arg3);
+		Protocol.outboundBuffer.p2(arg0);
+		Protocol.outboundBuffer.p2(arg1);
+		loops = 0;
+		errors = 0;
+		step = 1;
+		reply = -3;
+	}
+
+    @OriginalMember(owner = "client!da", name = "a", descriptor = "(IIIILclient!na;JI)V")
+    public static void method1016(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) JagString password, @OriginalArg(5) long name, @OriginalArg(6) int arg5) {
+        @Pc(8) Buffer local8 = new Buffer(GlobalConfig.LOGIN_USE_STRINGS ? 129 : 128);
+        local8.p1(10);
+        local8.p2((int) (Math.random() * 99999.0D));
+        local8.p2(530);
+        if (GlobalConfig.LOGIN_USE_STRINGS) {
+            local8.pjstr(Base37.decode37(name));
+        } else {
+            local8.p8(name);
+        }
+        local8.p4((int) (Math.random() * 9.9999999E7D));
+        local8.pjstr(password);
+        local8.p4((int) (Math.random() * 9.9999999E7D));
+        local8.p2(client.affiliate);
+        local8.p1(arg0);
+        local8.p1(arg2);
+        local8.p4((int) (Math.random() * 9.9999999E7D));
+        local8.p2(arg5);
+        local8.p2(arg1);
+        local8.p4((int) (Math.random() * 9.9999999E7D));
+        local8.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS);
+        Protocol.outboundBuffer.offset = 0;
+        Protocol.outboundBuffer.p1(36);
+        Protocol.outboundBuffer.p1(local8.offset);
+        Protocol.outboundBuffer.pBytes(local8.data, local8.offset);
+        reply = -3;
+        step = 1;
+        loops = 0;
+        errors = 0;
+    }
 }
diff --git a/client/src/main/java/rt4/Static255.java b/client/src/main/java/rt4/DeadClass.java
similarity index 80%
rename from client/src/main/java/rt4/Static255.java
rename to client/src/main/java/rt4/DeadClass.java
index cad9439..68fcda6 100644
--- a/client/src/main/java/rt4/Static255.java
+++ b/client/src/main/java/rt4/DeadClass.java
@@ -2,7 +2,9 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalMember;
 
-public final class Static255 {
+// Has no usages.
+
+public final class DeadClass {
 
 	@OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;")
 	public static final LruHashTable cache = new LruHashTable(4);
diff --git a/client/src/main/java/rt4/DisplayMode.java b/client/src/main/java/rt4/DisplayMode.java
index 93ddb4e..7910282 100644
--- a/client/src/main/java/rt4/DisplayMode.java
+++ b/client/src/main/java/rt4/DisplayMode.java
@@ -1,25 +1,301 @@
 package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 import java.awt.*;
 
-public class DisplayMode {
-    @OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V")
-    public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
-        while (true) {
-            @Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0);
-            while (local16.status == 0) {
-                ThreadUtils.sleep(10L);
-            }
-            if (local16.status == 1) {
-                arg0.setVisible(false);
-                arg0.dispose();
-                return;
-            }
-            ThreadUtils.sleep(100L);
-        }
-    }
+@OriginalClass("client!od")
+public final class DisplayMode {
+
+	@OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;")
+	public static DisplayMode[] aClass114Array1;
+    @OriginalMember(owner = "client!rc", name = "M", descriptor = "Z")
+    public static boolean aBoolean73 = false;
+
+    @OriginalMember(owner = "client!od", name = "j", descriptor = "I")
+	public int width;
+
+	@OriginalMember(owner = "client!od", name = "k", descriptor = "I")
+	public int refreshRate;
+
+	@OriginalMember(owner = "client!od", name = "l", descriptor = "I")
+	public int height;
+
+	@OriginalMember(owner = "client!od", name = "m", descriptor = "I")
+	public int bitDepth;
+
+	@OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V")
+	public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
+		while (true) {
+			@Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0);
+			while (local16.status == 0) {
+				ThreadUtils.sleep(10L);
+			}
+			if (local16.status == 1) {
+				arg0.setVisible(false);
+				arg0.dispose();
+				return;
+			}
+			ThreadUtils.sleep(100L);
+		}
+	}
+
+	@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V")
+	public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
+		Static97.aLong89 = 0L;
+		@Pc(4) int mode = getWindowMode();
+		if (arg1 == 3 || mode == 3) {
+			arg0 = true;
+		}
+		@Pc(44) boolean useHd = false;
+		if (mode > 0 != arg1 > 0) {
+			useHd = true;
+		}
+		if (arg0 && arg1 > 0) {
+			useHd = true;
+		}
+		setWindowMode(arg0, arg1, useHd, mode, arg2, arg3);
+	}
+
+	@OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I")
+	public static int getWindowMode() {
+		if (GameShell.fullScreenFrame != null) {
+			return 3;
+		} else if (GlRenderer.enabled && Static124.aBoolean156) {
+			return 2;
+		} else if (GlRenderer.enabled && !Static124.aBoolean156) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ZIZIZII)V")
+	public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+		if (arg2) {
+			GlRenderer.quit();
+		}
+		if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Preferences.fullScreenWidth || arg5 != Preferences.fullScreenHeight)) {
+			exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink);
+			GameShell.fullScreenFrame = null;
+		}
+		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
+			GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink);
+			if (GameShell.fullScreenFrame != null) {
+				Preferences.fullScreenHeight = arg5;
+				Preferences.fullScreenWidth = arg4;
+				Preferences.write(GameShell.signLink);
+			}
+		}
+		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
+			setWindowMode(true, Preferences.favoriteWorlds, true, arg3, -1, -1);
+			return;
+		}
+		@Pc(85) Container local85;
+		if (GameShell.fullScreenFrame != null) {
+			local85 = GameShell.fullScreenFrame;
+		} else if (GameShell.frame == null) {
+			local85 = GameShell.signLink.applet;
+		} else {
+			local85 = GameShell.frame;
+		}
+		GameShell.frameWidth = local85.getSize().width;
+		GameShell.frameHeight = local85.getSize().height;
+		@Pc(109) Insets local109;
+		if (GameShell.frame == local85) {
+			local109 = GameShell.frame.getInsets();
+			GameShell.frameWidth -= local109.right + local109.left;
+			GameShell.frameHeight -= local109.bottom + local109.top;
+		}
+		if (arg1 >= 2) {
+			GameShell.canvasWidth = GameShell.frameWidth;
+			GameShell.canvasHeight = GameShell.frameHeight;
+			GameShell.leftMargin = 0;
+			GameShell.topMargin = 0;
+		} else {
+			GameShell.topMargin = 0;
+			GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
+			GameShell.canvasWidth = 765;
+			GameShell.canvasHeight = 503;
+		}
+		if (arg0) {
+			Keyboard.stop(GameShell.canvas);
+			Mouse.stop(GameShell.canvas);
+			if (client.mouseWheel != null) {
+				client.mouseWheel.stop(GameShell.canvas);
+			}
+			client.instance.addCanvas();
+			Keyboard.start(GameShell.canvas);
+			Mouse.start(GameShell.canvas);
+			if (client.mouseWheel != null) {
+				client.mouseWheel.start(GameShell.canvas);
+			}
+		} else {
+			if (GlRenderer.enabled) {
+				GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
+			}
+			GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
+			if (GameShell.frame == local85) {
+				local109 = GameShell.frame.getInsets();
+				GameShell.canvas.setLocation(local109.left + GameShell.leftMargin, local109.top + GameShell.topMargin);
+			} else {
+				GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
+			}
+		}
+		if (arg1 == 0 && arg3 > 0) {
+			GlRenderer.createAndDestroyContext(GameShell.canvas);
+		}
+		if (arg2 && arg1 > 0) {
+			GameShell.canvas.setIgnoreRepaint(true);
+			if (!aBoolean73) {
+				SceneGraph.clear();
+				SoftwareRaster.frameBuffer = null;
+				SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
+				SoftwareRaster.clear();
+				if (client.gameState == 5) {
+					LoadingBar.render(true, Fonts.b12Full);
+				} else {
+					Static114.drawTextOnScreen(false, LocalizedText.LOADING);
+				}
+				try {
+					@Pc(269) Graphics local269 = GameShell.canvas.getGraphics();
+					SoftwareRaster.frameBuffer.draw(local269);
+				} catch (@Pc(277) Exception local277) {
+				}
+				Static139.method2704();
+				if (arg3 == 0) {
+					SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
+				} else {
+					SoftwareRaster.frameBuffer = null;
+				}
+				@Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(client.instance.getClass());
+				while (local300.status == 0) {
+					ThreadUtils.sleep(100L);
+				}
+				if (local300.status == 1) {
+					aBoolean73 = true;
+				}
+			}
+			if (aBoolean73) {
+				GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2);
+			}
+		}
+		if (!GlRenderer.enabled && arg1 > 0) {
+			setWindowMode(true, 0, true, arg3, -1, -1);
+			return;
+		}
+		if (arg1 > 0 && arg3 == 0) {
+			GameShell.thread.setPriority(5);
+			SoftwareRaster.frameBuffer = null;
+			SoftwareModel.method4580();
+			((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(200);
+			if (Preferences.highDetailLighting) {
+				Rasteriser.setBrightness(0.7F);
+			}
+			Static40.method4637();
+		} else if (arg1 == 0 && arg3 > 0) {
+			GameShell.thread.setPriority(1);
+			SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
+			SoftwareModel.method4583();
+			Static76.method1643();
+			((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
+			if (Preferences.highDetailLighting) {
+				if (Preferences.brightness == 1) {
+					Rasteriser.setBrightness(0.9F);
+				}
+				if (Preferences.brightness == 2) {
+					Rasteriser.setBrightness(0.8F);
+				}
+				if (Preferences.brightness == 3) {
+					Rasteriser.setBrightness(0.7F);
+				}
+				if (Preferences.brightness == 4) {
+					Rasteriser.setBrightness(0.6F);
+				}
+			}
+			GlTile.method1939();
+			Static40.method4637();
+		}
+		Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible();
+		if (arg2) {
+			client.method2721();
+		}
+		if (arg1 >= 2) {
+			Static124.aBoolean156 = true;
+		} else {
+			Static124.aBoolean156 = false;
+		}
+		if (InterfaceList.topLevelInterface != -1) {
+			Static210.method3712(true);
+		}
+		if (Protocol.socket != null && (client.gameState == 30 || client.gameState == 25)) {
+			ClientProt.method1373();
+		}
+		for (@Pc(466) int local466 = 0; local466 < 100; local466++) {
+			Static186.aBooleanArray100[local466] = true;
+		}
+		GameShell.fullRedraw = true;
+	}
+
+	@OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;")
+	public static DisplayMode[] getDisplayModes() {
+		if (aClass114Array1 == null) {
+			@Pc(16) DisplayMode[] local16 = method3558(GameShell.signLink);
+			@Pc(20) DisplayMode[] local20 = new DisplayMode[local16.length];
+			@Pc(22) int local22 = 0;
+			label52: for (@Pc(24) int local24 = 0; local24 < local16.length; local24++) {
+				@Pc(32) DisplayMode local32 = local16[local24];
+				if ((local32.bitDepth <= 0 || local32.bitDepth >= 24) && local32.width >= 800 && local32.height >= 600) {
+					for (@Pc(52) int local52 = 0; local52 < local22; local52++) {
+						@Pc(59) DisplayMode local59 = local20[local52];
+						if (local32.width == local59.width && local59.height == local32.height) {
+							if (local32.bitDepth > local59.bitDepth) {
+								local20[local52] = local32;
+							}
+							continue label52;
+						}
+					}
+					local20[local22] = local32;
+					local22++;
+				}
+			}
+			aClass114Array1 = new DisplayMode[local22];
+			ArrayUtils.copy(local20, 0, aClass114Array1, 0, local22);
+			@Pc(112) int[] local112 = new int[aClass114Array1.length];
+			for (@Pc(114) int local114 = 0; local114 < aClass114Array1.length; local114++) {
+				@Pc(122) DisplayMode local122 = aClass114Array1[local114];
+				local112[local114] = local122.height * local122.width;
+			}
+			Static181.method3346(local112, aClass114Array1);
+		}
+		return aClass114Array1;
+	}
+
+	@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ILsignlink!ll;)[Lclient!od;")
+	public static DisplayMode[] method3558(@OriginalArg(1) SignLink arg0) {
+		if (!arg0.isFullScreenSupported()) {
+			return new DisplayMode[0];
+		}
+		@Pc(17) PrivilegedRequest local17 = arg0.getDisplayModes();
+		while (local17.status == 0) {
+			ThreadUtils.sleep(10L);
+		}
+		if (local17.status == 2) {
+			return new DisplayMode[0];
+		}
+		@Pc(39) int[] local39 = (int[]) local17.result;
+		@Pc(45) DisplayMode[] local45 = new DisplayMode[local39.length >> 2];
+		for (@Pc(47) int local47 = 0; local47 < local45.length; local47++) {
+			@Pc(59) DisplayMode local59 = new DisplayMode();
+			local45[local47] = local59;
+			local59.width = local39[local47 << 2];
+			local59.height = local39[(local47 << 2) + 1];
+			local59.bitDepth = local39[(local47 << 2) + 2];
+			local59.refreshRate = local39[(local47 << 2) + 3];
+		}
+		return local45;
+	}
 }
diff --git a/client/src/main/java/rt4/Environment.java b/client/src/main/java/rt4/Environment.java
index bec01d4..354b8e7 100644
--- a/client/src/main/java/rt4/Environment.java
+++ b/client/src/main/java/rt4/Environment.java
@@ -37,11 +37,11 @@ public final class Environment {
 
 	@OriginalMember(owner = "client!li", name = "<init>", descriptor = "()V")
 	public Environment() {
-		this.anInt3526 = Static161.anInt3923;
+		this.anInt3526 = FogManager.anInt3923;
 		this.aFloat17 = 1.2F;
 		this.anInt3527 = -50;
 		this.aFloat16 = 1.1523438F;
-		this.anInt3525 = Static161.anInt3922;
+		this.anInt3525 = FogManager.anInt3922;
 		this.anInt3528 = -60;
 		this.aFloat18 = 0.69921875F;
 		this.anInt3529 = 0;
@@ -52,7 +52,7 @@ public final class Environment {
 	public Environment(@OriginalArg(0) Buffer arg0) {
 		@Pc(7) int local7 = arg0.g1();
 		if ((local7 & 0x1) == 0) {
-			this.anInt3526 = Static161.anInt3923;
+			this.anInt3526 = FogManager.anInt3923;
 		} else {
 			this.anInt3526 = arg0.g4();
 		}
@@ -81,7 +81,7 @@ public final class Environment {
 			this.anInt3527 = arg0.g2s();
 		}
 		if ((local7 & 0x20) == 0) {
-			this.anInt3525 = Static161.anInt3922;
+			this.anInt3525 = FogManager.anInt3922;
 		} else {
 			this.anInt3525 = arg0.g4();
 		}
diff --git a/client/src/main/java/rt4/Static161.java b/client/src/main/java/rt4/FogManager.java
similarity index 94%
rename from client/src/main/java/rt4/Static161.java
rename to client/src/main/java/rt4/FogManager.java
index 10454d6..2eb7c9a 100644
--- a/client/src/main/java/rt4/Static161.java
+++ b/client/src/main/java/rt4/FogManager.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
-public final class Static161 {
+public final class FogManager {
 
 	@OriginalMember(owner = "client!mk", name = "c", descriptor = "I")
 	public static int anInt3920;
@@ -159,4 +159,12 @@ public final class Static161 {
 	public static float method3068() {
 		return aFloat21;
 	}
+
+    @OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V")
+    public static void method3935(@OriginalArg(0) int arg0) {
+        method3060(anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F);
+        method3063(-50.0F, -60.0F, -50.0F);
+        method3062(anInt3922, 0);
+        method3058();
+    }
 }
diff --git a/client/src/main/java/rt4/Font.java b/client/src/main/java/rt4/Font.java
index 4480a8b..f5e5ecb 100644
--- a/client/src/main/java/rt4/Font.java
+++ b/client/src/main/java/rt4/Font.java
@@ -213,7 +213,12 @@ public abstract class Font extends SecondaryNode {
 		return local27;
 	}
 
-    @OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
+	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
+	public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
+		return SpriteLoader.decode(arg1, 0, arg0) ? method799(arg2.getFile(arg0, 0)) : null;
+	}
+
+	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
 	public final int method2852(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) {
 		return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 	}
diff --git a/client/src/main/java/rt4/Fonts.java b/client/src/main/java/rt4/Fonts.java
index c3d8e82..638bb17 100644
--- a/client/src/main/java/rt4/Fonts.java
+++ b/client/src/main/java/rt4/Fonts.java
@@ -45,13 +45,13 @@ public class Fonts {
 
     @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V")
     public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) {
-        p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0);
+        p11Full = Font.method2462(Sprites.p11FullId, arg1, arg0);
         if (GlRenderer.enabled) {
             p11FullSoftware = SoftwareFont.method2412(Sprites.p11FullId, arg0, arg1);
         } else {
             p11FullSoftware = (SoftwareFont) p11Full;
         }
-        p12Full = Static127.method2462(Sprites.p12FullId, arg1, arg0);
-        b12Full = Static127.method2462(Sprites.b12FullId, arg1, arg0);
+        p12Full = Font.method2462(Sprites.p12FullId, arg1, arg0);
+        b12Full = Font.method2462(Sprites.b12FullId, arg1, arg0);
     }
 }
diff --git a/client/src/main/java/rt4/GameShell.java b/client/src/main/java/rt4/GameShell.java
index b4814f1..6f17926 100644
--- a/client/src/main/java/rt4/GameShell.java
+++ b/client/src/main/java/rt4/GameShell.java
@@ -177,6 +177,51 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		VARIABLE_RENDER_RATE_NS = (int)(VARIABLE_RENDER_RATE * 1_000_000.0d);
 	}
 
+    @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V")
+	public static void method3662() {
+		@Pc(8) Container local8;
+		if (fullScreenFrame != null) {
+			local8 = fullScreenFrame;
+		} else if (frame == null) {
+			local8 = signLink.applet;
+		} else {
+			local8 = frame;
+		}
+		frameWidth = local8.getSize().width;
+		frameHeight = local8.getSize().height;
+		@Pc(35) Insets local35;
+		if (local8 == frame) {
+			local35 = frame.getInsets();
+			frameHeight -= local35.bottom + local35.top;
+			frameWidth -= local35.right + local35.left;
+		}
+		if (DisplayMode.getWindowMode() >= 2) {
+			canvasWidth = frameWidth;
+			leftMargin = 0;
+			topMargin = 0;
+			canvasHeight = frameHeight;
+		} else {
+			topMargin = 0;
+			leftMargin = (frameWidth - 765) / 2;
+			canvasHeight = 503;
+			canvasWidth = 765;
+		}
+		if (GlRenderer.enabled) {
+			GlRenderer.setCanvasSize(canvasWidth, canvasHeight);
+		}
+		canvas.setSize(canvasWidth, canvasHeight);
+		if (local8 == frame) {
+			local35 = frame.getInsets();
+			canvas.setLocation(local35.left + leftMargin, topMargin + local35.top);
+		} else {
+			canvas.setLocation(leftMargin, topMargin);
+		}
+		if (InterfaceList.topLevelInterface != -1) {
+			Static210.method3712(true);
+		}
+		Static139.method2704();
+	}
+
     @OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
 	@Override
 	public final void focusLost(@OriginalArg(0) FocusEvent event) {
diff --git a/client/src/main/java/rt4/GlModel.java b/client/src/main/java/rt4/GlModel.java
index 70d8be8..b3f6e8b 100644
--- a/client/src/main/java/rt4/GlModel.java
+++ b/client/src/main/java/rt4/GlModel.java
@@ -1035,7 +1035,7 @@ public final class GlModel extends Model {
 				}
 				if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) {
 					if (this.aBoolean303) {
-						Static259.aLongArray11[Static2.anInt7++] = arg8;
+						Model.aLongArray11[Static2.anInt7++] = arg8;
 					} else {
 						if (anIntArray468.length < this.anInt5296) {
 							anIntArray468 = new int[this.anInt5296];
@@ -1053,7 +1053,7 @@ public final class GlModel extends Model {
 									@Pc(703) short local703 = this.aShortArray82[local362];
 									@Pc(708) short local708 = this.aShortArray83[local362];
 									if (this.method4118(Static150.anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) {
-										Static259.aLongArray11[Static2.anInt7++] = arg8;
+										Model.aLongArray11[Static2.anInt7++] = arg8;
 										break label118;
 									}
 									local362++;
@@ -2379,9 +2379,9 @@ public final class GlModel extends Model {
 					aClass3_Sub15_8.p4(local71);
 				}
 			} else {
-				local60 = (int) Static161.aFloatArray18[0];
-				local71 = (int) Static161.aFloatArray18[1];
-				local78 = (int) Static161.aFloatArray18[2];
+				local60 = (int) FogManager.aFloatArray18[0];
+				local71 = (int) FogManager.aFloatArray18[1];
+				local78 = (int) FogManager.aFloatArray18[2];
 				local85 = (int) Math.sqrt((double) (local60 * local60 + local71 * local71 + local78 * local78));
 				local90 = (int) ((float) this.aShort29 * 1.3F);
 				local97 = this.aShort28 * local85 >> 8;
@@ -3461,21 +3461,21 @@ public final class GlModel extends Model {
 		}
 		@Pc(26) int local26;
 		@Pc(40) int local40;
-		if (Static161.anInt3920 > 0) {
-			local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort3 * Static161.anInt3920 >> 8) >> 3;
-			local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort2 * Static161.anInt3920 >> 8) >> 3;
+		if (FogManager.anInt3920 > 0) {
+			local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort3 * FogManager.anInt3920 >> 8) >> 3;
+			local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort2 * FogManager.anInt3920 >> 8) >> 3;
 		} else {
-			local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort2 * Static161.anInt3920 >> 8) >> 3;
-			local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort3 * Static161.anInt3920 >> 8) >> 3;
+			local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort2 * FogManager.anInt3920 >> 8) >> 3;
+			local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort3 * FogManager.anInt3920 >> 8) >> 3;
 		}
 		@Pc(85) int local85;
 		@Pc(99) int local99;
-		if (Static161.anInt3921 > 0) {
-			local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort3 * Static161.anInt3921 >> 8) >> 3;
-			local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort2 * Static161.anInt3921 >> 8) >> 3;
+		if (FogManager.anInt3921 > 0) {
+			local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort3 * FogManager.anInt3921 >> 8) >> 3;
+			local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort2 * FogManager.anInt3921 >> 8) >> 3;
 		} else {
-			local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort2 * Static161.anInt3921 >> 8) >> 3;
-			local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort3 * Static161.anInt3921 >> 8) >> 3;
+			local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort2 * FogManager.anInt3921 >> 8) >> 3;
+			local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort3 * FogManager.anInt3921 >> 8) >> 3;
 		}
 		@Pc(134) int local134 = local40 + 1 - local26;
 		@Pc(140) int local140 = local99 + 1 - local85;
@@ -3499,8 +3499,8 @@ public final class GlModel extends Model {
 		@Pc(248) int local248;
 		@Pc(258) int local258;
 		for (local194 = 0; local194 < this.vertexCount; local194++) {
-			@Pc(216) int local216 = (this.anIntArray461[local194] - (this.anIntArray465[local194] * Static161.anInt3920 >> 8) >> 3) - local26;
-			@Pc(234) int local234 = (this.anIntArray466[local194] - (this.anIntArray465[local194] * Static161.anInt3921 >> 8) >> 3) - local85;
+			@Pc(216) int local216 = (this.anIntArray461[local194] - (this.anIntArray465[local194] * FogManager.anInt3920 >> 8) >> 3) - local26;
+			@Pc(234) int local234 = (this.anIntArray466[local194] - (this.anIntArray465[local194] * FogManager.anInt3921 >> 8) >> 3) - local85;
 			@Pc(239) int local239 = this.anIntArray462[local194];
 			local246 = this.anIntArray462[local194 + 1];
 			for (local248 = local239; local248 < local246; local248++) {
diff --git a/client/src/main/java/rt4/GlRenderer.java b/client/src/main/java/rt4/GlRenderer.java
index 378dfa2..5934a4a 100644
--- a/client/src/main/java/rt4/GlRenderer.java
+++ b/client/src/main/java/rt4/GlRenderer.java
@@ -270,8 +270,8 @@ public final class GlRenderer {
 		gl.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
 		gl.glMatrixMode(GL2.GL_MODELVIEW);
 		gl.glLoadIdentity();
-		Static161.method3065();
-		LightingManager.method2400(); // LightingManager
+		FogManager.method3065();
+		LightingManager.method2400();
 	}
 
 	@OriginalMember(owner = "client!tf", name = "g", descriptor = "()V")
diff --git a/client/src/main/java/rt4/InterfaceList.java b/client/src/main/java/rt4/InterfaceList.java
index d4021a0..15da22a 100644
--- a/client/src/main/java/rt4/InterfaceList.java
+++ b/client/src/main/java/rt4/InterfaceList.java
@@ -190,4 +190,16 @@ public class InterfaceList {
             return arg0.ops[arg1];
         }
     }
+
+    @OriginalMember(owner = "client!qf", name = "a", descriptor = "(BII)Lclient!be;")
+    public static Component method1418(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
+        @Pc(7) Component local7 = getComponent(arg0);
+        if (arg1 == -1) {
+            return local7;
+        } else if (local7 == null || local7.createdComponents == null || local7.createdComponents.length <= arg1) {
+            return null;
+        } else {
+            return local7.createdComponents[arg1];
+        }
+    }
 }
diff --git a/client/src/main/java/rt4/JagString.java b/client/src/main/java/rt4/JagString.java
index 6b98b39..e4f26a3 100644
--- a/client/src/main/java/rt4/JagString.java
+++ b/client/src/main/java/rt4/JagString.java
@@ -19,6 +19,8 @@ public final class JagString implements StringInterface {
     public static final JagString EMPTY = parse("");
 	@OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;")
 	public static final JagString aClass100_853 = parse("null");
+	@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
+	public static final JagString aClass100_994 = parse(")3");
 	@OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
 	public byte[] chars;
 
@@ -192,7 +194,64 @@ public final class JagString implements StringInterface {
         return parseInt(true, arg0);
     }
 
-    @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
+    @OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;")
+    public static JagString formatIp(@OriginalArg(0) int arg0) {
+        return concatenate(new JagString[] { parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF) });
+    }
+
+	@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
+	public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
+		if (arg1.indexOf(Static127.PERCENT_SIGN) == -1) {
+			return arg1;
+		}
+		while (true) {
+			@Pc(14) int local14 = arg1.indexOf(Static127.aClass100_133);
+			if (local14 == -1) {
+				while (true) {
+					local14 = arg1.indexOf(Static127.aClass100_1097);
+					if (local14 == -1) {
+						while (true) {
+							local14 = arg1.indexOf(Static127.aClass100_761);
+							if (local14 == -1) {
+								while (true) {
+									local14 = arg1.indexOf(Static127.aClass100_520);
+									if (local14 == -1) {
+										while (true) {
+											local14 = arg1.indexOf(Static127.aClass100_1002);
+											if (local14 == -1) {
+												while (true) {
+													local14 = arg1.indexOf(Static127.aClass100_591);
+													if (local14 == -1) {
+														return arg1;
+													}
+													@Pc(246) JagString local246 = EMPTY;
+													if (Player.lastLogAddress != null) {
+														local246 = formatIp(Player.lastLogAddress.intArg2);
+														if (Player.lastLogAddress.result != null) {
+															@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
+															local246 = decodeString(local265, local265.length, 0);
+														}
+													}
+													arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
+												}
+											}
+											arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(4, arg0)), arg1.substring(local14 + 2) });
+										}
+									}
+									arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(3, arg0)), arg1.substring(local14 + 2) });
+								}
+							}
+							arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(2, arg0)), arg1.substring(local14 + 2) });
+						}
+					}
+					arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(1, arg0)), arg1.substring(local14 + 2) });
+				}
+			}
+			arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(0, arg0)), arg1.substring(local14 + 2) });
+		}
+	}
+
+	@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
 	public final URL method3107() throws MalformedURLException {
 		return new URL(new String(this.chars, 0, this.length));
 	}
diff --git a/client/src/main/java/rt4/Light.java b/client/src/main/java/rt4/Light.java
index 188c430..ce8fc75 100644
--- a/client/src/main/java/rt4/Light.java
+++ b/client/src/main/java/rt4/Light.java
@@ -73,7 +73,7 @@ public final class Light {
 	@OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V")
 	public Light(@OriginalArg(0) Buffer arg0) {
 		if (anIntArray150 == null) {
-			Static84.method1771();
+			method1771();
 		}
 		this.anInt2241 = arg0.g1();
 		this.aBoolean124 = (this.anInt2241 & 0x10) != 0;
@@ -98,6 +98,11 @@ public final class Light {
 		}
 	}
 
+	@OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V")
+	public static void method1771() {
+		anIntArray150 = Static206.method3679(0.4F);
+	}
+
 	@OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V")
 	public final void method1762(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		this.anInt2233 = arg0;
diff --git a/client/src/main/java/rt4/LightingManager.java b/client/src/main/java/rt4/LightingManager.java
index ba93095..974cfcb 100644
--- a/client/src/main/java/rt4/LightingManager.java
+++ b/client/src/main/java/rt4/LightingManager.java
@@ -413,7 +413,7 @@ public class LightingManager {
         local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
         local4.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
         local4.glDepthMask(true);
-        local4.glFogfv(GL2.GL_FOG_COLOR, Static161.fogColor, 0);
+        local4.glFogfv(GL2.GL_FOG_COLOR, FogManager.fogColor, 0);
         local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
         GlRenderer.restoreLighting();
     }
diff --git a/client/src/main/java/rt4/LoadingBarAwt.java b/client/src/main/java/rt4/LoadingBarAwt.java
index d9f5a8e..49af1a9 100644
--- a/client/src/main/java/rt4/LoadingBarAwt.java
+++ b/client/src/main/java/rt4/LoadingBarAwt.java
@@ -12,14 +12,16 @@ public class LoadingBarAwt {
     public static FontMetrics aFontMetrics1;
     @OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;")
     public static Image anImage3;
+    @OriginalMember(owner = "client!sa", name = "R", descriptor = "Ljava/awt/Font;")
+    public static Font aFont1;
 
     @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
     public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
         try {
             @Pc(6) Graphics local6 = GameShell.canvas.getGraphics();
-            if (Static222.aFont1 == null) {
-                Static222.aFont1 = new Font("Helvetica", 1, 13);
-                aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1);
+            if (aFont1 == null) {
+                aFont1 = new Font("Helvetica", 1, 13);
+                aFontMetrics1 = GameShell.canvas.getFontMetrics(aFont1);
             }
             if (arg1) {
                 local6.setColor(Color.black);
@@ -39,7 +41,7 @@ public class LoadingBarAwt {
                 local56.setColor(Color.black);
                 local56.drawRect(1, 1, 301, 31);
                 local56.fillRect(arg3 * 3 + 2, 2, 300 - arg3 * 3, 30);
-                local56.setFont(Static222.aFont1);
+                local56.setFont(aFont1);
                 local56.setColor(Color.white);
                 arg2.method3112(22, (304 - arg2.method3155(aFontMetrics1)) / 2, local56);
                 local6.drawImage(anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
@@ -52,12 +54,12 @@ public class LoadingBarAwt {
                 local6.setColor(Color.black);
                 local6.drawRect(local140 + 1, local146 - -1, 301, 31);
                 local6.fillRect(arg3 * 3 + local140 + 2, local146 + 2, 300 - arg3 * 3, 30);
-                local6.setFont(Static222.aFont1);
+                local6.setFont(aFont1);
                 local6.setColor(Color.white);
                 arg2.method3112(local146 + 22, local140 + (-arg2.method3155(aFontMetrics1) + 304) / 2, local6);
             }
             if (client.mainLoadPrimaryText != null) {
-                local6.setFont(Static222.aFont1);
+                local6.setFont(aFont1);
                 local6.setColor(Color.white);
                 client.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - client.mainLoadPrimaryText.method3155(aFontMetrics1) / 2, local6);
             }
@@ -69,7 +71,7 @@ public class LoadingBarAwt {
     @OriginalMember(owner = "client!n", name = "a", descriptor = "(B)V")
     public static void clear() {
         aFontMetrics1 = null;
-        Static222.aFont1 = null;
+        aFont1 = null;
         anImage3 = null;
     }
 }
diff --git a/client/src/main/java/rt4/LocType.java b/client/src/main/java/rt4/LocType.java
index 7b750b9..2f14d2c 100644
--- a/client/src/main/java/rt4/LocType.java
+++ b/client/src/main/java/rt4/LocType.java
@@ -217,7 +217,7 @@ public final class LocType {
 	public final LocType getMultiLoc() {
 		@Pc(26) int local26 = -1;
 		if (this.multiLocVarbit != -1) {
-			local26 = Static155.getVarbit(this.multiLocVarbit);
+			local26 = VarpDomain.getVarbit(this.multiLocVarbit);
 		} else if (this.multiLocVarp != -1) {
 			local26 = VarpDomain.activeVarps[this.multiLocVarp];
 		}
diff --git a/client/src/main/java/rt4/LoginManager.java b/client/src/main/java/rt4/LoginManager.java
index 4beb699..7316ac9 100644
--- a/client/src/main/java/rt4/LoginManager.java
+++ b/client/src/main/java/rt4/LoginManager.java
@@ -14,6 +14,18 @@ public class LoginManager {
     public static final JagString ZAP = JagString.parse("zap");
     @OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;")
     public static final JagString UNZAP = JagString.parse("unzap");
+    @OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1103 = JagString.parse("ul");
+    @OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;")
+    public static final JagString aClass100_558 = JagString.parse("m");
+    @OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1090 = JagString.parse("l");
+    @OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;")
+    public static final JagString aClass100_807 = JagString.parse("n");
+    @OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;")
+	public static final JagString aClass100_772 = JagString.parse("um");
+    @OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;")
+    public static final JagString UNDERSCORE = JagString.parse("_");
     @OriginalMember(owner = "client!rl", name = "X", descriptor = "I")
     public static int anInt4937 = 0;
     @OriginalMember(owner = "client!sd", name = "X", descriptor = "Z")
@@ -41,7 +53,7 @@ public class LoginManager {
     @OriginalMember(owner = "client!pg", name = "S", descriptor = "I")
     public static int staffModLevel = 0;
     @OriginalMember(owner = "client!ud", name = "O", descriptor = "I")
-	public static int playerModLevel = 0;
+	public static int blackmarks = 0;
     @OriginalMember(owner = "client!jk", name = "G", descriptor = "Z")
     public static boolean playerUnderage = false;
     @OriginalMember(owner = "client!ql", name = "c", descriptor = "Z")
@@ -54,6 +66,44 @@ public class LoginManager {
     public static boolean mapQuickChat = false;
     @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z")
     public static boolean parentalAdvertConsent = false;
+    @OriginalMember(owner = "client!we", name = "H", descriptor = "[[B")
+    public static byte[][] mapFilesBuffer;
+    @OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
+    public static byte[][] locationMapFilesBuffer;
+    @OriginalMember(owner = "client!cl", name = "V", descriptor = "[I")
+	public static int[] underWaterLocationsMapFileIds;
+    @OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B")
+    public static byte[][] npcSpawnsFilesBuffer;
+    @OriginalMember(owner = "client!client", name = "lb", descriptor = "[I")
+	public static int[] mapFileIds;
+    @OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B")
+    public static byte[][] underWaterMapFilesBuffer;
+    @OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I")
+    public static int[][] regionsXteaKeys;
+    @OriginalMember(owner = "client!te", name = "H", descriptor = "[I")
+	public static int[] regionBitPacked;
+    @OriginalMember(owner = "client!nm", name = "P", descriptor = "[I")
+    public static int[] npcSpawnsFileIds;
+    @OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I")
+	public static int[] underWaterMapFileIds;
+    @OriginalMember(owner = "client!nj", name = "j", descriptor = "[I")
+    public static int[] locationsMapFileIds;
+    @OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
+    public static byte[][] underWaterLocationsMapFilesBuffer;
+    @OriginalMember(owner = "client!gf", name = "R", descriptor = "I")
+	public static int centralZoneX;
+    @OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
+    public static int centralZoneZ;
+    @OriginalMember(owner = "client!dc", name = "ab", descriptor = "I")
+    public static int centralPlane = 0;
+    @OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
+    public static Map map;
+    @OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
+    public static MapElementList mapElementList;
+    @OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
+    public static int mapFlagX = 0;
+    @OriginalMember(owner = "client!gk", name = "h", descriptor = "I")
+    public static int mapFlagZ = 0;
 
     @OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V")
     public static void clear() {
@@ -275,7 +325,7 @@ public class LoginManager {
                 buffer.p1(anInt39);
                 buffer.p1(client.advertSuppressed ? 1 : 0);
                 buffer.p1(1);
-                buffer.p1(Static144.getWindowMode());
+                buffer.p1(DisplayMode.getWindowMode());
                 buffer.p2(GameShell.canvasWidth);
                 buffer.p2(GameShell.canvasHeight);
                 buffer.p1(Preferences.antiAliasingMode);
@@ -395,7 +445,7 @@ public class LoginManager {
                 Protocol.socket.read(0, 14, Protocol.inboundBuffer.data);
                 Protocol.inboundBuffer.offset = 0;
                 staffModLevel = Protocol.inboundBuffer.g1();
-                playerModLevel = Protocol.inboundBuffer.g1();
+                blackmarks = Protocol.inboundBuffer.g1();
                 playerUnderage = Protocol.inboundBuffer.g1() == 1;
                 parentalChatConsent = Protocol.inboundBuffer.g1() == 1;
                 parentalAdvertConsent = Protocol.inboundBuffer.g1() == 1;
@@ -432,7 +482,7 @@ public class LoginManager {
                 reply = 2;
                 step = 0;
                 client.method4221();
-                Static80.centralZoneX = -1;
+                centralZoneX = -1;
                 Protocol.readRebuildPacket(false);
                 Protocol.opcode = -1;
                 return;
@@ -497,47 +547,227 @@ public class LoginManager {
 
     @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
 	public static void setupLoadingScreenRegion() {
-		@Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3);
-		@Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3);
-		Static156.locationMapFilesBuffer = new byte[18][];
-		Static35.underWaterLocationsMapFileIds = new int[18];
-		Static191.npcSpawnsFilesBuffer = new byte[18][];
-		Static36.mapFileIds = new int[18];
-		Static72.regionsXteaKeys = new int[18][4];
-		Static186.underWaterMapFilesBuffer = new byte[18][];
-		Static238.regionBitPacked = new int[18];
-		Static273.mapFilesBuffer = new byte[18][];
-		Static175.npcSpawnsFileIds = new int[18];
-		Static99.underWaterMapFileIds = new int[18];
-		Static172.locationsMapFileIds = new int[18];
-		Static19.underWaterLocationsMapFilesBuffer = new byte[18][];
+		@Pc(10) int local10 = (Camera.renderX >> 10) + (Camera.originX >> 3);
+		@Pc(23) int local23 = (Camera.renderZ >> 10) + (Camera.originZ >> 3);
+		locationMapFilesBuffer = new byte[18][];
+		underWaterLocationsMapFileIds = new int[18];
+		npcSpawnsFilesBuffer = new byte[18][];
+		mapFileIds = new int[18];
+		regionsXteaKeys = new int[18][4];
+		underWaterMapFilesBuffer = new byte[18][];
+		regionBitPacked = new int[18];
+		mapFilesBuffer = new byte[18][];
+		npcSpawnsFileIds = new int[18];
+		underWaterMapFileIds = new int[18];
+		locationsMapFileIds = new int[18];
+		underWaterLocationsMapFilesBuffer = new byte[18][];
 		@Pc(74) int local74 = 0;
 		@Pc(80) int local80;
 		for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) {
 			for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
 				@Pc(115) int local115 = (local80 << 8) + local97;
-				Static238.regionBitPacked[local74] = local115;
-				Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				if (Static175.npcSpawnsFileIds[local74] == -1) {
-					Static36.mapFileIds[local74] = -1;
-					Static172.locationsMapFileIds[local74] = -1;
-					Static99.underWaterMapFileIds[local74] = -1;
-					Static35.underWaterLocationsMapFileIds[local74] = -1;
+				regionBitPacked[local74] = local115;
+				mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_558, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1090, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_807, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_772, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1103, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				if (npcSpawnsFileIds[local74] == -1) {
+					mapFileIds[local74] = -1;
+					locationsMapFileIds[local74] = -1;
+					underWaterMapFileIds[local74] = -1;
+					underWaterLocationsMapFileIds[local74] = -1;
 				}
 				local74++;
 			}
 		}
-		for (local80 = local74; local80 < Static175.npcSpawnsFileIds.length; local80++) {
-			Static175.npcSpawnsFileIds[local80] = -1;
-			Static36.mapFileIds[local80] = -1;
-			Static172.locationsMapFileIds[local80] = -1;
-			Static99.underWaterMapFileIds[local80] = -1;
-			Static35.underWaterLocationsMapFileIds[local80] = -1;
+		for (local80 = local74; local80 < npcSpawnsFileIds.length; local80++) {
+			npcSpawnsFileIds[local80] = -1;
+			mapFileIds[local80] = -1;
+			locationsMapFileIds[local80] = -1;
+			underWaterMapFileIds[local80] = -1;
+			underWaterLocationsMapFileIds[local80] = -1;
 		}
-		Static127.method2463(0, local23, local10, 8, true, 8);
+		method2463(0, local23, local10, 8, true, 8);
 	}
+
+    @OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V")
+    public static void processLogout() {
+        if (Protocol.socket != null) {
+            Protocol.socket.close();
+            Protocol.socket = null;
+        }
+        client.method3768();
+        SceneGraph.clear();
+        @Pc(19) int local19;
+        for (local19 = 0; local19 < 4; local19++) {
+            PathFinder.collisionMaps[local19].resetFlags();
+        }
+        WorldMap.clear(false);
+        System.gc();
+        MidiPlayer.method801();
+        MidiPlayer.jingle = false;
+        MusicPlayer.groupId = -1;
+        AreaSoundManager.clear(true);
+        Static230.dynamicMapRegion = false;
+        Camera.originZ = 0;
+        centralZoneX = 0;
+        centralZoneZ = 0;
+        Camera.originX = 0;
+        for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) {
+            Static143.hintMapMarkers[local19] = null;
+        }
+        PlayerList.size = 0;
+        NpcList.size = 0;
+        for (local19 = 0; local19 < 2048; local19++) {
+            PlayerList.players[local19] = null;
+            PlayerList.appearanceCache[local19] = null;
+        }
+        for (local19 = 0; local19 < 32768; local19++) {
+            NpcList.npcs[local19] = null;
+        }
+        for (local19 = 0; local19 < 4; local19++) {
+            for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
+                for (@Pc(122) int local122 = 0; local122 < 104; local122++) {
+                    SceneGraph.objStacks[local19][local115][local122] = null;
+                }
+            }
+        }
+        Camera.resetCameraEffects();
+        Protocol.verifyId = 0;
+        VarpDomain.reset();
+        Static73.method1596(true);
+    }
+
+    @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
+    public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) {
+        if (centralZoneX == arg2 && arg1 == centralZoneZ && (centralPlane == arg0 || SceneGraph.allLevelsAreVisible())) {
+            return;
+        }
+        centralZoneX = arg2;
+        centralZoneZ = arg1;
+        centralPlane = arg0;
+        if (SceneGraph.allLevelsAreVisible()) {
+            centralPlane = 0;
+        }
+        if (arg4) {
+            client.setGameState(28);
+        } else {
+            client.setGameState(25);
+        }
+        Static114.drawTextOnScreen(true, LocalizedText.LOADING);
+        @Pc(53) int local53 = Camera.originZ;
+        @Pc(55) int local55 = Camera.originX;
+        Camera.originZ = arg1 * 8 - 48;
+        Camera.originX = (arg2 - 6) * 8;
+        map = MapList.getContainingSource(centralZoneX * 8, centralZoneZ * 8);
+        @Pc(81) int local81 = Camera.originZ - local53;
+        @Pc(86) int local86 = Camera.originX - local55;
+        mapElementList = null;
+        @Pc(96) int local96;
+        @Pc(103) Npc local103;
+        @Pc(109) int local109;
+        if (arg4) {
+            NpcList.size = 0;
+            for (local96 = 0; local96 < 32768; local96++) {
+                local103 = NpcList.npcs[local96];
+                if (local103 != null) {
+                    local103.xFine -= local86 * 128;
+                    local103.zFine -= local81 * 128;
+                    if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
+                        for (local109 = 0; local109 < 10; local109++) {
+                            local103.movementQueueX[local109] -= local86;
+                            local103.movementQueueZ[local109] -= local81;
+                        }
+                        NpcList.ids[NpcList.size++] = local96;
+                    } else {
+                        NpcList.npcs[local96].setNpcType(null);
+                        NpcList.npcs[local96] = null;
+                    }
+                }
+            }
+        } else {
+            for (local96 = 0; local96 < 32768; local96++) {
+                local103 = NpcList.npcs[local96];
+                if (local103 != null) {
+                    for (local109 = 0; local109 < 10; local109++) {
+                        local103.movementQueueX[local109] -= local86;
+                        local103.movementQueueZ[local109] -= local81;
+                    }
+                    local103.xFine -= local86 * 128;
+                    local103.zFine -= local81 * 128;
+                }
+            }
+        }
+        for (local96 = 0; local96 < 2048; local96++) {
+            @Pc(265) Player local265 = PlayerList.players[local96];
+            if (local265 != null) {
+                for (local109 = 0; local109 < 10; local109++) {
+                    local265.movementQueueX[local109] -= local86;
+                    local265.movementQueueZ[local109] -= local81;
+                }
+                local265.xFine -= local86 * 128;
+                local265.zFine -= local81 * 128;
+            }
+        }
+        Player.level = arg0;
+        PlayerList.self.teleport(arg5, false, arg3);
+        @Pc(322) byte local322 = 104;
+        @Pc(324) byte local324 = 0;
+        @Pc(326) byte local326 = 0;
+        @Pc(328) byte local328 = 1;
+        @Pc(330) byte local330 = 104;
+        @Pc(332) byte local332 = 1;
+        if (local81 < 0) {
+            local328 = -1;
+            local330 = -1;
+            local326 = 103;
+        }
+        if (local86 < 0) {
+            local332 = -1;
+            local324 = 103;
+            local322 = -1;
+        }
+        for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) {
+            for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) {
+                @Pc(378) int local378 = local86 + local358;
+                @Pc(382) int local382 = local367 + local81;
+                for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
+                    if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
+                        SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382];
+                    } else {
+                        SceneGraph.objStacks[local384][local358][local367] = null;
+                    }
+                }
+            }
+        }
+        for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
+            local451.z -= local81;
+            local451.x -= local86;
+            if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {
+                local451.unlink();
+            }
+        }
+        if (arg4) {
+            Camera.renderX -= local86 * 128;
+            Camera.renderZ -= local81 * 128;
+            Camera.anInt4232 -= local81;
+            Camera.anInt5449 -= local86;
+            Camera.anInt5765 -= local81;
+            Camera.anInt5375 -= local86;
+        } else {
+            Camera.cameraType = 1;
+        }
+        SoundPlayer.anInt4451 = 0;
+        if (mapFlagX != 0) {
+            mapFlagZ -= local81;
+            mapFlagX -= local86;
+        }
+        if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
+            Static103.setInstantFade();
+        }
+        Static107.anInt2875 = -1;
+        Static99.aClass69_64.clear();
+        Static217.aClass69_116.clear();
+    }
 }
diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java
index 8ce599f..1341de0 100644
--- a/client/src/main/java/rt4/MiniMap.java
+++ b/client/src/main/java/rt4/MiniMap.java
@@ -25,6 +25,14 @@ public class MiniMap {
     public static int state = 0;
     @OriginalMember(owner = "client!we", name = "w", descriptor = "I")
     public static int anInt4130 = 0;
+    @OriginalMember(owner = "client!ej", name = "W", descriptor = "I")
+	public static int anInt1814 = 0;
+    @OriginalMember(owner = "client!vg", name = "d", descriptor = "I")
+    public static int anInt5755 = 2;
+    @OriginalMember(owner = "client!oe", name = "n", descriptor = "I")
+    public static int anInt4262 = 1;
+    @OriginalMember(owner = "client!gi", name = "H", descriptor = "I")
+	public static int anInt2252 = 0;
 
     @OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V")
     public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@@ -217,7 +225,7 @@ public class MiniMap {
             SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.width, arg1 + arg3.height);
         }
         if (state != 2 && state != 5 && sprite != null) {
-            @Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
+            @Pc(48) int local48 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
             @Pc(57) int local57 = PlayerList.self.xFine / 32 + 48;
             @Pc(67) int local67 = 464 - PlayerList.self.zFine / 32;
             if (GlRenderer.enabled) {
@@ -233,37 +241,37 @@ public class MiniMap {
             @Pc(200) int local200;
             @Pc(239) int local239;
             @Pc(271) int local271;
-            if (Static235.mapElementList != null) {
-                for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) {
-                    if (Static235.mapElementList.method3892(local117)) {
-                        local146 = (Static235.mapElementList.aShortArray73[local117] - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
+            if (LoginManager.mapElementList != null) {
+                for (@Pc(117) int local117 = 0; local117 < LoginManager.mapElementList.anInt5074; local117++) {
+                    if (LoginManager.mapElementList.method3892(local117)) {
+                        local146 = (LoginManager.mapElementList.aShortArray73[local117] - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
                         local150 = MathUtils.sin[local48];
                         local154 = MathUtils.cos[local48];
                         @Pc(156) Font local156 = Fonts.p11Full;
                         @Pc(164) int local164 = local150 * 256 / (anInt4130 + 256);
-                        local181 = (Static235.mapElementList.aShortArray72[local117] - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
+                        local181 = (LoginManager.mapElementList.aShortArray72[local117] - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
                         @Pc(189) int local189 = local154 * 256 / (anInt4130 + 256);
                         local200 = local181 * local189 - local146 * local164 >> 16;
-                        if (Static235.mapElementList.method3894(local117) == 1) {
+                        if (LoginManager.mapElementList.method3894(local117) == 1) {
                             local156 = Fonts.p12Full;
                         }
-                        if (Static235.mapElementList.method3894(local117) == 2) {
+                        if (LoginManager.mapElementList.method3894(local117) == 2) {
                             local156 = Fonts.b12Full;
                         }
                         local231 = local164 * local181 + local189 * local146 >> 16;
-                        local239 = local156.getMaxLineWidth(Static235.mapElementList.aClass100Array153[local117], 100);
+                        local239 = local156.getMaxLineWidth(LoginManager.mapElementList.aClass100Array153[local117], 100);
                         @Pc(245) int local245 = local231 - local239 / 2;
                         if (local245 >= -arg3.width && local245 <= arg3.width && local200 >= -arg3.height && local200 <= arg3.height) {
                             local271 = 16777215;
-                            if (Static235.mapElementList.anIntArray444[local117] != -1) {
-                                local271 = Static235.mapElementList.anIntArray444[local117];
+                            if (LoginManager.mapElementList.anIntArray444[local117] != -1) {
+                                local271 = LoginManager.mapElementList.anIntArray444[local117];
                             }
                             if (GlRenderer.enabled) {
                                 GlFont.method1188((GlSprite) arg3.method489(false));
                             } else {
                                 SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45);
                             }
-                            local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
+                            local156.renderParagraphAlpha(LoginManager.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
                             if (GlRenderer.enabled) {
                                 GlFont.method1173();
                             } else {
@@ -283,7 +291,7 @@ public class MiniMap {
                         continue;
                     }
                 }
-                method1446(arg3, Static67.mapfuncs[local382.mapElement], local150, local181, arg1, arg2);
+                method1446(arg3, Sprites.mapfuncs[local382.mapElement], local150, local181, arg1, arg2);
             }
             for (local146 = 0; local146 < 104; local146++) {
                 for (local181 = 0; local181 < 104; local181++) {
@@ -308,7 +316,7 @@ public class MiniMap {
                         if (local507.anInt3739 == -1) {
                             method1446(arg3, Sprites.mapdots[1], local231, local154, arg1, arg2);
                         } else {
-                            method1446(arg3, Static67.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2);
+                            method1446(arg3, Sprites.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2);
                         }
                     }
                 }
@@ -361,8 +369,8 @@ public class MiniMap {
                         }
                     }
                     if (local770.type == 2) {
-                        local154 = (local770.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
-                        local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32;
+                        local154 = (local770.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
+                        local231 = (-Camera.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32;
                         Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
                     }
                     if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) {
@@ -375,9 +383,9 @@ public class MiniMap {
                     }
                 }
             }
-            if (Static115.mapFlagX != 0) {
-                local146 = Static115.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32;
-                local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32;
+            if (LoginManager.mapFlagX != 0) {
+                local146 = LoginManager.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32;
+                local181 = LoginManager.mapFlagZ * 4 + 2 - PlayerList.self.zFine / 32;
                 method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2);
             }
             if (GlRenderer.enabled) {
@@ -402,7 +410,7 @@ public class MiniMap {
 			return;
 		}
 		@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2;
-		@Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
+		@Pc(27) int local27 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
 		@Pc(39) int local39 = Math.max(arg0.width / 2, arg0.height / 2) + 10;
 		if (local39 * local39 < local21) {
 			return;
diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java
index 0eeb416..c685025 100644
--- a/client/src/main/java/rt4/MiniMenu.java
+++ b/client/src/main/java/rt4/MiniMenu.java
@@ -61,6 +61,12 @@ public class MiniMenu {
     public static final JagString OPEN_PARENTHESIS = JagString.parse(" (X");
     @OriginalMember(owner = "client!qi", name = "B", descriptor = "Lclient!na;")
     public static final JagString COLOR_WHITE = JagString.parse("<col=ffffff>");
+    @OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;")
+    public static final JagString aClass100_164 = JagString.parse(" )2> <col=00ffff>");
+    @OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1039 = JagString.parse(" x ");
+    @OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;")
+    public static final JagString NULL = JagString.parse("null");
     @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;")
 	public static JagString aClass100_203 = null;
     @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;")
@@ -251,7 +257,7 @@ public class MiniMenu {
 
     @OriginalMember(owner = "client!hj", name = "a", descriptor = "(IJBLclient!na;ISLclient!na;I)V")
     public static void add(@OriginalArg(0) int cursor, @OriginalArg(1) long arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3, @OriginalArg(5) short arg4, @OriginalArg(6) JagString arg5, @OriginalArg(7) int arg6) {
-        if (Static60.aBoolean108 || size >= 500) {
+        if (Static40.aBoolean108 || size >= 500) {
             return;
         }
         ops[size] = arg5;
@@ -347,8 +353,8 @@ public class MiniMenu {
         if (local23 == 46) {
             PathFinder.findPathToLoc(local31, local19, local15);
             Protocol.outboundBuffer.p1isaac(247);
-            Protocol.outboundBuffer.p2le(Static142.originZ + local19);
-            Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
+            Protocol.outboundBuffer.p2le(Camera.originZ + local19);
+            Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
             Protocol.outboundBuffer.p2(Integer.MAX_VALUE & (int) (local31 >>> 32));
         }
         if (local23 == 40) {
@@ -412,12 +418,12 @@ public class MiniMenu {
         if (local23 == 42) {
             PathFinder.findPathToLoc(local31, local19, local15);
             Protocol.outboundBuffer.p1isaac(254);
-            Protocol.outboundBuffer.p2le(local15 + Static225.originX);
+            Protocol.outboundBuffer.p2le(local15 + Camera.originX);
             Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
-            Protocol.outboundBuffer.p2(local19 + Static142.originZ);
+            Protocol.outboundBuffer.p2(local19 + Camera.originZ);
         }
         if (local23 == 28) {
-            ClientProt.method2909();
+            ClientProt.closeWidget();
         }
         if (local23 == 45) {
             local192 = NpcList.npcs[local36];
@@ -448,16 +454,16 @@ public class MiniMenu {
             Cross.type = 2;
             Cross.y = Mouse.clickY;
             Protocol.outboundBuffer.p1isaac(66);
-            Protocol.outboundBuffer.p2le(Static225.originX + local15);
+            Protocol.outboundBuffer.p2le(Camera.originX + local15);
             Protocol.outboundBuffer.p2(local36);
-            Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ);
+            Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
         }
         if (local23 == 1001) {
             PathFinder.findPathToLoc(local31, local19, local15);
             Protocol.outboundBuffer.p1isaac(170);
             Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32));
-            Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
-            Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ);
+            Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
+            Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
         }
         if (local23 == 1002) {
             Cross.type = 2;
@@ -474,7 +480,7 @@ public class MiniMenu {
                 Protocol.outboundBuffer.p1isaac(92);
                 Protocol.outboundBuffer.p2leadd(local36);
             } else {
-                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name}));
+                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), aClass100_1039, ObjTypeList.get(local36).name}));
             }
             anInt2043 = 0;
             aClass13_7 = InterfaceList.getComponent(local19);
@@ -485,13 +491,13 @@ public class MiniMenu {
                 method3556(Player.level, local15, local19);
             } else if (local36 == 1) {
                 if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
-                    Cheat.teleport(Static225.originX + local15, Static142.originZ + local19, Player.level);
+                    Cheat.teleport(Camera.originX + local15, Camera.originZ + local19, Player.level);
                 } else if (PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) {
                     Protocol.outboundBuffer.p1(Static1.anInt5);
                     Protocol.outboundBuffer.p1(Static107.anInt2878);
                     Protocol.outboundBuffer.p2((int)Camera.yawTarget);
                     Protocol.outboundBuffer.p1(57);
-                    Protocol.outboundBuffer.p1(Static59.anInt1814);
+                    Protocol.outboundBuffer.p1(MiniMap.anInt1814);
                     Protocol.outboundBuffer.p1(MiniMap.anInt4130);
                     Protocol.outboundBuffer.p1(89);
                     Protocol.outboundBuffer.p2(PlayerList.self.xFine);
@@ -552,15 +558,15 @@ public class MiniMenu {
         }
         if (local23 == 41 && Static39.aClass13_10 == null) {
             ClientProt.method10(local15, local19);
-            Static39.aClass13_10 = Static201.method1418(local19, local15);
+            Static39.aClass13_10 = InterfaceList.method1418(local19, local15);
             InterfaceList.redraw(Static39.aClass13_10);
         }
         if (local23 == 49) {
             PathFinder.findPathToLoc(local31, local19, local15);
             Protocol.outboundBuffer.p1isaac(84);
             Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32));
-            Protocol.outboundBuffer.p2leadd(Static142.originZ + local19);
-            Protocol.outboundBuffer.p2le(local15 + Static225.originX);
+            Protocol.outboundBuffer.p2leadd(Camera.originZ + local19);
+            Protocol.outboundBuffer.p2le(local15 + Camera.originX);
         }
         if (local23 == 23) {
             Protocol.outboundBuffer.p1isaac(206);
@@ -573,9 +579,9 @@ public class MiniMenu {
         }
         if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) {
             Protocol.outboundBuffer.p1isaac(134);
-            Protocol.outboundBuffer.p2add(Static225.originX + local15);
+            Protocol.outboundBuffer.p2add(Camera.originX + local15);
             Protocol.outboundBuffer.p2(anInt4997);
-            Protocol.outboundBuffer.p2le(local19 + Static142.originZ);
+            Protocol.outboundBuffer.p2le(local19 + Camera.originZ);
             Protocol.outboundBuffer.p2(Static185.anInt4370);
             Protocol.outboundBuffer.p4me(Static224.anInt5062);
             Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
@@ -619,8 +625,8 @@ public class MiniMenu {
             Cross.y = Mouse.clickY;
             Protocol.outboundBuffer.p1isaac(228);
             Protocol.outboundBuffer.p2(local36);
-            Protocol.outboundBuffer.p2le(Static225.originX + local15);
-            Protocol.outboundBuffer.p2leadd(Static142.originZ + local19);
+            Protocol.outboundBuffer.p2le(Camera.originX + local15);
+            Protocol.outboundBuffer.p2leadd(Camera.originZ + local19);
         }
         if (local23 == 4) {
             local192 = NpcList.npcs[local36];
@@ -635,7 +641,7 @@ public class MiniMenu {
             }
         }
         if (local23 == 32) {
-            local693 = Static201.method1418(local19, local15);
+            local693 = InterfaceList.method1418(local19, local15);
             if (local693 != null) {
                 Static53.method1294();
                 @Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693);
@@ -702,8 +708,8 @@ public class MiniMenu {
             Cross.y = Mouse.clickY;
             Cross.milliseconds = 0;
             Protocol.outboundBuffer.p1isaac(109);
-            Protocol.outboundBuffer.p2le(local19 + Static142.originZ);
-            Protocol.outboundBuffer.p2(local15 + Static225.originX);
+            Protocol.outboundBuffer.p2le(local19 + Camera.originZ);
+            Protocol.outboundBuffer.p2(local15 + Camera.originX);
             Protocol.outboundBuffer.p2leadd(local36);
         }
         if (local23 == 25) {
@@ -736,7 +742,7 @@ public class MiniMenu {
                 local1955 = local693.anIntArrayArray4[0][1];
                 if (VarpDomain.activeVarps[local1955] != local693.anIntArray48[0]) {
                     VarpDomain.activeVarps[local1955] = local693.anIntArray48[0];
-                    Static85.refreshMagicVarp(local1955);
+                    VarpDomain.refreshMagicVarp(local1955);
                 }
             }
         }
@@ -762,7 +768,7 @@ public class MiniMenu {
             if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
                 local1955 = local693.anIntArrayArray4[0][1];
                 VarpDomain.activeVarps[local1955] = 1 - VarpDomain.activeVarps[local1955];
-                Static85.refreshMagicVarp(local1955);
+                VarpDomain.refreshMagicVarp(local1955);
             }
         }
         if (local23 == 33) {
@@ -775,11 +781,11 @@ public class MiniMenu {
             Cross.y = Mouse.clickY;
             Cross.type = 2;
             Protocol.outboundBuffer.p1isaac(101);
-            Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
+            Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
             Protocol.outboundBuffer.p2le(Static185.anInt4370);
             Protocol.outboundBuffer.p2le(anInt4997);
             Protocol.outboundBuffer.p2le(local36);
-            Protocol.outboundBuffer.p2leadd(Static142.originZ + local19);
+            Protocol.outboundBuffer.p2leadd(Camera.originZ + local19);
             Protocol.outboundBuffer.p4me(Static224.anInt5062);
         }
         if (local23 == 1004) {
@@ -797,16 +803,16 @@ public class MiniMenu {
             } else if (local36 == 1) {
                 Protocol.outboundBuffer.p1isaac(131);
                 Protocol.outboundBuffer.p4me(anInt2512);
-                Protocol.outboundBuffer.p2add(Static225.originX + local15);
+                Protocol.outboundBuffer.p2add(Camera.originX + local15);
                 Protocol.outboundBuffer.p2leadd(anInt506);
-                Protocol.outboundBuffer.p2add(local19 + Static142.originZ);
+                Protocol.outboundBuffer.p2add(local19 + Camera.originZ);
             }
         }
         if (local23 == 8) {
             local693 = InterfaceList.getComponent(local19);
             @Pc(2287) boolean local2287 = true;
             if (local693.anInt453 > 0) {
-                local2287 = Static249.method4265(local693);
+                local2287 = method4265(local693);
             }
             if (local2287) {
                 Protocol.outboundBuffer.p1isaac(10);
@@ -851,14 +857,14 @@ public class MiniMenu {
             Cross.x = Mouse.clickX;
             Cross.milliseconds = 0;
             Protocol.outboundBuffer.p1isaac(48);
-            Protocol.outboundBuffer.p2add(local15 + Static225.originX);
+            Protocol.outboundBuffer.p2add(local15 + Camera.originX);
             Protocol.outboundBuffer.p2leadd(local36);
-            Protocol.outboundBuffer.p2le(Static142.originZ + local19);
+            Protocol.outboundBuffer.p2le(Camera.originZ + local19);
         }
         if (local23 == 38 && PathFinder.findPathToLoc(local31, local19, local15)) {
             Protocol.outboundBuffer.p1isaac(233);
-            Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ);
-            Protocol.outboundBuffer.p2add(Static225.originX + local15);
+            Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
+            Protocol.outboundBuffer.p2add(Camera.originX + local15);
             Protocol.outboundBuffer.p2leadd(anInt506);
             Protocol.outboundBuffer.p4rme(anInt2512);
             Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
@@ -894,15 +900,15 @@ public class MiniMenu {
             InterfaceList.redraw(local693);
             aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE});
             if (aClass100_203 == null) {
-                aClass100_203 = Static92.NULL;
+                aClass100_203 = NULL;
             }
             return;
         }
         if (local23 == 50) {
             PathFinder.findPathToLoc(local31, local19, local15);
             Protocol.outboundBuffer.p1isaac(194);
-            Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ);
-            Protocol.outboundBuffer.p2le(Static225.originX + local15);
+            Protocol.outboundBuffer.p2leadd(local19 + Camera.originZ);
+            Protocol.outboundBuffer.p2le(Camera.originX + local15);
             Protocol.outboundBuffer.p2((int) (local31 >>> 32) & Integer.MAX_VALUE);
         }
         if (local23 == 48) {
@@ -946,9 +952,9 @@ public class MiniMenu {
             Cross.milliseconds = 0;
             Protocol.outboundBuffer.p1isaac(73);
             Protocol.outboundBuffer.p4rme(anInt2512);
-            Protocol.outboundBuffer.p2(Static142.originZ + local19);
+            Protocol.outboundBuffer.p2(Camera.originZ + local19);
             Protocol.outboundBuffer.p2leadd(local36);
-            Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
+            Protocol.outboundBuffer.p2leadd(local15 + Camera.originX);
             Protocol.outboundBuffer.p2le(anInt506);
         }
         if (local23 == 12) {
@@ -963,11 +969,11 @@ public class MiniMenu {
                 Static187.anInt4422 = 1;
                 method3556(Player.level, local15, local19);
             } else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
-                Cheat.teleport(local15 + Static225.originX, Static142.originZ - -local19, Player.level);
+                Cheat.teleport(local15 + Camera.originX, Camera.originZ - -local19, Player.level);
             } else {
                 Protocol.outboundBuffer.p1isaac(179);
-                Protocol.outboundBuffer.p2(local19 + Static142.originZ);
-                Protocol.outboundBuffer.p2(local15 + Static225.originX);
+                Protocol.outboundBuffer.p2(local19 + Camera.originZ);
+                Protocol.outboundBuffer.p2(local15 + Camera.originX);
             }
         }
         if (local23 == 6) {
@@ -997,8 +1003,8 @@ public class MiniMenu {
             Cross.type = 2;
             Protocol.outboundBuffer.p1isaac(33);
             Protocol.outboundBuffer.p2(local36);
-            Protocol.outboundBuffer.p2(Static225.originX + local15);
-            Protocol.outboundBuffer.p2le(Static142.originZ + local19);
+            Protocol.outboundBuffer.p2(Camera.originX + local15);
+            Protocol.outboundBuffer.p2le(Camera.originZ + local19);
         }
         if (local23 == 16) {
             local192 = NpcList.npcs[local36];
@@ -1058,7 +1064,7 @@ public class MiniMenu {
             @Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19;
             x = local15 + (local13 - local15) * (arg4 - arg0) / arg2;
             if (Static241.aBoolean302 && (anInt4999 & 0x40) != 0) {
-                @Pc(61) Component local61 = Static201.method1418(anInt2512, anInt506);
+                @Pc(61) Component local61 = InterfaceList.method1418(anInt2512, anInt506);
                 if (local61 == null) {
                     Static53.method1294();
                 } else {
@@ -1073,7 +1079,7 @@ public class MiniMenu {
         }
         @Pc(112) long local112 = -1L;
         for (local15 = 0; local15 < Static2.anInt7; local15++) {
-            @Pc(121) long local121 = Static259.aLongArray11[local15];
+            @Pc(121) long local121 = Model.aLongArray11[local15];
             x = (int) local121 & 0x7F;
             @Pc(133) int local133 = (int) local121 >> 29 & 0x3;
             @Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE;
@@ -1090,11 +1096,11 @@ public class MiniMenu {
                         continue;
                     }
                     if (anInt5014 == 1) {
-                        add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, Static27.aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
+                        add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
                     } else if (Static241.aBoolean302) {
                         @Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
                         if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) {
-                            add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, Static27.aClass100_164, local172.name}), x, (short) 38, aClass100_545, z);
+                            add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, aClass100_164, local172.name}), x, (short) 38, aClass100_545, z);
                         }
                     } else {
                         @Pc(228) JagString[] local228 = local172.ops;
@@ -1452,4 +1458,26 @@ public class MiniMenu {
 		anInt1742 = -1;
 		anInt2954 = -1;
 	}
+
+    @OriginalMember(owner = "client!wi", name = "c", descriptor = "(II)Z")
+    public static boolean method4640(@OriginalArg(0) int arg0) {
+        if (arg0 < 0) {
+            return false;
+        }
+        @Pc(12) int local12 = actions[arg0];
+        if (local12 >= 2000) {
+            local12 -= 2000;
+        }
+        return local12 == 1003;
+    }
+
+    @OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z")
+    public static boolean method4265(@OriginalArg(1) Component arg0) {
+        if (arg0.anInt453 == 205) {
+            Static267.anInt5775 = 250;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
diff --git a/client/src/main/java/rt4/Model.java b/client/src/main/java/rt4/Model.java
index 3d3838b..2f46d75 100644
--- a/client/src/main/java/rt4/Model.java
+++ b/client/src/main/java/rt4/Model.java
@@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!ak")
 public abstract class Model extends Entity {
 
-	@OriginalMember(owner = "client!ak", name = "s", descriptor = "Z")
+    @OriginalMember(owner = "client!vc", name = "V", descriptor = "[J")
+    public static final long[] aLongArray11 = new long[1000];
+    @OriginalMember(owner = "client!ak", name = "s", descriptor = "Z")
 	public boolean aBoolean303 = false;
 
     @OriginalMember(owner = "client!ak", name = "a", descriptor = "([[III)I")
diff --git a/client/src/main/java/rt4/Mouse.java b/client/src/main/java/rt4/Mouse.java
index 310aff5..2d77ef4 100644
--- a/client/src/main/java/rt4/Mouse.java
+++ b/client/src/main/java/rt4/Mouse.java
@@ -48,7 +48,9 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
 	public static volatile int anInt3521 = -1;
 	@OriginalMember(owner = "client!sa", name = "Y", descriptor = "I")
 	public static volatile int anInt4973 = 0;
-	public int mouseWheelX;
+    @OriginalMember(owner = "client!wi", name = "W", descriptor = "I")
+    public static int anInt5850 = 0;
+    public int mouseWheelX;
 	public int mouseWheelY;
 
     @OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V")
diff --git a/client/src/main/java/rt4/MouseWheel.java b/client/src/main/java/rt4/MouseWheel.java
index 7f3ccc7..4be1d85 100644
--- a/client/src/main/java/rt4/MouseWheel.java
+++ b/client/src/main/java/rt4/MouseWheel.java
@@ -9,6 +9,9 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!uc")
 public abstract class MouseWheel {
 
+    @OriginalMember(owner = "client!eh", name = "j", descriptor = "I")
+    public static int wheelRotation = 0;
+
     @OriginalMember(owner = "client!dh", name = "a", descriptor = "(B)Lclient!uc;")
     public static MouseWheel create() {
         try {
diff --git a/client/src/main/java/rt4/MsiType.java b/client/src/main/java/rt4/MsiType.java
index 7c6ee49..98a3bbd 100644
--- a/client/src/main/java/rt4/MsiType.java
+++ b/client/src/main/java/rt4/MsiType.java
@@ -35,7 +35,7 @@ public final class MsiType {
 			return local17;
 		}
 		MsiTypeList.spritesArchive.isFileReady(this.spriteId);
-		local17 = Static164.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive);
+		local17 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive);
 		if (local17 != null) {
 			local17.adjustPalette(MsiTypeList.redDelta, MsiTypeList.greenDelta, MsiTypeList.blueDelta);
 			local17.innerWidth = local17.width;
diff --git a/client/src/main/java/rt4/Npc.java b/client/src/main/java/rt4/Npc.java
index 0277839..51083c5 100644
--- a/client/src/main/java/rt4/Npc.java
+++ b/client/src/main/java/rt4/Npc.java
@@ -93,8 +93,8 @@ public final class Npc extends PathingEntity {
 					if (Static101.anInt2640 != 0) {
 						model.rotateX(Static101.anInt2640);
 					}
-					if (Static102.anInt2680 != 0) {
-						model.rotateZ(Static102.anInt2680);
+					if (PathingEntity.anInt2680 != 0) {
+						model.rotateZ(PathingEntity.anInt2680);
 					}
 					if (Static62.anInt1938 != 0) {
 						model.translate(0, Static62.anInt1938, 0);
diff --git a/client/src/main/java/rt4/NpcList.java b/client/src/main/java/rt4/NpcList.java
index acff079..ee702ae 100644
--- a/client/src/main/java/rt4/NpcList.java
+++ b/client/src/main/java/rt4/NpcList.java
@@ -331,8 +331,8 @@ public class NpcList {
 			}
 		}
 		if ((arg0.faceX != 0 || arg0.faceY != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) {
-			local70 = arg0.xFine - (arg0.faceX - Static225.originX - Static225.originX) * 64;
-			local43 = arg0.zFine - (arg0.faceY - Static142.originZ - Static142.originZ) * 64;
+			local70 = arg0.xFine - (arg0.faceX - Camera.originX - Camera.originX) * 64;
+			local43 = arg0.zFine - (arg0.faceY - Camera.originZ - Camera.originZ) * 64;
 			if (local70 != 0 || local43 != 0) {
 				arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF;
 			}
diff --git a/client/src/main/java/rt4/NpcType.java b/client/src/main/java/rt4/NpcType.java
index 953775a..b5e2052 100644
--- a/client/src/main/java/rt4/NpcType.java
+++ b/client/src/main/java/rt4/NpcType.java
@@ -173,7 +173,7 @@ public final class NpcType {
 	public final NpcType getMultiNpc() {
 		@Pc(5) int local5 = -1;
 		if (this.multiNpcVarbit != -1) {
-			local5 = Static155.getVarbit(this.multiNpcVarbit);
+			local5 = VarpDomain.getVarbit(this.multiNpcVarbit);
 		} else if (this.multiNpcVarp != -1) {
 			local5 = VarpDomain.activeVarps[this.multiNpcVarp];
 		}
@@ -192,7 +192,7 @@ public final class NpcType {
 		}
 		@Pc(16) int local16 = -1;
 		if (this.multiNpcVarbit != -1) {
-			local16 = Static155.getVarbit(this.multiNpcVarbit);
+			local16 = VarpDomain.getVarbit(this.multiNpcVarbit);
 		} else if (this.multiNpcVarp != -1) {
 			local16 = VarpDomain.activeVarps[this.multiNpcVarp];
 		}
diff --git a/client/src/main/java/rt4/PathingEntity.java b/client/src/main/java/rt4/PathingEntity.java
index c96d97e..898b66d 100644
--- a/client/src/main/java/rt4/PathingEntity.java
+++ b/client/src/main/java/rt4/PathingEntity.java
@@ -12,7 +12,9 @@ public abstract class PathingEntity extends Entity {
 	public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 };
 	@OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;")
 	public static final BasType aClass20_1 = new BasType();
-	@OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
+    @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
+    public static int anInt2680 = 0;
+    @OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
 	public int spotAnimStart;
 
 	@OriginalMember(owner = "client!fe", name = "S", descriptor = "I")
@@ -300,7 +302,7 @@ public abstract class PathingEntity extends Entity {
 		this.zFine = arg0 * 64 + this.movementQueueZ[0] * 128;
 		this.xFine = arg0 * 64 + this.movementQueueX[0] * 128;
 		if (GlRenderer.enabled && PlayerList.self == this) {
-			Static86.setInstantFade();
+			Static103.setInstantFade();
 		}
 	}
 
@@ -354,7 +356,7 @@ public abstract class PathingEntity extends Entity {
 
 	@OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V")
 	protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) {
-		Static102.anInt2680 = 0;
+		anInt2680 = 0;
 		Static101.anInt2640 = 0;
 		Static62.anInt1938 = 0;
 		@Pc(21) BasType local21 = this.getBasType();
@@ -393,9 +395,9 @@ public abstract class PathingEntity extends Entity {
 		if (Static101.anInt2640 != 0) {
 			arg0.rotateX(Static101.anInt2640);
 		}
-		Static102.anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF;
-		if (Static102.anInt2680 != 0) {
-			arg0.rotateZ(Static102.anInt2680);
+		anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF;
+		if (anInt2680 != 0) {
+			arg0.rotateZ(anInt2680);
 		}
 		Static62.anInt1938 = local224 + local87;
 		if (local201 + local134 < Static62.anInt1938) {
diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java
index 761701c..a597c41 100644
--- a/client/src/main/java/rt4/Player.java
+++ b/client/src/main/java/rt4/Player.java
@@ -180,8 +180,8 @@ public final class Player extends PathingEntity {
     @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
     public static void setTutorialIsland() {
         inTutorialIsland = 0;
-        @Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7);
-        @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ;
+        @Pc(17) int local17 = Camera.originX + (PlayerList.self.xFine >> 7);
+        @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Camera.originZ;
         if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
             inTutorialIsland = 1;
         }
@@ -363,8 +363,8 @@ public final class Player extends PathingEntity {
 						}
 					}
 					if (local245.type == 2) {
-						@Pc(340) int local340 = (local245.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
-						local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
+						@Pc(340) int local340 = (local245.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
+						local291 = (local245.anInt4046 - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
 						this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.playerModelId, arg2, arg6);
 					}
 					if (local245.type == 10 && local245.actorTargetId >= 0 && PlayerList.players.length > local245.actorTargetId) {
@@ -390,8 +390,8 @@ public final class Player extends PathingEntity {
 					if (Static101.anInt2640 != 0) {
 						local184.rotateX(Static101.anInt2640);
 					}
-					if (Static102.anInt2680 != 0) {
-						local184.rotateZ(Static102.anInt2680);
+					if (PathingEntity.anInt2680 != 0) {
+						local184.rotateZ(PathingEntity.anInt2680);
 					}
 					if (Static62.anInt1938 != 0) {
 						local184.translate(0, Static62.anInt1938, 0);
@@ -483,11 +483,11 @@ public final class Player extends PathingEntity {
 	@OriginalMember(owner = "client!e", name = "e", descriptor = "(I)Lclient!na;")
 	public final JagString getName() {
 		@Pc(2) JagString local2 = this.username;
-		if (Static103.aClass100Array88 != null) {
-			local2 = JagString.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 });
+		if (PlayerList.playerNames != null) {
+			local2 = JagString.concatenate(new JagString[] { PlayerList.playerNames[this.anInt1651], local2 });
 		}
-		if (Static263.aClass100Array174 != null) {
-			local2 = JagString.concatenate(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] });
+		if (PlayerList.playerNames2 != null) {
+			local2 = JagString.concatenate(new JagString[] { local2, PlayerList.playerNames2[this.anInt1651] });
 		}
 		return local2;
 	}
diff --git a/client/src/main/java/rt4/PlayerAppearance.java b/client/src/main/java/rt4/PlayerAppearance.java
index 5b1b02f..1cd2c4f 100644
--- a/client/src/main/java/rt4/PlayerAppearance.java
+++ b/client/src/main/java/rt4/PlayerAppearance.java
@@ -38,6 +38,12 @@ public final class PlayerAppearance {
     public static final int[] MALE_FEATURES = new int[] { 0, 1, 2, 3, 4, 5, 6, 14 };
     @OriginalMember(owner = "client!kh", name = "g", descriptor = "Lclient!hh;")
     public static final PlayerAppearance DEFAULT = new PlayerAppearance();
+    @OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
+	public static final int[] FEMALE_FEATURES = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 };
+    @OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;")
+    public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
+    @OriginalMember(owner = "client!vf", name = "g", descriptor = "[I")
+	public static final int[] anIntArray515 = new int[14];
     @OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S")
     public static short[][] aShortArrayArray2;
 	@OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S")
@@ -141,7 +147,7 @@ public final class PlayerAppearance {
 	}
 
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(ZZ)V")
-	public final void method1948(@OriginalArg(0) boolean arg0) {
+	public final void setFemale(@OriginalArg(0) boolean arg0) {
 		this.gender = arg0;
 		this.method1947();
 	}
@@ -157,7 +163,7 @@ public final class PlayerAppearance {
 			for (@Pc(24) int local24 = 0; local24 < 8; local24++) {
 				for (@Pc(31) int local31 = 0; local31 < IdkTypeList.anInt1716; local31++) {
 					@Pc(38) IdkType local38 = IdkTypeList.get(local31);
-					if (local38 != null && !local38.aBoolean85 && local38.feature == (arg2 ? Static153.anIntArray351[local24] : MALE_FEATURES[local24])) {
+					if (local38 != null && !local38.aBoolean85 && local38.feature == (arg2 ? FEMALE_FEATURES[local24] : MALE_FEATURES[local24])) {
 						arg3[anIntArray451[local24]] = Integer.MIN_VALUE | local31;
 						break;
 					}
@@ -172,7 +178,7 @@ public final class PlayerAppearance {
 	}
 
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IZI)V")
-	public final void method1951(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+	public final void setBaseColor(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		this.anIntArray236[arg0] = arg1;
 		this.method1947();
 	}
@@ -364,16 +370,16 @@ public final class PlayerAppearance {
 					local374 = arg0[local353].anInt5399;
 					local367 = arg0[local353].anInt5398;
 					local381 = local858.frames[local374];
-					Static276.aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16);
+					aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16);
 					local381 &= 0xFFFF;
 					Static241.anIntArray520[local353] = local381;
-					if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) {
-						local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
-						local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
+					if (aClass3_Sub2_Sub7Array8[local353] != null) {
+						local836 |= aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
+						local827 |= aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
 						local838 |= local858.aBoolean278;
 					}
 					if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
-						Static262.anIntArray515[local353] = local858.anIntArray474[local374];
+						anIntArray515[local353] = local858.anIntArray474[local374];
 						Static73.anIntArray183[local353] = arg0[local353].anInt5404;
 						local979 = local858.frames[local367];
 						Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16);
@@ -384,7 +390,7 @@ public final class PlayerAppearance {
 							local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
 						}
 					} else {
-						Static262.anIntArray515[local353] = 0;
+						anIntArray515[local353] = 0;
 						Static73.anIntArray183[local353] = 0;
 						Static133.aClass3_Sub2_Sub7Array7[local353] = null;
 						anIntArray187[local353] = -1;
@@ -461,8 +467,8 @@ public final class PlayerAppearance {
 		local481 = 0;
 		local598 = 1;
 		while (local481 < local346) {
-			if (Static276.aClass3_Sub2_Sub7Array8[local481] != null) {
-				local1284.method4565(Static276.aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, Static262.anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]);
+			if (aClass3_Sub2_Sub7Array8[local481] != null) {
+				local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]);
 			}
 			local481++;
 			local598 <<= 0x1;
@@ -475,7 +481,7 @@ public final class PlayerAppearance {
 			local1284.method4558(local1154, local979, local1156, local451, arg4 - 1, local457, arg2.aBoolean278);
 		}
 		for (local481 = 0; local481 < local346; local481++) {
-			Static276.aClass3_Sub2_Sub7Array8[local481] = null;
+			aClass3_Sub2_Sub7Array8[local481] = null;
 			Static133.aClass3_Sub2_Sub7Array7[local481] = null;
 			aClass144Array2[local481] = null;
 		}
diff --git a/client/src/main/java/rt4/PlayerList.java b/client/src/main/java/rt4/PlayerList.java
index fdbb015..3a832f9 100644
--- a/client/src/main/java/rt4/PlayerList.java
+++ b/client/src/main/java/rt4/PlayerList.java
@@ -9,10 +9,16 @@ public class PlayerList {
     public static final Player[] players = new Player[2048];
     @OriginalMember(owner = "client!ib", name = "f", descriptor = "[I")
     public static final int[] ids = new int[2048];
+    @OriginalMember(owner = "client!ke", name = "Y", descriptor = "[I")
+    public static final int[] anIntArray309 = new int[] { 1, 4 };
     @OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;")
     public static Player self;
     @OriginalMember(owner = "client!bf", name = "E", descriptor = "I")
     public static int selfId = -1;
     @OriginalMember(owner = "client!vl", name = "j", descriptor = "I")
     public static int size = 0;
+    @OriginalMember(owner = "client!i", name = "Ub", descriptor = "[Lclient!na;")
+    public static JagString[] playerNames;
+    @OriginalMember(owner = "client!vg", name = "a", descriptor = "[Lclient!na;")
+    public static JagString[] playerNames2;
 }
diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java
index 5dbf6a3..6762f2e 100644
--- a/client/src/main/java/rt4/Protocol.java
+++ b/client/src/main/java/rt4/Protocol.java
@@ -52,6 +52,8 @@ public class Protocol {
 	public static int opcode3 = 0;
     @OriginalMember(owner = "client!sj", name = "t", descriptor = "I")
 	public static int opcode2 = 0;
+    @OriginalMember(owner = "client!bj", name = "r", descriptor = "I")
+    public static int anInt659 = 2;
 
     @OriginalMember(owner = "client!g", name = "b", descriptor = "(B)V")
     public static void readLocationPacket() {
@@ -145,7 +147,7 @@ public class Protocol {
             if (local218 == 65535) {
                 local218 = -1;
             }
-            Static92.method1881(Player.level, local39, local31, local19, local45, local23, local218);
+            SceneGraph.method1881(Player.level, local39, local31, local19, local45, local23, local218);
         } else if (opcode == ServerProt.LOCATION_PACKET_202) {
             int local15 = inboundBuffer.g1();
             int local23 = local15 >> 2;
@@ -162,7 +164,7 @@ public class Protocol {
             int local247 = inboundBuffer.g2();
             int local633 = inboundBuffer.g2lesadd();
             if (!GlRenderer.enabled) {
-                Static170.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228);
+                SceneGraph.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228);
             }
         } else if (opcode == ServerProt.LOCATION_PACKET_14) {
             int local15 = inboundBuffer.g1();
@@ -350,27 +352,27 @@ public class Protocol {
         if (!Static230.dynamicMapRegion) {
             local13 = inboundBuffer.g2sub();
             local20 = (length - inboundBuffer.offset) / 16;
-            Static72.regionsXteaKeys = new int[local20][4];
+            LoginManager.regionsXteaKeys = new int[local20][4];
             for (local26 = 0; local26 < local20; local26++) {
                 for (local31 = 0; local31 < 4; local31++) {
-                    Static72.regionsXteaKeys[local26][local31] = inboundBuffer.g4me();
+                    LoginManager.regionsXteaKeys[local26][local31] = inboundBuffer.g4me();
                 }
             }
             local26 = inboundBuffer.g1ssub();
             local31 = inboundBuffer.g2();
             local60 = inboundBuffer.g2sub();
             local64 = inboundBuffer.g2sub();
-            Static238.regionBitPacked = new int[local20];
-            Static273.mapFilesBuffer = new byte[local20][];
-            Static191.npcSpawnsFilesBuffer = null;
-            Static99.underWaterMapFileIds = new int[local20];
-            Static156.locationMapFilesBuffer = new byte[local20][];
-            Static19.underWaterLocationsMapFilesBuffer = new byte[local20][];
-            Static175.npcSpawnsFileIds = null;
-            Static36.mapFileIds = new int[local20];
-            Static186.underWaterMapFilesBuffer = new byte[local20][];
-            Static172.locationsMapFileIds = new int[local20];
-            Static35.underWaterLocationsMapFileIds = new int[local20];
+            LoginManager.regionBitPacked = new int[local20];
+            LoginManager.mapFilesBuffer = new byte[local20][];
+            LoginManager.npcSpawnsFilesBuffer = null;
+            LoginManager.underWaterMapFileIds = new int[local20];
+            LoginManager.locationMapFilesBuffer = new byte[local20][];
+            LoginManager.underWaterLocationsMapFilesBuffer = new byte[local20][];
+            LoginManager.npcSpawnsFileIds = null;
+            LoginManager.mapFileIds = new int[local20];
+            LoginManager.underWaterMapFilesBuffer = new byte[local20][];
+            LoginManager.locationsMapFileIds = new int[local20];
+            LoginManager.underWaterLocationsMapFileIds = new int[local20];
             local20 = 0;
             @Pc(100) boolean local100 = false;
             if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) {
@@ -383,22 +385,22 @@ public class Protocol {
                 for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) {
                     local169 = (local138 << 8) + local151;
                     if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) {
-                        Static238.regionBitPacked[local20] = local169;
-                        Static36.mapFileIds[local20] = -1;
-                        Static172.locationsMapFileIds[local20] = -1;
-                        Static99.underWaterMapFileIds[local20] = -1;
-                        Static35.underWaterLocationsMapFileIds[local20] = -1;
+                        LoginManager.regionBitPacked[local20] = local169;
+                        LoginManager.mapFileIds[local20] = -1;
+                        LoginManager.locationsMapFileIds[local20] = -1;
+                        LoginManager.underWaterMapFileIds[local20] = -1;
+                        LoginManager.underWaterLocationsMapFileIds[local20] = -1;
                     } else {
-                        Static238.regionBitPacked[local20] = local169;
-                        Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
-                        Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
-                        Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
-                        Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
+                        LoginManager.regionBitPacked[local20] = local169;
+                        LoginManager.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
+                        LoginManager.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
+                        LoginManager.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
+                        LoginManager.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
                     }
                     local20++;
                 }
             }
-            Static127.method2463(local26, local60, local31, local64, false, local13);
+            LoginManager.method2463(local26, local60, local31, local64, false, local13);
             return;
         }
         local13 = inboundBuffer.g2leadd();
@@ -421,24 +423,24 @@ public class Protocol {
         }
         inboundBuffer.accessBytes();
         local60 = (length - inboundBuffer.offset) / 16;
-        Static72.regionsXteaKeys = new int[local60][4];
+        LoginManager.regionsXteaKeys = new int[local60][4];
         for (local64 = 0; local64 < local60; local64++) {
             for (local391 = 0; local391 < 4; local391++) {
-                Static72.regionsXteaKeys[local64][local391] = inboundBuffer.g4me();
+                LoginManager.regionsXteaKeys[local64][local391] = inboundBuffer.g4me();
             }
         }
         local64 = inboundBuffer.g2();
-        Static35.underWaterLocationsMapFileIds = new int[local60];
-        Static172.locationsMapFileIds = new int[local60];
-        Static36.mapFileIds = new int[local60];
-        Static19.underWaterLocationsMapFilesBuffer = new byte[local60][];
-        Static175.npcSpawnsFileIds = null;
-        Static99.underWaterMapFileIds = new int[local60];
-        Static156.locationMapFilesBuffer = new byte[local60][];
-        Static273.mapFilesBuffer = new byte[local60][];
-        Static238.regionBitPacked = new int[local60];
-        Static191.npcSpawnsFilesBuffer = null;
-        Static186.underWaterMapFilesBuffer = new byte[local60][];
+        LoginManager.underWaterLocationsMapFileIds = new int[local60];
+        LoginManager.locationsMapFileIds = new int[local60];
+        LoginManager.mapFileIds = new int[local60];
+        LoginManager.underWaterLocationsMapFilesBuffer = new byte[local60][];
+        LoginManager.npcSpawnsFileIds = null;
+        LoginManager.underWaterMapFileIds = new int[local60];
+        LoginManager.locationMapFilesBuffer = new byte[local60][];
+        LoginManager.mapFilesBuffer = new byte[local60][];
+        LoginManager.regionBitPacked = new int[local60];
+        LoginManager.npcSpawnsFilesBuffer = null;
+        LoginManager.underWaterMapFilesBuffer = new byte[local60][];
         local60 = 0;
         for (local391 = 0; local391 < 4; local391++) {
             for (local138 = 0; local138 < 13; local138++) {
@@ -450,26 +452,26 @@ public class Protocol {
                         @Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8);
                         @Pc(573) int local573;
                         for (local573 = 0; local573 < local60; local573++) {
-                            if (local571 == Static238.regionBitPacked[local573]) {
+                            if (local571 == LoginManager.regionBitPacked[local573]) {
                                 local571 = -1;
                                 break;
                             }
                         }
                         if (local571 != -1) {
-                            Static238.regionBitPacked[local60] = local571;
+                            LoginManager.regionBitPacked[local60] = local571;
                             @Pc(609) int local609 = local571 & 0xFF;
                             local573 = local571 >> 8 & 0xFF;
-                            Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
-                            Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
-                            Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
-                            Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
+                            LoginManager.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
+                            LoginManager.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
+                            LoginManager.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
+                            LoginManager.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
                             local60++;
                         }
                     }
                 }
             }
         }
-        Static127.method2463(local26, local64, local20, local31, false, local13);
+        LoginManager.method2463(local26, local64, local20, local31, false, local13);
     }
 
     @OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V")
@@ -1034,7 +1036,7 @@ public class Protocol {
             return true;
         } else if (opcode == ServerProt.CLEAR_MINIMAP_FLAG) {
             opcode = -1;
-            Static115.mapFlagX = 0;
+            LoginManager.mapFlagX = 0;
             return true;
         } else if (opcode == ServerProt.IF_SETSCROLLPOS) {
             int id = inboundBuffer.g4me();
@@ -1178,7 +1180,7 @@ public class Protocol {
             int optId = inboundBuffer.g1();
             JagString option = inboundBuffer.gjstr();
             if (optId >= 1 && optId <= 8) {
-                if (option.equalsIgnoreCase(Static92.NULL)) {
+                if (option.equalsIgnoreCase(MiniMenu.NULL)) {
                     option = null;
                 }
                 Player.options[optId - 1] = option;
@@ -1234,7 +1236,7 @@ public class Protocol {
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.UPDATE_UID192) {
-            Static271.writeRandom(inboundBuffer);
+            writeRandom(inboundBuffer);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) {
@@ -1251,7 +1253,7 @@ public class Protocol {
             int step = inboundBuffer.g1();
             int dur = inboundBuffer.g1();
             setVerifyId(tracknum);
-            Static260.method3849(cy, tz, step, tx, dur);
+            Camera.method3849(cy, tz, step, tx, dur);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.IF_SETANIM) {
@@ -1364,8 +1366,8 @@ public class Protocol {
                 }
             } else {
                 int plane = target >> 28 & 0x3;
-                int posX = (target >> 14 & 0x3FFF) - Static225.originX;
-                int posZ = (target & 0x3FFF) - Static142.originZ;
+                int posX = (target >> 14 & 0x3FFF) - Camera.originX;
+                int posZ = (target & 0x3FFF) - Camera.originZ;
                 if (posX >= 0 && posZ >= 0 && posX < 104 && posZ < 104) {
                     posZ = posZ * 128 + 64;
                     posX = posX * 128 + 64;
@@ -1425,9 +1427,9 @@ public class Protocol {
             setVerifyId(tracknum);
             Camera.yawTarget = yaw;
             Camera.pitchTarget = pitch;
-            if (Static227.cameraType == 2) {
-                Static240.cameraPitch = (int)Camera.pitchTarget;
-                Static184.cameraYaw = (int)Camera.yawTarget;
+            if (Camera.cameraType == 2) {
+                Camera.cameraPitch = (int)Camera.pitchTarget;
+                Camera.cameraYaw = (int)Camera.yawTarget;
             }
             Camera.clampCameraAngle();
             opcode = -1;
@@ -1580,7 +1582,7 @@ public class Protocol {
             for (int i = 0; i < VarpDomain.activeVarps.length; i++) {
                 if (VarpDomain.varp[i] != VarpDomain.activeVarps[i]) {
                     VarpDomain.activeVarps[i] = VarpDomain.varp[i];
-                    Static85.refreshMagicVarp(i);
+                    VarpDomain.refreshMagicVarp(i);
                     VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i;
                 }
             }
@@ -1594,7 +1596,7 @@ public class Protocol {
             int local1146 = inboundBuffer.g1();
             int local277 = inboundBuffer.g1();
             setVerifyId(tracknum);
-            Static141.method2722(true, local1146, counter, local277, modelId, local786);
+            Camera.method2722(true, local1146, counter, local277, modelId, local786);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.MESSAGE_QUICKCHAT_PRIVATE) {
@@ -1679,9 +1681,9 @@ public class Protocol {
             int shake4 = inboundBuffer.g2();
             setVerifyId(tracknum);
             Static176.customCameraActive[cameraId] = true;
-            Static222.cameraJitter[cameraId] = jitter;
-            Static276.cameraAmplitude[cameraId] = amplitude;
-            Static202.cameraFrequency[cameraId] = frequency;
+            Camera.cameraJitter[cameraId] = jitter;
+            Camera.cameraAmplitude[cameraId] = amplitude;
+            Camera.cameraFrequency[cameraId] = frequency;
             Static31.anIntArray76[cameraId] = shake4;
             opcode = -1;
             return true;
@@ -1752,7 +1754,7 @@ public class Protocol {
             return true;
         } else if (opcode == ServerProt.URL_OPEN) {
             if (GameShell.fullScreenFrame != null) {
-                Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
+                DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
             }
             @Pc(3848) byte[] data = new byte[length];
             inboundBuffer.gBytesIsaac(data, length);
@@ -1779,7 +1781,7 @@ public class Protocol {
         } else if (opcode == ServerProt.VARBIT_SMALL) {
             int value = inboundBuffer.g1add();
             int id = inboundBuffer.g2le();
-            Static272.setVarbit(value, id);
+            VarpDomain.setVarbit(value, id);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.IF_OPENTOP) {
@@ -1886,10 +1888,10 @@ public class Protocol {
             }
             int z = pos & 0x3FFF;
             int x = pos >> 14 & 0x3FFF;
-            x -= Static225.originX;
-            z -= Static142.originZ;
+            x -= Camera.originX;
+            z -= Camera.originZ;
             int plane = pos >> 28 & 0x3;
-            Static92.method1881(plane, rotation, type, z, type2, x, seqId);
+            SceneGraph.method1881(plane, rotation, type, z, type2, x, seqId);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.MESSAGE_PRIVATE) {
@@ -2018,7 +2020,7 @@ public class Protocol {
         } else if (opcode == ServerProt.VARBIT_LARGE) {
             int value = inboundBuffer.g4le();
             int id = inboundBuffer.g2leadd();
-            Static272.setVarbit(value, id);
+            VarpDomain.setVarbit(value, id);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.UPDATE_INV_PARTIAL) {
@@ -2059,11 +2061,11 @@ public class Protocol {
         } else if (opcode == ServerProt.CAM_RESET) {
             int tracknum = inboundBuffer.g2();
             setVerifyId(tracknum);
-            Static35.resetCameraEffects();
+            Camera.resetCameraEffects();
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.LOGOUT) {
-            Static278.processLogout();
+            LoginManager.processLogout();
             opcode = -1;
             return false;
         } else if (opcode == ServerProt.GRAND_EXCHANGE_OFFERS) {
@@ -2294,7 +2296,7 @@ public class Protocol {
             return true;
         } else {
             TracingException.report("T1 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length, null);
-            Static278.processLogout();
+            LoginManager.processLogout();
             return true;
         }
     }
@@ -2307,12 +2309,12 @@ public class Protocol {
             Static175.method3279();
             return true;
         } catch (@Pc(19) Exception local19) {
-            @Pc(61) String local61 = "T2 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - ";
+            @Pc(61) String local61 = "T2 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length + "," + (Camera.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Camera.originZ) + " - ";
             for (@Pc(63) int local63 = 0; local63 < length && local63 < 50; local63++) {
                 local61 = local61 + inboundBuffer.data[local63] + ",";
             }
             TracingException.report(local61, local19);
-            Static278.processLogout();
+            LoginManager.processLogout();
             return true;
         }
     }
@@ -2506,7 +2508,7 @@ public class Protocol {
         }
         // VarpDomain
         for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) {
-            Static85.refreshMagicVarp(i);
+            VarpDomain.refreshMagicVarp(i);
             VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i;
         }
         @Pc(782) int modelId;
@@ -2684,7 +2686,7 @@ public class Protocol {
                         outboundBuffer.p2add(Static18.anInt588);
                         outboundBuffer.p1sub(local1363);
                     }
-                } else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
+                } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
                     Static226.method3901();
                 } else if (MiniMenu.size > 0) {
                     Static59.method1372();
@@ -2728,24 +2730,24 @@ public class Protocol {
                                         priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead();
                                         if (priorityRequest == null) {
                                             if (WorldMap.component == null) {
-                                                Static137.anInt3337 = 0;
+                                                Static36.anInt3337 = 0;
                                             }
-                                            if (Static105.aClass13_14 != null) {
+                                            if (Static40.aClass13_14 != null) {
                                                 ClientProt.method28();
                                             }
-                                            if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static58.wheelRotation != 0) {
-                                                y = Player.level - Static58.wheelRotation;
+                                            if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MouseWheel.wheelRotation != 0) {
+                                                y = Player.level - MouseWheel.wheelRotation;
                                                 if (y < 0) {
                                                     y = 0;
                                                 } else if (y > 3) {
                                                     y = 3;
                                                 }
                                                 // Cheat
-                                                Cheat.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y);
+                                                Cheat.teleport(PlayerList.self.movementQueueX[0] + Camera.originX, PlayerList.self.movementQueueZ[0] + Camera.originZ, y);
                                             }
                                             if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
                                                 if (MiniMenu.anInt1742 != -1) {
-                                                    Cheat.teleport(Static225.originX + MiniMenu.anInt1742, Static142.originZ - -MiniMenu.anInt2954, Player.level);
+                                                    Cheat.teleport(Camera.originX + MiniMenu.anInt1742, Camera.originZ - -MiniMenu.anInt2954, Player.level);
                                                 }
                                                 Static187.anInt4422 = 0;
                                                 Static125.anInt3096 = 0;
@@ -2753,9 +2755,9 @@ public class Protocol {
                                                 if (MiniMenu.anInt1742 != -1) {
                                                     outboundBuffer.p1isaac(131);
                                                     outboundBuffer.p4me(MiniMenu.anInt2512);
-                                                    outboundBuffer.p2add(Static225.originX + MiniMenu.anInt1742);
+                                                    outboundBuffer.p2add(Camera.originX + MiniMenu.anInt1742);
                                                     outboundBuffer.p2leadd(MiniMenu.anInt506);
-                                                    outboundBuffer.p2add(MiniMenu.anInt2954 + Static142.originZ);
+                                                    outboundBuffer.p2add(MiniMenu.anInt2954 + Camera.originZ);
                                                     Cross.type = 1;
                                                     Cross.milliseconds = 0;
                                                     Cross.y = Mouse.clickY;
@@ -2765,8 +2767,8 @@ public class Protocol {
                                             } else if (Static187.anInt4422 == 2) {
                                                 if (MiniMenu.anInt1742 != -1) {
                                                     outboundBuffer.p1isaac(179);
-                                                    outboundBuffer.p2(Static142.originZ + MiniMenu.anInt2954);
-                                                    outboundBuffer.p2(MiniMenu.anInt1742 + Static225.originX);
+                                                    outboundBuffer.p2(Camera.originZ + MiniMenu.anInt2954);
+                                                    outboundBuffer.p2(MiniMenu.anInt1742 + Camera.originX);
                                                     Cross.milliseconds = 0;
                                                     Cross.type = 1;
                                                     Cross.x = Mouse.clickX;
@@ -2810,9 +2812,9 @@ public class Protocol {
                                                     InterfaceList.redraw(Static43.aClass13_11);
                                                 }
                                             }
-                                            if (Static227.cameraType == 1) {
-                                                Static250.method4273();
-                                            } else if (Static227.cameraType == 2) {
+                                            if (Camera.cameraType == 1) {
+                                                Camera.method4273();
+                                            } else if (Camera.cameraType == 2) {
                                                 Camera.updateLockedCamera();
                                             } else {
                                                 Camera.updateLoginScreenCamera();
@@ -2836,7 +2838,7 @@ public class Protocol {
                                                 Static164.newTab = false;
                                             }
                                             Static131.anInt3251++;
-                                            Static82.anInt2252++;
+                                            MiniMap.anInt2252++;
                                             Static143.anInt3486++;
                                             if (Static143.anInt3486 > 500) {
                                                 Static143.anInt3486 = 0;
@@ -2845,36 +2847,36 @@ public class Protocol {
                                                     Static230.anInt5161 += Static220.anInt4941;
                                                 }
                                                 if ((modelId & 0x2) == 2) {
-                                                    Static206.anInt4774 += Static20.anInt659;
+                                                    Static206.anInt4774 += anInt659;
                                                 }
                                                 if ((modelId & 0x1) == 1) {
                                                     Static132.anInt3291 += Static248.anInt4229;
                                                 }
                                             }
-                                            if (Static82.anInt2252 > 500) {
-                                                Static82.anInt2252 = 0;
+                                            if (MiniMap.anInt2252 > 500) {
+                                                MiniMap.anInt2252 = 0;
                                                 modelId = (int) (Math.random() * 8.0D);
                                                 if ((modelId & 0x1) == 1) {
-                                                    Static59.anInt1814 += Static263.anInt5755;
+                                                    MiniMap.anInt1814 += MiniMap.anInt5755;
                                                 }
                                                 if ((modelId & 0x2) == 2) {
-                                                    MiniMap.anInt4130 += Static179.anInt4262;
+                                                    MiniMap.anInt4130 += MiniMap.anInt4262;
                                                 }
                                             }
                                             if (Static132.anInt3291 < -50) {
                                                 Static248.anInt4229 = 2;
                                             }
-                                            if (Static59.anInt1814 < -60) {
-                                                Static263.anInt5755 = 2;
+                                            if (MiniMap.anInt1814 < -60) {
+                                                MiniMap.anInt5755 = 2;
                                             }
                                             if (MiniMap.anInt4130 < -20) {
-                                                Static179.anInt4262 = 1;
+                                                MiniMap.anInt4262 = 1;
                                             }
                                             if (Static206.anInt4774 < -55) {
-                                                Static20.anInt659 = 2;
+                                                anInt659 = 2;
                                             }
                                             if (Static206.anInt4774 > 55) {
-                                                Static20.anInt659 = -2;
+                                                anInt659 = -2;
                                             }
                                             if (Static230.anInt5161 < -40) {
                                                 Static220.anInt4941 = 1;
@@ -2886,10 +2888,10 @@ public class Protocol {
                                                 Static220.anInt4941 = -1;
                                             }
                                             if (MiniMap.anInt4130 > 10) {
-                                                Static179.anInt4262 = -1;
+                                                MiniMap.anInt4262 = -1;
                                             }
-                                            if (Static59.anInt1814 > 60) {
-                                                Static263.anInt5755 = -2;
+                                            if (MiniMap.anInt1814 > 60) {
+                                                MiniMap.anInt5755 = -2;
                                             }
                                             if (Static131.anInt3251 > 50) {
                                                 outboundBuffer.p1isaac(93);
@@ -3199,4 +3201,16 @@ public class Protocol {
         outboundBuffer.p1isaac(177);
         outboundBuffer.p2(verifyId);
     }
+
+    @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
+    public static void writeRandom(@OriginalArg(0) Buffer arg0) {
+        if (client.uid != null) {
+            try {
+                client.uid.seek(0L);
+                client.uid.write(arg0.data, arg0.offset, 24);
+            } catch (@Pc(16) Exception local16) {
+            }
+        }
+        arg0.offset += 24;
+    }
 }
diff --git a/client/src/main/java/rt4/SceneGraph.java b/client/src/main/java/rt4/SceneGraph.java
index 151ba45..e354ffa 100644
--- a/client/src/main/java/rt4/SceneGraph.java
+++ b/client/src/main/java/rt4/SceneGraph.java
@@ -68,6 +68,12 @@ public class SceneGraph {
     public static Scenery[] aClass31Array2;
     @OriginalMember(owner = "client!gf", name = "O", descriptor = "[[[I")
     public static int[][][] underwaterTileHeights;
+    @OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;")
+    public static GlTile[][] underwaterHdTiles;
+    @OriginalMember(owner = "client!jm", name = "r", descriptor = "I")
+    public static int anInt3114;
+    @OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
+	public static byte[][][] aByteArrayArrayArray13;
 
     @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
     public static boolean allLevelsAreVisible() {
@@ -316,4 +322,223 @@ public class SceneGraph {
 		@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
 		return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key;
 	}
+
+    @OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V")
+    public static void setRenderTiles(@OriginalArg(0) boolean arg0) {
+        if (arg0) {
+            tiles = underWaterGroundTiles;
+            tileHeights = underwaterTileHeights;
+            underwaterHdTiles = underWaterHdTiles;
+        } else {
+            tiles = surfaceGroundTiles;
+            tileHeights = surfaceTileHeights;
+            underwaterHdTiles = surfaceHdTiles;
+        }
+        anInt3114 = tiles.length;
+    }
+
+    @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIZLclient!wa;IIBII)V")
+    public static void readTile(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) Buffer arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
+        @Pc(32) int local32;
+        if (arg5 < 0 || arg5 >= 104 || arg4 < 0 || arg4 >= 104) {
+            while (true) {
+                local32 = arg3.g1();
+                if (local32 == 0) {
+                    break;
+                }
+                if (local32 == 1) {
+                    arg3.g1();
+                    break;
+                }
+                if (local32 <= 49) {
+                    arg3.g1();
+                }
+            }
+            return;
+        }
+        if (!arg2) {
+            tileFlags[arg7][arg5][arg4] = 0;
+        }
+        while (true) {
+            local32 = arg3.g1();
+            if (local32 == 0) {
+                if (arg2) {
+                    tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4];
+                } else if (arg7 == 0) {
+                    tileHeights[0][arg5][arg4] = -PerlinNoise.getTileHeight(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8;
+                } else {
+                    tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - 240;
+                }
+                break;
+            }
+            if (local32 == 1) {
+                @Pc(111) int local111 = arg3.g1();
+                if (arg2) {
+                    tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4] + local111 * 8;
+                } else {
+                    if (local111 == 1) {
+                        local111 = 0;
+                    }
+                    if (arg7 == 0) {
+                        tileHeights[0][arg5][arg4] = -local111 * 8;
+                    } else {
+                        tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - local111 * 8;
+                    }
+                }
+                break;
+            }
+            if (local32 <= 49) {
+                tileOverlays[arg7][arg5][arg4] = arg3.g1s();
+                tileShapes[arg7][arg5][arg4] = (byte) ((local32 - 2) / 4);
+                tileAngles[arg7][arg5][arg4] = (byte) (local32 + arg6 - 2 & 0x3);
+            } else if (local32 > 81) {
+                tileUnderlays[arg7][arg5][arg4] = (byte) (local32 - 81);
+            } else if (!arg2) {
+                tileFlags[arg7][arg5][arg4] = (byte) (local32 - 49);
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIIIIII)V")
+    public static void method1881(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
+        if (arg5 < 0 || arg3 < 0 || arg5 >= 103 || arg3 >= 103) {
+            return;
+        }
+        @Pc(38) int local38;
+        if (arg4 == 0) {
+            @Pc(28) Wall local28 = getWall(arg0, arg5, arg3);
+            if (local28 != null) {
+                local38 = Integer.MAX_VALUE & (int) (local28.key >>> 32);
+                if (arg2 == 2) {
+                    local28.primary = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.primary);
+                    local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6);
+                } else {
+                    local28.primary = new Loc(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.primary);
+                }
+            }
+        }
+        if (arg4 == 1) {
+            @Pc(106) WallDecor local106 = getWallDecor(arg0, arg5, arg3);
+            if (local106 != null) {
+                local38 = (int) (local106.key >>> 32) & Integer.MAX_VALUE;
+                if (arg2 == 4 || arg2 == 5) {
+                    local106.primary = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.primary);
+                } else if (arg2 == 6) {
+                    local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
+                } else if (arg2 == 7) {
+                    local106.primary = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.primary);
+                } else if (arg2 == 8) {
+                    local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
+                    local106.aClass8_2 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2);
+                }
+            }
+        }
+        if (arg4 == 2) {
+            if (arg2 == 11) {
+                arg2 = 10;
+            }
+            @Pc(255) Scenery local255 = getScenery(arg0, arg5, arg3);
+            if (local255 != null) {
+                local255.primary = new Loc((int) (local255.key >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary);
+            }
+        }
+        if (arg4 == 3) {
+            @Pc(290) GroundDecor local290 = getGroundDecor(arg0, arg5, arg3);
+            if (local290 != null) {
+                local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.key >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary);
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V")
+    public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) {
+        if (arg4 == null) {
+            return;
+        }
+        @Pc(6) GroundDecor local6 = new GroundDecor();
+        local6.primary = arg4;
+        local6.anInt732 = arg1 * 128 + 64;
+        local6.anInt736 = arg2 * 128 + 64;
+        local6.anInt733 = arg3;
+        local6.key = arg5;
+        local6.aBoolean49 = arg6;
+        if (tiles[arg0][arg1][arg2] == null) {
+            tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
+        }
+        tiles[arg0][arg1][arg2].groundDecor = local6;
+    }
+
+    @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
+    public static void method2574(@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) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) {
+        @Pc(7) AttachLocRequest local7 = new AttachLocRequest();
+        local7.angle = arg6;
+        local7.anInt1205 = arg3;
+        local7.anInt1187 = arg1;
+        local7.anInt1200 = arg5;
+        local7.entityId = arg2;
+        local7.x = arg8;
+        local7.anInt1197 = arg10;
+        local7.z = arg4;
+        local7.locId = arg11;
+        local7.anInt1188 = arg7;
+        local7.anInt1191 = arg0;
+        local7.shape = arg9;
+        AttachLocRequest.queue.addTail(local7);
+    }
+
+    @OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
+	public static int method2251(@OriginalArg(0) int arg0) {
+		@Pc(11) int local11 = arg0 & 0x3F;
+		@Pc(17) int local17 = arg0 >> 6 & 0x3;
+		if (local11 == 18) {
+			if (local17 == 0) {
+				return 1;
+			}
+			if (local17 == 1) {
+				return 2;
+			}
+			if (local17 == 2) {
+				return 4;
+			}
+			if (local17 == 3) {
+				return 8;
+			}
+		} else if (local11 == 19 || local11 == 21) {
+			if (local17 == 0) {
+				return 16;
+			}
+			if (local17 == 1) {
+				return 32;
+			}
+			if (local17 == 2) {
+				return 64;
+			}
+			if (local17 == 3) {
+				return 128;
+			}
+		}
+		return 0;
+	}
+
+    @OriginalMember(owner = "client!vf", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIJ)V")
+    public static void method4508(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8) {
+        if (arg4 == null && arg5 == null) {
+            return;
+        }
+        @Pc(8) Wall local8 = new Wall();
+        local8.key = arg8;
+        local8.anInt3048 = arg1 * 128 + 64;
+        local8.anInt3044 = arg2 * 128 + 64;
+        local8.anInt3051 = arg3;
+        local8.primary = arg4;
+        local8.aClass8_6 = arg5;
+        local8.anInt3049 = arg6;
+        local8.anInt3052 = arg7;
+        for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) {
+            if (tiles[local42][arg1][arg2] == null) {
+                tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2);
+            }
+        }
+        tiles[arg0][arg1][arg2].wall = local8;
+    }
 }
diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java
index 0f05484..773f0d8 100644
--- a/client/src/main/java/rt4/ScriptRunner.java
+++ b/client/src/main/java/rt4/ScriptRunner.java
@@ -31,6 +31,12 @@ public final class ScriptRunner {
 	public static final Calendar aCalendar2 = Calendar.getInstance();
 	@OriginalMember(owner = "client!kk", name = "m", descriptor = "Lclient!na;")
 	public static final JagString CS_ERROR = JagString.parse("Clientscript error )2 check log for details");
+	@OriginalMember(owner = "client!fe", name = "nc", descriptor = "[Lclient!hj;")
+	public static final GoSubFrame[] callStack = new GoSubFrame[50];
+	@OriginalMember(owner = "client!ee", name = "j", descriptor = "[I")
+	public static final int[] anIntArray140 = new int[5];
+	@OriginalMember(owner = "client!oe", name = "i", descriptor = "[[I")
+	public static final int[][] anIntArrayArray33 = new int[5][5000];
 	@OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
 	public static QuickChatPhrase activePhrase;
 	@OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;")
@@ -39,8 +45,12 @@ public final class ScriptRunner {
 	public static Component staticActiveComponent2;
 	@OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;")
 	public static JagString[] stringLocals;
+	@OriginalMember(owner = "client!rh", name = "a", descriptor = "[I")
+	public static int[] intLocals;
+	@OriginalMember(owner = "client!km", name = "ad", descriptor = "I")
+	public static int fp = 0;
 
-	public class Cs2Opcodes {
+	public static class Cs2Opcodes {
 		// Component setters
 		public static final int setPosition = 1000;
 		public static final int setSize = 1001;
@@ -48,6 +58,34 @@ public final class ScriptRunner {
 		public static final int setAspect = 1004;
 		public static final int setNoClickThrough = 1005;
 
+		public static final int setScrollPos = 1100;
+		public static final int setTrans = 1103;
+		public static final int setLineWid = 1104;
+		public static final int setSprite = 1105;
+		public static final int set2DAngle = 1106;
+		public static final int setSpriteTiling = 1107;
+		public static final int setModel = 1108;
+		public static final int set3DRotation = 1109;
+		public static final int setAnimation = 1110;
+		public static final int setModelOrthog = 1111;
+		public static final int setText = 1112;
+		public static final int setFont = 1113;
+		public static final int setTextAlignment = 1114;
+		public static final int setTextAntiMacro = 1115;
+		public static final int setOutlineThickness = 1116;
+		public static final int setShadowColor = 1117;
+		public static final int setVFlip = 1118;
+		public static final int setHFlip = 1119;
+		public static final int setScrollMax = 1120;
+		public static final int setAlpha = 1122;
+		public static final int set3DViewDistance = 1123;
+
+		public static final int setItem = 1200;
+		public static final int setNpcHead = 1201;
+		public static final int setPlayerHead = 1202;
+		public static final int setPlayerFull = 1204;
+		public static final int setItemNoNum = 1205;
+
 		// Component properties
 		public static final int getX = 1500;
 		public static final int getY = 1501;
@@ -98,7 +136,7 @@ public final class ScriptRunner {
 		public static final int formatNumber = 4124;
 
 		// Objs
-		public static final int itemIsStackable = 4207;
+		public static final int itemIsMembers = 4207;
 		public static final int itemAttribute = 4208;
 		public static final int searchItem = 4210;
 
@@ -115,6 +153,219 @@ public final class ScriptRunner {
 		public static final int getFirstWorldData = 6501;
 		public static final int getNextWorldData = 6502;
 		public static final int setWorldHost = 6503;
+		public static final int setChild = 200;
+		public static final int setChild2 = 201;
+		public static final int setBaseIdkit = 403;
+		public static final int setBaseColor = 404;
+		public static final int setFemale = 410;
+		public static final int setRGB = 1101;
+		public static final int setFilled = 1102;
+		public static final int setContextMenuOption = 1300;
+		public static final int setDraggable = 1301;
+		public static final int setDragRenderBehaviour = 1302;
+		public static final int setDragDeadZone = 1303;
+		public static final int setDragDeadTime = 1304;
+		public static final int setOptionBase = 1305;
+		public static final int setTargetVerb = 1306;
+		public static final int hookMousePress = 1400;
+		public static final int hookDraggedOver = 1401;
+		public static final int hookMouseRelease = 1402;
+		public static final int hookMouseEnter = 1403;
+		public static final int hookMouseExit = 1404;
+		public static final int hookDragStart = 1405;
+		public static final int hookUseWith = 1406;
+		public static final int hookVARP = 1407;
+		public static final int hookFrame = 1408;
+		public static final int hookOptionClick = 1409;
+		public static final int hookDragRelease = 1410;
+		public static final int hookDrag = 1411;
+		public static final int hookMouseHover = 1412;
+		public static final int hookContainer = 1414;
+		public static final int hookSkill = 1415;
+		public static final int hookOnUse = 1416;
+		public static final int hookScroll = 1417;
+		public static final int hookMsg = 1418;
+		public static final int hookKey = 1419;
+		public static final int hookFriendList = 1420;
+		public static final int hookClanList = 1421;
+		public static final int hookMiscData = 1422;
+		public static final int hookDialogAbort = 1423;
+		public static final int hookWidgetsOpenClose = 1424;
+		public static final int hookGEUpdate = 1425;
+		public static final int hookMinimapUnlock = 1426;
+		public static final int hookResize = 1427;
+		public static final int hookVARC = 1428;
+		public static final int hookSTRING = 1429;
+		public static final int getScrollX = 1600;
+		public static final int getScrollY = 1601;
+		public static final int getText = 1602;
+		public static final int getScrollMaxH = 1603;
+		public static final int getScrollMaxV = 1604;
+		public static final int get3DDistance = 1605;
+		public static final int getRotateX = 1606;
+		public static final int getRotateZ = 1607;
+		public static final int getRotateY = 1608;
+		public static final int getAlpha = 1609;
+		public static final int getModelXOffset = 1610;
+		public static final int getModelYOffset = 1611;
+		public static final int getSpriteId = 1612;
+		public static final int getItemId = 1700;
+		public static final int getItemAmt = 1701;
+		public static final int getChildId = 1702;
+		public static final int getTargetMask = 1800;
+		public static final int getOption = 1801;
+		public static final int getOptionBase = 1802;
+		public static final int getX2 = 2500;
+		public static final int getY2 = 2501;
+		public static final int getWidth2 = 2502;
+		public static final int getHeight2 = 2503;
+		public static final int isHidden2 = 2504;
+		public static final int getLayer2 = 2505;
+		public static final int getScrollX2 = 2600;
+		public static final int getScrollY2 = 2601;
+		public static final int getText2 = 2602;
+		public static final int getScrollMaxH2 = 2603;
+		public static final int getScrollMaxV2 = 2604;
+		public static final int get3DDistance2 = 2605;
+		public static final int getRotateX2 = 2606;
+		public static final int getRotateZ2 = 2607;
+		public static final int getRotateY2 = 2608;
+		public static final int getAlpha2 = 2609;
+		public static final int getModelXOffset2 = 2610;
+		public static final int getModelYOffset2 = 2611;
+		public static final int getSpriteId2 = 2612;
+		public static final int getItemId2 = 2700;
+		public static final int getItemAmt2 = 2701;
+		public static final int hasChild = 2702;
+		public static final int nextChild = 2703;
+		public static final int hasChildModal = 2704;
+		public static final int hasChildOverlay = 2705;
+		public static final int getTargetMask2 = 2800;
+		public static final int getOption2 = 2801;
+		public static final int getOptionBase2 = 2802;
+		public static final int msg = 3100;
+		public static final int animateSelf = 3101;
+		public static final int sendIntegerInput = 3104;
+		public static final int sendNameInput = 3105;
+		public static final int sendStringInput = 3106;
+		public static final int clickPlayerOption = 3107;
+		public static final int playSoundEffect = 3200;
+		public static final int playMusic = 3201;
+		public static final int playMusicEffect = 3202;
+		public static final int getClientCycle = 3300;
+		public static final int getItemIdInSlot = 3301;
+		public static final int getItemAmtInSlot = 3302;
+		public static final int getItemAmtInContainer = 3303;
+		public static final int getItemContainerLength = 3304;
+		public static final int getSkillCurrentLvl = 3305;
+		public static final int getSkillActualLvl = 3306;
+		public static final int getSkillXp = 3307;
+		public static final int getMyLocation = 3308;
+		public static final int x = 3309;
+		public static final int z = 3310;
+		public static final int y = 3311;
+		public static final int isMember = 3312;
+		public static final int getItemIdInInpsectingSlot = 3313;
+		public static final int getItemAmtInInspectingSlot = 3314;
+		public static final int getItemAmtInInspectingContainer = 3315;
+		public static final int getClientRights = 3316;
+		public static final int getSystemUpdateTimer = 3317;
+		public static final int getWorldId = 3318;
+		public static final int getRunEnergy = 3321;
+		public static final int getPlayerWeight = 3322;
+		public static final int hasMoreThen5Blackmarks = 3323;
+		public static final int getBlackmarks = 3324;
+		public static final int isSiteSettingsMembers = 3325;
+		public static final int getMyCombat = 3326;
+		public static final int IsFemale = 3327;
+		public static final int mapQuickchat = 3329;
+		public static final int getContainerFreeSlots = 3330;
+		public static final int getContainerIntAttrCountIgnoreStacks = 3331;
+		public static final int getContainerIntAttrCount = 3332;
+		public static final int getLoginTypeRelatedMethod3333 = 3333;
+		public static final int getLanguage = 3335;
+		public static final int moveCoord = 3336;
+		public static final int getAffid = 3337;
+		public static final int datamap = 3400;
+		public static final int datamap2 = 3408;
+		public static final int datamapContainsValue = 3409;
+		public static final int datamapContainsValue2 = 3410;
+		public static final int datamapSize = 3411;
+		public static final int getFriendCount = 3600;
+		public static final int getFriendName = 3601;
+		public static final int getFriendWorld = 3602;
+		public static final int getFriendRank = 3603;
+		public static final int isFriend = 3609;
+		public static final int getFriendWorldName = 3610;
+		public static final int clanChatDisplayName = 3611;
+		public static final int clanGetChatCount = 3612;
+		public static final int clanChatUsername = 3613;
+		public static final int clanChatUserWorld = 3614;
+		public static final int clanChatUserRank = 3615;
+		public static final int getIgnoreCount = 3621;
+		public static final int getIgnoreName = 3622;
+		public static final int getGEIsSelling = 3903;
+		public static final int getGEItem = 3904;
+		public static final int getGEItemPrice = 3905;
+		public static final int getGEItemAmt = 3906;
+		public static final int getGEItemAmtTransfered = 3907;
+		public static final int getGECashTransfered = 3908;
+		public static final int getGENotStarted = 3910;
+		public static final int getGEIsStatus2 = 3911;
+		public static final int getGEIsDone = 3912;
+		public static final int getGEIsStatus1 = 3913;
+		public static final int add = 4000;
+		public static final int subtract = 4001;
+		public static final int multiply = 4002;
+		public static final int divide = 4003;
+		public static final int rndExcl = 4004;
+		public static final int rnd = 4005;
+		public static final int getItemName = 4200;
+		public static final int getItemGroundOption = 4201;
+		public static final int getItemOption = 4202;
+		public static final int getItemValue = 4203;
+		public static final int itemIsStackable = 4204;
+		public static final int getNotedItem = 4205;
+		public static final int getRealItem = 4206;
+		public static final int nextSearchResult = 4211;
+		public static final int getNpcAttribute = 4300;
+		public static final int getTradeSetting = 5016;
+		public static final int isHoldingAlt = 5100;
+		public static final int isHoldingCtrl = 5101;
+		public static final int isHoldingShift = 5102;
+		public static final int setWorldmapZoom = 5200;
+		public static final int getWorldmapZoom = 5201;
+		public static final int loadDungeonmap = 5205;
+		public static final int getDungeonmap = 5206;
+		public static final int getDungeonMapName = 5207;
+		public static final int getDungeonmapCenter = 5210;
+		public static final int setPositionInMap = 5214;
+		public static final int dungeonmapContains = 5215;
+		public static final int getMapDefaultZoom = 5218;
+		public static final int getDisplayMode = 5306;
+		public static final int getLastIp5419 = 5419;
+		public static final int cameraMoveTo = 5500;
+		public static final int cameraPointAt = 5501;
+		public static final int cameraUnlock = 5503;
+		public static final int cameraGetVrot = 5505;
+		public static final int cameraGetHrot = 5506;
+		public static final int directlogin = 5600;
+		public static final int sendRequestAccount = 5604;
+		public static final int sendCreateAccount = 5605;
+		public static final int getGameloginRc = 5607;
+		public static final int getWorldswitchTimer = 5608;
+		public static final int getAccountCreateRC = 5609;
+		public static final int getDetailedRC = 5611;
+		public static final int getMinute = 6300;
+		public static final int getCurrentDaysSinceLaunch = 6301;
+		public static final int getDaysSinceLaunch = 6302;
+		public static final int getYear = 6303;
+		public static final int isLeapYear = 6304;
+		public static final int setNoOptions = 1307;
+		public static final int sendCloseWidgetPacket = 3103;
+		public static final int skipLoginstage10 = 5601;
+		public static final int resetRCs = 5602;
+		public static final int resetAccountCreateRC = 5606;
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V")
@@ -125,7 +376,7 @@ public final class ScriptRunner {
 		if (script == null) {
 			return;
 		}
-		Static138.fp = 0;
+		fp = 0;
 		@Pc(26) int ssp = 0;
 		@Pc(28) int isp = 0;
 		@Pc(30) int pc = -1;
@@ -134,7 +385,7 @@ public final class ScriptRunner {
 		@Pc(44) byte op = -1;
 		@Pc(58) int cycles;
 		try {
-			Static215.intLocals = new int[script.anInt4667];
+			intLocals = new int[script.anInt4667];
 			@Pc(50) int intLocalIndex = 0;
 			stringLocals = new JagString[script.anInt4671];
 			@Pc(56) int stringLocalIndex = 0;
@@ -170,7 +421,7 @@ public final class ScriptRunner {
 					if (id == 0x80000009) {
 						id = request.keyChar;
 					}
-					Static215.intLocals[intLocalIndex++] = id;
+					intLocals[intLocalIndex++] = id;
 				} else if (local4[cycles] instanceof JagString) {
 					value = (JagString) local4[cycles];
 					if (value.strEquals(EVENT_OPBASE)) {
@@ -204,7 +455,7 @@ public final class ScriptRunner {
 					if (opcode == 2) {
 						id = intOperands[pc];
 						isp--;
-						Static148.method2766(id, intStack[isp]);
+						VarpDomain.method2766(id, intStack[isp]);
 						continue;
 					}
 					if (opcode == 3) {
@@ -244,12 +495,12 @@ public final class ScriptRunner {
 						continue;
 					}
 					if (opcode == 21) {
-						if (Static138.fp == 0) {
+						if (fp == 0) {
 							return;
 						}
-						@Pc(423) GoSubFrame frame = Static67.callStack[--Static138.fp];
+						@Pc(423) GoSubFrame frame = callStack[--fp];
 						script = frame.script;
-						Static215.intLocals = frame.intLocals;
+						intLocals = frame.intLocals;
 						opcodes = script.opcodes;
 						pc = frame.pc;
 						stringLocals = frame.stringLocals;
@@ -258,13 +509,13 @@ public final class ScriptRunner {
 					}
 					if (opcode == 25) {
 						id = intOperands[pc];
-						intStack[isp++] = Static155.getVarbit(id);
+						intStack[isp++] = VarpDomain.getVarbit(id);
 						continue;
 					}
 					if (opcode == 27) {
 						id = intOperands[pc];
 						isp--;
-						Static202.setVarbitClient(id, intStack[isp]);
+						VarpDomain.setVarbitClient(id, intStack[isp]);
 						continue;
 					}
 					if (opcode == 31) {
@@ -282,14 +533,14 @@ public final class ScriptRunner {
 						continue;
 					}
 					if (opcode == 33) {
-						intStack[isp++] = Static215.intLocals[intOperands[pc]];
+						intStack[isp++] = intLocals[intOperands[pc]];
 						continue;
 					}
 					@Pc(555) int local;
 					if (opcode == 34) {
 						local = intOperands[pc];
 						isp--;
-						Static215.intLocals[local] = intStack[isp];
+						intLocals[local] = intStack[isp];
 						continue;
 					}
 					if (opcode == 35) {
@@ -332,16 +583,16 @@ public final class ScriptRunner {
 						ssp -= local642.anInt4669;
 						@Pc(705) GoSubFrame local705 = new GoSubFrame();
 						local705.stringLocals = stringLocals;
-						local705.intLocals = Static215.intLocals;
+						local705.intLocals = intLocals;
 						local705.pc = pc;
 						local705.script = script;
-						if (Static138.fp >= Static67.callStack.length) {
+						if (fp >= callStack.length) {
 							throw new RuntimeException();
 						}
 						script = local642;
 						pc = -1;
-						Static67.callStack[Static138.fp++] = local705;
-						Static215.intLocals = local646;
+						callStack[fp++] = local705;
+						intLocals = local646;
 						intOperands = local642.intOperands;
 						opcodes = local642.opcodes;
 						stringLocals = local650;
@@ -364,7 +615,7 @@ public final class ScriptRunner {
 						int3 = intStack[isp];
 						int1 = intOperands[pc] & 0xFFFF;
 						if (int3 >= 0 && int3 <= 5000) {
-							Static55.anIntArray140[id] = int3;
+							anIntArray140[id] = int3;
 							@Pc(828) byte local828 = -1;
 							if (int1 == 105) {
 								local828 = 0;
@@ -374,7 +625,7 @@ public final class ScriptRunner {
 								if (int3 <= local652) {
 									continue nextOp;
 								}
-								Static179.anIntArrayArray33[id][local652] = local828;
+								anIntArrayArray33[id][local652] = local828;
 								local652++;
 							}
 						}
@@ -384,8 +635,8 @@ public final class ScriptRunner {
 						id = intOperands[pc];
 						isp--;
 						int1 = intStack[isp];
-						if (int1 >= 0 && int1 < Static55.anIntArray140[id]) {
-							intStack[isp++] = Static179.anIntArrayArray33[id][int1];
+						if (int1 >= 0 && int1 < anIntArray140[id]) {
+							intStack[isp++] = anIntArrayArray33[id][int1];
 							continue;
 						}
 						throw new RuntimeException();
@@ -394,8 +645,8 @@ public final class ScriptRunner {
 						id = intOperands[pc];
 						isp -= 2;
 						int1 = intStack[isp];
-						if (int1 >= 0 && int1 < Static55.anIntArray140[id]) {
-							Static179.anIntArrayArray33[id][int1] = intStack[isp + 1];
+						if (int1 >= 0 && int1 < anIntArray140[id]) {
+							anIntArrayArray33[id][int1] = intStack[isp + 1];
 							continue;
 						}
 						throw new RuntimeException();
@@ -403,7 +654,7 @@ public final class ScriptRunner {
 					if (opcode == 47) {
 						value = VarcDomain.varcstrs[intOperands[pc]];
 						if (value == null) {
-							value = Static254.aClass100_1061;
+							value = VarpDomain.aClass100_1061;
 						}
 						stringStack[ssp++] = value;
 						continue;
@@ -494,11 +745,11 @@ public final class ScriptRunner {
 						InterfaceList.redraw(component);
 						continue;
 					}
-					if (opcode == 200) {
+					if (opcode == Cs2Opcodes.setChild) {
 						isp -= 2;
 						int1 = intStack[isp];
 						int3 = intStack[isp + 1];
-						local1256 = Static201.method1418(int1, int3);
+						local1256 = InterfaceList.method1418(int1, int3);
 						if (local1256 != null && int3 != -1) {
 							intStack[isp++] = 1;
 							if (local1020) {
@@ -511,7 +762,7 @@ public final class ScriptRunner {
 						intStack[isp++] = 0;
 						continue;
 					}
-					if (opcode == 201) {
+					if (opcode == Cs2Opcodes.setChild2) {
 						isp--;
 						int1 = intStack[isp];
 						local1204 = InterfaceList.getComponent(int1);
@@ -530,7 +781,7 @@ public final class ScriptRunner {
 				} else {
 					@Pc(12388) boolean local12388;
 					if (opcode < 500) {
-						if (opcode == 403) {
+						if (opcode == Cs2Opcodes.setBaseIdkit) {
 							isp -= 2;
 							int3 = intStack[isp + 1];
 							int1 = intStack[isp];
@@ -542,33 +793,33 @@ public final class ScriptRunner {
 							}
 							int2 = 0;
 							while (true) {
-								if (int2 >= Static153.anIntArray351.length) {
+								if (int2 >= PlayerAppearance.FEMALE_FEATURES.length) {
 									continue nextOp;
 								}
-								if (int1 == Static153.anIntArray351[int2]) {
+								if (int1 == PlayerAppearance.FEMALE_FEATURES[int2]) {
 									PlayerList.self.appearance.method1953(int2, int3);
 									continue nextOp;
 								}
 								int2++;
 							}
 						}
-						if (opcode == 404) {
+						if (opcode == Cs2Opcodes.setBaseColor) {
 							isp -= 2;
 							int1 = intStack[isp];
 							int3 = intStack[isp + 1];
-							PlayerList.self.appearance.method1951(int1, int3);
+							PlayerList.self.appearance.setBaseColor(int1, int3);
 							continue;
 						}
-						if (opcode == 410) {
+						if (opcode == Cs2Opcodes.setFemale) {
 							isp--;
 							local12388 = intStack[isp] != 0;
-							PlayerList.self.appearance.method1948(local12388);
+							PlayerList.self.appearance.setFemale(local12388);
 							continue;
 						}
 					} else {
 						@Pc(1552) boolean local1552;
 						if ((opcode < 1000 || opcode >= 1100) && (opcode < 2000 || opcode >= 2100)) {
-							@Pc(2522) JagString local2522;
+							@Pc(2522) JagString str1;
 							if (opcode >= 1100 && opcode < 1200 || !(opcode < 2100 || opcode >= 2200)) {
 								if (opcode < 2000) {
 									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
@@ -577,7 +828,7 @@ public final class ScriptRunner {
 									isp--;
 									component = InterfaceList.getComponent(intStack[isp]);
 								}
-								if (opcode == 1100) {
+								if (opcode == Cs2Opcodes.setScrollPos) {
 									isp -= 2;
 									component.scrollX = intStack[isp];
 									if (component.scrollX > component.scrollMaxH - component.width) {
@@ -599,7 +850,7 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1101) {
+								if (opcode == Cs2Opcodes.setRGB) {
 									isp--;
 									component.color = intStack[isp];
 									InterfaceList.redraw(component);
@@ -608,43 +859,43 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1102) {
+								if (opcode == Cs2Opcodes.setFilled) {
 									isp--;
-									component.aBoolean30 = intStack[isp] == 1;
+									component.filled = intStack[isp] == 1;
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1103) {
+								if (opcode == Cs2Opcodes.setTrans) {
 									isp--;
 									component.alpha = intStack[isp];
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1104) {
+								if (opcode == Cs2Opcodes.setLineWid) {
 									isp--;
 									component.lineWidth = intStack[isp];
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1105) {
+								if (opcode == Cs2Opcodes.setSprite) {
 									isp--;
 									component.spriteId = intStack[isp];
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1106) {
+								if (opcode == Cs2Opcodes.set2DAngle) {
 									isp--;
 									component.angle2d = intStack[isp];
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1107) {
+								if (opcode == Cs2Opcodes.setSpriteTiling) {
 									isp--;
 									component.spriteTiling = intStack[isp] == 1;
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1108) {
+								if (opcode == Cs2Opcodes.setModel) {
 									component.modelType = 1;
 									isp--;
 									component.modelId = intStack[isp];
@@ -654,7 +905,7 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1109) {
+								if (opcode == Cs2Opcodes.set3DRotation) {
 									isp -= 6;
 									component.modelXOffset = intStack[isp];
 									component.modelZOffset = intStack[isp + 1];
@@ -669,7 +920,7 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1110) {
+								if (opcode == Cs2Opcodes.setAnimation) {
 									isp--;
 									int3 = intStack[isp];
 									if (component.modelSeqId != int3) {
@@ -684,17 +935,17 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1111) {
+								if (opcode == Cs2Opcodes.setModelOrthog) {
 									isp--;
 									component.modelOrtho = intStack[isp] == 1;
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1112) {
+								if (opcode == Cs2Opcodes.setText) {
 									ssp--;
-									local2522 = stringStack[ssp];
-									if (!local2522.strEquals(component.text)) {
-										component.text = local2522;
+									str1 = stringStack[ssp];
+									if (!str1.strEquals(component.text)) {
+										component.text = str1;
 										InterfaceList.redraw(component);
 									}
 									if (component.createdComponentId == -1) {
@@ -702,13 +953,13 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1113) {
+								if (opcode == Cs2Opcodes.setFont) {
 									isp--;
 									component.font = intStack[isp];
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1114) {
+								if (opcode == Cs2Opcodes.setTextAlignment) {
 									isp -= 3;
 									component.anInt460 = intStack[isp];
 									component.anInt478 = intStack[isp + 1];
@@ -716,37 +967,37 @@ public final class ScriptRunner {
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1115) {
+								if (opcode == Cs2Opcodes.setTextAntiMacro) {
 									isp--;
 									component.textAntiMacro = intStack[isp] == 1;
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1116) {
+								if (opcode == Cs2Opcodes.setOutlineThickness) {
 									isp--;
 									component.outlineThickness = intStack[isp];
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1117) {
+								if (opcode == Cs2Opcodes.setShadowColor) {
 									isp--;
 									component.shadowColor = intStack[isp];
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1118) {
+								if (opcode == Cs2Opcodes.setVFlip) {
 									isp--;
 									component.vFlip = intStack[isp] == 1;
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1119) {
+								if (opcode == Cs2Opcodes.setHFlip) {
 									isp--;
 									component.hFlip = intStack[isp] == 1;
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1120) {
+								if (opcode == Cs2Opcodes.setScrollMax) {
 									isp -= 2;
 									component.scrollMaxH = intStack[isp];
 									component.scrollMaxV = intStack[isp + 1];
@@ -763,13 +1014,13 @@ public final class ScriptRunner {
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1122) {
+								if (opcode == Cs2Opcodes.setAlpha) {
 									isp--;
 									component.hasAlpha = intStack[isp] == 1;
 									InterfaceList.redraw(component);
 									continue;
 								}
-								if (opcode == 1123) {
+								if (opcode == Cs2Opcodes.set3DViewDistance) {
 									isp--;
 									component.modelZoom = intStack[isp];
 									InterfaceList.redraw(component);
@@ -787,7 +1038,7 @@ public final class ScriptRunner {
 									opcode -= 1000;
 								}
 								InterfaceList.redraw(component);
-								if (opcode == 1200 || opcode == 1205) {
+								if (opcode == Cs2Opcodes.setItem || opcode == Cs2Opcodes.setItemNoNum) {
 									isp -= 2;
 									int2 = intStack[isp + 1];
 									int3 = intStack[isp];
@@ -815,7 +1066,7 @@ public final class ScriptRunner {
 										} else if (component.baseWidth > 0) {
 											component.modelZoom = component.modelZoom * 32 / component.baseWidth;
 										}
-										if (opcode == 1205) {
+										if (opcode == Cs2Opcodes.setItemNoNum) {
 											component.objDrawText = false;
 										} else {
 											component.objDrawText = true;
@@ -823,7 +1074,7 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1201) {
+								if (opcode == Cs2Opcodes.setNpcHead) {
 									component.modelType = 2;
 									isp--;
 									component.modelId = intStack[isp];
@@ -840,7 +1091,7 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1203) {
+								if (opcode == Cs2Opcodes.setPlayerHead) {
 									component.modelType = 6;
 									isp--;
 									component.modelId = intStack[isp];
@@ -849,7 +1100,7 @@ public final class ScriptRunner {
 									}
 									continue;
 								}
-								if (opcode == 1204) {
+								if (opcode == Cs2Opcodes.setPlayerFull) {
 									component.modelType = 5;
 									isp--;
 									component.modelId = intStack[isp];
@@ -866,7 +1117,7 @@ public final class ScriptRunner {
 								} else {
 									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 								}
-								if (opcode == 1300) {
+								if (opcode == Cs2Opcodes.setContextMenuOption) {
 									isp--;
 									int3 = intStack[isp] - 1;
 									if (int3 >= 0 && int3 <= 9) {
@@ -877,39 +1128,39 @@ public final class ScriptRunner {
 									ssp--;
 									continue;
 								}
-								if (opcode == 1301) {
+								if (opcode == Cs2Opcodes.setDraggable) {
 									isp -= 2;
 									int2 = intStack[isp + 1];
 									int3 = intStack[isp];
-									component.aClass13_5 = Static201.method1418(int3, int2);
+									component.aClass13_5 = InterfaceList.method1418(int3, int2);
 									continue;
 								}
-								if (opcode == 1302) {
+								if (opcode == Cs2Opcodes.setDragRenderBehaviour) {
 									isp--;
 									component.dragRenderBehavior = intStack[isp] == 1;
 									continue;
 								}
-								if (opcode == 1303) {
+								if (opcode == Cs2Opcodes.setDragDeadZone) {
 									isp--;
 									component.dragDeadzone = intStack[isp];
 									continue;
 								}
-								if (opcode == 1304) {
+								if (opcode == Cs2Opcodes.setDragDeadTime) {
 									isp--;
 									component.dragDeadtime = intStack[isp];
 									continue;
 								}
-								if (opcode == 1305) {
+								if (opcode == Cs2Opcodes.setOptionBase) {
 									ssp--;
 									component.optionBase = stringStack[ssp];
 									continue;
 								}
-								if (opcode == 1306) {
+								if (opcode == Cs2Opcodes.setTargetVerb) {
 									ssp--;
 									component.targetVerb = stringStack[ssp];
 									continue;
 								}
-								if (opcode == 1307) {
+								if (opcode == Cs2Opcodes.setNoOptions) {
 									component.ops = null;
 									continue;
 								}
@@ -942,8 +1193,8 @@ public final class ScriptRunner {
 									}
 									@Pc(12937) int[] local12937 = null;
 									ssp--;
-									local2522 = stringStack[ssp];
-									if (local2522.length() > 0 && local2522.charAt(local2522.length() - 1) == 89) {
+									str1 = stringStack[ssp];
+									if (str1.length() > 0 && str1.charAt(str1.length() - 1) == 89) {
 										isp--;
 										local652 = intStack[isp];
 										if (local652 > 0) {
@@ -953,16 +1204,16 @@ public final class ScriptRunner {
 												local12937[local652] = intStack[isp];
 											}
 										}
-										local2522 = local2522.substring(local2522.length() - 1, 0);
+										str1 = str1.substring(str1.length() - 1, 0);
 									}
-									@Pc(13000) Object[] local13000 = new Object[local2522.length() + 1];
+									@Pc(13000) Object[] local13000 = new Object[str1.length() + 1];
 									for (c = local13000.length - 1; c >= 1; c--) {
-										if (local2522.charAt(c - 1) == 115) {
+										if (str1.charAt(c - 1) == 115) {
 											ssp--;
 											local13000[c] = stringStack[ssp];
 										} else {
 											isp--;
-											local13000[c] = Integer.valueOf(intStack[isp]);
+											local13000[c] = intStack[isp];
 										}
 									}
 									isp--;
@@ -970,70 +1221,70 @@ public final class ScriptRunner {
 									if (c == -1) {
 										local13000 = null;
 									} else {
-										local13000[0] = Integer.valueOf(c);
+										local13000[0] = c;
 									}
 									component.aBoolean25 = true;
-									if (opcode == 1400) {
+									if (opcode == Cs2Opcodes.hookMousePress) {
 										component.onClickRepeat = local13000;
-									} else if (opcode == 1401) {
+									} else if (opcode == Cs2Opcodes.hookDraggedOver) {
 										component.onHold = local13000;
-									} else if (opcode == 1402) {
+									} else if (opcode == Cs2Opcodes.hookMouseRelease) {
 										component.onRelease = local13000;
-									} else if (opcode == 1403) {
+									} else if (opcode == Cs2Opcodes.hookMouseEnter) {
 										component.onMouseOver = local13000;
-									} else if (opcode == 1404) {
+									} else if (opcode == Cs2Opcodes.hookMouseExit) {
 										component.onMouseLeave = local13000;
-									} else if (opcode == 1405) {
+									} else if (opcode == Cs2Opcodes.hookDragStart) {
 										component.onDragStart = local13000;
-									} else if (opcode == 1406) {
+									} else if (opcode == Cs2Opcodes.hookUseWith) {
 										component.onUseWith = local13000;
-									} else if (opcode == 1407) {
+									} else if (opcode == Cs2Opcodes.hookVARP) {
 										component.varpTriggers = local12937;
 										component.onVarpTransmit = local13000;
-									} else if (opcode == 1408) {
+									} else if (opcode == Cs2Opcodes.hookFrame) {
 										component.onTimer = local13000;
-									} else if (opcode == 1409) {
+									} else if (opcode == Cs2Opcodes.hookOptionClick) {
 										component.onOptionClick = local13000;
-									} else if (opcode == 1410) {
+									} else if (opcode == Cs2Opcodes.hookDragRelease) {
 										component.onDragRelease = local13000;
-									} else if (opcode == 1411) {
+									} else if (opcode == Cs2Opcodes.hookDrag) {
 										component.onDrag = local13000;
-									} else if (opcode == 1412) {
+									} else if (opcode == Cs2Opcodes.hookMouseHover) {
 										component.onMouseRepeat = local13000;
-									} else if (opcode == 1414) {
+									} else if (opcode == Cs2Opcodes.hookContainer) {
 										component.inventoryTriggers = local12937;
 										component.onInvTransmit = local13000;
-									} else if (opcode == 1415) {
+									} else if (opcode == Cs2Opcodes.hookSkill) {
 										component.statTriggers = local12937;
 										component.onStatTransmit = local13000;
-									} else if (opcode == 1416) {
+									} else if (opcode == Cs2Opcodes.hookOnUse) {
 										component.onUse = local13000;
-									} else if (opcode == 1417) {
+									} else if (opcode == Cs2Opcodes.hookScroll) {
 										component.onScroll = local13000;
-									} else if (opcode == 1418) {
+									} else if (opcode == Cs2Opcodes.hookMsg) {
 										component.onMsg = local13000;
-									} else if (opcode == 1419) {
+									} else if (opcode == Cs2Opcodes.hookKey) {
 										component.onKey = local13000;
-									} else if (opcode == 1420) {
+									} else if (opcode == Cs2Opcodes.hookFriendList) {
 										component.onFriendTransmit = local13000;
-									} else if (opcode == 1421) {
+									} else if (opcode == Cs2Opcodes.hookClanList) {
 										component.onClanTransmit = local13000;
-									} else if (opcode == 1422) {
+									} else if (opcode == Cs2Opcodes.hookMiscData) {
 										component.onMiscTransmit = local13000;
-									} else if (opcode == 1423) {
+									} else if (opcode == Cs2Opcodes.hookDialogAbort) {
 										component.onDialogAbort = local13000;
-									} else if (opcode == 1424) {
+									} else if (opcode == Cs2Opcodes.hookWidgetsOpenClose) {
 										component.onWidgetsOpenClose = local13000;
-									} else if (opcode == 1425) {
+									} else if (opcode == Cs2Opcodes.hookGEUpdate) { // if_setonstocktransmit
 										component.onStockTransmit = local13000;
-									} else if (opcode == 1426) {
+									} else if (opcode == Cs2Opcodes.hookMinimapUnlock) {
 										component.onMinimapUnlock = local13000;
-									} else if (opcode == 1427) {
+									} else if (opcode == Cs2Opcodes.hookResize) {
 										component.onResize = local13000;
-									} else if (opcode == 1428) {
+									} else if (opcode == Cs2Opcodes.hookVARC) {
 										component.onVarcTransmit = local13000;
 										component.varcTriggers = local12937;
-									} else if (opcode == 1429) {
+									} else if (opcode == Cs2Opcodes.hookSTRING) {
 										component.varcstrTriggers = local12937;
 										component.onVarcstrTransmit = local13000;
 									}
@@ -1067,65 +1318,65 @@ public final class ScriptRunner {
 									}
 								} else if (opcode < 1700) {
 									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
-									if (opcode == 1600) {
+									if (opcode == Cs2Opcodes.getScrollX) {
 										intStack[isp++] = component.scrollX;
 										continue;
 									}
-									if (opcode == 1601) {
+									if (opcode == Cs2Opcodes.getScrollY) {
 										intStack[isp++] = component.scrollY;
 										continue;
 									}
-									if (opcode == 1602) {
+									if (opcode == Cs2Opcodes.getText) {
 										stringStack[ssp++] = component.text;
 										continue;
 									}
-									if (opcode == 1603) {
+									if (opcode == Cs2Opcodes.getScrollMaxH) {
 										intStack[isp++] = component.scrollMaxH;
 										continue;
 									}
-									if (opcode == 1604) {
+									if (opcode == Cs2Opcodes.getScrollMaxV) {
 										intStack[isp++] = component.scrollMaxV;
 										continue;
 									}
-									if (opcode == 1605) {
+									if (opcode == Cs2Opcodes.get3DDistance) {
 										intStack[isp++] = component.modelZoom;
 										continue;
 									}
-									if (opcode == 1606) {
+									if (opcode == Cs2Opcodes.getRotateX) {
 										intStack[isp++] = component.modelXAngle;
 										continue;
 									}
-									if (opcode == 1607) {
+									if (opcode == Cs2Opcodes.getRotateZ) {
 										intStack[isp++] = component.modelYOffset;
 										continue;
 									}
-									if (opcode == 1608) {
+									if (opcode == Cs2Opcodes.getRotateY) {
 										intStack[isp++] = component.modelYAngle;
 										continue;
 									}
-									if (opcode == 1609) {
+									if (opcode == Cs2Opcodes.getAlpha) {
 										intStack[isp++] = component.alpha;
 										continue;
 									}
-									if (opcode == 1610) {
+									if (opcode == Cs2Opcodes.getModelXOffset) {
 										intStack[isp++] = component.modelXOffset;
 										continue;
 									}
-									if (opcode == 1611) {
+									if (opcode == Cs2Opcodes.getModelYOffset) {
 										intStack[isp++] = component.modelZOffset;
 										continue;
 									}
-									if (opcode == 1612) {
+									if (opcode == Cs2Opcodes.getSpriteId) {
 										intStack[isp++] = component.spriteId;
 										continue;
 									}
 								} else if (opcode < 1800) {
 									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
-									if (opcode == 1700) {
+									if (opcode == Cs2Opcodes.getItemId) {
 										intStack[isp++] = component.objId;
 										continue;
 									}
-									if (opcode == 1701) {
+									if (opcode == Cs2Opcodes.getItemAmt) {
 										if (component.objId == -1) {
 											intStack[isp++] = 0;
 										} else {
@@ -1133,17 +1384,17 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 1702) {
+									if (opcode == Cs2Opcodes.getChildId) {
 										intStack[isp++] = component.createdComponentId;
 										continue;
 									}
 								} else if (opcode < 1900) {
 									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
-									if (opcode == 1800) {
+									if (opcode == Cs2Opcodes.getTargetMask) {
 										intStack[isp++] = InterfaceList.getServerActiveProperties(component).getTargetMask();
 										continue;
 									}
-									if (opcode == 1801) {
+									if (opcode == Cs2Opcodes.getOption) {
 										isp--;
 										int3 = intStack[isp];
 										int3--;
@@ -1154,7 +1405,7 @@ public final class ScriptRunner {
 										stringStack[ssp++] = EMPTY_STRING;
 										continue;
 									}
-									if (opcode == 1802) {
+									if (opcode == Cs2Opcodes.getOptionBase) {
 										if (component.optionBase == null) {
 											stringStack[ssp++] = EMPTY_STRING;
 										} else {
@@ -1165,93 +1416,93 @@ public final class ScriptRunner {
 								} else if (opcode < 2600) {
 									isp--;
 									component = InterfaceList.getComponent(intStack[isp]);
-									if (opcode == 2500) {
+									if (opcode == Cs2Opcodes.getX2) {
 										intStack[isp++] = component.x;
 										continue;
 									}
-									if (opcode == 2501) {
+									if (opcode == Cs2Opcodes.getY2) {
 										intStack[isp++] = component.y;
 										continue;
 									}
-									if (opcode == 2502) {
+									if (opcode == Cs2Opcodes.getWidth2) {
 										intStack[isp++] = component.width;
 										continue;
 									}
-									if (opcode == 2503) {
+									if (opcode == Cs2Opcodes.getHeight2) {
 										intStack[isp++] = component.height;
 										continue;
 									}
-									if (opcode == 2504) {
+									if (opcode == Cs2Opcodes.isHidden2) {
 										intStack[isp++] = component.hidden ? 1 : 0;
 										continue;
 									}
-									if (opcode == 2505) {
+									if (opcode == Cs2Opcodes.getLayer2) {
 										intStack[isp++] = component.layer;
 										continue;
 									}
 								} else if (opcode < 2700) {
 									isp--;
 									component = InterfaceList.getComponent(intStack[isp]);
-									if (opcode == 2600) {
+									if (opcode == Cs2Opcodes.getScrollX2) {
 										intStack[isp++] = component.scrollX;
 										continue;
 									}
-									if (opcode == 2601) {
+									if (opcode == Cs2Opcodes.getScrollY2) {
 										intStack[isp++] = component.scrollY;
 										continue;
 									}
-									if (opcode == 2602) {
+									if (opcode == Cs2Opcodes.getText2) {
 										stringStack[ssp++] = component.text;
 										continue;
 									}
-									if (opcode == 2603) {
+									if (opcode == Cs2Opcodes.getScrollMaxH2) {
 										intStack[isp++] = component.scrollMaxH;
 										continue;
 									}
-									if (opcode == 2604) {
+									if (opcode == Cs2Opcodes.getScrollMaxV2) {
 										intStack[isp++] = component.scrollMaxV;
 										continue;
 									}
-									if (opcode == 2605) {
+									if (opcode == Cs2Opcodes.get3DDistance2) {
 										intStack[isp++] = component.modelZoom;
 										continue;
 									}
-									if (opcode == 2606) {
+									if (opcode == Cs2Opcodes.getRotateX2) {
 										intStack[isp++] = component.modelXAngle;
 										continue;
 									}
-									if (opcode == 2607) {
+									if (opcode == Cs2Opcodes.getRotateZ2) {
 										intStack[isp++] = component.modelYOffset;
 										continue;
 									}
-									if (opcode == 2608) {
+									if (opcode == Cs2Opcodes.getRotateY2) {
 										intStack[isp++] = component.modelYAngle;
 										continue;
 									}
-									if (opcode == 2609) {
+									if (opcode == Cs2Opcodes.getAlpha2) {
 										intStack[isp++] = component.alpha;
 										continue;
 									}
-									if (opcode == 2610) {
+									if (opcode == Cs2Opcodes.getModelXOffset2) {
 										intStack[isp++] = component.modelXOffset;
 										continue;
 									}
-									if (opcode == 2611) {
+									if (opcode == Cs2Opcodes.getModelYOffset2) {
 										intStack[isp++] = component.modelZOffset;
 										continue;
 									}
-									if (opcode == 2612) {
+									if (opcode == Cs2Opcodes.getSpriteId2) {
 										intStack[isp++] = component.spriteId;
 										continue;
 									}
 								} else if (opcode < 2800) {
-									if (opcode == 2700) {
+									if (opcode == Cs2Opcodes.getItemId2) {
 										isp--;
 										component = InterfaceList.getComponent(intStack[isp]);
 										intStack[isp++] = component.objId;
 										continue;
 									}
-									if (opcode == 2701) {
+									if (opcode == Cs2Opcodes.getItemAmt2) {
 										isp--;
 										component = InterfaceList.getComponent(intStack[isp]);
 										if (component.objId == -1) {
@@ -1261,7 +1512,7 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 2702) {
+									if (opcode == Cs2Opcodes.hasChild) {
 										isp--;
 										int1 = intStack[isp];
 										@Pc(12566) ComponentPointer local12566 = (ComponentPointer) InterfaceList.openInterfaces.get((long) int1);
@@ -1272,7 +1523,7 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 2703) {
+									if (opcode == Cs2Opcodes.nextChild) {
 										isp--;
 										component = InterfaceList.getComponent(intStack[isp]);
 										if (component.createdComponents == null) {
@@ -1289,7 +1540,7 @@ public final class ScriptRunner {
 										intStack[isp++] = int3;
 										continue;
 									}
-									if (opcode == 2704 || opcode == 2705) {
+									if (opcode == Cs2Opcodes.hasChildModal || opcode == Cs2Opcodes.hasChildOverlay) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
@@ -1304,11 +1555,11 @@ public final class ScriptRunner {
 								} else if (opcode < 2900) {
 									isp--;
 									component = InterfaceList.getComponent(intStack[isp]);
-									if (opcode == 2800) {
+									if (opcode == Cs2Opcodes.getTargetMask2) {
 										intStack[isp++] = InterfaceList.getServerActiveProperties(component).getTargetMask();
 										continue;
 									}
-									if (opcode == 2801) {
+									if (opcode == Cs2Opcodes.getOption2) {
 										isp--;
 										int3 = intStack[isp];
 										int3--;
@@ -1319,7 +1570,7 @@ public final class ScriptRunner {
 										stringStack[ssp++] = EMPTY_STRING;
 										continue;
 									}
-									if (opcode == 2802) {
+									if (opcode == Cs2Opcodes.getOptionBase2) {
 										if (component.optionBase == null) {
 											stringStack[ssp++] = EMPTY_STRING;
 										} else {
@@ -1328,22 +1579,22 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 3200) {
-									if (opcode == 3100) {
+									if (opcode == Cs2Opcodes.msg) {
 										ssp--;
 										string = stringStack[ssp];
 										Chat.add(EMPTY_STRING, 0, string);
 										continue;
 									}
-									if (opcode == 3101) {
+									if (opcode == Cs2Opcodes.animateSelf) {
 										isp -= 2;
 										Player.animate(intStack[isp + 1], intStack[isp], PlayerList.self);
 										continue;
 									}
-									if (opcode == 3103) {
-										ClientProt.method2909();
+									if (opcode == Cs2Opcodes.sendCloseWidgetPacket) {
+										ClientProt.closeWidget();
 										continue;
 									}
-									if (opcode == 3104) {
+									if (opcode == Cs2Opcodes.sendIntegerInput) {
 										ssp--;
 										string = stringStack[ssp];
 										int3 = 0;
@@ -1354,14 +1605,14 @@ public final class ScriptRunner {
 										Protocol.outboundBuffer.p4(int3);
 										continue;
 									}
-									if (opcode == 3105) {
+									if (opcode == Cs2Opcodes.sendNameInput) {
 										ssp--;
 										string = stringStack[ssp];
 										Protocol.outboundBuffer.p1isaac(244);
 										Protocol.outboundBuffer.p8(string.encode37());
 										continue;
 									}
-									if (opcode == 3106) {
+									if (opcode == Cs2Opcodes.sendStringInput) {
 										ssp--;
 										string = stringStack[ssp];
 										Protocol.outboundBuffer.p1isaac(65);
@@ -1369,12 +1620,12 @@ public final class ScriptRunner {
 										Protocol.outboundBuffer.pjstr(string);
 										continue;
 									}
-									if (opcode == 3107) {
+									if (opcode == Cs2Opcodes.clickPlayerOption) {
 										isp--;
 										int1 = intStack[isp];
 										ssp--;
-										local2522 = stringStack[ssp];
-										ClientProt.method4613(int1, local2522);
+										str1 = stringStack[ssp];
+										ClientProt.clickPlayerOption(int1, str1);
 										continue;
 									}
 									if (opcode == 3108) {
@@ -1402,122 +1653,122 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 3300) {
-									if (opcode == 3200) {
+									if (opcode == Cs2Opcodes.playSoundEffect) {
 										isp -= 3;
 										SoundPlayer.play(intStack[isp + 1], intStack[isp], intStack[isp + 2]);
 										continue;
 									}
-									if (opcode == 3201) {
+									if (opcode == Cs2Opcodes.playMusic) {
 										isp--;
 										MusicPlayer.playSong(intStack[isp]);
 										continue;
 									}
-									if (opcode == 3202) {
+									if (opcode == Cs2Opcodes.playMusicEffect) {
 										isp -= 2;
 										MusicPlayer.playJingle(intStack[isp + 1], intStack[isp]);
 										continue;
 									}
 								} else if (opcode < 3400) {
-									if (opcode == 3300) {
+									if (opcode == Cs2Opcodes.getClientCycle) {
 										intStack[isp++] = client.loop;
 										continue;
 									}
-									if (opcode == 3301) {
+									if (opcode == Cs2Opcodes.getItemIdInSlot) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
 										intStack[isp++] = Inv.getItemType(int1, int3);
 										continue;
 									}
-									if (opcode == 3302) {
+									if (opcode == Cs2Opcodes.getItemAmtInSlot) {
 										isp -= 2;
 										int3 = intStack[isp + 1];
 										int1 = intStack[isp];
 										intStack[isp++] = Inv.getItemCount(int1, int3);
 										continue;
 									}
-									if (opcode == 3303) {
+									if (opcode == Cs2Opcodes.getItemAmtInContainer) {
 										isp -= 2;
 										int3 = intStack[isp + 1];
 										int1 = intStack[isp];
 										intStack[isp++] = Inv.getSlotTotal(int1, int3);
 										continue;
 									}
-									if (opcode == 3304) {
+									if (opcode == Cs2Opcodes.getItemContainerLength) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = InvTypeList.get(int1).size;
 										continue;
 									}
-									if (opcode == 3305) {
+									if (opcode == Cs2Opcodes.getSkillCurrentLvl) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = PlayerSkillXpTable.boostedLevels[int1];
 										continue;
 									}
-									if (opcode == 3306) {
+									if (opcode == Cs2Opcodes.getSkillActualLvl) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = PlayerSkillXpTable.baseLevels[int1];
 										continue;
 									}
-									if (opcode == 3307) {
+									if (opcode == Cs2Opcodes.getSkillXp) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = PlayerSkillXpTable.experience[int1];
 										continue;
 									}
-									if (opcode == 3308) {
+									if (opcode == Cs2Opcodes.getMyLocation) {
 										int1 = Player.level;
-										int3 = Static225.originX + (PlayerList.self.xFine >> 7);
-										int2 = (PlayerList.self.zFine >> 7) + Static142.originZ;
+										int3 = Camera.originX + (PlayerList.self.xFine >> 7);
+										int2 = (PlayerList.self.zFine >> 7) + Camera.originZ;
 										intStack[isp++] = (int1 << 28) - (-(int3 << 14) - int2);
 										continue;
 									}
-									if (opcode == 3309) {
+									if (opcode == Cs2Opcodes.x) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = int1 >> 14 & 0x3FFF;
 										continue;
 									}
-									if (opcode == 3310) {
+									if (opcode == Cs2Opcodes.z) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = int1 >> 28;
 										continue;
 									}
-									if (opcode == 3311) {
+									if (opcode == Cs2Opcodes.y) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = int1 & 0x3FFF;
 										continue;
 									}
-									if (opcode == 3312) {
+									if (opcode == Cs2Opcodes.isMember) {
 										intStack[isp++] = LoginManager.mapMembers ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3313) {
+									if (opcode == Cs2Opcodes.getItemIdInInpsectingSlot) {
 										isp -= 2;
 										int1 = intStack[isp] + 32768;
 										int3 = intStack[isp + 1];
 										intStack[isp++] = Inv.getItemType(int1, int3);
 										continue;
 									}
-									if (opcode == 3314) {
+									if (opcode == Cs2Opcodes.getItemAmtInInspectingSlot) {
 										isp -= 2;
 										int1 = intStack[isp] + 32768;
 										int3 = intStack[isp + 1];
 										intStack[isp++] = Inv.getItemCount(int1, int3);
 										continue;
 									}
-									if (opcode == 3315) {
+									if (opcode == Cs2Opcodes.getItemAmtInInspectingContainer) {
 										isp -= 2;
 										int1 = intStack[isp] + 32768;
 										int3 = intStack[isp + 1];
 										intStack[isp++] = Inv.getSlotTotal(int1, int3);
 										continue;
 									}
-									if (opcode == 3316) {
+									if (opcode == Cs2Opcodes.getClientRights) {
 										if (LoginManager.staffModLevel < 2) {
 											intStack[isp++] = 0;
 										} else {
@@ -1525,47 +1776,47 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 3317) {
+									if (opcode == Cs2Opcodes.getSystemUpdateTimer) {
 										intStack[isp++] = Player.rebootTimer;
 										continue;
 									}
-									if (opcode == 3318) {
+									if (opcode == Cs2Opcodes.getWorldId) {
 										intStack[isp++] = Player.worldId;
 										continue;
 									}
-									if (opcode == 3321) {
+									if (opcode == Cs2Opcodes.getRunEnergy) {
 										intStack[isp++] = Player.runEnergy;
 										continue;
 									}
-									if (opcode == 3322) {
+									if (opcode == Cs2Opcodes.getPlayerWeight) {
 										intStack[isp++] = Player.weight;
 										continue;
 									}
-									if (opcode == 3323) {
-										if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) {
+									if (opcode == Cs2Opcodes.hasMoreThen5Blackmarks) {
+										if (LoginManager.blackmarks >= 5 && LoginManager.blackmarks <= 9) {
 											intStack[isp++] = 1;
 											continue;
 										}
 										intStack[isp++] = 0;
 										continue;
 									}
-									if (opcode == 3324) {
-										if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) {
-											intStack[isp++] = LoginManager.playerModLevel;
+									if (opcode == Cs2Opcodes.getBlackmarks) {
+										if (LoginManager.blackmarks >= 5 && LoginManager.blackmarks <= 9) {
+											intStack[isp++] = LoginManager.blackmarks;
 											continue;
 										}
 										intStack[isp++] = 0;
 										continue;
 									}
-									if (opcode == 3325) {
+									if (opcode == Cs2Opcodes.isSiteSettingsMembers) {
 										intStack[isp++] = LoginManager.playerMember ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3326) {
+									if (opcode == Cs2Opcodes.getMyCombat) {
 										intStack[isp++] = PlayerList.self.combatLevel;
 										continue;
 									}
-									if (opcode == 3327) {
+									if (opcode == Cs2Opcodes.IsFemale) {
 										intStack[isp++] = PlayerList.self.appearance.gender ? 1 : 0;
 										continue;
 									}
@@ -1573,39 +1824,39 @@ public final class ScriptRunner {
 										intStack[isp++] = LoginManager.playerUnderage && !LoginManager.parentalChatConsent ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3329) {
+									if (opcode == Cs2Opcodes.mapQuickchat) {
 										intStack[isp++] = LoginManager.mapQuickChat ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3330) {
+									if (opcode == Cs2Opcodes.getContainerFreeSlots) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = Inv.getFreeSpace(int1);
 										continue;
 									}
-									if (opcode == 3331) {
+									if (opcode == Cs2Opcodes.getContainerIntAttrCountIgnoreStacks) {
 										isp -= 2;
 										int3 = intStack[isp + 1];
 										int1 = intStack[isp];
 										intStack[isp++] = Inv.getTotalParam(false, int1, int3);
 										continue;
 									}
-									if (opcode == 3332) {
+									if (opcode == Cs2Opcodes.getContainerIntAttrCount) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
 										intStack[isp++] = Inv.getTotalParam(true, int1, int3);
 										continue;
 									}
-									if (opcode == 3333) {
+									if (opcode == Cs2Opcodes.getLoginTypeRelatedMethod3333) {
 										intStack[isp++] = LoginManager.anInt39;
 										continue;
 									}
-									if (opcode == 3335) {
+									if (opcode == Cs2Opcodes.getLanguage) {
 										intStack[isp++] = client.language;
 										continue;
 									}
-									if (opcode == 3336) {
+									if (opcode == Cs2Opcodes.moveCoord) {
 										isp -= 4;
 										int3 = intStack[isp + 1];
 										int1 = intStack[isp];
@@ -1617,13 +1868,13 @@ public final class ScriptRunner {
 										intStack[isp++] = int1;
 										continue;
 									}
-									if (opcode == 3337) {
+									if (opcode == Cs2Opcodes.getAffid) {
 										intStack[isp++] = client.affiliate;
 										continue;
 									}
 								} else if (opcode < 3500) {
 									@Pc(3422) EnumType local3422;
-									if (opcode == 3400) {
+									if (opcode == Cs2Opcodes.datamap) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
@@ -1633,7 +1884,7 @@ public final class ScriptRunner {
 										stringStack[ssp++] = local3422.getString(int3);
 										continue;
 									}
-									if (opcode == 3408) {
+									if (opcode == Cs2Opcodes.datamap2) {
 										isp -= 4;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
@@ -1650,7 +1901,7 @@ public final class ScriptRunner {
 										}
 										throw new RuntimeException("C3408-1");
 									}
-									if (opcode == 3409) {
+									if (opcode == Cs2Opcodes.datamapContainsValue) {
 										isp -= 3;
 										int3 = intStack[isp + 1];
 										int2 = intStack[isp + 2];
@@ -1665,11 +1916,11 @@ public final class ScriptRunner {
 										intStack[isp++] = local3549.containsValue(int2) ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3410) {
+									if (opcode == Cs2Opcodes.datamapContainsValue2) {
 										isp--;
 										int1 = intStack[isp];
 										ssp--;
-										local2522 = stringStack[ssp];
+										str1 = stringStack[ssp];
 										if (int1 == -1) {
 											throw new RuntimeException("C3410-2");
 										}
@@ -1677,10 +1928,10 @@ public final class ScriptRunner {
 										if (local3422.valueType != 115) {
 											throw new RuntimeException("C3410-1");
 										}
-										intStack[isp++] = local3422.containsValue(local2522) ? 1 : 0;
+										intStack[isp++] = local3422.containsValue(str1) ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3411) {
+									if (opcode == Cs2Opcodes.datamapSize) {
 										isp--;
 										int1 = intStack[isp];
 										@Pc(3645) EnumType local3645 = EnumTypeList.get(int1);
@@ -1688,7 +1939,7 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 3700) {
-									if (opcode == 3600) {
+									if (opcode == Cs2Opcodes.getFriendCount) {
 										if (FriendsList.state == 0) {
 											intStack[isp++] = -2;
 										} else if (FriendsList.state == 1) {
@@ -1698,7 +1949,7 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 3601) {
+									if (opcode == Cs2Opcodes.getFriendName) {
 										isp--;
 										int1 = intStack[isp];
 										if (FriendsList.state == 2 && int1 < FriendsList.size) {
@@ -1708,7 +1959,7 @@ public final class ScriptRunner {
 										stringStack[ssp++] = EMPTY_STRING;
 										continue;
 									}
-									if (opcode == 3602) {
+									if (opcode == Cs2Opcodes.getFriendWorld) {
 										isp--;
 										int1 = intStack[isp];
 										if (FriendsList.state == 2 && FriendsList.size > int1) {
@@ -1718,7 +1969,7 @@ public final class ScriptRunner {
 										intStack[isp++] = 0;
 										continue;
 									}
-									if (opcode == 3603) {
+									if (opcode == Cs2Opcodes.getFriendRank) {
 										isp--;
 										int1 = intStack[isp];
 										if (FriendsList.state == 2 && FriendsList.size > int1) {
@@ -1760,7 +2011,7 @@ public final class ScriptRunner {
 										IgnoreList.remove(string.encode37());
 										continue;
 									}
-									if (opcode == 3609) {
+									if (opcode == Cs2Opcodes.isFriend) {
 										ssp--;
 										string = stringStack[ssp];
 										if (string.startsWith(aClass100_446) || string.startsWith(aClass100_537)) {
@@ -1769,7 +2020,7 @@ public final class ScriptRunner {
 										intStack[isp++] = FriendsList.contains(string) ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3610) {
+									if (opcode == Cs2Opcodes.getFriendWorldName) {
 										isp--;
 										int1 = intStack[isp];
 										if (FriendsList.state == 2 && FriendsList.size > int1) {
@@ -1779,7 +2030,7 @@ public final class ScriptRunner {
 										stringStack[ssp++] = EMPTY_STRING;
 										continue;
 									}
-									if (opcode == 3611) {
+									if (opcode == Cs2Opcodes.clanChatDisplayName) {
 										if (ClanChat.name == null) {
 											stringStack[ssp++] = EMPTY_STRING;
 										} else {
@@ -1787,7 +2038,7 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 3612) {
+									if (opcode == Cs2Opcodes.clanGetChatCount) {
 										if (ClanChat.name == null) {
 											intStack[isp++] = 0;
 										} else {
@@ -1795,7 +2046,7 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 3613) {
+									if (opcode == Cs2Opcodes.clanChatUsername) {
 										isp--;
 										int1 = intStack[isp];
 										if (ClanChat.name != null && ClanChat.size > int1) {
@@ -1805,7 +2056,7 @@ public final class ScriptRunner {
 										stringStack[ssp++] = EMPTY_STRING;
 										continue;
 									}
-									if (opcode == 3614) {
+									if (opcode == Cs2Opcodes.clanChatUserWorld) {
 										isp--;
 										int1 = intStack[isp];
 										if (ClanChat.name != null && int1 < ClanChat.size) {
@@ -1815,7 +2066,7 @@ public final class ScriptRunner {
 										intStack[isp++] = 0;
 										continue;
 									}
-									if (opcode == 3615) {
+									if (opcode == Cs2Opcodes.clanChatUserRank) {
 										isp--;
 										int1 = intStack[isp];
 										if (ClanChat.name != null && ClanChat.size > int1) {
@@ -1849,7 +2100,7 @@ public final class ScriptRunner {
 										ClanChat.leave();
 										continue;
 									}
-									if (opcode == 3621) {
+									if (opcode == Cs2Opcodes.getIgnoreCount) {
 										if (FriendsList.state == 0) {
 											intStack[isp++] = -1;
 										} else {
@@ -1857,7 +2108,7 @@ public final class ScriptRunner {
 										}
 										continue;
 									}
-									if (opcode == 3622) {
+									if (opcode == Cs2Opcodes.getIgnoreName) {
 										isp--;
 										int1 = intStack[isp];
 										if (FriendsList.state != 0 && IgnoreList.size > int1) {
@@ -1928,64 +2179,64 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 4000) {
-									if (opcode == 3903) {
+									if (opcode == Cs2Opcodes.getGEIsSelling) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = StockMarketManager.offers[int1].getType();
 										continue;
 									}
-									if (opcode == 3904) {
+									if (opcode == Cs2Opcodes.getGEItem) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = StockMarketManager.offers[int1].item;
 										continue;
 									}
-									if (opcode == 3905) {
+									if (opcode == Cs2Opcodes.getGEItemPrice) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = StockMarketManager.offers[int1].price;
 										continue;
 									}
-									if (opcode == 3906) {
+									if (opcode == Cs2Opcodes.getGEItemAmt) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = StockMarketManager.offers[int1].count;
 										continue;
 									}
-									if (opcode == 3907) {
+									if (opcode == Cs2Opcodes.getGEItemAmtTransfered) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = StockMarketManager.offers[int1].completedCount;
 										continue;
 									}
-									if (opcode == 3908) {
+									if (opcode == Cs2Opcodes.getGECashTransfered) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = StockMarketManager.offers[int1].completedGold;
 										continue;
 									}
-									if (opcode == 3910) {
+									if (opcode == Cs2Opcodes.getGENotStarted) {
 										isp--;
 										int1 = intStack[isp];
 										int3 = StockMarketManager.offers[int1].getStatus();
 										intStack[isp++] = int3 == 0 ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3911) {
+									if (opcode == Cs2Opcodes.getGEIsStatus2) {
 										isp--;
 										int1 = intStack[isp];
 										int3 = StockMarketManager.offers[int1].getStatus();
 										intStack[isp++] = int3 == 2 ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3912) {
+									if (opcode == Cs2Opcodes.getGEIsDone) {
 										isp--;
 										int1 = intStack[isp];
 										int3 = StockMarketManager.offers[int1].getStatus();
 										intStack[isp++] = int3 == 5 ? 1 : 0;
 										continue;
 									}
-									if (opcode == 3913) {
+									if (opcode == Cs2Opcodes.getGEIsStatus1) {
 										isp--;
 										int1 = intStack[isp];
 										int3 = StockMarketManager.offers[int1].getStatus();
@@ -1993,41 +2244,41 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 4100) {
-									if (opcode == 4000) {
+									if (opcode == Cs2Opcodes.add) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
 										intStack[isp++] = int3 + int1;
 										continue;
 									}
-									if (opcode == 4001) {
+									if (opcode == Cs2Opcodes.subtract) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
 										intStack[isp++] = int1 - int3;
 										continue;
 									}
-									if (opcode == 4002) {
+									if (opcode == Cs2Opcodes.multiply) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
 										intStack[isp++] = int3 * int1;
 										continue;
 									}
-									if (opcode == 4003) {
+									if (opcode == Cs2Opcodes.divide) {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
 										intStack[isp++] = int1 / int3;
 										continue;
 									}
-									if (opcode == 4004) {
+									if (opcode == Cs2Opcodes.rndExcl) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = (int) ((double) int1 * Math.random());
 										continue;
 									}
-									if (opcode == 4005) {
+									if (opcode == Cs2Opcodes.rnd) {
 										isp--;
 										int1 = intStack[isp];
 										intStack[isp++] = (int) (Math.random() * (double) (int1 + 1));
@@ -2087,7 +2338,7 @@ public final class ScriptRunner {
 										if (int1 == 0) {
 											intStack[isp++] = 0;
 										} else {
-											intStack[isp++] = (int) Math.pow((double) int1, (double) int3);
+											intStack[isp++] = (int) Math.pow(int1, int3);
 										}
 										continue;
 									}
@@ -2100,7 +2351,7 @@ public final class ScriptRunner {
 										} else if (int3 == 0) {
 											intStack[isp++] = Integer.MAX_VALUE;
 										} else {
-											intStack[isp++] = (int) Math.pow((double) int1, 1.0D / (double) int3);
+											intStack[isp++] = (int) Math.pow(int1, 1.0D / (double) int3);
 										}
 										continue;
 									}
@@ -2143,14 +2394,14 @@ public final class ScriptRunner {
 								} else if (opcode >= 4200) {
 									@Pc(5294) ParamType local5294;
 									if (opcode < 4300) {
-										if (opcode == 4200) {
+										if (opcode == Cs2Opcodes.getItemName) {
 											isp--;
 											int1 = intStack[isp];
 											stringStack[ssp++] = ObjTypeList.get(int1).name;
 											continue;
 										}
 										@Pc(11269) ObjType local11269;
-										if (opcode == 4201) {
+										if (opcode == Cs2Opcodes.getItemGroundOption) {
 											isp -= 2;
 											int1 = intStack[isp];
 											int3 = intStack[isp + 1];
@@ -2162,7 +2413,7 @@ public final class ScriptRunner {
 											stringStack[ssp++] = EMPTY_STRING;
 											continue;
 										}
-										if (opcode == 4202) {
+										if (opcode == Cs2Opcodes.getItemOption) {
 											isp -= 2;
 											int1 = intStack[isp];
 											int3 = intStack[isp + 1];
@@ -2174,20 +2425,20 @@ public final class ScriptRunner {
 											stringStack[ssp++] = EMPTY_STRING;
 											continue;
 										}
-										if (opcode == 4203) {
+										if (opcode == Cs2Opcodes.getItemValue) {
 											isp--;
 											int1 = intStack[isp];
 											intStack[isp++] = ObjTypeList.get(int1).cost;
 											continue;
 										}
-										if (opcode == 4204) {
+										if (opcode == Cs2Opcodes.itemIsStackable) {
 											isp--;
 											int1 = intStack[isp];
 											intStack[isp++] = ObjTypeList.get(int1).stackable == 1 ? 1 : 0;
 											continue;
 										}
 										@Pc(11417) ObjType local11417;
-										if (opcode == 4205) {
+										if (opcode == Cs2Opcodes.getNotedItem) {
 											isp--;
 											int1 = intStack[isp];
 											local11417 = ObjTypeList.get(int1);
@@ -2198,7 +2449,7 @@ public final class ScriptRunner {
 											intStack[isp++] = int1;
 											continue;
 										}
-										if (opcode == 4206) {
+										if (opcode == Cs2Opcodes.getRealItem) {
 											isp--;
 											int1 = intStack[isp];
 											local11417 = ObjTypeList.get(int1);
@@ -2209,7 +2460,7 @@ public final class ScriptRunner {
 											intStack[isp++] = int1;
 											continue;
 										}
-										if (opcode == Cs2Opcodes.itemIsStackable) {
+										if (opcode == Cs2Opcodes.itemIsMembers) {
 											isp--;
 											int1 = intStack[isp];
 											intStack[isp++] = ObjTypeList.get(int1).members ? 1 : 0;
@@ -2236,7 +2487,7 @@ public final class ScriptRunner {
 											intStack[isp++] = Find.index;
 											continue;
 										}
-										if (opcode == 4211) {
+										if (opcode == Cs2Opcodes.nextSearchResult) {
 											if (Find.results != null && Find.size < Find.index) {
 												intStack[isp++] = Find.results[Find.size++] & 0xFFFF;
 												continue;
@@ -2249,7 +2500,7 @@ public final class ScriptRunner {
 											continue;
 										}
 									} else if (opcode < 4400) {
-										if (opcode == 4300) {
+										if (opcode == Cs2Opcodes.getNpcAttribute) {
 											isp -= 2;
 											int1 = intStack[isp];
 											int3 = intStack[isp + 1];
@@ -2292,16 +2543,16 @@ public final class ScriptRunner {
 													continue;
 												}
 												if (opcode == 5003) {
-													local2522 = null;
+													str1 = null;
 													isp--;
 													int1 = intStack[isp];
 													if (int1 < 100) {
-														local2522 = Chat.messages[int1];
+														str1 = Chat.messages[int1];
 													}
-													if (local2522 == null) {
-														local2522 = EMPTY_STRING;
+													if (str1 == null) {
+														str1 = EMPTY_STRING;
 													}
-													stringStack[ssp++] = local2522;
+													stringStack[ssp++] = str1;
 													continue;
 												}
 												if (opcode == 5004) {
@@ -2325,114 +2576,114 @@ public final class ScriptRunner {
 														if (LoginManager.staffModLevel == 0 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) {
 															continue;
 														}
-														local2522 = string.toLowerCase();
+														str1 = string.toLowerCase();
 														@Pc(5555) byte local5555 = 0;
-														if (local2522.startsWith(LocalizedText.STABLE_CHATCOL0)) {
+														if (str1.startsWith(LocalizedText.STABLE_CHATCOL0)) {
 															local5555 = 0;
 															string = string.substring(LocalizedText.STABLE_CHATCOL0.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL1)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL1)) {
 															string = string.substring(LocalizedText.STABLE_CHATCOL1.length());
 															local5555 = 1;
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL2)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL2)) {
 															string = string.substring(LocalizedText.STABLE_CHATCOL2.length());
 															local5555 = 2;
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL3)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL3)) {
 															local5555 = 3;
 															string = string.substring(LocalizedText.STABLE_CHATCOL3.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL4)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL4)) {
 															string = string.substring(LocalizedText.STABLE_CHATCOL4.length());
 															local5555 = 4;
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL5)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL5)) {
 															string = string.substring(LocalizedText.STABLE_CHATCOL5.length());
 															local5555 = 5;
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL6)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL6)) {
 															local5555 = 6;
 															string = string.substring(LocalizedText.STABLE_CHATCOL6.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL7)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL7)) {
 															local5555 = 7;
 															string = string.substring(LocalizedText.STABLE_CHATCOL7.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL8)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL8)) {
 															string = string.substring(LocalizedText.STABLE_CHATCOL8.length());
 															local5555 = 8;
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL9)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL9)) {
 															local5555 = 9;
 															string = string.substring(LocalizedText.STABLE_CHATCOL9.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL10)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL10)) {
 															local5555 = 10;
 															string = string.substring(LocalizedText.STABLE_CHATCOL10.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL11)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATCOL11)) {
 															string = string.substring(LocalizedText.STABLE_CHATCOL11.length());
 															local5555 = 11;
 														} else if (client.language != 0) {
-															if (local2522.startsWith(LocalizedText.CHATCOL0)) {
+															if (str1.startsWith(LocalizedText.CHATCOL0)) {
 																local5555 = 0;
 																string = string.substring(LocalizedText.CHATCOL0.length());
-															} else if (local2522.startsWith(LocalizedText.CHATCOL1)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL1)) {
 																string = string.substring(LocalizedText.CHATCOL1.length());
 																local5555 = 1;
-															} else if (local2522.startsWith(LocalizedText.CHATCOL2)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL2)) {
 																string = string.substring(LocalizedText.CHATCOL2.length());
 																local5555 = 2;
-															} else if (local2522.startsWith(LocalizedText.CHATCOL3)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL3)) {
 																string = string.substring(LocalizedText.CHATCOL3.length());
 																local5555 = 3;
-															} else if (local2522.startsWith(LocalizedText.CHATCOL4)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL4)) {
 																string = string.substring(LocalizedText.CHATCOL4.length());
 																local5555 = 4;
-															} else if (local2522.startsWith(LocalizedText.CHATCOL5)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL5)) {
 																local5555 = 5;
 																string = string.substring(LocalizedText.CHATCOL5.length());
-															} else if (local2522.startsWith(LocalizedText.CHATCOL6)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL6)) {
 																string = string.substring(LocalizedText.CHATCOL6.length());
 																local5555 = 6;
-															} else if (local2522.startsWith(LocalizedText.CHATCOL7)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL7)) {
 																local5555 = 7;
 																string = string.substring(LocalizedText.CHATCOL7.length());
-															} else if (local2522.startsWith(LocalizedText.CHATCOL8)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL8)) {
 																local5555 = 8;
 																string = string.substring(LocalizedText.CHATCOL8.length());
-															} else if (local2522.startsWith(LocalizedText.CHATCOL9)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL9)) {
 																local5555 = 9;
 																string = string.substring(LocalizedText.CHATCOL9.length());
-															} else if (local2522.startsWith(LocalizedText.CHATCOL10)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL10)) {
 																string = string.substring(LocalizedText.CHATCOL10.length());
 																local5555 = 10;
-															} else if (local2522.startsWith(LocalizedText.CHATCOL11)) {
+															} else if (str1.startsWith(LocalizedText.CHATCOL11)) {
 																string = string.substring(LocalizedText.CHATCOL11.length());
 																local5555 = 11;
 															}
 														}
 														@Pc(5943) byte local5943 = 0;
-														local2522 = string.toLowerCase();
-														if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT1)) {
+														str1 = string.toLowerCase();
+														if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT1)) {
 															string = string.substring(LocalizedText.STABLE_CHATEFFECT1.length());
 															local5943 = 1;
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT2)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT2)) {
 															local5943 = 2;
 															string = string.substring(LocalizedText.STABLE_CHATEFFECT2.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT3)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT3)) {
 															string = string.substring(LocalizedText.STABLE_CHATEFFECT3.length());
 															local5943 = 3;
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT4)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECT4)) {
 															local5943 = 4;
 															string = string.substring(LocalizedText.STABLE_CHATEFFECT4.length());
-														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECTC5)) {
+														} else if (str1.startsWith(LocalizedText.STABLE_CHATEFFECTC5)) {
 															local5943 = 5;
 															string = string.substring(LocalizedText.STABLE_CHATEFFECTC5.length());
 														} else if (client.language != 0) {
-															if (local2522.startsWith(LocalizedText.CHATEFFECT1)) {
+															if (str1.startsWith(LocalizedText.CHATEFFECT1)) {
 																string = string.substring(LocalizedText.CHATEFFECT1.length());
 																local5943 = 1;
-															} else if (local2522.startsWith(LocalizedText.CHATEFFECT2)) {
+															} else if (str1.startsWith(LocalizedText.CHATEFFECT2)) {
 																local5943 = 2;
 																string = string.substring(LocalizedText.CHATEFFECT2.length());
-															} else if (local2522.startsWith(LocalizedText.CHATEFFECT3)) {
+															} else if (str1.startsWith(LocalizedText.CHATEFFECT3)) {
 																local5943 = 3;
 																string = string.substring(LocalizedText.CHATEFFECT3.length());
-															} else if (local2522.startsWith(LocalizedText.CHATEFFECT4)) {
+															} else if (str1.startsWith(LocalizedText.CHATEFFECT4)) {
 																local5943 = 4;
 																string = string.substring(LocalizedText.CHATEFFECT4.length());
-															} else if (local2522.startsWith(LocalizedText.CHATEFFECT5)) {
+															} else if (str1.startsWith(LocalizedText.CHATEFFECT5)) {
 																string = string.substring(LocalizedText.CHATEFFECT5.length());
 																local5943 = 5;
 															}
@@ -2442,7 +2693,7 @@ public final class ScriptRunner {
 														c = Protocol.outboundBuffer.offset;
 														Protocol.outboundBuffer.p1(local5555);
 														Protocol.outboundBuffer.p1(local5943);
-														Static146.method2748(Protocol.outboundBuffer, string);
+														WordPack.encode(Protocol.outboundBuffer, string);
 														Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - c);
 														continue;
 													}
@@ -2451,14 +2702,14 @@ public final class ScriptRunner {
 												}
 												if (opcode == 5009) {
 													ssp -= 2;
-													local2522 = stringStack[ssp + 1];
+													str1 = stringStack[ssp + 1];
 													string = stringStack[ssp];
 													if (LoginManager.staffModLevel != 0 || (!LoginManager.playerUnderage || LoginManager.parentalChatConsent) && !LoginManager.mapQuickChat) {
 														Protocol.outboundBuffer.p1isaac(201);
 														Protocol.outboundBuffer.p1(0);
 														int2 = Protocol.outboundBuffer.offset;
 														Protocol.outboundBuffer.p8(string.encode37());
-														Static146.method2748(Protocol.outboundBuffer, local2522);
+														WordPack.encode(Protocol.outboundBuffer, str1);
 														Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - int2);
 													}
 													continue;
@@ -2466,27 +2717,27 @@ public final class ScriptRunner {
 												if (opcode == 5010) {
 													isp--;
 													int1 = intStack[isp];
-													local2522 = null;
+													str1 = null;
 													if (int1 < 100) {
-														local2522 = Chat.names[int1];
+														str1 = Chat.names[int1];
 													}
-													if (local2522 == null) {
-														local2522 = EMPTY_STRING;
+													if (str1 == null) {
+														str1 = EMPTY_STRING;
 													}
-													stringStack[ssp++] = local2522;
+													stringStack[ssp++] = str1;
 													continue;
 												}
 												if (opcode == 5011) {
 													isp--;
 													int1 = intStack[isp];
-													local2522 = null;
+													str1 = null;
 													if (int1 < 100) {
-														local2522 = Chat.clans[int1];
+														str1 = Chat.clans[int1];
 													}
-													if (local2522 == null) {
-														local2522 = EMPTY_STRING;
+													if (str1 == null) {
+														str1 = EMPTY_STRING;
 													}
-													stringStack[ssp++] = local2522;
+													stringStack[ssp++] = str1;
 													continue;
 												}
 												if (opcode == 5012) {
@@ -2508,7 +2759,7 @@ public final class ScriptRunner {
 													stringStack[ssp++] = string;
 													continue;
 												}
-												if (opcode == 5016) {
+												if (opcode == Cs2Opcodes.getTradeSetting) {
 													intStack[isp++] = Chat.tradeFilter;
 													continue;
 												}
@@ -2723,7 +2974,7 @@ public final class ScriptRunner {
 													continue;
 												}
 											} else if (opcode < 5200) {
-												if (opcode == 5100) {
+												if (opcode == Cs2Opcodes.isHoldingAlt) {
 													if (Keyboard.pressedKeys[Keyboard.KEY_ALT]) {
 														intStack[isp++] = 1;
 													} else {
@@ -2731,7 +2982,7 @@ public final class ScriptRunner {
 													}
 													continue;
 												}
-												if (opcode == 5101) {
+												if (opcode == Cs2Opcodes.isHoldingCtrl) {
 													if (Keyboard.pressedKeys[Keyboard.KEY_CTRL]) {
 														intStack[isp++] = 1;
 													} else {
@@ -2739,7 +2990,7 @@ public final class ScriptRunner {
 													}
 													continue;
 												}
-												if (opcode == 5102) {
+												if (opcode == Cs2Opcodes.isHoldingShift) {
 													if (Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
 														intStack[isp++] = 1;
 													} else {
@@ -2750,12 +3001,12 @@ public final class ScriptRunner {
 											} else {
 												@Pc(7566) boolean local7566;
 												if (opcode < 5300) {
-													if (opcode == 5200) {
+													if (opcode == Cs2Opcodes.setWorldmapZoom) {
 														isp--;
 														WorldMap.setTargetZoom(intStack[isp]);
 														continue;
 													}
-													if (opcode == 5201) {
+													if (opcode == Cs2Opcodes.getWorldmapZoom) {
 														intStack[isp++] = WorldMap.getTargetZoom();
 														continue;
 													}
@@ -2773,12 +3024,12 @@ public final class ScriptRunner {
 														stringStack[ssp - 1] = WorldMap.method923(stringStack[ssp - 1]);
 														continue;
 													}
-													if (opcode == 5205) {
+													if (opcode == Cs2Opcodes.loadDungeonmap) {
 														ssp--;
 														WorldMap.method1853(stringStack[ssp]);
 														continue;
 													}
-													if (opcode == 5206) {
+													if (opcode == Cs2Opcodes.getDungeonmap) {
 														isp--;
 														int1 = intStack[isp];
 														@Pc(7264) Map local7264 = MapList.getContainingSource(int1 >> 14 & 0x3FFF, int1 & 0x3FFF);
@@ -2790,7 +3041,7 @@ public final class ScriptRunner {
 														continue;
 													}
 													@Pc(7293) Map local7293;
-													if (opcode == 5207) {
+													if (opcode == Cs2Opcodes.getDungeonMapName) {
 														ssp--;
 														local7293 = MapList.get(stringStack[ssp]);
 														if (local7293 != null && local7293.aClass100_137 != null) {
@@ -2810,7 +3061,7 @@ public final class ScriptRunner {
 														intStack[isp++] = WorldMap.originZ + WorldMap.length - WorldMap.anInt919 - 1;
 														continue;
 													}
-													if (opcode == 5210) {
+													if (opcode == Cs2Opcodes.getDungeonmapCenter) {
 														local7293 = WorldMap.method4361();
 														if (local7293 == null) {
 															intStack[isp++] = 0;
@@ -2836,13 +3087,13 @@ public final class ScriptRunner {
 														int1 = WorldMap.method2352();
 														int2 = 0;
 														if (int1 == -1) {
-															local2522 = EMPTY_STRING;
+															str1 = EMPTY_STRING;
 														} else {
-															local2522 = WorldMap.labels.aClass100Array153[int1];
+															str1 = WorldMap.labels.aClass100Array153[int1];
 															int2 = WorldMap.labels.method3894(int1);
 														}
-														local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10);
-														stringStack[ssp++] = local2522;
+														str1 = str1.method3140(Static67.aClass100_639, Static5.aClass100_10);
+														stringStack[ssp++] = str1;
 														intStack[isp++] = int2;
 														continue;
 													}
@@ -2850,31 +3101,31 @@ public final class ScriptRunner {
 														int2 = 0;
 														int1 = WorldMap.method2385();
 														if (int1 == -1) {
-															local2522 = EMPTY_STRING;
+															str1 = EMPTY_STRING;
 														} else {
-															local2522 = WorldMap.labels.aClass100Array153[int1];
+															str1 = WorldMap.labels.aClass100Array153[int1];
 															int2 = WorldMap.labels.method3894(int1);
 														}
-														local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10);
-														stringStack[ssp++] = local2522;
+														str1 = str1.method3140(Static67.aClass100_639, Static5.aClass100_10);
+														stringStack[ssp++] = str1;
 														intStack[isp++] = int2;
 														continue;
 													}
-													if (opcode == 5214) {
+													if (opcode == Cs2Opcodes.setPositionInMap) {
 														isp--;
 														int1 = intStack[isp];
 														WorldMap.method3616(int1 >> 14 & 0x3FFF, int1 & 0x3FFF);
 														continue;
 													}
-													if (opcode == 5215) {
+													if (opcode == Cs2Opcodes.dungeonmapContains) {
 														isp--;
 														int1 = intStack[isp];
 														ssp--;
-														local2522 = stringStack[ssp];
+														str1 = stringStack[ssp];
 														local7566 = false;
 														@Pc(7577) SecondaryLinkedList local7577 = Static183.method3333(int1 >> 14 & 0x3FFF, int1 & 0x3FFF);
 														for (@Pc(7582) Map local7582 = (Map) local7577.method795(); local7582 != null; local7582 = (Map) local7577.method797()) {
-															if (local7582.group.equalsIgnoreCase(local2522)) {
+															if (local7582.group.equalsIgnoreCase(str1)) {
 																local7566 = true;
 																break;
 															}
@@ -2902,7 +3153,7 @@ public final class ScriptRunner {
 														}
 														continue;
 													}
-													if (opcode == 5218) {
+													if (opcode == Cs2Opcodes.getMapDefaultZoom) {
 														local7293 = WorldMap.method4361();
 														if (local7293 == null) {
 															intStack[isp++] = -1;
@@ -2925,37 +3176,37 @@ public final class ScriptRunner {
 														isp -= 2;
 														int3 = intStack[isp + 1];
 														int1 = intStack[isp];
-														Static241.setWindowMode(false, 3, int1, int3);
+														DisplayMode.setWindowMode(false, 3, int1, int3);
 														intStack[isp++] = GameShell.fullScreenFrame == null ? 0 : 1;
 														continue;
 													}
 													if (opcode == 5301) {
 														if (GameShell.fullScreenFrame != null) {
-															Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
+															DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
 														}
 														continue;
 													}
 													if (opcode == 5302) {
-														@Pc(7780) Class114[] local7780 = Static3.method4660();
+														@Pc(7780) DisplayMode[] local7780 = DisplayMode.getDisplayModes();
 														intStack[isp++] = local7780.length;
 														continue;
 													}
 													if (opcode == 5303) {
 														isp--;
 														int1 = intStack[isp];
-														@Pc(7800) Class114[] local7800 = Static3.method4660();
-														intStack[isp++] = local7800[int1].anInt4248;
-														intStack[isp++] = local7800[int1].anInt4250;
+														@Pc(7800) DisplayMode[] local7800 = DisplayMode.getDisplayModes();
+														intStack[isp++] = local7800[int1].width;
+														intStack[isp++] = local7800[int1].height;
 														continue;
 													}
 													if (opcode == 5305) {
 														int3 = Preferences.fullScreenHeight;
 														int1 = Preferences.fullScreenWidth;
 														int2 = -1;
-														@Pc(7833) Class114[] local7833 = Static3.method4660();
+														@Pc(7833) DisplayMode[] local7833 = DisplayMode.getDisplayModes();
 														for (c = 0; c < local7833.length; c++) {
-															@Pc(7843) Class114 local7843 = local7833[c];
-															if (int1 == local7843.anInt4248 && local7843.anInt4250 == int3) {
+															@Pc(7843) DisplayMode local7843 = local7833[c];
+															if (int1 == local7843.width && local7843.height == int3) {
 																int2 = c;
 																break;
 															}
@@ -2963,8 +3214,8 @@ public final class ScriptRunner {
 														intStack[isp++] = int2;
 														continue;
 													}
-													if (opcode == 5306) {
-														intStack[isp++] = Static144.getWindowMode();
+													if (opcode == Cs2Opcodes.getDisplayMode) {
+														intStack[isp++] = DisplayMode.getWindowMode();
 														continue;
 													}
 													if (opcode == 5307) {
@@ -2973,7 +3224,7 @@ public final class ScriptRunner {
 														if (int1 < 0 || int1 > 2) {
 															int1 = 0;
 														}
-														Static241.setWindowMode(false, int1, -1, -1);
+														DisplayMode.setWindowMode(false, int1, -1, -1);
 														continue;
 													}
 													if (opcode == 5308) {
@@ -2994,13 +3245,13 @@ public final class ScriptRunner {
 													if (opcode == 5400) {
 														ssp -= 2;
 														string = stringStack[ssp];
-														local2522 = stringStack[ssp + 1];
+														str1 = stringStack[ssp + 1];
 														isp--;
 														int2 = intStack[isp];
 														Protocol.outboundBuffer.p1isaac(117);
-														Protocol.outboundBuffer.p1(Buffer.getStringLength(string) + Buffer.getStringLength(local2522) + 1);
+														Protocol.outboundBuffer.p1(Buffer.getStringLength(string) + Buffer.getStringLength(str1) + 1);
 														Protocol.outboundBuffer.pjstr(string);
-														Protocol.outboundBuffer.pjstr(local2522);
+														Protocol.outboundBuffer.pjstr(str1);
 														Protocol.outboundBuffer.p1(int2);
 														continue;
 													}
@@ -3019,7 +3270,7 @@ public final class ScriptRunner {
 														int1 = intStack[isp];
 														int3 = intStack[isp + 1];
 														if (int1 >= 0 && int1 < 2) {
-															Static107.anIntArrayArrayArray9[int1] = new int[int3 << 1][4];
+															Camera.anIntArrayArrayArray9[int1] = new int[int3 << 1][4];
 														}
 														continue;
 													}
@@ -3032,21 +3283,21 @@ public final class ScriptRunner {
 														c = intStack[isp + 4];
 														@Pc(8108) int local8108 = intStack[isp + 6];
 														local1087 = intStack[isp + 5];
-														if (int1 >= 0 && int1 < 2 && Static107.anIntArrayArrayArray9[int1] != null && int3 >= 0 && Static107.anIntArrayArrayArray9[int1].length > int3) {
-															Static107.anIntArrayArrayArray9[int1][int3] = new int[] { (int2 >> 14 & 0x3FFF) * 128, local652, (int2 & 0x3FFF) * 128, local8108 };
-															Static107.anIntArrayArrayArray9[int1][int3 + 1] = new int[] { (c >> 14 & 0x3FFF) * 128, local1087, (c & 0x3FFF) * 128 };
+														if (int1 >= 0 && int1 < 2 && Camera.anIntArrayArrayArray9[int1] != null && int3 >= 0 && Camera.anIntArrayArrayArray9[int1].length > int3) {
+															Camera.anIntArrayArrayArray9[int1][int3] = new int[] { (int2 >> 14 & 0x3FFF) * 128, local652, (int2 & 0x3FFF) * 128, local8108 };
+															Camera.anIntArrayArrayArray9[int1][int3 + 1] = new int[] { (c >> 14 & 0x3FFF) * 128, local1087, (c & 0x3FFF) * 128 };
 														}
 														continue;
 													}
 													if (opcode == 5407) {
 														isp--;
-														int1 = Static107.anIntArrayArrayArray9[intStack[isp]].length >> 1;
+														int1 = Camera.anIntArrayArrayArray9[intStack[isp]].length >> 1;
 														intStack[isp++] = int1;
 														continue;
 													}
 													if (opcode == 5411) {
 														if (GameShell.fullScreenFrame != null) {
-															Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
+															DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
 														}
 														if (GameShell.frame == null) {
 															Static169.openUrl(Static15.method479(), false);
@@ -3055,10 +3306,10 @@ public final class ScriptRunner {
 														}
 														continue;
 													}
-													if (opcode == 5419) {
+													if (opcode == Cs2Opcodes.getLastIp5419) {
 														string = EMPTY_STRING;
 														if (Player.lastLogAddress != null) {
-															string = Static181.method3341(Player.lastLogAddress.intArg2);
+															string = JagString.formatIp(Player.lastLogAddress.intArg2);
 															if (Player.lastLogAddress.result != null) {
 																@Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
 																string = JagString.decodeString(local8281, local8281.length, 0);
@@ -3073,7 +3324,7 @@ public final class ScriptRunner {
 													}
 													if (opcode == 5421) {
 														if (GameShell.fullScreenFrame != null) {
-															Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
+															DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
 														}
 														isp--;
 														local1552 = intStack[isp] == 1;
@@ -3093,19 +3344,19 @@ public final class ScriptRunner {
 														isp--;
 														int2 = intStack[isp];
 														ssp -= 2;
-														local2522 = stringStack[ssp + 1];
+														str1 = stringStack[ssp + 1];
 														string = stringStack[ssp];
 														if (string.length() > 0) {
-															if (Static103.aClass100Array88 == null) {
-																Static103.aClass100Array88 = new JagString[Static132.anIntArray309[client.game]];
+															if (PlayerList.playerNames == null) {
+																PlayerList.playerNames = new JagString[PlayerList.anIntArray309[client.game]];
 															}
-															Static103.aClass100Array88[int2] = string;
+															PlayerList.playerNames[int2] = string;
 														}
-														if (local2522.length() > 0) {
-															if (Static263.aClass100Array174 == null) {
-																Static263.aClass100Array174 = new JagString[Static132.anIntArray309[client.game]];
+														if (str1.length() > 0) {
+															if (PlayerList.playerNames2 == null) {
+																PlayerList.playerNames2 = new JagString[PlayerList.anIntArray309[client.game]];
 															}
-															Static263.aClass100Array174[int2] = local2522;
+															PlayerList.playerNames2[int2] = str1;
 														}
 														continue;
 													}
@@ -3117,27 +3368,27 @@ public final class ScriptRunner {
 													if (opcode == 5424) {
 														isp -= 11;
 														Static40.anInt1275 = intStack[isp];
-														Static111.anInt2910 = intStack[isp + 1];
-														Static251.anInt5457 = intStack[isp + 2];
-														Static232.anInt5208 = intStack[isp + 3];
-														Static55.anInt1736 = intStack[isp + 4];
-														Static169.anInt4073 = intStack[isp + 5];
-														Static85.anInt2261 = intStack[isp + 6];
-														Static136.anInt3324 = intStack[isp + 7];
-														Static254.anInt5556 = intStack[isp + 8];
-														Static195.anInt4581 = intStack[isp + 9];
-														Static262.anInt5752 = intStack[isp + 10];
-														client.js5Archive8.isFileReady(Static55.anInt1736);
-														client.js5Archive8.isFileReady(Static169.anInt4073);
-														client.js5Archive8.isFileReady(Static85.anInt2261);
-														client.js5Archive8.isFileReady(Static136.anInt3324);
-														client.js5Archive8.isFileReady(Static254.anInt5556);
-														Static261.aBoolean298 = true;
+														Static40.anInt2910 = intStack[isp + 1];
+														Static40.anInt5457 = intStack[isp + 2];
+														Static40.anInt5208 = intStack[isp + 3];
+														Static40.anInt1736 = intStack[isp + 4];
+														Static40.anInt4073 = intStack[isp + 5];
+														Static40.anInt2261 = intStack[isp + 6];
+														Static40.anInt3324 = intStack[isp + 7];
+														Static40.anInt5556 = intStack[isp + 8];
+														Static40.anInt4581 = intStack[isp + 9];
+														Static40.anInt5752 = intStack[isp + 10];
+														client.js5Archive8.isFileReady(Static40.anInt1736);
+														client.js5Archive8.isFileReady(Static40.anInt4073);
+														client.js5Archive8.isFileReady(Static40.anInt2261);
+														client.js5Archive8.isFileReady(Static40.anInt3324);
+														client.js5Archive8.isFileReady(Static40.anInt5556);
+														Static40.aBoolean298 = true;
 														continue;
 													}
 													if (opcode == 5425) {
-														Static114.method4637();
-														Static261.aBoolean298 = false;
+														Static40.method4637();
+														Static40.aBoolean298 = false;
 														continue;
 													}
 													if (opcode == 5426) {
@@ -3152,22 +3403,22 @@ public final class ScriptRunner {
 														continue;
 													}
 												} else if (opcode < 5600) {
-													if (opcode == 5500) {
+													if (opcode == Cs2Opcodes.cameraMoveTo) {
 														isp -= 4;
 														int1 = intStack[isp];
 														local652 = intStack[isp + 3];
 														int2 = intStack[isp + 2];
 														int3 = intStack[isp + 1];
-														Static141.method2722(false, int2, int3, local652, (int1 & 0x3FFF) - Static142.originZ, (int1 >> 14 & 0x3FFF) - Static225.originX);
+														Camera.method2722(false, int2, int3, local652, (int1 & 0x3FFF) - Camera.originZ, (int1 >> 14 & 0x3FFF) - Camera.originX);
 														continue;
 													}
-													if (opcode == 5501) {
+													if (opcode == Cs2Opcodes.cameraPointAt) {
 														isp -= 4;
 														int3 = intStack[isp + 1];
 														int1 = intStack[isp];
 														local652 = intStack[isp + 3];
 														int2 = intStack[isp + 2];
-														Static260.method3849(int3, (int1 & 0x3FFF) - Static142.originZ, int2, (int1 >> 14 & 0x3FFF) - Static225.originX, local652);
+														Camera.method3849(int3, (int1 & 0x3FFF) - Camera.originZ, int2, (int1 >> 14 & 0x3FFF) - Camera.originX, local652);
 														continue;
 													}
 													if (opcode == 5502) {
@@ -3176,68 +3427,68 @@ public final class ScriptRunner {
 														if (int1 >= 2) {
 															throw new RuntimeException();
 														}
-														Static155.anInt3718 = int1;
+														Camera.anInt3718 = int1;
 														int3 = intStack[isp + 1];
-														if (Static107.anIntArrayArrayArray9[Static155.anInt3718].length >> 1 <= int3 + 1) {
+														if (Camera.anIntArrayArrayArray9[Camera.anInt3718].length >> 1 <= int3 + 1) {
 															throw new RuntimeException();
 														}
-														Static127.anInt3125 = int3;
-														Static233.anInt5224 = 0;
-														Static228.anInt5101 = intStack[isp + 2];
-														Static114.anInt5843 = intStack[isp + 3];
+														Camera.anInt3125 = int3;
+														Camera.anInt5224 = 0;
+														Camera.anInt5101 = intStack[isp + 2];
+														Camera.anInt5843 = intStack[isp + 3];
 														int2 = intStack[isp + 4];
 														if (int2 >= 2) {
 															throw new RuntimeException();
 														}
-														Static52.anInt1694 = int2;
+														Camera.anInt1694 = int2;
 														local652 = intStack[isp + 5];
-														if (Static107.anIntArrayArrayArray9[Static52.anInt1694].length >> 1 <= local652 + 1) {
+														if (Camera.anIntArrayArrayArray9[Camera.anInt1694].length >> 1 <= local652 + 1) {
 															throw new RuntimeException();
 														}
-														Static75.anInt2119 = local652;
-														Static227.cameraType = 3;
+														Camera.anInt2119 = local652;
+														Camera.cameraType = 3;
 														continue;
 													}
-													if (opcode == 5503) {
-														Static35.resetCameraEffects();
+													if (opcode == Cs2Opcodes.cameraUnlock) {
+														Camera.resetCameraEffects();
 														continue;
 													}
 													if (opcode == 5504) {
 														isp -= 2;
 														Camera.pitchTarget = intStack[isp];
 														Camera.yawTarget = intStack[isp + 1];
-														if (Static227.cameraType == 2) {
-															Static184.cameraYaw = (int)Camera.yawTarget;
-															Static240.cameraPitch = (int)Camera.pitchTarget;
+														if (Camera.cameraType == 2) {
+															Camera.cameraYaw = (int)Camera.yawTarget;
+															Camera.cameraPitch = (int)Camera.pitchTarget;
 														}
 														Camera.clampCameraAngle();
 														continue;
 													}
-													if (opcode == 5505) {
+													if (opcode == Cs2Opcodes.cameraGetVrot) {
 														intStack[isp++] = (int)Camera.pitchTarget;
 														continue;
 													}
-													if (opcode == 5506) {
+													if (opcode == Cs2Opcodes.cameraGetHrot) {
 														intStack[isp++] = (int)Camera.yawTarget;
 														continue;
 													}
 												} else if (opcode < 5700) {
-													if (opcode == 5600) {
+													if (opcode == Cs2Opcodes.directlogin) {
 														ssp -= 2;
 														string = stringStack[ssp];
-														local2522 = stringStack[ssp + 1];
+														str1 = stringStack[ssp + 1];
 														isp--;
 														int2 = intStack[isp];
 														if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) {
-															LoginManager.method3896(string, local2522, int2);
+															LoginManager.method3896(string, str1, int2);
 														}
 														continue;
 													}
-													if (opcode == 5601) {
+													if (opcode == Cs2Opcodes.skipLoginstage10) {
 														LoginManager.method3395();
 														continue;
 													}
-													if (opcode == 5602) {
+													if (opcode == Cs2Opcodes.resetRCs) {
 														if (LoginManager.step == 0) {
 															LoginManager.reply = -2;
 														}
@@ -3246,40 +3497,40 @@ public final class ScriptRunner {
 													if (opcode == 5603) {
 														isp -= 4;
 														if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) {
-															Static125.method2448(intStack[isp + 2], intStack[isp + 3], intStack[isp], intStack[isp + 1]);
+															CreateManager.method2448(intStack[isp + 2], intStack[isp + 3], intStack[isp], intStack[isp + 1]);
 														}
 														continue;
 													}
-													if (opcode == 5604) {
+													if (opcode == Cs2Opcodes.sendRequestAccount) {
 														ssp--;
 														if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) {
-															ClientProt.method1691(stringStack[ssp].encode37());
+															CreateManager.method1691(stringStack[ssp].encode37());
 														}
 														continue;
 													}
-													if (opcode == 5605) {
+													if (opcode == Cs2Opcodes.sendCreateAccount) {
 														isp -= 4;
 														ssp -= 2;
 														if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) {
-															Static40.method1016(intStack[isp], intStack[isp + 3], intStack[isp + 1], stringStack[ssp + 1], stringStack[ssp].encode37(), intStack[isp + 2]);
+															CreateManager.method1016(intStack[isp], intStack[isp + 3], intStack[isp + 1], stringStack[ssp + 1], stringStack[ssp].encode37(), intStack[isp + 2]);
 														}
 														continue;
 													}
-													if (opcode == 5606) {
+													if (opcode == Cs2Opcodes.resetAccountCreateRC) {
 														if (CreateManager.step == 0) {
 															CreateManager.reply = -2;
 														}
 														continue;
 													}
-													if (opcode == 5607) {
+													if (opcode == Cs2Opcodes.getGameloginRc) {
 														intStack[isp++] = LoginManager.reply;
 														continue;
 													}
-													if (opcode == 5608) {
+													if (opcode == Cs2Opcodes.getWorldswitchTimer) {
 														intStack[isp++] = LoginManager.hopTime;
 														continue;
 													}
-													if (opcode == 5609) {
+													if (opcode == Cs2Opcodes.getAccountCreateRC) {
 														intStack[isp++] = CreateManager.reply;
 														continue;
 													}
@@ -3290,7 +3541,7 @@ public final class ScriptRunner {
 														CreateManager.suggestedNames = null;
 														continue;
 													}
-													if (opcode == 5611) {
+													if (opcode == Cs2Opcodes.getDetailedRC) {
 														intStack[isp++] = LoginManager.disallowResult;
 														continue;
 													}
@@ -3320,7 +3571,7 @@ public final class ScriptRunner {
 															}
 														}
 														if (GlRenderer.enabled) {
-															Static86.setInstantFade();
+															Static103.setInstantFade();
 															if (!Preferences.highDetailLighting) {
 																Static145.method2742();
 															}
@@ -3444,7 +3695,7 @@ public final class ScriptRunner {
 														isp--;
 														Preferences.fogEnabled = intStack[isp] == 1;
 														if (GlRenderer.enabled) {
-															Static86.setInstantFade();
+															Static103.setInstantFade();
 														}
 														Preferences.write(GameShell.signLink);
 														Preferences.sentToServer = false;
@@ -3465,7 +3716,7 @@ public final class ScriptRunner {
 													if (opcode == 6017) {
 														isp--;
 														Preferences.stereo = intStack[isp] == 1;
-														Static211.method930();
+														client.method930();
 														Preferences.write(GameShell.signLink);
 														Preferences.sentToServer = false;
 														continue;
@@ -3661,13 +3912,13 @@ public final class ScriptRunner {
 												} else if (opcode < 6300) {
 													if (opcode == 6200) {
 														isp -= 2;
-														Static178.aShort25 = (short) intStack[isp];
-														if (Static178.aShort25 <= 0) {
-															Static178.aShort25 = 256;
+														Static115.aShort25 = (short) intStack[isp];
+														if (Static115.aShort25 <= 0) {
+															Static115.aShort25 = 256;
 														}
-														Static10.aShort9 = (short) intStack[isp + 1];
-														if (Static10.aShort9 <= 0) {
-															Static10.aShort9 = 205;
+														Static115.aShort9 = (short) intStack[isp + 1];
+														if (Static115.aShort9 <= 0) {
+															Static115.aShort9 = 205;
 														}
 														continue;
 													}
@@ -3685,32 +3936,32 @@ public final class ScriptRunner {
 													}
 													if (opcode == 6202) {
 														isp -= 4;
-														Static153.aShort22 = (short) intStack[isp];
-														if (Static153.aShort22 <= 0) {
-															Static153.aShort22 = 1;
+														Static115.aShort22 = (short) intStack[isp];
+														if (Static115.aShort22 <= 0) {
+															Static115.aShort22 = 1;
 														}
-														Static4.aShort1 = (short) intStack[isp + 1];
-														if (Static4.aShort1 <= 0) {
-															Static4.aShort1 = 32767;
-														} else if (Static153.aShort22 > Static4.aShort1) {
-															Static4.aShort1 = Static153.aShort22;
+														Static115.aShort1 = (short) intStack[isp + 1];
+														if (Static115.aShort1 <= 0) {
+															Static115.aShort1 = 32767;
+														} else if (Static115.aShort22 > Static115.aShort1) {
+															Static115.aShort1 = Static115.aShort22;
 														}
-														Static55.aShort12 = (short) intStack[isp + 2];
-														if (Static55.aShort12 <= 0) {
-															Static55.aShort12 = 1;
+														Static115.aShort12 = (short) intStack[isp + 2];
+														if (Static115.aShort12 <= 0) {
+															Static115.aShort12 = 1;
 														}
-														Static131.aShort21 = (short) intStack[isp + 3];
-														if (Static131.aShort21 <= 0) {
-															Static131.aShort21 = 32767;
-														} else if (Static131.aShort21 < Static55.aShort12) {
-															Static131.aShort21 = Static55.aShort12;
+														Static115.aShort21 = (short) intStack[isp + 3];
+														if (Static115.aShort21 <= 0) {
+															Static115.aShort21 = 32767;
+														} else if (Static115.aShort21 < Static115.aShort12) {
+															Static115.aShort21 = Static115.aShort12;
 														}
 														continue;
 													}
 													if (opcode == 6203) {
 														Static115.method2314(Static280.aClass13_26.width, 0, Static280.aClass13_26.height, 0, false);
-														intStack[isp++] = Static166.anInt4055;
-														intStack[isp++] = Static245.anInt5377;
+														intStack[isp++] = Static115.anInt4055;
+														intStack[isp++] = Static115.anInt5377;
 														continue;
 													}
 													if (opcode == 6204) {
@@ -3719,37 +3970,37 @@ public final class ScriptRunner {
 														continue;
 													}
 													if (opcode == 6205) {
-														intStack[isp++] = Static178.aShort25;
-														intStack[isp++] = Static10.aShort9;
+														intStack[isp++] = Static115.aShort25;
+														intStack[isp++] = Static115.aShort9;
 														continue;
 													}
 												} else if (opcode < 6400) {
-													if (opcode == 6300) {
+													if (opcode == Cs2Opcodes.getMinute) {
 														intStack[isp++] = (int) (MonotonicClock.currentTimeMillis() / 60000L);
 														continue;
 													}
-													if (opcode == 6301) {
+													if (opcode == Cs2Opcodes.getCurrentDaysSinceLaunch) {
 														intStack[isp++] = (int) (MonotonicClock.currentTimeMillis() / 86400000L) - 11745;
 														continue;
 													}
-													if (opcode == 6302) {
+													if (opcode == Cs2Opcodes.getDaysSinceLaunch) {
 														isp -= 3;
 														int2 = intStack[isp + 2];
 														int3 = intStack[isp + 1];
 														int1 = intStack[isp];
 														aCalendar2.clear();
-														aCalendar2.set(11, 12);
+														aCalendar2.set(Calendar.HOUR_OF_DAY, 12);
 														aCalendar2.set(int2, int3, int1);
 														intStack[isp++] = (int) (aCalendar2.getTime().getTime() / 86400000L) - 11745;
 														continue;
 													}
-													if (opcode == 6303) {
+													if (opcode == Cs2Opcodes.getYear) {
 														aCalendar2.clear();
 														aCalendar2.setTime(new Date(MonotonicClock.currentTimeMillis()));
-														intStack[isp++] = aCalendar2.get(1);
+														intStack[isp++] = aCalendar2.get(Calendar.YEAR);
 														continue;
 													}
-													if (opcode == 6304) {
+													if (opcode == Cs2Opcodes.isLeapYear) {
 														local1552 = true;
 														isp--;
 														int1 = intStack[isp];
@@ -3924,9 +4175,9 @@ public final class ScriptRunner {
 									}
 									if (opcode == Cs2Opcodes.concatString) {
 										ssp -= 2;
-										local2522 = stringStack[ssp + 1];
+										str1 = stringStack[ssp + 1];
 										string = stringStack[ssp];
-										stringStack[ssp++] = JagString.concatenate(new JagString[] { string, local2522 });
+										stringStack[ssp++] = JagString.concatenate(new JagString[] { string, str1 });
 										continue;
 									}
 									if (opcode == Cs2Opcodes.concatSignedInt) {
@@ -3956,10 +4207,10 @@ public final class ScriptRunner {
 									}
 									if (opcode == Cs2Opcodes.strForGender) {
 										ssp -= 2;
-										local2522 = stringStack[ssp + 1];
+										str1 = stringStack[ssp + 1];
 										string = stringStack[ssp];
 										if (PlayerList.self.appearance != null && PlayerList.self.appearance.gender) {
-											stringStack[ssp++] = local2522;
+											stringStack[ssp++] = str1;
 											continue;
 										}
 										stringStack[ssp++] = string;
@@ -3997,12 +4248,12 @@ public final class ScriptRunner {
 									if (opcode == Cs2Opcodes.chooseString) {
 										ssp -= 2;
 										string = stringStack[ssp];
-										local2522 = stringStack[ssp + 1];
+										str1 = stringStack[ssp + 1];
 										isp--;
 										if (intStack[isp] == 1) {
 											stringStack[ssp++] = string;
 										} else {
-											stringStack[ssp++] = local2522;
+											stringStack[ssp++] = str1;
 										}
 										continue;
 									}
@@ -4026,25 +4277,25 @@ public final class ScriptRunner {
 									if (opcode == Cs2Opcodes.isValidChar) {
 										isp--;
 										int1 = intStack[isp];
-										intStack[isp++] = isValidChar(int1) ? 1 : 0;
+										intStack[isp++] = StringUtils.isValidChar(int1) ? 1 : 0;
 										continue;
 									}
 									if (opcode == Cs2Opcodes.isAlphaNumeric) {
 										isp--;
 										int1 = intStack[isp];
-										intStack[isp++] = Static83.isAlphaNumeric(int1) ? 1 : 0;
+										intStack[isp++] = StringUtils.isAlphaNumeric(int1) ? 1 : 0;
 										continue;
 									}
 									if (opcode == Cs2Opcodes.isLetter) {
 										isp--;
 										int1 = intStack[isp];
-										intStack[isp++] = Static258.isLetter(int1) ? 1 : 0;
+										intStack[isp++] = StringUtils.isLetter(int1) ? 1 : 0;
 										continue;
 									}
 									if (opcode == Cs2Opcodes.isDigit) {
 										isp--;
 										int1 = intStack[isp];
-										intStack[isp++] = Static24.isDigit(int1) ? 1 : 0;
+										intStack[isp++] = StringUtils.isDigit(int1) ? 1 : 0;
 										continue;
 									}
 									if (opcode == Cs2Opcodes.length) {
@@ -4069,7 +4320,7 @@ public final class ScriptRunner {
 									if (opcode == Cs2Opcodes.removeTags) {
 										ssp--;
 										string = stringStack[ssp];
-										local2522 = Static87.allocate(string.length());
+										str1 = Static87.allocate(string.length());
 										@Pc(12220) boolean local12220 = false;
 										for (local652 = 0; local652 < string.length(); local652++) {
 											c = string.charAt(local652);
@@ -4078,11 +4329,11 @@ public final class ScriptRunner {
 											} else if (c == 62) {
 												local12220 = false;
 											} else if (!local12220) {
-												local2522.append(c);
+												str1.append(c);
 											}
 										}
-										local2522.method3156();
-										stringStack[ssp++] = local2522;
+										str1.method3156();
+										stringStack[ssp++] = str1;
 										continue;
 									}
 									if (opcode == Cs2Opcodes.indexOfChar) {
@@ -4097,10 +4348,10 @@ public final class ScriptRunner {
 									if (opcode == Cs2Opcodes.indexOfStr) {
 										ssp -= 2;
 										string = stringStack[ssp];
-										local2522 = stringStack[ssp + 1];
+										str1 = stringStack[ssp + 1];
 										isp--;
 										int2 = intStack[isp];
-										intStack[isp++] = string.indexOf(local2522, int2);
+										intStack[isp++] = string.indexOf(str1, int2);
 										continue;
 									}
 									if (opcode == Cs2Opcodes.toLower) {
@@ -4227,8 +4478,8 @@ public final class ScriptRunner {
 			} else {
 				@Pc(14385) JagString str = Static87.allocate(30);
 				str.method3113(Static219.aClass100_928).method3113(script.name);
-				for (cycles = Static138.fp - 1; cycles >= 0; cycles--) {
-					str.method3113(aClass100_253).method3113(Static67.callStack[cycles].script.name);
+				for (cycles = fp - 1; cycles >= 0; cycles--) {
+					str.method3113(aClass100_253).method3113(callStack[cycles].script.name);
 				}
 				if (op == 40) {
 					cycles = intOperands[pc];
@@ -4247,14 +4498,4 @@ public final class ScriptRunner {
 		run(200000, request);
 	}
 
-	@OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
-	public static boolean isValidChar(@OriginalArg(1) int arg0) {
-		if (arg0 >= 32 && arg0 <= 126) {
-			return true;
-		} else if (arg0 >= 160 && arg0 <= 255) {
-			return true;
-		} else {
-			return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159;
-		}
-	}
 }
diff --git a/client/src/main/java/rt4/SoftLruHashTable.java b/client/src/main/java/rt4/SoftLruHashTable.java
index 713c034..4b59062 100644
--- a/client/src/main/java/rt4/SoftLruHashTable.java
+++ b/client/src/main/java/rt4/SoftLruHashTable.java
@@ -30,6 +30,17 @@ public final class SoftLruHashTable {
 		this.aClass133_18 = new HashTable(local11);
 	}
 
+	@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
+	public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) {
+		if (arg1.aClass3_Sub2_66 != null) {
+			arg1.method4365();
+		}
+		arg1.aClass3_Sub2_66 = arg0;
+		arg1.aClass3_Sub2_67 = arg0.aClass3_Sub2_67;
+		arg1.aClass3_Sub2_66.aClass3_Sub2_67 = arg1;
+		arg1.aClass3_Sub2_67.aClass3_Sub2_66 = arg1;
+	}
+
 	@OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V")
 	public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
 		this.method3098(arg1);
@@ -82,7 +93,7 @@ public final class SoftLruHashTable {
 			} else if (++local9.secondaryKey > (long) arg0) {
 				@Pc(33) ReferenceNode local33 = ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY.create(local9);
 				this.aClass133_18.put(local33, local9.key);
-				Static84.method1772(local9, local33);
+				method1772(local9, local33);
 				local9.unlink();
 				local9.method4365();
 			}
diff --git a/client/src/main/java/rt4/SoftwareModel.java b/client/src/main/java/rt4/SoftwareModel.java
index 1d3b3b4..57f4c6f 100644
--- a/client/src/main/java/rt4/SoftwareModel.java
+++ b/client/src/main/java/rt4/SoftwareModel.java
@@ -862,7 +862,7 @@ public final class SoftwareModel extends Model {
 				}
 				if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) {
 					if (this.aBoolean303) {
-						Static259.aLongArray11[Static2.anInt7++] = arg8;
+						Model.aLongArray11[Static2.anInt7++] = arg8;
 					} else {
 						local190 = true;
 					}
@@ -1628,7 +1628,7 @@ public final class SoftwareModel extends Model {
 					}
 				} else {
 					if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) {
-						Static259.aLongArray11[Static2.anInt7++] = arg2;
+						Model.aLongArray11[Static2.anInt7++] = arg2;
 						arg1 = false;
 					}
 					if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) {
diff --git a/client/src/main/java/rt4/SpriteLoader.java b/client/src/main/java/rt4/SpriteLoader.java
index 192304a..5f8801e 100644
--- a/client/src/main/java/rt4/SpriteLoader.java
+++ b/client/src/main/java/rt4/SpriteLoader.java
@@ -315,11 +315,33 @@ public class SpriteLoader {
 
     @OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;")
     public static IndexedSprite loadIndexedSpriteAutoDetect(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1) {
-        return decode(arg1, arg0) ? Static276.method4614() : null;
+        return decode(arg1, arg0) ? method4614() : null;
     }
 
     @OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;")
     public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
         return decode(arg0, arg1) ? method1764() : null;
     }
+
+    @OriginalMember(owner = "client!wh", name = "b", descriptor = "(B)Lclient!ok;")
+    public static IndexedSprite method4614() {
+        @Pc(27) IndexedSprite local27;
+        if (GlRenderer.enabled) {
+            local27 = new GlIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette);
+        } else {
+            local27 = new SoftwareIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette);
+        }
+        clear();
+        return local27;
+    }
+
+    @OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
+    public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
+        return decode(arg1, 0, arg0) ? Static134.method2619() : null;
+    }
+
+    @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;")
+    public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) {
+        return decode(arg0, arg1) ? method3537() : null;
+    }
 }
diff --git a/client/src/main/java/rt4/Sprites.java b/client/src/main/java/rt4/Sprites.java
index e5b3507..f353281 100644
--- a/client/src/main/java/rt4/Sprites.java
+++ b/client/src/main/java/rt4/Sprites.java
@@ -138,6 +138,12 @@ public class Sprites {
     public static IndexedSprite[] nameIcons;
     @OriginalMember(owner = "client!th", name = "f", descriptor = "[Lclient!ok;")
     public static IndexedSprite[] scrollbars;
+    @OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;")
+    public static Sprite compass;
+    @OriginalMember(owner = "client!wi", name = "R", descriptor = "[Lclient!qf;")
+    public static Sprite[] hintMapEdge;
+    @OriginalMember(owner = "client!fe", name = "lc", descriptor = "[Lclient!qf;")
+    public static Sprite[] mapfuncs;
 
     @OriginalMember(owner = "client!g", name = "a", descriptor = "(ILclient!ve;)V")
     public static void init(@OriginalArg(1) Js5 archive) {
@@ -235,12 +241,12 @@ public class Sprites {
                 floorShadows[local101].trim();
             }
         }
-        @Pc(124) SoftwareSprite compass = SpriteLoader.loadSoftwareSprite(0, archive, compassId);
-        compass.trim();
+        @Pc(124) SoftwareSprite newCompass = SpriteLoader.loadSoftwareSprite(0, archive, compassId);
+        newCompass.trim();
         if (GlRenderer.enabled) {
-            Static106.compass = new GlSprite(compass);
+            compass = new GlSprite(newCompass);
         } else {
-            Static106.compass = compass;
+            compass = newCompass;
         }
         @Pc(143) SoftwareSprite[] local143 = SpriteLoader.loadSoftwareSprites(hintMapEdgeId, archive);
         @Pc(145) int local145;
@@ -248,12 +254,12 @@ public class Sprites {
             local143[local145].trim();
         }
         if (GlRenderer.enabled) {
-            Static277.hintMapEdge = new Sprite[local143.length];
+            hintMapEdge = new Sprite[local143.length];
             for (local145 = 0; local145 < local143.length; local145++) {
-                Static277.hintMapEdge[local145] = new GlSprite(local143[local145]);
+                hintMapEdge[local145] = new GlSprite(local143[local145]);
             }
         } else {
-            Static277.hintMapEdge = local143;
+            hintMapEdge = local143;
         }
         @Pc(196) int local196 = (int) ((double) 21 * Math.random()) - 10;
         local145 = (int) (Math.random() * 21.0D) - 10;
@@ -264,12 +270,12 @@ public class Sprites {
             mapfunctions[local219].method315(local145 + local217, local217 + local196, local217 + local210);
         }
         if (GlRenderer.enabled) {
-            Static67.mapfuncs = new Sprite[mapfunctions.length];
+            mapfuncs = new Sprite[mapfunctions.length];
             for (local219 = 0; local219 < mapfunctions.length; local219++) {
-                Static67.mapfuncs[local219] = new GlSprite(mapfunctions[local219]);
+                mapfuncs[local219] = new GlSprite(mapfunctions[local219]);
             }
         } else {
-            Static67.mapfuncs = mapfunctions;
+            mapfuncs = mapfunctions;
         }
     }
 
@@ -277,4 +283,27 @@ public class Sprites {
     public static int total() {
         return 15;
     }
+
+    @OriginalMember(owner = "client!ja", name = "a", descriptor = "(Z)V")
+    public static void clear() {
+        Fonts.p12Full = null;
+        hitmarks = null;
+        crosses = null;
+        nameIcons = null;
+        Fonts.p11FullSoftware = null;
+        mapfunctions = null;
+        mapfuncs = null;
+        mapmarkhints = null;
+        headiconPrayers = null;
+        Fonts.b12Full = null;
+        compass = null;
+        mapdots = null;
+        Fonts.p11Full = null;
+        mapflags = null;
+        hitbars = null;
+        hintMapEdge = null;
+        headhints = null;
+        headiconPks = null;
+        scrollbars = null;
+    }
 }
diff --git a/client/src/main/java/rt4/Static1.java b/client/src/main/java/rt4/Static1.java
index 6f54c94..443ad0a 100644
--- a/client/src/main/java/rt4/Static1.java
+++ b/client/src/main/java/rt4/Static1.java
@@ -6,7 +6,11 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static1 {
 
-	@OriginalMember(owner = "client!a", name = "h", descriptor = "I")
+    @OriginalMember(owner = "client!wi", name = "hb", descriptor = "[[Z")
+    public static final boolean[][] aBooleanArrayArray4 = new boolean[][] { { true, true, true }, { false, false }, { false, true }, { true, false }, { false, true, true }, { true, false, true }, { false, true, false }, { true, false, false } };
+    @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
+	public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
+    @OriginalMember(owner = "client!a", name = "h", descriptor = "I")
 	public static int anInt5;
 
 	@OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;")
@@ -83,9 +87,9 @@ public final class Static1 {
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
 							local264 = arg5[local12 - 1][local17 + 1];
 							local274 = arg7[local12 - 1][local17 + 1];
-							local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
-							local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
-							if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) {
+							local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
+							local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
+							if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
 								for (local317 = 0; local317 < 8; local317++) {
 									if (local317 == 0) {
 										local127++;
@@ -104,9 +108,9 @@ public final class Static1 {
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
 							local264 = arg5[local12 - 1][local17 - 1];
 							local274 = arg7[local12 - 1][local17 - 1];
-							local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)];
-							local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
-							if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) {
+							local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
+							local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
+							if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
 								for (local317 = 0; local317 < 8; local317++) {
 									if (local127 == local317) {
 										local166[local127++] = local214;
@@ -124,9 +128,9 @@ public final class Static1 {
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
 							local264 = arg5[local12 + 1][local17 - 1];
 							local274 = arg7[local12 + 1][local17 - 1];
-							local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
-							local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)];
-							if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) {
+							local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
+							local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
+							if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
 								for (local317 = 0; local317 < 8; local317++) {
 									if (local127 == local317) {
 										local166[local127++] = local202;
@@ -144,9 +148,9 @@ public final class Static1 {
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
 							local264 = arg5[local12 + 1][local17 + 1];
 							local274 = arg7[local12 + 1][local17 + 1];
-							local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
-							local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
-							if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) {
+							local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
+							local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
+							if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
 								for (local317 = 0; local317 < 8; local317++) {
 									if (local127 == local317) {
 										local166[local127++] = local226;
@@ -162,7 +166,7 @@ public final class Static1 {
 					if (local143 != 0 && local38 != local143) {
 						local242 = FloTypeList.method4395(local143 - 1);
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
-							local129 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
+							local129 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
 							for (local777 = 0; local777 < 8; local777++) {
 								if (local127 == local777) {
 									local166[local127++] = local143;
@@ -177,7 +181,7 @@ public final class Static1 {
 					if (local163 != 0 && local38 != local163) {
 						local242 = FloTypeList.method4395(local163 - 1);
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
-							local133 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
+							local133 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
 							for (local777 = 0; local777 < 8; local777++) {
 								if (local127 == local777) {
 									local166[local127++] = local163;
@@ -192,7 +196,7 @@ public final class Static1 {
 					if (local153 != 0 && local38 != local153) {
 						local242 = FloTypeList.method4395(local153 - 1);
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
-							local131 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
+							local131 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
 							for (local777 = 0; local777 < 8; local777++) {
 								if (local777 == local127) {
 									local166[local127++] = local153;
@@ -207,7 +211,7 @@ public final class Static1 {
 					if (local190 != 0 && local38 != local190) {
 						local242 = FloTypeList.method4395(local190 - 1);
 						if (local242.aBoolean310 && local242.anInt5899 != -1) {
-							local168 = Static130.anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4];
+							local168 = anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4];
 							for (local777 = 0; local777 < 8; local777++) {
 								if (local127 == local777) {
 									local166[local127++] = local190;
@@ -221,10 +225,10 @@ public final class Static1 {
 					}
 					for (local1035 = 0; local1035 < local127; local1035++) {
 						local777 = local166[local1035];
-						local1055 = Static277.aBooleanArrayArray4[local163 == local777 ? local133 : 0];
-						local1068 = Static277.aBooleanArrayArray4[local777 == local153 ? local131 : 0];
-						@Pc(1077) boolean[] local1077 = Static277.aBooleanArrayArray4[local143 == local777 ? local129 : 0];
-						local1086 = Static277.aBooleanArrayArray4[local190 == local777 ? local168 : 0];
+						local1055 = aBooleanArrayArray4[local163 == local777 ? local133 : 0];
+						local1068 = aBooleanArrayArray4[local777 == local153 ? local131 : 0];
+						@Pc(1077) boolean[] local1077 = aBooleanArrayArray4[local143 == local777 ? local129 : 0];
+						local1086 = aBooleanArrayArray4[local190 == local777 ? local168 : 0];
 						@Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1);
 						@Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092);
 						local1097.anInt2482 += 5;
@@ -291,9 +295,9 @@ public final class Static1 {
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
 							local274 = arg5[local12 - 1][local17 + 1];
 							local1527 = arg7[local12 - 1][local17 + 1];
-							local299 = Static130.anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)];
-							local317 = Static130.anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)];
-							if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) {
+							local299 = anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)];
+							local317 = anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)];
+							if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
 								local214 = 0;
 							} else {
 								for (local1571 = 0; local1571 < 8; local1571++) {
@@ -318,9 +322,9 @@ public final class Static1 {
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
 							local274 = arg5[local12 - 1][local17 - 1];
 							local1527 = arg7[local12 - 1][local17 - 1];
-							local299 = Static130.anIntArray300[(local274 & 0x3) + local1527 * 4];
-							local317 = Static130.anIntArray300[(local274 + 3 & 0x3) + local1527 * 4];
-							if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) {
+							local299 = anIntArray300[(local274 & 0x3) + local1527 * 4];
+							local317 = anIntArray300[(local274 + 3 & 0x3) + local1527 * 4];
+							if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
 								local202 = 0;
 							} else {
 								for (local1571 = 0; local1571 < 8; local1571++) {
@@ -344,9 +348,9 @@ public final class Static1 {
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
 							local274 = arg5[local12 + 1][local17 - 1];
 							local1527 = arg7[local12 + 1][local17 - 1];
-							local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
-							local299 = Static130.anIntArray300[local1527 * 4 + (local274 & 0x3)];
-							if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) {
+							local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
+							local299 = anIntArray300[local1527 * 4 + (local274 & 0x3)];
+							if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
 								local226 = 0;
 							} else {
 								for (local1571 = 0; local1571 < 8; local1571++) {
@@ -370,9 +374,9 @@ public final class Static1 {
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
 							local1527 = arg7[local12 + 1][local17 + 1];
 							local274 = arg5[local12 + 1][local17 + 1];
-							local299 = Static130.anIntArray300[(local274 + 2 & 0x3) + local1527 * 4];
-							local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
-							if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) {
+							local299 = anIntArray300[(local274 + 2 & 0x3) + local1527 * 4];
+							local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
+							if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
 								local1035 = 0;
 							} else {
 								for (local1571 = 0; local1571 < 8; local1571++) {
@@ -393,7 +397,7 @@ public final class Static1 {
 					if (local163 != 0 && local163 != local127) {
 						local1496 = FloTypeList.method4395(local163 - 1);
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
-							local133 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
+							local133 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
 							for (local2003 = 0; local2003 < 8; local2003++) {
 								if (local2003 == local1386) {
 									local1382[local1386++] = local163;
@@ -408,7 +412,7 @@ public final class Static1 {
 					if (local153 != 0 && local127 != local153) {
 						local1496 = FloTypeList.method4395(local153 - 1);
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
-							local131 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
+							local131 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
 							for (local2003 = 0; local2003 < 8; local2003++) {
 								if (local1386 == local2003) {
 									local1382[local1386++] = local153;
@@ -423,7 +427,7 @@ public final class Static1 {
 					if (local190 != 0 && local190 != local127) {
 						local1496 = FloTypeList.method4395(local190 - 1);
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
-							local168 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
+							local168 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
 							for (local2003 = 0; local2003 < 8; local2003++) {
 								if (local1386 == local2003) {
 									local1382[local1386++] = local190;
@@ -438,7 +442,7 @@ public final class Static1 {
 					if (local180 != 0 && local180 != local127) {
 						local1496 = FloTypeList.method4395(local180 - 1);
 						if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
-							local143 = Static130.anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)];
+							local143 = anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)];
 							for (local2003 = 0; local2003 < 8; local2003++) {
 								if (local2003 == local1386) {
 									local1382[local1386++] = local180;
@@ -452,10 +456,10 @@ public final class Static1 {
 					}
 					for (local777 = 0; local777 < local1386; local777++) {
 						local2003 = local1382[local777];
-						local1055 = Static277.aBooleanArrayArray4[local2003 == local163 ? local133 : 0];
-						local1068 = Static277.aBooleanArrayArray4[local153 == local2003 ? local131 : 0];
-						local1086 = Static277.aBooleanArrayArray4[local2003 == local190 ? local168 : 0];
-						@Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
+						local1055 = aBooleanArrayArray4[local2003 == local163 ? local133 : 0];
+						local1068 = aBooleanArrayArray4[local153 == local2003 ? local131 : 0];
+						local1086 = aBooleanArrayArray4[local2003 == local190 ? local168 : 0];
+						@Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
 						@Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1);
 						@Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324);
 						@Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
diff --git a/client/src/main/java/rt4/Static10.java b/client/src/main/java/rt4/Static10.java
index 0a2b0f7..54d681c 100644
--- a/client/src/main/java/rt4/Static10.java
+++ b/client/src/main/java/rt4/Static10.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static10 {
 
-	@OriginalMember(owner = "client!an", name = "db", descriptor = "S")
-	public static short aShort9 = 205;
-
-	@OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V")
+    @OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V")
 	public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		if (Static189.anInt4457 != arg1) {
 			Static173.anIntArray367 = new int[arg1];
diff --git a/client/src/main/java/rt4/Static101.java b/client/src/main/java/rt4/Static101.java
index 2ef55e6..fda8514 100644
--- a/client/src/main/java/rt4/Static101.java
+++ b/client/src/main/java/rt4/Static101.java
@@ -8,14 +8,24 @@ public final class Static101 {
 
     @OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;")
 	public static final JagString aClass100_538 = JagString.parse(" ");
+	@OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;")
+	private static final JagString LANG_PT = JagString.parse("pt");
+	@OriginalMember(owner = "client!mc", name = "mb", descriptor = "Lclient!na;")
+	private static final JagString LANG_EN = JagString.parse("en");
+	@OriginalMember(owner = "client!mc", name = "vb", descriptor = "Lclient!na;")
+	private static final JagString LANG_DE = JagString.parse("de");
+	@OriginalMember(owner = "client!mc", name = "pb", descriptor = "Lclient!na;")
+	private static final JagString LANG_FR = JagString.parse("fr");
+	@OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;")
+	public static final JagString[] LANGUAGES = new JagString[] {LANG_EN, LANG_DE, LANG_FR, LANG_PT};
 
 	@OriginalMember(owner = "client!hm", name = "ab", descriptor = "I")
 	public static int anInt2640 = 0;
 
     @OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I")
 	public static int method2053(@OriginalArg(0) JagString arg0) {
-		for (@Pc(12) int local12 = 0; local12 < Static153.aClass100Array113.length; local12++) {
-			if (Static153.aClass100Array113[local12].equalsIgnoreCase(arg0)) {
+		for (@Pc(12) int local12 = 0; local12 < LANGUAGES.length; local12++) {
+			if (LANGUAGES[local12].equalsIgnoreCase(arg0)) {
 				return local12;
 			}
 		}
diff --git a/client/src/main/java/rt4/Static102.java b/client/src/main/java/rt4/Static102.java
deleted file mode 100644
index 1c4dcac..0000000
--- a/client/src/main/java/rt4/Static102.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static102 {
-
-	@OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
-	public static int anInt2680 = 0;
-
-}
diff --git a/client/src/main/java/rt4/Static103.java b/client/src/main/java/rt4/Static103.java
index 2cc55f1..35d804d 100644
--- a/client/src/main/java/rt4/Static103.java
+++ b/client/src/main/java/rt4/Static103.java
@@ -6,22 +6,59 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static103 {
 
-	@OriginalMember(owner = "client!i", name = "Ub", descriptor = "[Lclient!na;")
-	public static JagString[] aClass100Array88;
-
+	@OriginalMember(owner = "client!ph", name = "b", descriptor = "[[Lclient!li;")
+	public static final Environment[][] aClass92ArrayArray1 = new Environment[13][13];
 	@OriginalMember(owner = "client!i", name = "ec", descriptor = "[I")
 	public static int[] anIntArray254;
 
-	@OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;")
-	public static final JagString aClass100_558 = JagString.parse("m");
+	@OriginalMember(owner = "client!ig", name = "d", descriptor = "I")
+	public static int anInt2883;
+	@OriginalMember(owner = "client!jm", name = "s", descriptor = "F")
+	public static float aFloat13;
+	@OriginalMember(owner = "client!ui", name = "mb", descriptor = "F")
+	public static float aFloat37;
+	@OriginalMember(owner = "client!ej", name = "bb", descriptor = "F")
+	public static float aFloat6;
+	@OriginalMember(owner = "client!vh", name = "e", descriptor = "I")
+	public static int anInt4623;
+	@OriginalMember(owner = "client!ni", name = "h", descriptor = "I")
+	public static int anInt4153;
+	@OriginalMember(owner = "client!be", name = "Vb", descriptor = "F")
+	public static float aFloat4;
+	@OriginalMember(owner = "client!ab", name = "b", descriptor = "I")
+	public static int anInt5868 = 0;
+	@OriginalMember(owner = "client!sf", name = "c", descriptor = "I")
+	public static int anInt5080;
+	@OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
+	public static int anInt3255;
+	@OriginalMember(owner = "client!aj", name = "X", descriptor = "F")
+	public static float aFloat1;
+	@OriginalMember(owner = "client!p", name = "g", descriptor = "F")
+	public static float aFloat23;
+	@OriginalMember(owner = "client!nc", name = "a", descriptor = "I")
+	public static int anInt4044;
+	@OriginalMember(owner = "client!bm", name = "a", descriptor = "F")
+	public static float aFloat5;
+	@OriginalMember(owner = "client!ve", name = "t", descriptor = "I")
+	public static int anInt5731;
+	@OriginalMember(owner = "client!md", name = "S", descriptor = "I")
+	public static int anInt3709;
+	@OriginalMember(owner = "client!ui", name = "T", descriptor = "F")
+	public static float aFloat36;
+	@OriginalMember(owner = "client!en", name = "z", descriptor = "F")
+	public static float aFloat7;
+	@OriginalMember(owner = "client!ge", name = "q", descriptor = "I")
+	public static int anInt2161;
+	@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
+	public static boolean instantScreenFade = true;
 
 	@OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I")
 	public static int method2235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		if (Static222.instantScreenFade) {
+		if (instantScreenFade) {
 			arg0 = 1000000;
-			Static222.instantScreenFade = false;
+			instantScreenFade = false;
 		}
-		@Pc(15) Environment local15 = Static192.aClass92ArrayArray1[arg3][arg1];
+		@Pc(15) Environment local15 = aClass92ArrayArray1[arg3][arg1];
 		@Pc(25) float local25 = ((float) arg2 * 0.1F + 0.7F) * local15.aFloat16;
 		@Pc(28) float local28 = local15.aFloat18;
 		@Pc(31) int local31 = local15.anInt3526;
@@ -31,42 +68,42 @@ public final class Static103 {
 			local34 = 0;
 		}
 		@Pc(44) float local44 = local15.aFloat17;
-		if (local31 != Static109.anInt2883 || Static126.aFloat13 != local25 || Static8.aFloat1 != local28 || local44 != Static15.aFloat4 || Static166.anInt4044 != local37 || Static226.anInt5080 != local34) {
-			Static126.aFloat13 = local25;
-			Static253.aFloat37 = Static253.aFloat36;
-			Static59.aFloat6 = Static61.aFloat7;
-			Static109.anInt2883 = local31;
-			Static264.anInt4623 = Static154.anInt3709;
-			Static171.anInt4153 = Static79.anInt2161;
-			Static15.aFloat4 = local44;
-			Static3.anInt5868 = 0;
-			Static131.anInt3255 = Static261.anInt5731;
-			Static226.anInt5080 = local34;
-			Static8.aFloat1 = local28;
-			Static166.anInt4044 = local37;
-			Static185.aFloat23 = Static23.aFloat5;
+		if (local31 != anInt2883 || aFloat13 != local25 || aFloat1 != local28 || local44 != aFloat4 || anInt4044 != local37 || anInt5080 != local34) {
+			aFloat13 = local25;
+			aFloat37 = aFloat36;
+			aFloat6 = aFloat7;
+			anInt2883 = local31;
+			anInt4623 = anInt3709;
+			anInt4153 = anInt2161;
+			aFloat4 = local44;
+			anInt5868 = 0;
+			anInt3255 = anInt5731;
+			anInt5080 = local34;
+			aFloat1 = local28;
+			anInt4044 = local37;
+			aFloat23 = aFloat5;
 		}
-		if (Static3.anInt5868 < 65536) {
-			Static3.anInt5868 += arg0 * 250;
-			if (Static3.anInt5868 >= 65536) {
-				Static3.anInt5868 = 65536;
+		if (anInt5868 < 65536) {
+			anInt5868 += arg0 * 250;
+			if (anInt5868 >= 65536) {
+				anInt5868 = 65536;
 			}
-			@Pc(114) float local114 = (float) Static3.anInt5868 / 65536.0F;
-			@Pc(118) int local118 = Static3.anInt5868 >> 8;
-			@Pc(125) int local125 = 65536 - Static3.anInt5868 >> 8;
-			Static154.anInt3709 = (local118 * (Static166.anInt4044 & 0xFF00FF) + (Static264.anInt4623 & 0xFF00FF) * local125 & 0xFF00FF00) + (local125 * (Static264.anInt4623 & 0xFF00) + (Static166.anInt4044 & 0xFF00) * local118 & 0xFF0000) >> 8;
-			@Pc(162) float local162 = (float) (65536 - Static3.anInt5868) / 65536.0F;
-			Static61.aFloat7 = local162 * Static59.aFloat6 + local114 * Static126.aFloat13;
-			Static253.aFloat36 = Static253.aFloat37 * local162 + local114 * Static8.aFloat1;
-			Static23.aFloat5 = local114 * Static15.aFloat4 + local162 * Static185.aFloat23;
-			Static261.anInt5731 = ((Static109.anInt2883 & 0xFF00) * local118 + local125 * (Static131.anInt3255 & 0xFF00) & 0xFF0000) + ((Static131.anInt3255 & 0xFF00FF) * local125 + ((Static109.anInt2883 & 0xFF00FF) * local118) & 0xFF00FF00) >> 8;
-			Static79.anInt2161 = local118 * Static226.anInt5080 + local125 * Static171.anInt4153 >> 8;
+			@Pc(114) float local114 = (float) anInt5868 / 65536.0F;
+			@Pc(118) int local118 = anInt5868 >> 8;
+			@Pc(125) int local125 = 65536 - anInt5868 >> 8;
+			anInt3709 = (local118 * (anInt4044 & 0xFF00FF) + (anInt4623 & 0xFF00FF) * local125 & 0xFF00FF00) + (local125 * (anInt4623 & 0xFF00) + (anInt4044 & 0xFF00) * local118 & 0xFF0000) >> 8;
+			@Pc(162) float local162 = (float) (65536 - anInt5868) / 65536.0F;
+			aFloat7 = local162 * aFloat6 + local114 * aFloat13;
+			aFloat36 = aFloat37 * local162 + local114 * aFloat1;
+			aFloat5 = local114 * aFloat4 + local162 * aFloat23;
+			anInt5731 = ((anInt2883 & 0xFF00) * local118 + local125 * (anInt3255 & 0xFF00) & 0xFF0000) + ((anInt3255 & 0xFF00FF) * local125 + ((anInt2883 & 0xFF00FF) * local118) & 0xFF00FF00) >> 8;
+			anInt2161 = local118 * anInt5080 + local125 * anInt4153 >> 8;
 		}
-		Static161.method3060(Static261.anInt5731, Static61.aFloat7, Static253.aFloat36, Static23.aFloat5);
-		Static161.method3062(Static154.anInt3709, Static79.anInt2161);
-		Static161.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534);
-		Static161.method3058();
-		return Static154.anInt3709;
+		FogManager.method3060(anInt5731, aFloat7, aFloat36, aFloat5);
+		FogManager.method3062(anInt3709, anInt2161);
+		FogManager.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534);
+		FogManager.method3058();
+		return anInt3709;
 	}
 
 	@OriginalMember(owner = "client!i", name = "e", descriptor = "(BI)I")
@@ -74,4 +111,8 @@ public final class Static103 {
 		return arg0 & 0xFF;
 	}
 
+	@OriginalMember(owner = "client!gm", name = "f", descriptor = "(B)V")
+	public static void setInstantFade() {
+		instantScreenFade = true;
+	}
 }
diff --git a/client/src/main/java/rt4/Static104.java b/client/src/main/java/rt4/Static104.java
deleted file mode 100644
index 653d1fc..0000000
--- a/client/src/main/java/rt4/Static104.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static104 {
-
-    @OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
-	public static int method2251(@OriginalArg(0) int arg0) {
-		@Pc(11) int local11 = arg0 & 0x3F;
-		@Pc(17) int local17 = arg0 >> 6 & 0x3;
-		if (local11 == 18) {
-			if (local17 == 0) {
-				return 1;
-			}
-			if (local17 == 1) {
-				return 2;
-			}
-			if (local17 == 2) {
-				return 4;
-			}
-			if (local17 == 3) {
-				return 8;
-			}
-		} else if (local11 == 19 || local11 == 21) {
-			if (local17 == 0) {
-				return 16;
-			}
-			if (local17 == 1) {
-				return 32;
-			}
-			if (local17 == 2) {
-				return 64;
-			}
-			if (local17 == 3) {
-				return 128;
-			}
-		}
-		return 0;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static105.java b/client/src/main/java/rt4/Static105.java
index 69d083a..477d564 100644
--- a/client/src/main/java/rt4/Static105.java
+++ b/client/src/main/java/rt4/Static105.java
@@ -6,15 +6,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static105 {
 
-	@OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;")
-	public static Class114[] aClass114Array1;
-
-	@OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;")
+    @OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;")
 	public static final ColorImageCacheEntry VALID = new ColorImageCacheEntry(0, 0);
 
-	@OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
-	public static Component aClass13_14 = null;
-
     @OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;")
 	public static final JagString aClass100_561 = JagString.parse(" )2> <col=ffffff>");
 
diff --git a/client/src/main/java/rt4/Static106.java b/client/src/main/java/rt4/Static106.java
deleted file mode 100644
index 3c766a1..0000000
--- a/client/src/main/java/rt4/Static106.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static106 {
-
-	@OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;")
-	public static Sprite compass;
-
-}
diff --git a/client/src/main/java/rt4/Static107.java b/client/src/main/java/rt4/Static107.java
index 451c8bf..527f755 100644
--- a/client/src/main/java/rt4/Static107.java
+++ b/client/src/main/java/rt4/Static107.java
@@ -10,7 +10,4 @@ public final class Static107 {
 	@OriginalMember(owner = "client!id", name = "b", descriptor = "I")
 	public static int anInt2875 = -1;
 
-	@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
-	public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
-
 }
diff --git a/client/src/main/java/rt4/Static109.java b/client/src/main/java/rt4/Static109.java
index 664013c..a45abc4 100644
--- a/client/src/main/java/rt4/Static109.java
+++ b/client/src/main/java/rt4/Static109.java
@@ -7,10 +7,7 @@ public final class Static109 {
 	@OriginalMember(owner = "client!ig", name = "b", descriptor = "I")
 	public static int anInt2882;
 
-	@OriginalMember(owner = "client!ig", name = "d", descriptor = "I")
-	public static int anInt2883;
-
-	@OriginalMember(owner = "client!ig", name = "f", descriptor = "I")
+    @OriginalMember(owner = "client!ig", name = "f", descriptor = "I")
 	public static int anInt2884;
 
 	@OriginalMember(owner = "client!ig", name = "i", descriptor = "I")
diff --git a/client/src/main/java/rt4/Static110.java b/client/src/main/java/rt4/Static110.java
index b8b89e7..67a1e77 100644
--- a/client/src/main/java/rt4/Static110.java
+++ b/client/src/main/java/rt4/Static110.java
@@ -7,7 +7,7 @@ public final class Static110 {
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V")
 	public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) {
-		Static182.aClass3_Sub14ArrayArray2[arg0] = arg1;
+		SceneGraph.underwaterHdTiles[arg0] = arg1;
 	}
 
 }
diff --git a/client/src/main/java/rt4/Static111.java b/client/src/main/java/rt4/Static111.java
index fe52982..3f404cf 100644
--- a/client/src/main/java/rt4/Static111.java
+++ b/client/src/main/java/rt4/Static111.java
@@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static111 {
 
-	@OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
-	public static int anInt2910;
-
-	@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
+    @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
 	public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
 		if (arg0.xMode == 0) {
 			arg0.y = arg0.baseY;
diff --git a/client/src/main/java/rt4/Static112.java b/client/src/main/java/rt4/Static112.java
index 03fb2ae..3cb5335 100644
--- a/client/src/main/java/rt4/Static112.java
+++ b/client/src/main/java/rt4/Static112.java
@@ -5,16 +5,19 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static112 {
 
-	@OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
+    @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;")
+    public static Sprite aClass3_Sub2_Sub1_6;
+
+    @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
 	public static void method2297() {
 		@Pc(3) int local3 = Static183.anInt4271;
 		@Pc(9) int local9 = Static229.anInt5138;
 		@Pc(11) int local11 = Static13.anInt436;
 		@Pc(13) int local13 = Static24.anInt761;
 		if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
-			if (client.js5Archive8.isFileReady(Static55.anInt1736) && client.js5Archive8.isFileReady(Static169.anInt4073)) {
-				Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static55.anInt1736);
-				Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static169.anInt4073);
+			if (client.js5Archive8.isFileReady(Static40.anInt1736) && client.js5Archive8.isFileReady(Static40.anInt4073)) {
+				Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt1736);
+				Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt4073);
 				if (GlRenderer.enabled) {
 					if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
 						Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
@@ -28,9 +31,9 @@ public final class Static112 {
 					}
 				}
 			} else if (GlRenderer.enabled) {
-				GlRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
+				GlRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static40.anInt2910);
 			} else {
-				SoftwareRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
+				SoftwareRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static40.anInt2910);
 			}
 		}
 		@Pc(112) int local112;
@@ -43,11 +46,11 @@ public final class Static112 {
 			Static181.aClass3_Sub2_Sub1_9.render(local3, local9);
 			Static181.aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9);
 		}
-		Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1);
+		Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static40.anInt4581, -1);
 		if (GlRenderer.enabled) {
-			GlRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
+			GlRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static40.anInt2910);
 		} else {
-			SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
+			SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static40.anInt2910);
 		}
 		local114 = Mouse.anInt5032;
 		local112 = Mouse.anInt4873;
@@ -57,26 +60,26 @@ public final class Static112 {
 			local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
 			if (local3 < local112 && local112 < local3 + local13 && local114 > local219 - 13 && local114 < local219 + 3) {
 				if (GlRenderer.enabled) {
-					GlRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
+					GlRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static40.anInt5457, 256 - Static40.anInt5208);
 				} else {
-					SoftwareRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
+					SoftwareRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static40.anInt5457, 256 - Static40.anInt5208);
 				}
 			}
 		}
-		if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static85.anInt2261) && client.js5Archive8.isFileReady(Static136.anInt3324) && client.js5Archive8.isFileReady(Static254.anInt5556)) {
-			Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static85.anInt2261);
-			Static92.aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static136.anInt3324);
-			Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static254.anInt5556);
+		if ((Static165.aClass3_Sub2_Sub1_8 == null || aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) {
+			Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt2261);
+			aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324);
+			Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556);
 			if (GlRenderer.enabled) {
 				if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
 					Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
 				} else {
 					Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
 				}
-				if (Static92.aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) {
-					Static92.aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6);
+				if (aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) {
+					aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
 				} else {
-					Static92.aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6);
+					aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
 				}
 				if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
 					Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10);
@@ -86,24 +89,24 @@ public final class Static112 {
 			}
 		}
 		@Pc(418) int local418;
-		if (Static165.aClass3_Sub2_Sub1_8 != null && Static92.aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) {
+		if (Static165.aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) {
 			local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width;
 			for (local219 = 0; local219 < local203; local219++) {
 				Static165.aClass3_Sub2_Sub1_8.render(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height);
 			}
-			local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height;
+			local219 = (local11 - 20) / aClass3_Sub2_Sub1_6.height;
 			for (local418 = 0; local418 < local219; local418++) {
-				Static92.aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20);
-				Static92.aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height);
+				aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * aClass3_Sub2_Sub1_6.height + 20);
+				aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * aClass3_Sub2_Sub1_6.height);
 			}
 			Static204.aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height);
 			Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height);
 		}
 		for (local203 = 0; local203 < MiniMenu.size; local203++) {
 			local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
-			local418 = Static195.anInt4581;
+			local418 = Static40.anInt4581;
 			if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) {
-				local418 = Static262.anInt5752;
+				local418 = Static40.anInt5752;
 			}
 			Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0);
 		}
diff --git a/client/src/main/java/rt4/Static114.java b/client/src/main/java/rt4/Static114.java
index 03a76d6..8ca9bb6 100644
--- a/client/src/main/java/rt4/Static114.java
+++ b/client/src/main/java/rt4/Static114.java
@@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static114 {
 
-	@OriginalMember(owner = "client!j", name = "K", descriptor = "I")
-	public static int anInt5843 = 0;
-
     @OriginalMember(owner = "client!j", name = "O", descriptor = "[I")
 	public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 };
 
@@ -40,12 +37,4 @@ public final class Static114 {
 		}
 	}
 
-	@OriginalMember(owner = "client!j", name = "g", descriptor = "(I)V")
-	public static void method4637() {
-		Static165.aClass3_Sub2_Sub1_8 = null;
-		Static39.aClass3_Sub2_Sub1_1 = null;
-		Static92.aClass3_Sub2_Sub1_6 = null;
-		Static181.aClass3_Sub2_Sub1_9 = null;
-		Static204.aClass3_Sub2_Sub1_10 = null;
-	}
 }
diff --git a/client/src/main/java/rt4/Static115.java b/client/src/main/java/rt4/Static115.java
index 6cb9915..a47e794 100644
--- a/client/src/main/java/rt4/Static115.java
+++ b/client/src/main/java/rt4/Static115.java
@@ -15,14 +15,33 @@ public final class Static115 {
 	@OriginalMember(owner = "client!ja", name = "j", descriptor = "I")
 	public static int anInt2937 = 0;
 
-	@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
-	public static int mapFlagX = 0;
-
 	@OriginalMember(owner = "client!ja", name = "r", descriptor = "I")
 	public static int anInt2941 = -1;
 
 	@OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;")
-	public static final JagString aClass100_582 = JagString.parse("http:)4)4");
+	public static final JagString HTTP_PROTOCOL = JagString.parse("http:)4)4");
+	@OriginalMember(owner = "client!od", name = "g", descriptor = "S")
+	public static short aShort25 = 256;
+	@OriginalMember(owner = "client!an", name = "db", descriptor = "S")
+	public static short aShort9 = 205;
+	@OriginalMember(owner = "client!mc", name = "tb", descriptor = "S")
+	public static short aShort22 = 1;
+	@OriginalMember(owner = "client!ac", name = "k", descriptor = "S")
+	public static short aShort1 = 32767;
+	@OriginalMember(owner = "client!nc", name = "n", descriptor = "I")
+	public static int anInt4055 = 0;
+	@OriginalMember(owner = "client!tm", name = "i", descriptor = "I")
+	public static int anInt5377 = 0;
+	@OriginalMember(owner = "client!bn", name = "eb", descriptor = "I")
+	public static int anInt773 = 0;
+	@OriginalMember(owner = "client!ah", name = "n", descriptor = "I")
+	public static int anInt983 = 0;
+	@OriginalMember(owner = "client!sc", name = "p", descriptor = "I")
+	public static int anInt5029 = 0;
+	@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
+	public static short aShort21 = 32767;
+	@OriginalMember(owner = "client!ee", name = "f", descriptor = "S")
+	public static short aShort12 = 1;
 
 	@OriginalMember(owner = "client!ja", name = "a", descriptor = "([II)[I")
 	public static int[] method2308(@OriginalArg(0) int[] arg0) {
@@ -61,21 +80,21 @@ public final class Static115 {
 			} else if (local25 > 100) {
 				local25 = 100;
 			}
-			@Pc(51) int local51 = local25 * (Static10.aShort9 - Static178.aShort25) / 100 + Static178.aShort25;
-			if (Static153.aShort22 > local51) {
-				local51 = Static153.aShort22;
-			} else if (Static4.aShort1 < local51) {
-				local51 = Static4.aShort1;
+			@Pc(51) int local51 = local25 * (aShort9 - aShort25) / 100 + aShort25;
+			if (aShort22 > local51) {
+				local51 = aShort22;
+			} else if (aShort1 < local51) {
+				local51 = aShort1;
 			}
 			@Pc(73) int local73 = local51 * arg2 * 512 / (arg0 * 334);
 			@Pc(115) int local115;
 			@Pc(122) int local122;
 			@Pc(86) short local86;
-			if (local73 < Static55.aShort12) {
-				local86 = Static55.aShort12;
+			if (local73 < aShort12) {
+				local86 = aShort12;
 				local51 = arg0 * 334 * local86 / (arg2 * 512);
-				if (Static4.aShort1 < local51) {
-					local51 = Static4.aShort1;
+				if (aShort1 < local51) {
+					local51 = aShort1;
 					local115 = arg2 * 512 * local51 / (local86 * 334);
 					local122 = (arg0 - local115) / 2;
 					if (arg4) {
@@ -86,11 +105,11 @@ public final class Static115 {
 					arg3 += local122;
 					arg0 -= local122 * 2;
 				}
-			} else if (Static131.aShort21 < local73) {
-				local86 = Static131.aShort21;
+			} else if (aShort21 < local73) {
+				local86 = aShort21;
 				local51 = local86 * arg0 * 334 / (arg2 * 512);
-				if (Static153.aShort22 > local51) {
-					local51 = Static153.aShort22;
+				if (aShort22 > local51) {
+					local51 = aShort22;
 					local115 = local86 * arg0 * 334 / (local51 * 512);
 					local122 = (arg2 - local115) / 2;
 					if (arg4) {
@@ -102,34 +121,12 @@ public final class Static115 {
 					arg1 += local122;
 				}
 			}
-			Static223.anInt5029 = local51 * arg2 / 334;
+			anInt5029 = local51 * arg2 / 334;
 		}
-		Static166.anInt4055 = (short) arg0;
-		Static245.anInt5377 = (short) arg2;
-		Static24.anInt773 = arg1;
-		Static7.anInt983 = arg3;
+		anInt4055 = (short) arg0;
+		anInt5377 = (short) arg2;
+		anInt773 = arg1;
+		anInt983 = arg3;
 	}
 
-	@OriginalMember(owner = "client!ja", name = "a", descriptor = "(Z)V")
-	public static void clear() {
-		Fonts.p12Full = null;
-		Sprites.hitmarks = null;
-		Sprites.crosses = null;
-		Sprites.nameIcons = null;
-		Fonts.p11FullSoftware = null;
-		Sprites.mapfunctions = null;
-		Static67.mapfuncs = null;
-		Sprites.mapmarkhints = null;
-		Sprites.headiconPrayers = null;
-		Fonts.b12Full = null;
-		Static106.compass = null;
-		Sprites.mapdots = null;
-		Fonts.p11Full = null;
-		Sprites.mapflags = null;
-		Sprites.hitbars = null;
-		Static277.hintMapEdge = null;
-		Sprites.headhints = null;
-		Sprites.headiconPks = null;
-		Sprites.scrollbars = null;
-	}
 }
diff --git a/client/src/main/java/rt4/Static12.java b/client/src/main/java/rt4/Static12.java
index 98655ec..ec19519 100644
--- a/client/src/main/java/rt4/Static12.java
+++ b/client/src/main/java/rt4/Static12.java
@@ -7,7 +7,4 @@ public final class Static12 {
 	@OriginalMember(owner = "client!bb", name = "M", descriptor = "I")
 	public static int anInt406;
 
-	@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
-	public static final byte[][] aByteArrayArray2 = new byte[250][];
-
 }
diff --git a/client/src/main/java/rt4/Static123.java b/client/src/main/java/rt4/Static123.java
index c043c93..e505c7b 100644
--- a/client/src/main/java/rt4/Static123.java
+++ b/client/src/main/java/rt4/Static123.java
@@ -13,8 +13,10 @@ public final class Static123 {
 
 	@OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
 	public static int anInt3947;
+    @OriginalMember(owner = "client!wi", name = "db", descriptor = "I")
+	public static int tileVisibilityDistance;
 
-	@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
+    @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
 	public static void topBannerRefresh() {
 		if (!client.advertSuppressed && client.modeWhere != 2) {
 			try {
@@ -42,15 +44,15 @@ public final class Static123 {
 			@Pc(158) int local158;
 			@Pc(137) boolean local137;
 			if (local10.anInt4453 == 1) {
-				local14 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069;
-				if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-					local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539;
+				local14 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
+				if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) {
+					local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
 					if (local115 < 0) {
 						local115 = 0;
 					}
-					local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539;
-					if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-						local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
+					local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539;
+					if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
+						local126 = tileVisibilityDistance + tileVisibilityDistance;
 					}
 					local137 = false;
 					while (local115 <= local126) {
@@ -78,15 +80,15 @@ public final class Static123 {
 					}
 				}
 			} else if (local10.anInt4453 == 2) {
-				local14 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539;
-				if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-					local115 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069;
+				local14 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
+				if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) {
+					local115 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
 					if (local115 < 0) {
 						local115 = 0;
 					}
-					local126 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069;
-					if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-						local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
+					local126 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069;
+					if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
+						local126 = tileVisibilityDistance + tileVisibilityDistance;
 					}
 					local137 = false;
 					while (local115 <= local126) {
@@ -116,22 +118,22 @@ public final class Static123 {
 			} else if (local10.anInt4453 == 4) {
 				local14 = local10.anInt4444 - anInt3947;
 				if (local14 > 128) {
-					local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539;
+					local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
 					if (local115 < 0) {
 						local115 = 0;
 					}
-					local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539;
-					if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-						local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
+					local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539;
+					if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
+						local126 = tileVisibilityDistance + tileVisibilityDistance;
 					}
 					if (local115 <= local126) {
-						@Pc(408) int local408 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069;
+						@Pc(408) int local408 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
 						if (local408 < 0) {
 							local408 = 0;
 						}
-						local158 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069;
-						if (local158 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-							local158 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
+						local158 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069;
+						if (local158 > tileVisibilityDistance + tileVisibilityDistance) {
+							local158 = tileVisibilityDistance + tileVisibilityDistance;
 						}
 						@Pc(430) boolean local430 = false;
 						label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) {
diff --git a/client/src/main/java/rt4/Static125.java b/client/src/main/java/rt4/Static125.java
index 181f3e5..ef575ef 100644
--- a/client/src/main/java/rt4/Static125.java
+++ b/client/src/main/java/rt4/Static125.java
@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static125 {
@@ -8,18 +7,4 @@ public final class Static125 {
     @OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
 	public static int anInt3096 = 0;
 
-    @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V")
-	public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		Protocol.outboundBuffer.offset = 0;
-		Protocol.outboundBuffer.p1(147);
-		Protocol.outboundBuffer.p1(arg2);
-		Protocol.outboundBuffer.p1(arg3);
-		Protocol.outboundBuffer.p2(arg0);
-		Protocol.outboundBuffer.p2(arg1);
-		CreateManager.loops = 0;
-		CreateManager.errors = 0;
-		CreateManager.step = 1;
-		CreateManager.reply = -3;
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static126.java b/client/src/main/java/rt4/Static126.java
index 78192f4..ec49164 100644
--- a/client/src/main/java/rt4/Static126.java
+++ b/client/src/main/java/rt4/Static126.java
@@ -5,13 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static126 {
 
-	@OriginalMember(owner = "client!jm", name = "r", descriptor = "I")
-	public static int anInt3114;
-
-	@OriginalMember(owner = "client!jm", name = "s", descriptor = "F")
-	public static float aFloat13;
-
-	@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
+    @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
 	public static void method2460() {
 		if (InterfaceList.topLevelInterface != -1) {
 			Static96.method1949(InterfaceList.topLevelInterface);
diff --git a/client/src/main/java/rt4/Static127.java b/client/src/main/java/rt4/Static127.java
index 70afabf..dbfa5f6 100644
--- a/client/src/main/java/rt4/Static127.java
+++ b/client/src/main/java/rt4/Static127.java
@@ -1,8 +1,5 @@
 package rt4;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
@@ -29,199 +26,138 @@ public final class Static127 {
 	@OriginalMember(owner = "client!k", name = "l", descriptor = "[I")
 	public static int[] anIntArray292;
 
-	@OriginalMember(owner = "client!k", name = "i", descriptor = "I")
-	public static int anInt3125 = 0;
-
 	@OriginalMember(owner = "client!k", name = "m", descriptor = "Z")
 	public static boolean neverRemoveRoofs = false;
 
-	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
-	public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
-		return SpriteLoader.decode(arg1, 0, arg0) ? Font.method799(arg2.getFile(arg0, 0)) : null;
-	}
-
-	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
-	public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) {
-		if (Static80.centralZoneX == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) {
-			return;
-		}
-		Static80.centralZoneX = arg2;
-		Static52.anInt1695 = arg1;
-		Static41.anInt1316 = arg0;
-		if (SceneGraph.allLevelsAreVisible()) {
-			Static41.anInt1316 = 0;
-		}
-		if (arg4) {
-			client.setGameState(28);
-		} else {
-			client.setGameState(25);
-		}
-		Static114.drawTextOnScreen(true, LocalizedText.LOADING);
-		@Pc(53) int local53 = Static142.originZ;
-		@Pc(55) int local55 = Static225.originX;
-		Static142.originZ = arg1 * 8 - 48;
-		Static225.originX = (arg2 - 6) * 8;
-		Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8);
-		@Pc(81) int local81 = Static142.originZ - local53;
-		@Pc(86) int local86 = Static225.originX - local55;
-		Static235.mapElementList = null;
-		@Pc(96) int local96;
-		@Pc(103) Npc local103;
-		@Pc(109) int local109;
-		if (arg4) {
-			NpcList.size = 0;
-			for (local96 = 0; local96 < 32768; local96++) {
-				local103 = NpcList.npcs[local96];
-				if (local103 != null) {
-					local103.xFine -= local86 * 128;
-					local103.zFine -= local81 * 128;
-					if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
-						for (local109 = 0; local109 < 10; local109++) {
-							local103.movementQueueX[local109] -= local86;
-							local103.movementQueueZ[local109] -= local81;
-						}
-						NpcList.ids[NpcList.size++] = local96;
-					} else {
-						NpcList.npcs[local96].setNpcType(null);
-						NpcList.npcs[local96] = null;
-					}
-				}
-			}
-		} else {
-			for (local96 = 0; local96 < 32768; local96++) {
-				local103 = NpcList.npcs[local96];
-				if (local103 != null) {
-					for (local109 = 0; local109 < 10; local109++) {
-						local103.movementQueueX[local109] -= local86;
-						local103.movementQueueZ[local109] -= local81;
-					}
-					local103.xFine -= local86 * 128;
-					local103.zFine -= local81 * 128;
-				}
-			}
-		}
-		for (local96 = 0; local96 < 2048; local96++) {
-			@Pc(265) Player local265 = PlayerList.players[local96];
-			if (local265 != null) {
-				for (local109 = 0; local109 < 10; local109++) {
-					local265.movementQueueX[local109] -= local86;
-					local265.movementQueueZ[local109] -= local81;
-				}
-				local265.xFine -= local86 * 128;
-				local265.zFine -= local81 * 128;
-			}
-		}
-		Player.level = arg0;
-		PlayerList.self.teleport(arg5, false, arg3);
-		@Pc(322) byte local322 = 104;
-		@Pc(324) byte local324 = 0;
-		@Pc(326) byte local326 = 0;
-		@Pc(328) byte local328 = 1;
-		@Pc(330) byte local330 = 104;
-		@Pc(332) byte local332 = 1;
-		if (local81 < 0) {
-			local328 = -1;
-			local330 = -1;
-			local326 = 103;
-		}
-		if (local86 < 0) {
-			local332 = -1;
-			local324 = 103;
-			local322 = -1;
-		}
-		for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) {
-			for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) {
-				@Pc(378) int local378 = local86 + local358;
-				@Pc(382) int local382 = local367 + local81;
-				for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
-					if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
-						SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382];
-					} else {
-						SceneGraph.objStacks[local384][local358][local367] = null;
-					}
-				}
-			}
-		}
-		for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
-			local451.z -= local81;
-			local451.x -= local86;
-			if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {
-				local451.unlink();
-			}
-		}
-		if (arg4) {
-			Static138.renderX -= local86 * 128;
-			Static134.renderZ -= local81 * 128;
-			Static248.anInt4232 -= local81;
-			Static251.anInt5449 -= local86;
-			Static265.anInt5765 -= local81;
-			Static245.anInt5375 -= local86;
-		} else {
-			Static227.cameraType = 1;
-		}
-		SoundPlayer.anInt4451 = 0;
-		if (Static115.mapFlagX != 0) {
-			Static84.anInt2255 -= local81;
-			Static115.mapFlagX -= local86;
-		}
-		if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
-			Static86.setInstantFade();
-		}
-		Static107.anInt2875 = -1;
-		Static99.aClass69_64.clear();
-		Static217.aClass69_116.clear();
-	}
-
-	@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
-	public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
-		if (arg1.indexOf(PERCENT_SIGN) == -1) {
-			return arg1;
-		}
-		while (true) {
-			@Pc(14) int local14 = arg1.indexOf(aClass100_133);
-			if (local14 == -1) {
-				while (true) {
-					local14 = arg1.indexOf(aClass100_1097);
-					if (local14 == -1) {
-						while (true) {
-							local14 = arg1.indexOf(aClass100_761);
-							if (local14 == -1) {
-								while (true) {
-									local14 = arg1.indexOf(aClass100_520);
-									if (local14 == -1) {
-										while (true) {
-											local14 = arg1.indexOf(aClass100_1002);
-											if (local14 == -1) {
-												while (true) {
-													local14 = arg1.indexOf(aClass100_591);
-													if (local14 == -1) {
-														return arg1;
-													}
-													@Pc(246) JagString local246 = JagString.EMPTY;
-													if (Player.lastLogAddress != null) {
-														local246 = Static181.method3341(Player.lastLogAddress.intArg2);
-														if (Player.lastLogAddress.result != null) {
-															@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
-															local246 = JagString.decodeString(local265, local265.length, 0);
-														}
-													}
-													arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
-												}
-											}
-											arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
-										}
-									}
-									arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
-								}
-							}
-							arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
-						}
-					}
-					arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
-				}
-			}
-			arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
-		}
-	}
-
+	@OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
+    public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
+        if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) {
+            return -2;
+        }
+        try {
+            @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0];
+            @Pc(35) byte local35 = 0;
+            @Pc(37) int local37 = 0;
+            @Pc(39) int local39 = 0;
+            while (true) {
+                @Pc(41) int local41 = 0;
+                @Pc(46) int local46 = local33[local39++];
+                @Pc(48) byte local48 = 0;
+                if (local46 == 0) {
+                    return local37;
+                }
+                if (local46 == 15) {
+                    local48 = 1;
+                }
+                if (local46 == 16) {
+                    local48 = 2;
+                }
+                if (local46 == 1) {
+                    local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]];
+                }
+                if (local46 == 17) {
+                    local48 = 3;
+                }
+                if (local46 == 2) {
+                    local41 = PlayerSkillXpTable.baseLevels[local33[local39++]];
+                }
+                if (local46 == 3) {
+                    local41 = PlayerSkillXpTable.experience[local33[local39++]];
+                }
+                @Pc(124) int local124;
+                @Pc(135) Component local135;
+                @Pc(140) int local140;
+                @Pc(152) int local152;
+                if (local46 == 4) {
+                    local124 = local33[local39++] << 16;
+                    @Pc(131) int local131 = local124 + local33[local39++];
+                    local135 = InterfaceList.getComponent(local131);
+                    local140 = local33[local39++];
+                    if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
+                        for (local152 = 0; local152 < local135.objTypes.length; local152++) {
+                            if (local140 + 1 == local135.objTypes[local152]) {
+                                local41 += local135.objCounts[local152];
+                            }
+                        }
+                    }
+                }
+                if (local46 == 5) {
+                    local41 = VarpDomain.activeVarps[local33[local39++]];
+                }
+                if (local46 == 6) {
+                    local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1];
+                }
+                if (local46 == 7) {
+                    local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875;
+                }
+                if (local46 == 8) {
+                    local41 = PlayerList.self.combatLevel;
+                }
+                if (local46 == 9) {
+                    for (local124 = 0; local124 < 25; local124++) {
+                        if (Static182.aBooleanArray97[local124]) {
+                            local41 += PlayerSkillXpTable.baseLevels[local124];
+                        }
+                    }
+                }
+                if (local46 == 10) {
+                    local124 = local33[local39++] << 16;
+                    local124 += local33[local39++];
+                    local135 = InterfaceList.getComponent(local124);
+                    local140 = local33[local39++];
+                    if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
+                        for (local152 = 0; local152 < local135.objTypes.length; local152++) {
+                            if (local135.objTypes[local152] == local140 + 1) {
+                                local41 = 999999999;
+                                break;
+                            }
+                        }
+                    }
+                }
+                if (local46 == 11) {
+                    local41 = Player.runEnergy;
+                }
+                if (local46 == 12) {
+                    local41 = Player.weight;
+                }
+                if (local46 == 13) {
+                    local124 = VarpDomain.activeVarps[local33[local39++]];
+                    @Pc(353) int local353 = local33[local39++];
+                    local41 = (0x1 << local353 & local124) == 0 ? 0 : 1;
+                }
+                if (local46 == 14) {
+                    local124 = local33[local39++];
+                    local41 = VarpDomain.getVarbit(local124);
+                }
+                if (local46 == 18) {
+                    local41 = (PlayerList.self.xFine >> 7) + Camera.originX;
+                }
+                if (local46 == 19) {
+                    local41 = (PlayerList.self.zFine >> 7) + Camera.originZ;
+                }
+                if (local46 == 20) {
+                    local41 = local33[local39++];
+                }
+                if (local48 == 0) {
+                    if (local35 == 0) {
+                        local37 += local41;
+                    }
+                    if (local35 == 1) {
+                        local37 -= local41;
+                    }
+                    if (local35 == 2 && local41 != 0) {
+                        local37 /= local41;
+                    }
+                    if (local35 == 3) {
+                        local37 *= local41;
+                    }
+                    local35 = 0;
+                } else {
+                    local35 = local48;
+                }
+            }
+        } catch (@Pc(464) Exception local464) {
+            return -1;
+        }
+    }
 }
diff --git a/client/src/main/java/rt4/Static128.java b/client/src/main/java/rt4/Static128.java
index 13b89fd..09a7fea 100644
--- a/client/src/main/java/rt4/Static128.java
+++ b/client/src/main/java/rt4/Static128.java
@@ -1,10 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalMember;
-
 public final class Static128 {
 
-    @OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
-	public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };
-
 }
diff --git a/client/src/main/java/rt4/Static13.java b/client/src/main/java/rt4/Static13.java
index 77c6662..0dadd31 100644
--- a/client/src/main/java/rt4/Static13.java
+++ b/client/src/main/java/rt4/Static13.java
@@ -10,7 +10,4 @@ public final class Static13 {
 	@OriginalMember(owner = "client!bc", name = "Z", descriptor = "I")
 	public static int anInt437;
 
-	@OriginalMember(owner = "client!bc", name = "I", descriptor = "Z")
-	public static boolean aBoolean16 = false;
-
 }
diff --git a/client/src/main/java/rt4/Static130.java b/client/src/main/java/rt4/Static130.java
index f9ffe9b..8299c32 100644
--- a/client/src/main/java/rt4/Static130.java
+++ b/client/src/main/java/rt4/Static130.java
@@ -7,7 +7,4 @@ public final class Static130 {
 	@OriginalMember(owner = "client!kc", name = "p", descriptor = "[I")
 	public static int[] anIntArray299;
 
-    @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
-	public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
-
 }
diff --git a/client/src/main/java/rt4/Static131.java b/client/src/main/java/rt4/Static131.java
index f31bc8c..eb76d9c 100644
--- a/client/src/main/java/rt4/Static131.java
+++ b/client/src/main/java/rt4/Static131.java
@@ -7,18 +7,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static131 {
 
-    @OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
-	public static int anInt3255;
-
     @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
 	public static int anInt3251 = 0;
 
-    @OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
-	public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 };
-
-	@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
-	public static short aShort21 = 32767;
-
     @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
 	public static int anInt3260 = -1;
 
diff --git a/client/src/main/java/rt4/Static132.java b/client/src/main/java/rt4/Static132.java
index 2276149..12a4c0d 100644
--- a/client/src/main/java/rt4/Static132.java
+++ b/client/src/main/java/rt4/Static132.java
@@ -9,9 +9,6 @@ public final class Static132 {
 	@OriginalMember(owner = "client!ke", name = "U", descriptor = "I")
 	public static int anInt3291 = 0;
 
-	@OriginalMember(owner = "client!ke", name = "Y", descriptor = "[I")
-	public static final int[] anIntArray309 = new int[] { 1, 4 };
-
 	@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
 	public static void closeInterface(@OriginalArg(0) boolean arg0, @OriginalArg(1) ComponentPointer arg1) {
 		@Pc(9) int local9 = (int) arg1.key;
@@ -20,7 +17,7 @@ public final class Static132 {
 		if (arg0) {
 			InterfaceList.method2275(local16);
 		}
-		Static273.method3214(local16);
+		method3214(local16);
 		@Pc(32) Component local32 = InterfaceList.getComponent(local9);
 		if (local32 != null) {
 			InterfaceList.redraw(local32);
@@ -33,7 +30,7 @@ public final class Static132 {
 			}
 		}
 		if (MiniMenu.size == 1) {
-			Static60.aBoolean108 = false;
+			Static40.aBoolean108 = false;
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
 		} else {
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
@@ -44,7 +41,7 @@ public final class Static132 {
 					local43 = local88;
 				}
 			}
-			Static13.anInt436 = MiniMenu.size * 15 + (Static261.aBoolean298 ? 26 : 22);
+			Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
 			Static24.anInt761 = local43 + 8;
 		}
 		if (InterfaceList.topLevelInterface != -1) {
@@ -175,4 +172,13 @@ public final class Static132 {
 			Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864));
 		}
 	}
+
+	@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
+	public static void method3214(@OriginalArg(1) int arg0) {
+		for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) {
+			if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) {
+				local11.unlink();
+			}
+		}
+	}
 }
diff --git a/client/src/main/java/rt4/Static134.java b/client/src/main/java/rt4/Static134.java
index d986125..ea3cfe5 100644
--- a/client/src/main/java/rt4/Static134.java
+++ b/client/src/main/java/rt4/Static134.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static134 {
 
-	@OriginalMember(owner = "client!kh", name = "f", descriptor = "I")
-	public static int renderZ;
-
 	@OriginalMember(owner = "client!kh", name = "a", descriptor = "(B)Lclient!ek;")
 	public static SoftwareIndexedSprite method2619() {
 		@Pc(25) SoftwareIndexedSprite local25 = new SoftwareIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette);
diff --git a/client/src/main/java/rt4/Static136.java b/client/src/main/java/rt4/Static136.java
index eac5330..73ae139 100644
--- a/client/src/main/java/rt4/Static136.java
+++ b/client/src/main/java/rt4/Static136.java
@@ -4,13 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static136 {
 
-	@OriginalMember(owner = "client!kk", name = "i", descriptor = "I")
-	public static int anInt3324;
-
-    @OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
-	public static int anInt3325 = 0;
-
-	@OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
+    @OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
 	public static boolean method2655() {
 		return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414();
 	}
diff --git a/client/src/main/java/rt4/Static137.java b/client/src/main/java/rt4/Static137.java
deleted file mode 100644
index 957771b..0000000
--- a/client/src/main/java/rt4/Static137.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static137 {
-
-	@OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
-	public static int anInt3337 = 0;
-
-	@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
-	public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) {
-		return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1());
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static138.java b/client/src/main/java/rt4/Static138.java
index a0716a5..8b3b33a 100644
--- a/client/src/main/java/rt4/Static138.java
+++ b/client/src/main/java/rt4/Static138.java
@@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static138 {
 
-	@OriginalMember(owner = "client!km", name = "Pc", descriptor = "I")
-	public static int renderX;
-
-    @OriginalMember(owner = "client!km", name = "pc", descriptor = "Z")
-	public static boolean aBoolean172 = false;
-
 	@OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;")
 	private static final JagString aClass100_641 = JagString.parse("Dec");
 
@@ -58,7 +52,4 @@ public final class Static138 {
 	@OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;")
 	public static final JagString TRADE = JagString.parse(":trade:");
 
-	@OriginalMember(owner = "client!km", name = "ad", descriptor = "I")
-	public static int fp = 0;
-
 }
diff --git a/client/src/main/java/rt4/Static141.java b/client/src/main/java/rt4/Static141.java
index 78ff5ea..bae9a8c 100644
--- a/client/src/main/java/rt4/Static141.java
+++ b/client/src/main/java/rt4/Static141.java
@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static141 {
@@ -8,19 +7,4 @@ public final class Static141 {
 	@OriginalMember(owner = "client!lb", name = "z", descriptor = "I")
 	public static int anInt3473;
 
-	@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
-	public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
-		Static113.anInt4612 = arg3;
-		Static231.anInt5203 = arg2;
-		Static245.anInt5375 = arg5;
-		Static233.anInt5225 = arg1;
-		Static248.anInt4232 = arg4;
-		if (arg0 && Static113.anInt4612 >= 100) {
-			Static138.renderX = Static245.anInt5375 * 128 + 64;
-			Static134.renderZ = Static248.anInt4232 * 128 + 64;
-			Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
-		}
-		Static227.cameraType = 2;
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static142.java b/client/src/main/java/rt4/Static142.java
deleted file mode 100644
index b7f256e..0000000
--- a/client/src/main/java/rt4/Static142.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static142 {
-
-	@OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
-	public static int originZ;
-
-}
diff --git a/client/src/main/java/rt4/Static144.java b/client/src/main/java/rt4/Static144.java
index 30a856f..c6c6cba 100644
--- a/client/src/main/java/rt4/Static144.java
+++ b/client/src/main/java/rt4/Static144.java
@@ -7,16 +7,4 @@ public final class Static144 {
 	@OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;")
 	public static Song aClass3_Sub29_1;
 
-    @OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I")
-	public static int getWindowMode() {
-		if (GameShell.fullScreenFrame != null) {
-			return 3;
-		} else if (GlRenderer.enabled && Static124.aBoolean156) {
-			return 2;
-		} else if (GlRenderer.enabled && !Static124.aBoolean156) {
-			return 1;
-		} else {
-			return 0;
-		}
-	}
 }
diff --git a/client/src/main/java/rt4/Static145.java b/client/src/main/java/rt4/Static145.java
index 9ec5d78..0dcf164 100644
--- a/client/src/main/java/rt4/Static145.java
+++ b/client/src/main/java/rt4/Static145.java
@@ -22,7 +22,7 @@ public final class Static145 {
 	@OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V")
 	public static void method2743(@OriginalArg(1) Js5 arg0) {
 		Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Flames.anInt3443, arg0);
-		Static96.anIntArray235 = new int[256];
+		Static221.anIntArray235 = new int[256];
 		@Pc(15) int local15;
 		for (local15 = 0; local15 < 3; local15++) {
 			@Pc(30) int local30 = Flames.anIntArray445[local15 + 1] >> 16 & 0xFF;
@@ -35,21 +35,21 @@ public final class Static145 {
 			@Pc(88) int local88 = Flames.anIntArray445[local15 + 1] & 0xFF;
 			@Pc(95) float local95 = ((float) local88 - local55) / 64.0F;
 			for (@Pc(97) int local97 = 0; local97 < 64; local97++) {
-				Static96.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16;
+				Static221.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16;
 				local48 += local80;
 				local55 += local95;
 				local39 += local62;
 			}
 		}
 		for (local15 = 192; local15 < 255; local15++) {
-			Static96.anIntArray235[local15] = Flames.anIntArray445[3];
+			Static221.anIntArray235[local15] = Flames.anIntArray445[3];
 		}
 		Static270.anIntArray562 = new int[32768];
 		Static263.anIntArray516 = new int[32768];
 		Static69.method1545(null);
 		Static103.anIntArray254 = new int[32768];
 		Static216.anIntArray188 = new int[32768];
-		Static167.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254);
+		Static221.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254);
 	}
 
 	@OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V")
diff --git a/client/src/main/java/rt4/Static146.java b/client/src/main/java/rt4/Static146.java
index 20488a9..aac9156 100644
--- a/client/src/main/java/rt4/Static146.java
+++ b/client/src/main/java/rt4/Static146.java
@@ -12,15 +12,6 @@ public final class Static146 {
 	@OriginalMember(owner = "client!lg", name = "b", descriptor = "Z")
 	public static boolean aBoolean174 = false;
 
-    @OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
-	public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) {
-		@Pc(6) int local6 = arg0.offset;
-		@Pc(14) byte[] local14 = arg1.method3148();
-		arg0.pSmart1or2(local14.length);
-		arg0.offset += WordPack.codec.method1550(local14.length, arg0.data, local14, 0, arg0.offset);
-		return arg0.offset - local6;
-	}
-
 	@OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V")
 	public static void method2750(@OriginalArg(0) int arg0) {
 		Static235.anInt5276 = arg0;
diff --git a/client/src/main/java/rt4/Static147.java b/client/src/main/java/rt4/Static147.java
index 99cfe8a..8747359 100644
--- a/client/src/main/java/rt4/Static147.java
+++ b/client/src/main/java/rt4/Static147.java
@@ -11,7 +11,7 @@ public final class Static147 {
 
 	@OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V")
 	public static void method2761(@OriginalArg(0) int arg0) {
-		Static170.anInt3241 = arg0;
+		UnderwaterMaterialRenderer.anInt3241 = arg0;
 		MaterialManager.resetArgument(3);
 		MaterialManager.resetArgument(4);
 	}
diff --git a/client/src/main/java/rt4/Static148.java b/client/src/main/java/rt4/Static148.java
index 3af1731..36f3ccc 100644
--- a/client/src/main/java/rt4/Static148.java
+++ b/client/src/main/java/rt4/Static148.java
@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static148 {
 
@@ -12,16 +10,4 @@ public final class Static148 {
 	@OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;")
 	public static HashTable aClass133_13;
 
-    @OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
-	public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		VarpDomain.activeVarps[arg0] = arg1;
-		@Pc(21) LongNode local21 = (LongNode) VarpDomain.aClass133_20.get((long) arg0);
-		if (local21 == null) {
-			local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
-			VarpDomain.aClass133_20.put(local21, (long) arg0);
-		} else {
-			local21.value = MonotonicClock.currentTimeMillis() + 500L;
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static15.java b/client/src/main/java/rt4/Static15.java
index 367f8e1..822d4d9 100644
--- a/client/src/main/java/rt4/Static15.java
+++ b/client/src/main/java/rt4/Static15.java
@@ -19,10 +19,8 @@ public final class Static15 {
 	public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l=");
 	@OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;")
 	public static final JagString aClass100_98 = JagString.parse(")4a=");
-	@OriginalMember(owner = "client!be", name = "Vb", descriptor = "F")
-	public static float aFloat4;
 
-	@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
+    @OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
 	public static JagString method479() {
 		@Pc(8) JagString local8 = aClass100_518;
 		@Pc(10) JagString local10 = JagString.EMPTY;
diff --git a/client/src/main/java/rt4/Static152.java b/client/src/main/java/rt4/Static152.java
index 52af51f..213bc9c 100644
--- a/client/src/main/java/rt4/Static152.java
+++ b/client/src/main/java/rt4/Static152.java
@@ -2,19 +2,126 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
 
 public final class Static152 {
 
     @OriginalMember(owner = "client!ma", name = "z", descriptor = "I")
 	public static int anInt3604 = -1;
 
-	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(IIBIIII)V")
-	public static void method2826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
-		if (arg4 - arg3 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg4 + arg3 && TextureOp29.anInt5773 <= arg1 - arg3 && TextureOp29.anInt2869 >= arg3 + arg1) {
-			Static8.method120(arg5, arg0, arg1, arg2, arg3, arg4);
-		} else {
-			Static280.method4670(arg2, arg1, arg3, arg5, arg0, arg4);
+	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V")
+	public static void method4670(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+		@Pc(18) int local18 = arg2 - arg4;
+		Static251.method4278(arg2);
+		@Pc(23) int local23 = 0;
+		if (local18 < 0) {
+			local18 = 0;
+		}
+		@Pc(32) int local32 = arg2;
+		@Pc(35) int local35 = -arg2;
+		@Pc(38) int local38 = -local18;
+		@Pc(40) int local40 = local18;
+		@Pc(42) int local42 = -1;
+		@Pc(61) int local61;
+		@Pc(69) int local69;
+		@Pc(78) int local78;
+		@Pc(87) int local87;
+		if (arg1 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg1) {
+			@Pc(52) int[] local52 = Static71.anIntArrayArray10[arg1];
+			local61 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164);
+			local69 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164);
+			local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164);
+			local87 = Static78.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164);
+			Static131.method2576(local52, local61, local78, arg3);
+			Static131.method2576(local52, local78, local87, arg0);
+			Static131.method2576(local52, local87, local69, arg3);
+		}
+		@Pc(107) int local107 = -1;
+		while (local23 < local32) {
+			local42 += 2;
+			local107 += 2;
+			local38 += local107;
+			local35 += local42;
+			if (local38 >= 0 && local40 >= 1) {
+				local40--;
+				Static241.anIntArray522[local40] = local23;
+				local38 -= local40 << 1;
+			}
+			local23++;
+			@Pc(264) int local264;
+			@Pc(273) int local273;
+			@Pc(280) int[] local280;
+			@Pc(161) int local161;
+			if (local35 >= 0) {
+				local32--;
+				local35 -= local32 << 1;
+				local161 = arg1 - local32;
+				local61 = arg1 + local32;
+				if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
+					if (local32 >= local18) {
+						local69 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
+						local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
+						if (TextureOp29.anInt2869 >= local61) {
+							Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
+						}
+						if (local161 >= TextureOp29.anInt5773) {
+							Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
+						}
+					} else {
+						local69 = Static241.anIntArray522[local32];
+						local78 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
+						local87 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
+						local264 = Static78.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164);
+						local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164);
+						if (TextureOp29.anInt2869 >= local61) {
+							local280 = Static71.anIntArrayArray10[local61];
+							Static131.method2576(local280, local87, local273, arg3);
+							Static131.method2576(local280, local273, local264, arg0);
+							Static131.method2576(local280, local264, local78, arg3);
+						}
+						if (local161 >= TextureOp29.anInt5773) {
+							local280 = Static71.anIntArrayArray10[local161];
+							Static131.method2576(local280, local87, local273, arg3);
+							Static131.method2576(local280, local273, local264, arg0);
+							Static131.method2576(local280, local264, local78, arg3);
+						}
+					}
+				}
+			}
+			local161 = arg1 - local23;
+			local61 = arg1 + local23;
+			if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
+				local69 = arg5 + local32;
+				local78 = arg5 - local32;
+				if (local69 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= local78) {
+					local69 = Static78.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164);
+					local78 = Static78.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164);
+					if (local23 < local18) {
+						local87 = local40 >= local23 ? local40 : Static241.anIntArray522[local23];
+						local264 = Static78.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164);
+						local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164);
+						if (TextureOp29.anInt2869 >= local61) {
+							local280 = Static71.anIntArrayArray10[local61];
+							Static131.method2576(local280, local78, local273, arg3);
+							Static131.method2576(local280, local273, local264, arg0);
+							Static131.method2576(local280, local264, local69, arg3);
+						}
+						if (local161 >= TextureOp29.anInt5773) {
+							local280 = Static71.anIntArrayArray10[local161];
+							Static131.method2576(local280, local78, local273, arg3);
+							Static131.method2576(local280, local273, local264, arg0);
+							Static131.method2576(local280, local264, local69, arg3);
+						}
+					} else {
+						if (TextureOp29.anInt2869 >= local61) {
+							Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
+						}
+						if (local161 >= TextureOp29.anInt5773) {
+							Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
+						}
+					}
+				}
+			}
 		}
 	}
-
 }
diff --git a/client/src/main/java/rt4/Static153.java b/client/src/main/java/rt4/Static153.java
deleted file mode 100644
index bfa8f3c..0000000
--- a/client/src/main/java/rt4/Static153.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static153 {
-
-    @OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
-	public static final int[] anIntArray351 = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 };
-
-	@OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;")
-	private static final JagString aClass100_725 = JagString.parse("pt");
-
-	@OriginalMember(owner = "client!mc", name = "mb", descriptor = "Lclient!na;")
-	private static final JagString aClass100_726 = JagString.parse("en");
-
-	@OriginalMember(owner = "client!mc", name = "vb", descriptor = "Lclient!na;")
-	private static final JagString aClass100_728 = JagString.parse("de");
-
-	@OriginalMember(owner = "client!mc", name = "pb", descriptor = "Lclient!na;")
-	private static final JagString aClass100_727 = JagString.parse("fr");
-
-	@OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;")
-	public static final JagString[] aClass100Array113 = new JagString[] { aClass100_726, aClass100_728, aClass100_727, aClass100_725 };
-
-	@OriginalMember(owner = "client!mc", name = "tb", descriptor = "S")
-	public static short aShort22 = 1;
-
-}
diff --git a/client/src/main/java/rt4/Static154.java b/client/src/main/java/rt4/Static154.java
index b002fb8..f03bd64 100644
--- a/client/src/main/java/rt4/Static154.java
+++ b/client/src/main/java/rt4/Static154.java
@@ -6,16 +6,13 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static154 {
 
-    @OriginalMember(owner = "client!md", name = "S", descriptor = "I")
-	public static int anInt3709;
-
     @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z")
 	public static boolean method2926(@OriginalArg(0) Component arg0) {
 		if (arg0.anIntArray43 == null) {
 			return false;
 		}
 		for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) {
-			@Pc(34) int local34 = Static273.method3212(local14, arg0);
+			@Pc(34) int local34 = Static127.method3212(local14, arg0);
 			@Pc(39) int local39 = arg0.anIntArray48[local14];
 			if (arg0.anIntArray43[local14] == 2) {
 				if (local39 <= local34) {
diff --git a/client/src/main/java/rt4/Static155.java b/client/src/main/java/rt4/Static155.java
index 42ff0ee..dec6098 100644
--- a/client/src/main/java/rt4/Static155.java
+++ b/client/src/main/java/rt4/Static155.java
@@ -1,24 +1,10 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static155 {
 
 	@OriginalMember(owner = "client!me", name = "nb", descriptor = "I")
 	public static int anInt3751;
 
-	@OriginalMember(owner = "client!me", name = "k", descriptor = "I")
-	public static int anInt3718 = -1;
-
-	@OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I")
-	public static int getVarbit(@OriginalArg(1) int arg0) {
-		@Pc(13) VarbitType local13 = VarbitTypeList.get(arg0);
-		@Pc(16) int local16 = local13.baseVar;
-		@Pc(19) int local19 = local13.endBit;
-		@Pc(22) int local22 = local13.startBit;
-		@Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local19 - local22];
-		return VarpDomain.activeVarps[local16] >> local22 & local29;
-	}
 }
diff --git a/client/src/main/java/rt4/Static156.java b/client/src/main/java/rt4/Static156.java
index bd4eb8e..1d09969 100644
--- a/client/src/main/java/rt4/Static156.java
+++ b/client/src/main/java/rt4/Static156.java
@@ -1,15 +1,11 @@
 package rt4;
 
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 public final class Static156 {
 
-	@OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
-	public static byte[][] locationMapFilesBuffer;
-
     @OriginalMember(owner = "client!mf", name = "X", descriptor = "I")
 	public static int loginScreenId;
 
@@ -34,19 +30,19 @@ public final class Static156 {
 		Static217.anInt4903 = arg2;
 		Static167.anInt4069 = arg0 / 128;
 		Static193.anInt4539 = arg2 / 128;
-		Static31.anInt987 = Static167.anInt4069 - Static277.tileVisibilityDistance;
+		Static31.anInt987 = Static167.anInt4069 - Static123.tileVisibilityDistance;
 		if (Static31.anInt987 < 0) {
 			Static31.anInt987 = 0;
 		}
-		Static80.anInt4698 = Static193.anInt4539 - Static277.tileVisibilityDistance;
+		Static80.anInt4698 = Static193.anInt4539 - Static123.tileVisibilityDistance;
 		if (Static80.anInt4698 < 0) {
 			Static80.anInt4698 = 0;
 		}
-		Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance;
+		Static2.anInt15 = Static167.anInt4069 + Static123.tileVisibilityDistance;
 		if (Static2.anInt15 > SceneGraph.mapSizeX) {
 			Static2.anInt15 = SceneGraph.mapSizeX;
 		}
-		Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance;
+		Static215.anInt4866 = Static193.anInt4539 + Static123.tileVisibilityDistance;
 		if (Static215.anInt4866 > SceneGraph.mapSizeZ) {
 			Static215.anInt4866 = SceneGraph.mapSizeZ;
 		}
@@ -58,12 +54,12 @@ public final class Static156 {
 		}
 		@Pc(104) int local104;
 		@Pc(113) int local113;
-		for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local104++) {
-			for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local113++) {
-				@Pc(130) int local130 = (local104 - Static277.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F);
-				@Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F);
-				@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance;
-				@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance;
+		for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local104++) {
+			for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local113++) {
+				@Pc(130) int local130 = (local104 - Static123.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F);
+				@Pc(140) int local140 = (local113 - Static123.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F);
+				@Pc(146) int local146 = Static167.anInt4069 + local104 - Static123.tileVisibilityDistance;
+				@Pc(152) int local152 = Static193.anInt4539 + local113 - Static123.tileVisibilityDistance;
 				if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.mapSizeX && local152 < SceneGraph.mapSizeZ) {
 					@Pc(176) int local176;
 					if (SceneGraph.underwaterTileHeights == null) {
@@ -78,8 +74,8 @@ public final class Static156 {
 				}
 			}
 		}
-		for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local104++) {
-			for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local113++) {
+		for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local104++) {
+			for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local113++) {
 				Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1];
 			}
 		}
@@ -90,15 +86,15 @@ public final class Static156 {
 		Static206.anIntArray427 = arg10;
 		Static123.method2419();
 		if (SceneGraph.underWaterGroundTiles != null) {
-			Static278.setRenderTiles(true);
+			SceneGraph.setRenderTiles(true);
 			Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
 			if (GlRenderer.enabled) {
 				MaterialManager.renderingUnderwater = false;
 				MaterialManager.setMaterial(0, 0);
-				Static161.method3066(null);
+				FogManager.method3066(null);
 				LightingManager.method2390();
 			}
-			Static278.setRenderTiles(false);
+			SceneGraph.setRenderTiles(false);
 		}
 		Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14);
 	}
diff --git a/client/src/main/java/rt4/Static158.java b/client/src/main/java/rt4/Static158.java
index 7614898..e123de9 100644
--- a/client/src/main/java/rt4/Static158.java
+++ b/client/src/main/java/rt4/Static158.java
@@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static158 {
 
-	@OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
-	public static Map aClass3_Sub2_Sub4_3;
-
 	@OriginalMember(owner = "client!mh", name = "X", descriptor = "I")
 	public static int anInt3851 = -1;
     @OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
@@ -15,32 +12,32 @@ public final class Static158 {
 
     @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
 	public static void decodeNpcFiles() {
-		@Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length;
+		@Pc(10) int local10 = LoginManager.npcSpawnsFilesBuffer.length;
 		for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
-			if (Static191.npcSpawnsFilesBuffer[local16] != null) {
+			if (LoginManager.npcSpawnsFilesBuffer[local16] != null) {
 				@Pc(25) int local25 = -1;
 				for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) {
-					if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) {
+					if (Static217.anIntArray434[local27] == LoginManager.regionBitPacked[local16]) {
 						local25 = local27;
 						break;
 					}
 				}
 				if (local25 == -1) {
-					Static217.anIntArray434[anInt3811] = Static238.regionBitPacked[local16];
+					Static217.anIntArray434[anInt3811] = LoginManager.regionBitPacked[local16];
 					local25 = anInt3811++;
 				}
 				@Pc(67) int local67 = 0;
-				@Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]);
-				while (local74.offset < Static191.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
+				@Pc(74) Buffer local74 = new Buffer(LoginManager.npcSpawnsFilesBuffer[local16]);
+				while (local74.offset < LoginManager.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
 					@Pc(97) int local97 = local67++ << 6 | local25;
 					@Pc(103) int local103 = local74.g2();
 					@Pc(107) int local107 = local103 >> 14;
 					@Pc(113) int local113 = local103 >> 7 & 0x3F;
-					@Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Static225.originX;
+					@Pc(125) int local125 = local113 + (LoginManager.regionBitPacked[local16] >> 8) * 64 - Camera.originX;
 					@Pc(129) int local129 = local103 & 0x3F;
-					@Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Static142.originZ;
+					@Pc(142) int local142 = local129 + (LoginManager.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ;
 					@Pc(148) NpcType local148 = NpcTypeList.get(local74.g2());
-					if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
+					if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == LoginManager.centralPlane && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
 						NpcList.npcs[local97] = new Npc();
 						@Pc(198) Npc local198 = NpcList.npcs[local97];
 						NpcList.ids[NpcList.size++] = local97;
diff --git a/client/src/main/java/rt4/Static160.java b/client/src/main/java/rt4/Static160.java
index 40283e3..e28df3d 100644
--- a/client/src/main/java/rt4/Static160.java
+++ b/client/src/main/java/rt4/Static160.java
@@ -21,9 +21,9 @@ public final class Static160 {
 				SoftwareRaster.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45);
 			}
 		} else if (GlRenderer.enabled) {
-			((GlSprite) Static106.compass).renderRotatedTransparent(arg0, arg1, arg2.width, arg2.height, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false));
+			((GlSprite) Sprites.compass).renderRotatedTransparent(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false));
 		} else {
-			((SoftwareSprite) Static106.compass).renderRotated(arg0, arg1, arg2.width, arg2.height, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
+			((SoftwareSprite) Sprites.compass).renderRotated(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
 		}
 		InterfaceList.rectangleRedraw[arg3] = true;
 	}
diff --git a/client/src/main/java/rt4/Static164.java b/client/src/main/java/rt4/Static164.java
index f3ee21d..045dbc0 100644
--- a/client/src/main/java/rt4/Static164.java
+++ b/client/src/main/java/rt4/Static164.java
@@ -150,14 +150,4 @@ public final class Static164 {
 		}
 	}
 
-	@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;")
-	public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) {
-		return SpriteLoader.decode(arg0, arg1) ? SpriteLoader.method3537() : null;
-	}
-
-	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
-	public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
-		return SpriteLoader.decode(arg1, 0, arg0) ? Static134.method2619() : null;
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static165.java b/client/src/main/java/rt4/Static165.java
index bb8f390..0f95016 100644
--- a/client/src/main/java/rt4/Static165.java
+++ b/client/src/main/java/rt4/Static165.java
@@ -12,13 +12,7 @@ public final class Static165 {
 	@OriginalMember(owner = "client!nb", name = "o", descriptor = "I")
 	public static int anInt4042;
 
-    @OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;")
-	public static final JagString aClass100_772 = JagString.parse("um");
-
-	@OriginalMember(owner = "client!nb", name = "d", descriptor = "I")
-	public static int anInt4035 = 0;
-
-	@OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
 	public static final JagString DETAILS = JagString.parse("details");
 
 	@OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIIIIIII)V")
diff --git a/client/src/main/java/rt4/Static166.java b/client/src/main/java/rt4/Static166.java
index 56f8f50..166cd17 100644
--- a/client/src/main/java/rt4/Static166.java
+++ b/client/src/main/java/rt4/Static166.java
@@ -1,13 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalMember;
-
 public final class Static166 {
 
-	@OriginalMember(owner = "client!nc", name = "a", descriptor = "I")
-	public static int anInt4044;
-
-	@OriginalMember(owner = "client!nc", name = "n", descriptor = "I")
-	public static int anInt4055 = 0;
-
 }
diff --git a/client/src/main/java/rt4/Static167.java b/client/src/main/java/rt4/Static167.java
index dd42ef2..4474e63 100644
--- a/client/src/main/java/rt4/Static167.java
+++ b/client/src/main/java/rt4/Static167.java
@@ -7,7 +7,4 @@ public final class Static167 {
 	@OriginalMember(owner = "client!nd", name = "s", descriptor = "I")
 	public static int anInt4069;
 
-	@OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;")
-	public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3;
-
 }
diff --git a/client/src/main/java/rt4/Static169.java b/client/src/main/java/rt4/Static169.java
index 60a7bbf..1cf54bd 100644
--- a/client/src/main/java/rt4/Static169.java
+++ b/client/src/main/java/rt4/Static169.java
@@ -7,10 +7,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static169 {
 
-	@OriginalMember(owner = "client!nf", name = "e", descriptor = "I")
-	public static int anInt4073;
-
-	@OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;")
+    @OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;")
 	public static Component aClass13_18;
 
     @OriginalMember(owner = "client!nf", name = "i", descriptor = "I")
@@ -43,14 +40,14 @@ public final class Static169 {
 		if (!arg3.isFullScreenSupported()) {
 			return null;
 		}
-		@Pc(20) Class114[] local20 = Static197.method3558(arg3);
+		@Pc(20) DisplayMode[] local20 = DisplayMode.method3558(arg3);
 		if (local20 == null) {
 			return null;
 		}
 		@Pc(27) boolean local27 = false;
 		for (@Pc(29) int local29 = 0; local29 < local20.length; local29++) {
-			if (arg2 == local20[local29].anInt4248 && arg1 == local20[local29].anInt4250 && (!local27 || local20[local29].anInt4251 > arg0)) {
-				arg0 = local20[local29].anInt4251;
+			if (arg2 == local20[local29].width && arg1 == local20[local29].height && (!local27 || local20[local29].bitDepth > arg0)) {
+				arg0 = local20[local29].bitDepth;
 				local27 = true;
 			}
 		}
diff --git a/client/src/main/java/rt4/Static170.java b/client/src/main/java/rt4/Static170.java
deleted file mode 100644
index 74966f0..0000000
--- a/client/src/main/java/rt4/Static170.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static170 {
-
-    @OriginalMember(owner = "client!nh", name = "Z", descriptor = "I")
-	public static int anInt3241 = 128;
-
-	@OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I")
-	public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
-
-	@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V")
-	public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) {
-		if (arg4 == null) {
-			return;
-		}
-		@Pc(6) GroundDecor local6 = new GroundDecor();
-		local6.primary = arg4;
-		local6.anInt732 = arg1 * 128 + 64;
-		local6.anInt736 = arg2 * 128 + 64;
-		local6.anInt733 = arg3;
-		local6.key = arg5;
-		local6.aBoolean49 = arg6;
-		if (SceneGraph.tiles[arg0][arg1][arg2] == null) {
-			SceneGraph.tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
-		}
-		SceneGraph.tiles[arg0][arg1][arg2].groundDecor = local6;
-	}
-
-	@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
-	public static void method2574(@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) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) {
-		@Pc(7) AttachLocRequest local7 = new AttachLocRequest();
-		local7.angle = arg6;
-		local7.anInt1205 = arg3;
-		local7.anInt1187 = arg1;
-		local7.anInt1200 = arg5;
-		local7.entityId = arg2;
-		local7.x = arg8;
-		local7.anInt1197 = arg10;
-		local7.z = arg4;
-		local7.locId = arg11;
-		local7.anInt1188 = arg7;
-		local7.anInt1191 = arg0;
-		local7.shape = arg9;
-		AttachLocRequest.queue.addTail(local7);
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static171.java b/client/src/main/java/rt4/Static171.java
index 6bcf265..8638a90 100644
--- a/client/src/main/java/rt4/Static171.java
+++ b/client/src/main/java/rt4/Static171.java
@@ -7,10 +7,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static171 {
 
-	@OriginalMember(owner = "client!ni", name = "h", descriptor = "I")
-	public static int anInt4153;
-
-	@OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I")
+    @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I")
 	public static int method3218(@OriginalArg(1) JagString arg0) {
 		if (WorldMap.labels == null || arg0.length() == 0) {
 			return -1;
diff --git a/client/src/main/java/rt4/Static172.java b/client/src/main/java/rt4/Static172.java
index b12b3fc..11d8935 100644
--- a/client/src/main/java/rt4/Static172.java
+++ b/client/src/main/java/rt4/Static172.java
@@ -12,9 +12,6 @@ public final class Static172 {
     @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_70;
 
-	@OriginalMember(owner = "client!nj", name = "j", descriptor = "[I")
-	public static int[] locationsMapFileIds;
-
 	@OriginalMember(owner = "client!nj", name = "k", descriptor = "I")
 	public static int anInt4165;
 
diff --git a/client/src/main/java/rt4/Static173.java b/client/src/main/java/rt4/Static173.java
index 6c92150..c4ce08d 100644
--- a/client/src/main/java/rt4/Static173.java
+++ b/client/src/main/java/rt4/Static173.java
@@ -9,122 +9,7 @@ public final class Static173 {
 	@OriginalMember(owner = "client!nk", name = "d", descriptor = "[I")
 	public static int[] anIntArray367;
 
-    @OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V")
-	public static void method3240(@OriginalArg(1) boolean arg0) {
-		@Pc(7) int local7;
-		@Pc(16) Npc local16;
-		@Pc(107) int local107;
-		@Pc(113) int local113;
-		@Pc(133) int local133;
-		@Pc(149) int local149;
-		@Pc(158) int local158;
-		@Pc(171) int local171;
-		for (local7 = 0; local7 < NpcList.size; local7++) {
-			local16 = NpcList.npcs[NpcList.ids[local7]];
-			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
-				@Pc(42) int local42 = local16.getSize();
-				@Pc(97) int local97;
-				if (local42 == 1) {
-					if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
-						local97 = local16.xFine >> 7;
-						local107 = local16.zFine >> 7;
-						if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
-							local171 = Static31.anIntArrayArray6[local97][local107]++;
-						}
-					}
-				} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
-					local97 = local16.xFine - local42 * 64 >> 7;
-					local107 = local16.zFine - local42 * 64 >> 7;
-					local113 = local16.getSize() + local97;
-					if (local97 < 0) {
-						local97 = 0;
-					}
-					if (local113 > 104) {
-						local113 = 104;
-					}
-					local133 = local107 + local16.getSize();
-					if (local107 < 0) {
-						local107 = 0;
-					}
-					if (local133 > 104) {
-						local133 = 104;
-					}
-					for (local149 = local97; local149 < local113; local149++) {
-						for (local158 = local107; local158 < local133; local158++) {
-							local171 = Static31.anIntArrayArray6[local149][local158]++;
-						}
-					}
-				}
-			}
-		}
-		label200: for (local7 = 0; local7 < NpcList.size; local7++) {
-			local16 = NpcList.npcs[NpcList.ids[local7]];
-			@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
-			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
-				local107 = local16.getSize();
-				if (local107 == 1) {
-					if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
-						local113 = local16.xFine >> 7;
-						local133 = local16.zFine >> 7;
-						if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
-							continue;
-						}
-						if (Static31.anIntArrayArray6[local113][local133] > 1) {
-							local171 = Static31.anIntArrayArray6[local113][local133]--;
-							continue;
-						}
-					}
-				} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
-					local113 = local16.xFine - local107 * 64 >> 7;
-					local133 = local16.zFine - local107 * 64 >> 7;
-					local158 = local133 + local107;
-					if (local133 < 0) {
-						local133 = 0;
-					}
-					@Pc(368) boolean local368 = true;
-					local149 = local113 + local107;
-					if (local158 > 104) {
-						local158 = 104;
-					}
-					if (local113 < 0) {
-						local113 = 0;
-					}
-					if (local149 > 104) {
-						local149 = 104;
-					}
-					@Pc(396) int local396;
-					@Pc(401) int local401;
-					for (local396 = local113; local396 < local149; local396++) {
-						for (local401 = local133; local401 < local158; local401++) {
-							if (Static31.anIntArrayArray6[local396][local401] <= 1) {
-								local368 = false;
-								break;
-							}
-						}
-					}
-					if (local368) {
-						local396 = local113;
-						while (true) {
-							if (local396 >= local149) {
-								continue label200;
-							}
-							for (local401 = local133; local401 < local158; local401++) {
-								local171 = Static31.anIntArrayArray6[local396][local401]--;
-							}
-							local396++;
-						}
-					}
-				}
-				if (!local16.type.aBoolean183) {
-					local262 |= Long.MIN_VALUE;
-				}
-				local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine);
-				Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
-			}
-		}
-	}
-
-	@OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
+    @OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
 	public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) {
 		Static83.method436(arg0, 0, arg0.length - 1, arg1);
 	}
diff --git a/client/src/main/java/rt4/Static174.java b/client/src/main/java/rt4/Static174.java
deleted file mode 100644
index f0e17d4..0000000
--- a/client/src/main/java/rt4/Static174.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static174 {
-
-	@OriginalMember(owner = "client!nl", name = "d", descriptor = "F")
-	public static float aFloat22;
-
-	@OriginalMember(owner = "client!nl", name = "g", descriptor = "I")
-	public static int anInt4191;
-
-	@OriginalMember(owner = "client!nl", name = "b", descriptor = "[[F")
-	public static final float[][] aFloatArrayArray2 = new float[2][8];
-
-	@OriginalMember(owner = "client!nl", name = "f", descriptor = "[[I")
-	public static final int[][] anIntArrayArray32 = new int[2][8];
-
-	@OriginalMember(owner = "client!nl", name = "a", descriptor = "(F)F")
-	public static float method3250(@OriginalArg(0) float arg0) {
-		@Pc(7) float local7 = (float) Math.pow(2.0D, (double) arg0) * 32.703197F;
-		return local7 * 3.1415927F / 11025.0F;
-	}
-}
diff --git a/client/src/main/java/rt4/Static175.java b/client/src/main/java/rt4/Static175.java
index f296525..8d212dd 100644
--- a/client/src/main/java/rt4/Static175.java
+++ b/client/src/main/java/rt4/Static175.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static175 {
 
-	@OriginalMember(owner = "client!nm", name = "P", descriptor = "[I")
-	public static int[] npcSpawnsFileIds;
-
-	@OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
 	public static JagString url;
 
 	@OriginalMember(owner = "client!nm", name = "U", descriptor = "I")
@@ -16,7 +13,7 @@ public final class Static175 {
     @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V")
 	public static void method3279() {
 		if (Static267.anInt5775 > 0) {
-			Static278.processLogout();
+			LoginManager.processLogout();
 		} else {
 			Static233.aClass95_4 = Protocol.socket;
 			Protocol.socket = null;
diff --git a/client/src/main/java/rt4/Static176.java b/client/src/main/java/rt4/Static176.java
index ff56a4f..8f858ed 100644
--- a/client/src/main/java/rt4/Static176.java
+++ b/client/src/main/java/rt4/Static176.java
@@ -16,7 +16,9 @@ public final class Static176 {
 	public static final JagString aClass100_420 = JagString.parse(")1o");
 	@OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;")
 	public static final JagString aClass100_783 = JagString.parse(")4p=");
-	@OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;")
+    @OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;")
+    public static final JagString aClass100_230 = JagString.parse("");
+    @OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_76;
 
 	@OriginalMember(owner = "client!ob", name = "a", descriptor = "[Z")
@@ -47,15 +49,15 @@ public final class Static176 {
 			}
 			return true;
 		} else {
-			@Pc(62) JagString local62 = Static211.aClass100_230;
+			@Pc(62) JagString local62 = aClass100_230;
 			if (client.modeWhere != 0) {
 				local62 = JagString.concatenate(new JagString[] { aClass100_193, JagString.parseInt(local3.id + 7000) });
 			}
-			@Pc(89) JagString local89 = Static211.aClass100_230;
+			@Pc(89) JagString local89 = aClass100_230;
 			if (client.settings != null) {
 				local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings});
 			}
-			@Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.aClass100_582, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : Static260.aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? aClass100_184 : Static260.aClass100_945 });
+			@Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.HTTP_PROTOCOL, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : Static260.aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? aClass100_184 : Static260.aClass100_945 });
 			try {
 				client.instance.getAppletContext().showDocument(local182.method3107(), "_self");
 				return true;
diff --git a/client/src/main/java/rt4/Static178.java b/client/src/main/java/rt4/Static178.java
index e85001a..c6c8e92 100644
--- a/client/src/main/java/rt4/Static178.java
+++ b/client/src/main/java/rt4/Static178.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static178 {
 
-    @OriginalMember(owner = "client!od", name = "g", descriptor = "S")
-	public static short aShort25 = 256;
-
 	@OriginalMember(owner = "client!od", name = "i", descriptor = "I")
 	public static int anInt4247 = 0;
 
diff --git a/client/src/main/java/rt4/Static179.java b/client/src/main/java/rt4/Static179.java
index c488c36..308419f 100644
--- a/client/src/main/java/rt4/Static179.java
+++ b/client/src/main/java/rt4/Static179.java
@@ -7,13 +7,4 @@ public final class Static179 {
 	@OriginalMember(owner = "client!oe", name = "b", descriptor = "I")
 	public static int anInt4254 = 0;
 
-	@OriginalMember(owner = "client!oe", name = "i", descriptor = "[[I")
-	public static final int[][] anIntArrayArray33 = new int[5][5000];
-
-	@OriginalMember(owner = "client!oe", name = "n", descriptor = "I")
-	public static int anInt4262 = 1;
-
-	@OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;")
-	public static final JagString aClass100_807 = JagString.parse("n");
-
 }
diff --git a/client/src/main/java/rt4/Static18.java b/client/src/main/java/rt4/Static18.java
index 6be9031..a2aaefa 100644
--- a/client/src/main/java/rt4/Static18.java
+++ b/client/src/main/java/rt4/Static18.java
@@ -50,10 +50,10 @@ public final class Static18 {
 			local55 = local72 * local57 >> 16;
 			local57 = local57 * local68 >> 16;
 		}
-		Static240.cameraPitch = arg6;
-		Static184.cameraYaw = arg4;
-		Static134.renderZ = arg5 - local57;
-		Static138.renderX = arg0 - local55;
+		Camera.cameraPitch = arg6;
+		Camera.cameraYaw = arg4;
+		Camera.renderZ = arg5 - local57;
+		Camera.renderX = arg0 - local55;
 		Static5.anInt40 = arg2 - local59;
 	}
 
diff --git a/client/src/main/java/rt4/Static181.java b/client/src/main/java/rt4/Static181.java
index 56ab5d9..e1f7892 100644
--- a/client/src/main/java/rt4/Static181.java
+++ b/client/src/main/java/rt4/Static181.java
@@ -17,11 +17,6 @@ public final class Static181 {
 		}
 	}
 
-	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;")
-	public static JagString method3341(@OriginalArg(0) int arg0) {
-		return JagString.concatenate(new JagString[] { JagString.parseInt(arg0 >> 24 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 >> 16 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 >> 8 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 & 0xFF) });
-	}
-
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V")
 	public static void method3346(@OriginalArg(1) int[] arg0, @OriginalArg(2) Object[] arg1) {
 		Static53.method1292(arg1, arg0.length - 1, arg0, 0);
diff --git a/client/src/main/java/rt4/Static182.java b/client/src/main/java/rt4/Static182.java
index ef49602..b131e12 100644
--- a/client/src/main/java/rt4/Static182.java
+++ b/client/src/main/java/rt4/Static182.java
@@ -13,9 +13,6 @@ public final class Static182 {
     @OriginalMember(owner = "client!oj", name = "t", descriptor = "[I")
 	public static int[] anIntArray372;
 
-	@OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;")
-	public static GlTile[][] aClass3_Sub14ArrayArray2;
-
 	@OriginalMember(owner = "client!oj", name = "p", descriptor = "I")
 	public static final int anInt4306 = 2301979;
 
diff --git a/client/src/main/java/rt4/Static184.java b/client/src/main/java/rt4/Static184.java
index 7bf2b11..2bef8b4 100644
--- a/client/src/main/java/rt4/Static184.java
+++ b/client/src/main/java/rt4/Static184.java
@@ -6,12 +6,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static184 {
 
-    @OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
-	public static int cameraYaw;
-
     @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z")
 	public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) {
-		return arg4 == null ? true : Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6);
+		return arg4 == null || Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6);
 	}
 
 	@OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I")
diff --git a/client/src/main/java/rt4/Static185.java b/client/src/main/java/rt4/Static185.java
index 4c25967..9cbb231 100644
--- a/client/src/main/java/rt4/Static185.java
+++ b/client/src/main/java/rt4/Static185.java
@@ -9,16 +9,13 @@ public final class Static185 {
 	@OriginalMember(owner = "client!p", name = "e", descriptor = "I")
 	public static int anInt4370;
 
-	@OriginalMember(owner = "client!p", name = "g", descriptor = "F")
-	public static float aFloat23;
-
-	@OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V")
+    @OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V")
 	public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
 		if (arg1 && !SceneGraph.allLevelsAreVisible() && (SceneGraph.tileFlags[0][arg7][arg8] & 0x2) == 0) {
 			if ((SceneGraph.tileFlags[arg2][arg7][arg8] & 0x10) != 0) {
 				return;
 			}
-			if (Static4.method22(arg8, arg7, arg2) != Static41.anInt1316) {
+			if (Static4.method22(arg8, arg7, arg2) != LoginManager.centralPlane) {
 				return;
 			}
 		}
@@ -100,7 +97,7 @@ public final class Static185 {
 				} else {
 					local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
 				}
-				Static170.method2570(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211);
+				SceneGraph.method2570(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211);
 				if (local62.anInt4435 == 1 && arg4 != null) {
 					arg4.method3057(arg7, arg8);
 				}
@@ -164,7 +161,7 @@ public final class Static185 {
 			} else {
 				local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
 			}
-			Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261);
+			SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261);
 			if (arg1) {
 				if (arg9 == 0) {
 					if (local62.aBoolean215) {
@@ -216,7 +213,7 @@ public final class Static185 {
 			} else {
 				local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
 			}
-			Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
+			SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
 			if (local62.aBoolean215 && arg1) {
 				if (arg9 == 0) {
 					SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
@@ -252,7 +249,7 @@ public final class Static185 {
 					local1254 = new Loc(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
 					local1269 = new Loc(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
 				}
-				Static262.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261);
+				SceneGraph.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261);
 				if (local62.aBoolean220 && arg1) {
 					if (arg9 == 0) {
 						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
@@ -284,7 +281,7 @@ public final class Static185 {
 				} else {
 					local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
 				}
-				Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
+				SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
 				if (local62.aBoolean215 && arg1) {
 					if (arg9 == 0) {
 						SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
diff --git a/client/src/main/java/rt4/Static186.java b/client/src/main/java/rt4/Static186.java
index cf53586..4d1e01f 100644
--- a/client/src/main/java/rt4/Static186.java
+++ b/client/src/main/java/rt4/Static186.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static186 {
 
-	@OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B")
-	public static byte[][] underWaterMapFilesBuffer;
-
-	@OriginalMember(owner = "client!pa", name = "K", descriptor = "Z")
+    @OriginalMember(owner = "client!pa", name = "K", descriptor = "Z")
 	public static boolean aBoolean205 = false;
 
 	@OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z")
diff --git a/client/src/main/java/rt4/Static188.java b/client/src/main/java/rt4/Static188.java
deleted file mode 100644
index 2595998..0000000
--- a/client/src/main/java/rt4/Static188.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static188 {
-
-	@OriginalMember(owner = "client!pd", name = "b", descriptor = "[F")
-	public static final float[] aFloatArray22 = new float[] { 0.1F, 0.1F, 0.15F, 0.1F };
-}
diff --git a/client/src/main/java/rt4/Static19.java b/client/src/main/java/rt4/Static19.java
index d1a4fd5..bffe24e 100644
--- a/client/src/main/java/rt4/Static19.java
+++ b/client/src/main/java/rt4/Static19.java
@@ -6,13 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static19 {
 
-	@OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
-	public static byte[][] underWaterLocationsMapFilesBuffer;
-
-	@OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z")
-	public static boolean aBoolean43 = true;
-
-	@OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z")
+    @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z")
 	public static boolean method583(@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) int arg6, @OriginalArg(7) int arg7) {
 		if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) {
 			return false;
diff --git a/client/src/main/java/rt4/Static190.java b/client/src/main/java/rt4/Static190.java
deleted file mode 100644
index 9f52234..0000000
--- a/client/src/main/java/rt4/Static190.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rt4;
-
-public final class Static190 {
-
-}
diff --git a/client/src/main/java/rt4/Static191.java b/client/src/main/java/rt4/Static191.java
index 9e67364..439fb17 100644
--- a/client/src/main/java/rt4/Static191.java
+++ b/client/src/main/java/rt4/Static191.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static191 {
 
-	@OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B")
-	public static byte[][] npcSpawnsFilesBuffer;
-
-	@OriginalMember(owner = "client!pg", name = "fb", descriptor = "I")
+    @OriginalMember(owner = "client!pg", name = "fb", descriptor = "I")
 	public static final int anInt4506 = 50;
 
 	@OriginalMember(owner = "client!pg", name = "P", descriptor = "[Lclient!na;")
diff --git a/client/src/main/java/rt4/Static192.java b/client/src/main/java/rt4/Static192.java
index b0cad5a..a662a28 100644
--- a/client/src/main/java/rt4/Static192.java
+++ b/client/src/main/java/rt4/Static192.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static192 {
 
-	@OriginalMember(owner = "client!ph", name = "b", descriptor = "[[Lclient!li;")
-	public static final Environment[][] aClass92ArrayArray1 = new Environment[13][13];
-
-	@OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V")
+    @OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V")
 	public static void method3474() {
 		PlayerAppearance.aClass99_33.method3103();
 		PlayerAppearance.aClass99_21.method3103();
diff --git a/client/src/main/java/rt4/Static195.java b/client/src/main/java/rt4/Static195.java
index 3f2ea4e..4ac6b47 100644
--- a/client/src/main/java/rt4/Static195.java
+++ b/client/src/main/java/rt4/Static195.java
@@ -1,44 +1,10 @@
 package rt4;
 
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static195 {
 
-    @OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
-	public static int anInt4581;
-
     @OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
 	public static JagString walkText;
 
-    @OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V")
-	public static void method3532() {
-		for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.head(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) {
-			@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
-			if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) {
-				local16.unlink();
-			} else if (client.loop >= local21.anInt4822) {
-				if (local21.anInt4819 > 0) {
-					@Pc(54) Npc local54 = NpcList.npcs[local21.anInt4819 - 1];
-					if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) {
-						local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine);
-					}
-				}
-				if (local21.anInt4819 < 0) {
-					@Pc(102) int local102 = -local21.anInt4819 - 1;
-					@Pc(107) Player local107;
-					if (PlayerList.selfId == local102) {
-						local107 = PlayerList.self;
-					} else {
-						local107 = PlayerList.players[local102];
-					}
-					if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) {
-						local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine);
-					}
-				}
-				local21.method3704(Static178.anInt4247);
-				Static43.method1141(Player.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
-			}
-		}
-	}
 }
diff --git a/client/src/main/java/rt4/Static197.java b/client/src/main/java/rt4/Static197.java
index d668a59..6cda4eb 100644
--- a/client/src/main/java/rt4/Static197.java
+++ b/client/src/main/java/rt4/Static197.java
@@ -1,11 +1,6 @@
 package rt4;
 
-import java.awt.Container;
-import java.awt.Graphics;
-import java.awt.Insets;
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static197 {
 
@@ -18,195 +13,4 @@ public final class Static197 {
 	@OriginalMember(owner = "client!pm", name = "ab", descriptor = "Z")
 	public static boolean aBoolean228 = true;
 
-	@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ILsignlink!ll;)[Lclient!od;")
-	public static Class114[] method3558(@OriginalArg(1) SignLink arg0) {
-		if (!arg0.isFullScreenSupported()) {
-			return new Class114[0];
-		}
-		@Pc(17) PrivilegedRequest local17 = arg0.getDisplayModes();
-		while (local17.status == 0) {
-			ThreadUtils.sleep(10L);
-		}
-		if (local17.status == 2) {
-			return new Class114[0];
-		}
-		@Pc(39) int[] local39 = (int[]) local17.result;
-		@Pc(45) Class114[] local45 = new Class114[local39.length >> 2];
-		for (@Pc(47) int local47 = 0; local47 < local45.length; local47++) {
-			@Pc(59) Class114 local59 = new Class114();
-			local45[local47] = local59;
-			local59.anInt4248 = local39[local47 << 2];
-			local59.anInt4250 = local39[(local47 << 2) + 1];
-			local59.anInt4251 = local39[(local47 << 2) + 2];
-			local59.anInt4249 = local39[(local47 << 2) + 3];
-		}
-		return local45;
-	}
-
-	@OriginalMember(owner = "client!pm", name = "a", descriptor = "(ZIZIZII)V")
-	public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
-		if (arg2) {
-			GlRenderer.quit();
-		}
-		if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Preferences.fullScreenWidth || arg5 != Preferences.fullScreenHeight)) {
-			DisplayMode.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink);
-			GameShell.fullScreenFrame = null;
-		}
-		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
-			GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink);
-			if (GameShell.fullScreenFrame != null) {
-				Preferences.fullScreenHeight = arg5;
-				Preferences.fullScreenWidth = arg4;
-				Preferences.write(GameShell.signLink);
-			}
-		}
-		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
-			setWindowMode(true, Preferences.favoriteWorlds, true, arg3, -1, -1);
-			return;
-		}
-		@Pc(85) Container local85;
-		if (GameShell.fullScreenFrame != null) {
-			local85 = GameShell.fullScreenFrame;
-		} else if (GameShell.frame == null) {
-			local85 = GameShell.signLink.applet;
-		} else {
-			local85 = GameShell.frame;
-		}
-		GameShell.frameWidth = local85.getSize().width;
-		GameShell.frameHeight = local85.getSize().height;
-		@Pc(109) Insets local109;
-		if (GameShell.frame == local85) {
-			local109 = GameShell.frame.getInsets();
-			GameShell.frameWidth -= local109.right + local109.left;
-			GameShell.frameHeight -= local109.bottom + local109.top;
-		}
-		if (arg1 >= 2) {
-			GameShell.canvasWidth = GameShell.frameWidth;
-			GameShell.canvasHeight = GameShell.frameHeight;
-			GameShell.leftMargin = 0;
-			GameShell.topMargin = 0;
-		} else {
-			GameShell.topMargin = 0;
-			GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
-			GameShell.canvasWidth = 765;
-			GameShell.canvasHeight = 503;
-		}
-		if (arg0) {
-			Keyboard.stop(GameShell.canvas);
-			Mouse.stop(GameShell.canvas);
-			if (client.mouseWheel != null) {
-				client.mouseWheel.stop(GameShell.canvas);
-			}
-			client.instance.addCanvas();
-			Keyboard.start(GameShell.canvas);
-			Mouse.start(GameShell.canvas);
-			if (client.mouseWheel != null) {
-				client.mouseWheel.start(GameShell.canvas);
-			}
-		} else {
-			if (GlRenderer.enabled) {
-				GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
-			}
-			GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
-			if (GameShell.frame == local85) {
-				local109 = GameShell.frame.getInsets();
-				GameShell.canvas.setLocation(local109.left + GameShell.leftMargin, local109.top + GameShell.topMargin);
-			} else {
-				GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
-			}
-		}
-		if (arg1 == 0 && arg3 > 0) {
-			GlRenderer.createAndDestroyContext(GameShell.canvas);
-		}
-		if (arg2 && arg1 > 0) {
-			GameShell.canvas.setIgnoreRepaint(true);
-			if (!Static211.aBoolean73) {
-				SceneGraph.clear();
-				SoftwareRaster.frameBuffer = null;
-				SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
-				SoftwareRaster.clear();
-				if (client.gameState == 5) {
-					LoadingBar.render(true, Fonts.b12Full);
-				} else {
-					Static114.drawTextOnScreen(false, LocalizedText.LOADING);
-				}
-				try {
-					@Pc(269) Graphics local269 = GameShell.canvas.getGraphics();
-					SoftwareRaster.frameBuffer.draw(local269);
-				} catch (@Pc(277) Exception local277) {
-				}
-				Static139.method2704();
-				if (arg3 == 0) {
-					SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
-				} else {
-					SoftwareRaster.frameBuffer = null;
-				}
-				@Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(client.instance.getClass());
-				while (local300.status == 0) {
-					ThreadUtils.sleep(100L);
-				}
-				if (local300.status == 1) {
-					Static211.aBoolean73 = true;
-				}
-			}
-			if (Static211.aBoolean73) {
-				GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2);
-			}
-		}
-		if (!GlRenderer.enabled && arg1 > 0) {
-			setWindowMode(true, 0, true, arg3, -1, -1);
-			return;
-		}
-		if (arg1 > 0 && arg3 == 0) {
-			GameShell.thread.setPriority(5);
-			SoftwareRaster.frameBuffer = null;
-			SoftwareModel.method4580();
-			((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(200);
-			if (Preferences.highDetailLighting) {
-				Rasteriser.setBrightness(0.7F);
-			}
-			Static114.method4637();
-		} else if (arg1 == 0 && arg3 > 0) {
-			GameShell.thread.setPriority(1);
-			SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
-			SoftwareModel.method4583();
-			Static76.method1643();
-			((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
-			if (Preferences.highDetailLighting) {
-				if (Preferences.brightness == 1) {
-					Rasteriser.setBrightness(0.9F);
-				}
-				if (Preferences.brightness == 2) {
-					Rasteriser.setBrightness(0.8F);
-				}
-				if (Preferences.brightness == 3) {
-					Rasteriser.setBrightness(0.7F);
-				}
-				if (Preferences.brightness == 4) {
-					Rasteriser.setBrightness(0.6F);
-				}
-			}
-			GlTile.method1939();
-			Static114.method4637();
-		}
-		Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible();
-		if (arg2) {
-			client.method2721();
-		}
-		if (arg1 >= 2) {
-			Static124.aBoolean156 = true;
-		} else {
-			Static124.aBoolean156 = false;
-		}
-		if (InterfaceList.topLevelInterface != -1) {
-			Static210.method3712(true);
-		}
-		if (Protocol.socket != null && (client.gameState == 30 || client.gameState == 25)) {
-			ClientProt.method1373();
-		}
-		for (@Pc(466) int local466 = 0; local466 < 100; local466++) {
-			Static186.aBooleanArray100[local466] = true;
-		}
-		GameShell.fullRedraw = true;
-	}
 }
diff --git a/client/src/main/java/rt4/Static198.java b/client/src/main/java/rt4/Static198.java
index 40f680a..7e8348b 100644
--- a/client/src/main/java/rt4/Static198.java
+++ b/client/src/main/java/rt4/Static198.java
@@ -17,13 +17,13 @@ public final class Static198 {
 			return;
 		}
 		@Pc(38) int local38 = SceneGraph.getTileHeight(Player.level, arg5, arg2) - arg3;
-		@Pc(42) int local42 = arg2 - Static134.renderZ;
+		@Pc(42) int local42 = arg2 - Camera.renderZ;
 		@Pc(46) int local46 = local38 - Static5.anInt40;
-		@Pc(50) int local50 = arg5 - Static138.renderX;
-		@Pc(54) int local54 = MathUtils.sin[Static240.cameraPitch];
-		@Pc(58) int local58 = MathUtils.cos[Static240.cameraPitch];
-		@Pc(62) int local62 = MathUtils.sin[Static184.cameraYaw];
-		@Pc(66) int local66 = MathUtils.cos[Static184.cameraYaw];
+		@Pc(50) int local50 = arg5 - Camera.renderX;
+		@Pc(54) int local54 = MathUtils.sin[Camera.cameraPitch];
+		@Pc(58) int local58 = MathUtils.cos[Camera.cameraPitch];
+		@Pc(62) int local62 = MathUtils.sin[Camera.cameraYaw];
+		@Pc(66) int local66 = MathUtils.cos[Camera.cameraYaw];
 		@Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16;
 		@Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16;
 		@Pc(89) int local89 = local76;
diff --git a/client/src/main/java/rt4/Static20.java b/client/src/main/java/rt4/Static20.java
deleted file mode 100644
index cacaf70..0000000
--- a/client/src/main/java/rt4/Static20.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static20 {
-
-	@OriginalMember(owner = "client!bj", name = "r", descriptor = "I")
-	public static int anInt659 = 2;
-
-	@OriginalMember(owner = "client!bj", name = "s", descriptor = "I")
-	public static int anInt660 = -1;
-
-	@OriginalMember(owner = "client!bj", name = "V", descriptor = "I")
-	public static final int anInt671 = 3353893;
-
-}
diff --git a/client/src/main/java/rt4/Static201.java b/client/src/main/java/rt4/Static201.java
index 756ef47..35ebd7d 100644
--- a/client/src/main/java/rt4/Static201.java
+++ b/client/src/main/java/rt4/Static201.java
@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static201 {
 
@@ -15,15 +13,4 @@ public final class Static201 {
 	@OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;")
 	public static Component aClass13_13 = null;
 
-	@OriginalMember(owner = "client!qf", name = "a", descriptor = "(BII)Lclient!be;")
-	public static Component method1418(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(7) Component local7 = InterfaceList.getComponent(arg0);
-		if (arg1 == -1) {
-			return local7;
-		} else if (local7 == null || local7.createdComponents == null || local7.createdComponents.length <= arg1) {
-			return null;
-		} else {
-			return local7.createdComponents[arg1];
-		}
-	}
 }
diff --git a/client/src/main/java/rt4/Static202.java b/client/src/main/java/rt4/Static202.java
index 0f05425..f3c95d6 100644
--- a/client/src/main/java/rt4/Static202.java
+++ b/client/src/main/java/rt4/Static202.java
@@ -6,23 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static202 {
 
-	@OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
-	public static final int[] cameraFrequency = new int[5];
-
-	@OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V")
-	public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(7) VarbitType local7 = VarbitTypeList.get(arg0);
-		@Pc(10) int local10 = local7.endBit;
-		@Pc(16) int local16 = local7.startBit;
-		@Pc(19) int local19 = local7.baseVar;
-		@Pc(25) int local25 = Song_Class3_Sub9.anIntArray135[local10 - local16];
-		if (arg1 < 0 || arg1 > local25) {
-			arg1 = 0;
-		}
-		local25 <<= local16;
-		Static148.method2766(local19, local25 & arg1 << local16 | VarpDomain.activeVarps[local19] & ~local25);
-	}
-
 	@OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V")
 	public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) {
 		Static54.method1307(arg1, arg0.length - 1, arg0, 0);
diff --git a/client/src/main/java/rt4/Static203.java b/client/src/main/java/rt4/Static203.java
deleted file mode 100644
index 37ecd5b..0000000
--- a/client/src/main/java/rt4/Static203.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package rt4;
-
-import java.awt.Container;
-import java.awt.Insets;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static203 {
-
-    @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V")
-	public static void method3662() {
-		@Pc(8) Container local8;
-		if (GameShell.fullScreenFrame != null) {
-			local8 = GameShell.fullScreenFrame;
-		} else if (GameShell.frame == null) {
-			local8 = GameShell.signLink.applet;
-		} else {
-			local8 = GameShell.frame;
-		}
-		GameShell.frameWidth = local8.getSize().width;
-		GameShell.frameHeight = local8.getSize().height;
-		@Pc(35) Insets local35;
-		if (local8 == GameShell.frame) {
-			local35 = GameShell.frame.getInsets();
-			GameShell.frameHeight -= local35.bottom + local35.top;
-			GameShell.frameWidth -= local35.right + local35.left;
-		}
-		if (Static144.getWindowMode() >= 2) {
-			GameShell.canvasWidth = GameShell.frameWidth;
-			GameShell.leftMargin = 0;
-			GameShell.topMargin = 0;
-			GameShell.canvasHeight = GameShell.frameHeight;
-		} else {
-			GameShell.topMargin = 0;
-			GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
-			GameShell.canvasHeight = 503;
-			GameShell.canvasWidth = 765;
-		}
-		if (GlRenderer.enabled) {
-			GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
-		}
-		GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
-		if (local8 == GameShell.frame) {
-			local35 = GameShell.frame.getInsets();
-			GameShell.canvas.setLocation(local35.left + GameShell.leftMargin, GameShell.topMargin + local35.top);
-		} else {
-			GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
-		}
-		if (InterfaceList.topLevelInterface != -1) {
-			Static210.method3712(true);
-		}
-		Static139.method2704();
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static210.java b/client/src/main/java/rt4/Static210.java
index 203915e..dbfc756 100644
--- a/client/src/main/java/rt4/Static210.java
+++ b/client/src/main/java/rt4/Static210.java
@@ -2,19 +2,9 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static210 {
 
-	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V")
-	public static void method3711() {
-		for (@Pc(7) int local7 = 0; local7 < 104; local7++) {
-			for (@Pc(14) int local14 = 0; local14 < 104; local14++) {
-				Static31.anIntArrayArray6[local7][local14] = 0;
-			}
-		}
-	}
-
 	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V")
 	public static void method3712(@OriginalArg(0) boolean arg0) {
 		Static234.method4017(GameShell.canvasHeight, arg0, InterfaceList.topLevelInterface, GameShell.canvasWidth);
diff --git a/client/src/main/java/rt4/Static211.java b/client/src/main/java/rt4/Static211.java
index 33229a1..2c0206c 100644
--- a/client/src/main/java/rt4/Static211.java
+++ b/client/src/main/java/rt4/Static211.java
@@ -4,35 +4,10 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static211 {
 
-	@OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;")
-	public static final JagString aClass100_517 = JagString.parse("");
 	@OriginalMember(owner = "client!rc", name = "R", descriptor = "Z")
 	private static boolean aBoolean74;
 
 	@OriginalMember(owner = "client!rc", name = "p", descriptor = "I")
 	public static int anInt1142 = 0;
 
-	@OriginalMember(owner = "client!rc", name = "C", descriptor = "Z")
-	public static boolean aBoolean72 = false;
-
-	@OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;")
-	public static final JagString aClass100_230 = JagString.parse("");
-
-	@OriginalMember(owner = "client!rc", name = "M", descriptor = "Z")
-	public static boolean aBoolean73 = false;
-
-    @OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
-	public static void method930() {
-		if (client.musicChannel != null) {
-			client.musicChannel.quit();
-		}
-		if (client.soundChannel != null) {
-			client.soundChannel.quit();
-		}
-		AudioChannel.init(Preferences.stereo);
-		client.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0);
-		client.musicChannel.setStream(client.musicStream);
-		client.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1);
-		client.soundChannel.setStream(client.soundStream);
-	}
 }
diff --git a/client/src/main/java/rt4/Static213.java b/client/src/main/java/rt4/Static213.java
deleted file mode 100644
index 6d2d2af..0000000
--- a/client/src/main/java/rt4/Static213.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static213 {
-
-	@OriginalMember(owner = "client!re", name = "y", descriptor = "I")
-	public static int anInt4851;
-
-}
diff --git a/client/src/main/java/rt4/Static215.java b/client/src/main/java/rt4/Static215.java
index f7a9d32..406571e 100644
--- a/client/src/main/java/rt4/Static215.java
+++ b/client/src/main/java/rt4/Static215.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static215 {
 
-	@OriginalMember(owner = "client!rh", name = "a", descriptor = "[I")
-	public static int[] intLocals;
-
-	@OriginalMember(owner = "client!rh", name = "d", descriptor = "I")
+    @OriginalMember(owner = "client!rh", name = "d", descriptor = "I")
 	public static int anInt4866;
 
 	@OriginalMember(owner = "client!rh", name = "g", descriptor = "I")
diff --git a/client/src/main/java/rt4/Static22.java b/client/src/main/java/rt4/Static22.java
deleted file mode 100644
index f8a1416..0000000
--- a/client/src/main/java/rt4/Static22.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static22 {
-
-    @OriginalMember(owner = "client!bl", name = "X", descriptor = "I")
-	public static int anInt730 = -1;
-
-}
diff --git a/client/src/main/java/rt4/Static220.java b/client/src/main/java/rt4/Static220.java
index 48c63ae..b5df847 100644
--- a/client/src/main/java/rt4/Static220.java
+++ b/client/src/main/java/rt4/Static220.java
@@ -57,7 +57,7 @@ public final class Static220 {
 
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V")
 	public static void method3801() {
-		for (@Pc(1) int local1 = 0; local1 < Static126.anInt3114; local1++) {
+		for (@Pc(1) int local1 = 0; local1 < SceneGraph.anInt3114; local1++) {
 			for (@Pc(6) int local6 = 0; local6 < SceneGraph.mapSizeX; local6++) {
 				for (@Pc(11) int local11 = 0; local11 < SceneGraph.mapSizeZ; local11++) {
 					@Pc(22) Tile local22 = SceneGraph.tiles[local1][local6][local11];
diff --git a/client/src/main/java/rt4/Static221.java b/client/src/main/java/rt4/Static221.java
index bb1d524..175beb4 100644
--- a/client/src/main/java/rt4/Static221.java
+++ b/client/src/main/java/rt4/Static221.java
@@ -8,6 +8,10 @@ public final class Static221 {
 
 	@OriginalMember(owner = "client!s", name = "a", descriptor = "[I")
 	public static int[] tt;
+	@OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;")
+	public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3;
+	@OriginalMember(owner = "client!hh", name = "r", descriptor = "[I")
+	public static int[] anIntArray235;
 
 	@OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V")
 	public static void method3392(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@@ -29,7 +33,7 @@ public final class Static221 {
 				@Pc(65) int local65 = SoftwareRaster.pixels[local24++ + arg0];
 				@Pc(70) int local70 = Static216.anIntArray188[local20++];
 				if (local70 == 0) {
-					Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = local65;
+					aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = local65;
 				} else {
 					@Pc(76) int local76 = local70 + 18;
 					if (local76 > 255) {
@@ -39,19 +43,19 @@ public final class Static221 {
 					if (local89 > 255) {
 						local89 = 255;
 					}
-					local70 = Static96.anIntArray235[local70];
-					Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = (local89 * (local65 & 0xFF00FF) + (local70 & 0xFF00FF) * local76 & 0xFF00FF00) + ((local70 & 0xFF00) * local76 + ((local65 & 0xFF00) * local89) & 0xFF0000) >> 8;
+					local70 = anIntArray235[local70];
+					aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = (local89 * (local65 & 0xFF00FF) + (local70 & 0xFF00FF) * local76 & 0xFF00FF00) + ((local70 & 0xFF00) * local76 + ((local65 & 0xFF00) * local89) & 0xFF0000) >> 8;
 				}
 			}
 			for (local55 = 0; local55 < local43; local55++) {
-				Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = SoftwareRaster.pixels[arg0 + local24++];
+				aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = SoftwareRaster.pixels[arg0 + local24++];
 			}
 			local24 += SoftwareRaster.width - 128;
 		}
 		if (GlRenderer.enabled) {
-			GlRaster.method1178(Static167.aClass3_Sub2_Sub1_Sub1_3.pixels, arg0, arg1, Static167.aClass3_Sub2_Sub1_Sub1_3.width, Static167.aClass3_Sub2_Sub1_Sub1_3.height);
+			GlRaster.method1178(aClass3_Sub2_Sub1_Sub1_3.pixels, arg0, arg1, aClass3_Sub2_Sub1_Sub1_3.width, aClass3_Sub2_Sub1_Sub1_3.height);
 		} else {
-			Static167.aClass3_Sub2_Sub1_Sub1_3.method1415(arg0, arg1);
+			aClass3_Sub2_Sub1_Sub1_3.method1415(arg0, arg1);
 		}
 	}
 
diff --git a/client/src/main/java/rt4/Static222.java b/client/src/main/java/rt4/Static222.java
index 6f05184..9e1bede 100644
--- a/client/src/main/java/rt4/Static222.java
+++ b/client/src/main/java/rt4/Static222.java
@@ -1,20 +1,10 @@
 package rt4;
 
-import java.awt.Font;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static222 {
 
-	@OriginalMember(owner = "client!sa", name = "R", descriptor = "Ljava/awt/Font;")
-	public static Font aFont1;
-
-	@OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I")
-	public static final int[] cameraJitter = new int[5];
-
-	@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
-	public static boolean instantScreenFade = true;
-
 	@OriginalMember(owner = "client!sa", name = "a", descriptor = "(IIIBI)V")
 	public static void method3826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
 		if (arg3 <= arg2) {
diff --git a/client/src/main/java/rt4/Static223.java b/client/src/main/java/rt4/Static223.java
index c6aab53..873b4d3 100644
--- a/client/src/main/java/rt4/Static223.java
+++ b/client/src/main/java/rt4/Static223.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static223 {
 
-    @OriginalMember(owner = "client!sc", name = "p", descriptor = "I")
-	public static int anInt5029 = 0;
-
     @OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z")
 	public static final boolean[] aBooleanArray116 = new boolean[100];
 
diff --git a/client/src/main/java/rt4/Static225.java b/client/src/main/java/rt4/Static225.java
index ae14e5b..676f965 100644
--- a/client/src/main/java/rt4/Static225.java
+++ b/client/src/main/java/rt4/Static225.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static225 {
 
-	@OriginalMember(owner = "client!se", name = "a", descriptor = "I")
-	public static int originX;
-
     @OriginalMember(owner = "client!se", name = "h", descriptor = "I")
 	public static int anInt5073 = -1;
 
diff --git a/client/src/main/java/rt4/Static226.java b/client/src/main/java/rt4/Static226.java
index f317a1e..94e9d1b 100644
--- a/client/src/main/java/rt4/Static226.java
+++ b/client/src/main/java/rt4/Static226.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static226 {
 
-    @OriginalMember(owner = "client!sf", name = "c", descriptor = "I")
-	public static int anInt5080;
-
 	@OriginalMember(owner = "client!sf", name = "j", descriptor = "I")
 	public static int anInt5085;
 
@@ -73,12 +70,12 @@ public final class Static226 {
 			local43 = 0;
 		}
 		if (anInt3953 == 1) {
-			if (Static155.anInt3751 == Static277.anInt5850 && Static280.anInt5895 == Static60.anInt1892) {
-				Static13.anInt436 = MiniMenu.size * 15 + (Static261.aBoolean298 ? 26 : 22);
+			if (Static155.anInt3751 == Mouse.anInt5850 && Static280.anInt5895 == Static60.anInt1892) {
+				Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
 				anInt3953 = 0;
 				Static229.anInt5138 = local43;
 				Static183.anInt4271 = local27;
-				Static60.aBoolean108 = true;
+				Static40.aBoolean108 = true;
 				Static24.anInt761 = local16;
 			}
 		} else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) {
@@ -86,11 +83,11 @@ public final class Static226 {
 			anInt3953 = 0;
 			Static24.anInt761 = local16;
 			Static229.anInt5138 = local43;
-			Static13.anInt436 = (Static261.aBoolean298 ? 26 : 22) + MiniMenu.size * 15;
-			Static60.aBoolean108 = true;
+			Static13.anInt436 = (Static40.aBoolean298 ? 26 : 22) + MiniMenu.size * 15;
+			Static40.aBoolean108 = true;
 		} else {
 			Static280.anInt5895 = Mouse.clickY;
-			Static277.anInt5850 = Mouse.clickX;
+			Mouse.anInt5850 = Mouse.clickX;
 			anInt3953 = 1;
 		}
 	}
diff --git a/client/src/main/java/rt4/Static227.java b/client/src/main/java/rt4/Static227.java
index 1bdc9c1..16cef90 100644
--- a/client/src/main/java/rt4/Static227.java
+++ b/client/src/main/java/rt4/Static227.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static227 {
 
-    @OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
-	public static int cameraType;
-
     @OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;")
 	public static final JagString SETTINGS = JagString.parse("settings");
 
diff --git a/client/src/main/java/rt4/Static228.java b/client/src/main/java/rt4/Static228.java
index ad0c01c..2e9bb0e 100644
--- a/client/src/main/java/rt4/Static228.java
+++ b/client/src/main/java/rt4/Static228.java
@@ -8,13 +8,15 @@ public final class Static228 {
 
     @OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B")
     public static final byte[][] aByteArrayArray6 = new byte[50][];
-    @OriginalMember(owner = "client!sh", name = "c", descriptor = "I")
-	public static int anInt5101 = 0;
 
-	@OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;")
 	public static final JagString aClass100_967 = JagString.parse("");
+    @OriginalMember(owner = "client!wi", name = "X", descriptor = "[[B")
+    public static final byte[][] aByteArrayArray16 = new byte[1000][];
+    @OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
+    public static final byte[][] aByteArrayArray2 = new byte[250][];
 
-	@OriginalMember(owner = "client!sh", name = "f", descriptor = "I")
+    @OriginalMember(owner = "client!sh", name = "f", descriptor = "I")
 	public static int anInt5103 = -1;
 
 	@OriginalMember(owner = "client!sh", name = "i", descriptor = "[[I")
@@ -27,12 +29,12 @@ public final class Static228 {
 	public static synchronized byte[] allocate(@OriginalArg(1) int arg0) {
 		@Pc(22) byte[] local22;
 		if (arg0 == 100 && Static115.anInt2937 > 0) {
-			local22 = Static277.aByteArrayArray16[--Static115.anInt2937];
-			Static277.aByteArrayArray16[Static115.anInt2937] = null;
+			local22 = aByteArrayArray16[--Static115.anInt2937];
+			aByteArrayArray16[Static115.anInt2937] = null;
 			return local22;
 		} else if (arg0 == 5000 && Static251.anInt5459 > 0) {
-			local22 = Static12.aByteArrayArray2[--Static251.anInt5459];
-			Static12.aByteArrayArray2[Static251.anInt5459] = null;
+			local22 = aByteArrayArray2[--Static251.anInt5459];
+			aByteArrayArray2[Static251.anInt5459] = null;
 			return local22;
 		} else if (arg0 == 30000 && Static224.anInt5064 > 0) {
 			local22 = aByteArrayArray6[--Static224.anInt5064];
diff --git a/client/src/main/java/rt4/Static229.java b/client/src/main/java/rt4/Static229.java
index 055442e..63c1bea 100644
--- a/client/src/main/java/rt4/Static229.java
+++ b/client/src/main/java/rt4/Static229.java
@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static229 {
@@ -8,15 +7,4 @@ public final class Static229 {
 	@OriginalMember(owner = "client!si", name = "ab", descriptor = "I")
 	public static int anInt5138;
 
-    @OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_974 = JagString.parse("<br>(X");
-
-	@OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V")
-	public static void method3935(@OriginalArg(0) int arg0) {
-		Static161.method3060(Static161.anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F);
-		Static161.method3063(-50.0F, -60.0F, -50.0F);
-		Static161.method3062(Static161.anInt3922, 0);
-		Static161.method3058();
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static23.java b/client/src/main/java/rt4/Static23.java
index 9a06fd6..d146618 100644
--- a/client/src/main/java/rt4/Static23.java
+++ b/client/src/main/java/rt4/Static23.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static23 {
 
-	@OriginalMember(owner = "client!bm", name = "a", descriptor = "F")
-	public static float aFloat5;
-
     @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V")
 	public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		@Pc(3) int local3;
diff --git a/client/src/main/java/rt4/Static231.java b/client/src/main/java/rt4/Static231.java
index 7594677..2237538 100644
--- a/client/src/main/java/rt4/Static231.java
+++ b/client/src/main/java/rt4/Static231.java
@@ -15,132 +15,7 @@ public final class Static231 {
 	@OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z")
 	public static boolean aBoolean252 = false;
 
-	@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIBIII)V")
-	public static void method3981(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
-		@Pc(7) int local7 = 0;
-		@Pc(12) int local12 = arg0 - arg3;
-		@Pc(14) int local14 = 0;
-		@Pc(16) int local16 = arg6;
-		@Pc(20) int local20 = arg6 * arg6;
-		@Pc(25) int local25 = arg6 - arg3;
-		@Pc(29) int local29 = arg0 * arg0;
-		@Pc(33) int local33 = local20 << 1;
-		@Pc(37) int local37 = local25 * local25;
-		@Pc(41) int local41 = local12 * local12;
-		@Pc(45) int local45 = local29 << 1;
-		@Pc(49) int local49 = local37 << 1;
-		@Pc(53) int local53 = local41 << 1;
-		@Pc(57) int local57 = local25 << 1;
-		@Pc(61) int local61 = arg6 << 1;
-		@Pc(70) int local70 = local33 + local29 * (1 - local61);
-		@Pc(79) int local79 = local20 - (local61 - 1) * local45;
-		@Pc(88) int local88 = local49 + local41 * (1 - local57);
-		@Pc(96) int local96 = local37 - local53 * (local57 - 1);
-		@Pc(100) int local100 = local20 << 2;
-		@Pc(104) int local104 = local29 << 2;
-		@Pc(108) int local108 = local37 << 2;
-		@Pc(112) int local112 = local33 * 3;
-		@Pc(118) int local118 = (local61 - 3) * local45;
-		@Pc(130) int local130 = local41 << 2;
-		@Pc(134) int local134 = local49 * 3;
-		@Pc(140) int local140 = (local57 - 3) * local53;
-		@Pc(146) int local146 = (arg6 - 1) * local104;
-		@Pc(148) int local148 = local108;
-		@Pc(150) int local150 = local100;
-		@Pc(156) int local156 = (local25 - 1) * local130;
-		@Pc(174) int local174;
-		@Pc(183) int local183;
-		@Pc(192) int local192;
-		@Pc(201) int local201;
-		if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
-			@Pc(166) int[] local166 = Static71.anIntArrayArray10[arg4];
-			local174 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg0, TextureOp29.anInt4164);
-			local183 = Static78.method1690(TextureOp29.anInt5063, arg5 + arg0, TextureOp29.anInt4164);
-			local192 = Static78.method1690(TextureOp29.anInt5063, arg5 - local12, TextureOp29.anInt4164);
-			local201 = Static78.method1690(TextureOp29.anInt5063, arg5 + local12, TextureOp29.anInt4164);
-			Static131.method2576(local166, local174, local192, arg2);
-			Static131.method2576(local166, local192, local201, arg1);
-			Static131.method2576(local166, local201, local183, arg2);
-		}
-		while (local16 > 0) {
-			if (local70 < 0) {
-				while (local70 < 0) {
-					local70 += local112;
-					local112 += local100;
-					local7++;
-					local79 += local150;
-					local150 += local100;
-				}
-			}
-			@Pc(255) boolean local255 = local16 <= local25;
-			if (local79 < 0) {
-				local79 += local150;
-				local70 += local112;
-				local7++;
-				local150 += local100;
-				local112 += local100;
-			}
-			if (local255) {
-				if (local88 < 0) {
-					while (local88 < 0) {
-						local14++;
-						local96 += local148;
-						local148 += local108;
-						local88 += local134;
-						local134 += local108;
-					}
-				}
-				if (local96 < 0) {
-					local14++;
-					local96 += local148;
-					local88 += local134;
-					local148 += local108;
-					local134 += local108;
-				}
-				local88 += -local156;
-				local156 -= local130;
-				local96 += -local140;
-				local140 -= local130;
-			}
-			local79 += -local118;
-			local70 += -local146;
-			local146 -= local104;
-			local118 -= local104;
-			local16--;
-			local183 = arg4 + local16;
-			local174 = arg4 - local16;
-			if (TextureOp29.anInt5773 <= local183 && TextureOp29.anInt2869 >= local174) {
-				local192 = Static78.method1690(TextureOp29.anInt5063, arg5 + local7, TextureOp29.anInt4164);
-				local201 = Static78.method1690(TextureOp29.anInt5063, arg5 - local7, TextureOp29.anInt4164);
-				if (local255) {
-					@Pc(404) int local404 = Static78.method1690(TextureOp29.anInt5063, arg5 + local14, TextureOp29.anInt4164);
-					@Pc(412) int local412 = Static78.method1690(TextureOp29.anInt5063, arg5 - local14, TextureOp29.anInt4164);
-					@Pc(420) int[] local420;
-					if (TextureOp29.anInt5773 <= local174) {
-						local420 = Static71.anIntArrayArray10[local174];
-						Static131.method2576(local420, local201, local412, arg2);
-						Static131.method2576(local420, local412, local404, arg1);
-						Static131.method2576(local420, local404, local192, arg2);
-					}
-					if (local183 <= TextureOp29.anInt2869) {
-						local420 = Static71.anIntArrayArray10[local183];
-						Static131.method2576(local420, local201, local412, arg2);
-						Static131.method2576(local420, local412, local404, arg1);
-						Static131.method2576(local420, local404, local192, arg2);
-					}
-				} else {
-					if (TextureOp29.anInt5773 <= local174) {
-						Static131.method2576(Static71.anIntArrayArray10[local174], local201, local192, arg2);
-					}
-					if (TextureOp29.anInt2869 >= local183) {
-						Static131.method2576(Static71.anIntArrayArray10[local183], local201, local192, arg2);
-					}
-				}
-			}
-		}
-	}
-
-	@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V")
+    @OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V")
 	public static void method3982(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		@Pc(15) int local15 = arg4 - arg2;
 		@Pc(19) int local19 = arg1 - arg3;
diff --git a/client/src/main/java/rt4/Static232.java b/client/src/main/java/rt4/Static232.java
index f0fb1d2..1ab9138 100644
--- a/client/src/main/java/rt4/Static232.java
+++ b/client/src/main/java/rt4/Static232.java
@@ -6,13 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static232 {
 
-	@OriginalMember(owner = "client!sm", name = "b", descriptor = "I")
-	public static int anInt5208;
-
-	@OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
-	public static byte[][][] aByteArrayArrayArray13;
-
-    @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V")
+	@OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V")
 	public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) {
 		@Pc(9) int local9 = arg2 - arg4;
 		@Pc(11) int local11 = -1;
diff --git a/client/src/main/java/rt4/Static233.java b/client/src/main/java/rt4/Static233.java
index 23cc564..0873c56 100644
--- a/client/src/main/java/rt4/Static233.java
+++ b/client/src/main/java/rt4/Static233.java
@@ -21,12 +21,6 @@ public final class Static233 {
 	@OriginalMember(owner = "client!t", name = "y", descriptor = "I")
 	public static int loadingScreenState = 0;
 
-	@OriginalMember(owner = "client!t", name = "z", descriptor = "I")
-	public static int anInt5224 = 0;
-
-	@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
-	public static final JagString aClass100_994 = JagString.parse(")3");
-
     @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V")
 	public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
 		@Pc(3) int local3 = 0;
@@ -34,7 +28,7 @@ public final class Static233 {
 		while (local5.length > local3) {
 			@Pc(17) MapMarker local17 = local5[local3];
 			if (local17 != null && local17.type == 2) {
-				Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Static225.originX << 7), arg3);
+				Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Camera.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Camera.originX << 7), arg3);
 				if (Static65.anInt1951 > -1 && client.loop % 20 < 10) {
 					Sprites.headhints[local17.anInt4048].render(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
 				}
@@ -48,11 +42,11 @@ public final class Static233 {
 		@Pc(19) byte local19;
 		@Pc(21) byte[][] local21;
 		if (GlRenderer.enabled && arg0) {
-			local21 = Static19.underWaterLocationsMapFilesBuffer;
+			local21 = LoginManager.underWaterLocationsMapFilesBuffer;
 			local19 = 1;
 		} else {
 			local19 = 4;
-			local21 = Static156.locationMapFilesBuffer;
+			local21 = LoginManager.locationMapFilesBuffer;
 		}
 		for (@Pc(29) int local29 = 0; local29 < local19; local29++) {
 			client.audioLoop();
@@ -66,8 +60,8 @@ public final class Static233 {
 							@Pc(83) int local83 = local56 >> 14 & 0x3FF;
 							@Pc(89) int local89 = local56 >> 3 & 0x7FF;
 							@Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8);
-							for (@Pc(101) int local101 = 0; local101 < Static238.regionBitPacked.length; local101++) {
-								if (Static238.regionBitPacked[local101] == local99 && local21[local101] != null) {
+							for (@Pc(101) int local101 = 0; local101 < LoginManager.regionBitPacked.length; local101++) {
+								if (LoginManager.regionBitPacked[local101] == local99 && local21[local101] != null) {
 									Static217.method3771(PathFinder.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8);
 									break;
 								}
diff --git a/client/src/main/java/rt4/Static235.java b/client/src/main/java/rt4/Static235.java
index b3db69e..dbc6df8 100644
--- a/client/src/main/java/rt4/Static235.java
+++ b/client/src/main/java/rt4/Static235.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static235 {
 
-	@OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
-	public static MapElementList mapElementList;
-
     @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I")
 	public static int anInt5276 = 0;
 
diff --git a/client/src/main/java/rt4/Static236.java b/client/src/main/java/rt4/Static236.java
index 9357d44..10d1e6d 100644
--- a/client/src/main/java/rt4/Static236.java
+++ b/client/src/main/java/rt4/Static236.java
@@ -50,12 +50,12 @@ public final class Static236 {
 				aBoolean84 = true;
 			}
 		}
-		if (Static58.wheelRotation == 0) {
+		if (MouseWheel.wheelRotation == 0) {
 			return;
 		}
 		local139 = arg2.width;
 		if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) {
-			arg2.scrollY += Static58.wheelRotation * 45;
+			arg2.scrollY += MouseWheel.wheelRotation * 45;
 			InterfaceList.redraw(arg2);
 		}
 	}
diff --git a/client/src/main/java/rt4/Static238.java b/client/src/main/java/rt4/Static238.java
index b8240b7..03f9efa 100644
--- a/client/src/main/java/rt4/Static238.java
+++ b/client/src/main/java/rt4/Static238.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static238 {
 
-    @OriginalMember(owner = "client!te", name = "H", descriptor = "[I")
-	public static int[] regionBitPacked;
-
-	@OriginalMember(owner = "client!te", name = "B", descriptor = "[I")
+    @OriginalMember(owner = "client!te", name = "B", descriptor = "[I")
 	public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 };
 
 }
diff --git a/client/src/main/java/rt4/Static24.java b/client/src/main/java/rt4/Static24.java
index a404f5b..a5c3953 100644
--- a/client/src/main/java/rt4/Static24.java
+++ b/client/src/main/java/rt4/Static24.java
@@ -9,10 +9,7 @@ public final class Static24 {
 	@OriginalMember(owner = "client!bn", name = "O", descriptor = "I")
 	public static int anInt761;
 
-    @OriginalMember(owner = "client!bn", name = "eb", descriptor = "I")
-	public static int anInt773 = 0;
-
-	@OriginalMember(owner = "client!bn", name = "a", descriptor = "(III)I")
+    @OriginalMember(owner = "client!bn", name = "a", descriptor = "(III)I")
 	public static int method667(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(8) int local8 = 0;
 		while (arg0 > 0) {
@@ -23,8 +20,4 @@ public final class Static24 {
 		return local8;
 	}
 
-	@OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z")
-	public static boolean isDigit(@OriginalArg(1) int arg0) {
-		return arg0 >= 48 && arg0 <= 57;
-	}
 }
diff --git a/client/src/main/java/rt4/Static240.java b/client/src/main/java/rt4/Static240.java
index a92ebb5..199d044 100644
--- a/client/src/main/java/rt4/Static240.java
+++ b/client/src/main/java/rt4/Static240.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static240 {
 
-	@OriginalMember(owner = "client!tg", name = "b", descriptor = "I")
-	public static int cameraPitch;
-
     @OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1008 = JagString.parse("<col=00ffff>");
 
diff --git a/client/src/main/java/rt4/Static241.java b/client/src/main/java/rt4/Static241.java
index 4b1a66b..69f5392 100644
--- a/client/src/main/java/rt4/Static241.java
+++ b/client/src/main/java/rt4/Static241.java
@@ -18,24 +18,7 @@ public final class Static241 {
     @OriginalMember(owner = "client!th", name = "n", descriptor = "Z")
 	public static boolean aBoolean302 = false;
 
-	@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V")
-	public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
-		Static97.aLong89 = 0L;
-		@Pc(4) int mode = Static144.getWindowMode();
-		if (arg1 == 3 || mode == 3) {
-			arg0 = true;
-		}
-		@Pc(44) boolean useHd = false;
-		if (mode > 0 != arg1 > 0) {
-			useHd = true;
-		}
-		if (arg0 && arg1 > 0) {
-			useHd = true;
-		}
-		Static197.setWindowMode(arg0, arg1, useHd, mode, arg2, arg3);
-	}
-
-	@OriginalMember(owner = "client!th", name = "a", descriptor = "(IIBIIII)I")
+    @OriginalMember(owner = "client!th", name = "a", descriptor = "(IIBIIII)I")
 	public static int method4541(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
 		if ((arg4 & 0x1) == 1) {
 			@Pc(9) int local9 = arg0;
diff --git a/client/src/main/java/rt4/Static242.java b/client/src/main/java/rt4/Static242.java
index 8ac7152..409eaf2 100644
--- a/client/src/main/java/rt4/Static242.java
+++ b/client/src/main/java/rt4/Static242.java
@@ -109,8 +109,8 @@ public final class Static242 {
 		@Pc(19) int local19 = arg4 << 7;
 		@Pc(29) int local29 = arg6 + arg7 + arg8 + arg9 >> 2;
 		@Pc(33) int local33 = arg5 << 7;
-		@Pc(43) int local43 = local19 - (local29 * Static161.anInt3920 >> 8) >> 3;
-		@Pc(53) int local53 = local33 - (local29 * Static161.anInt3921 >> 8) >> 3;
+		@Pc(43) int local43 = local19 - (local29 * FogManager.anInt3920 >> 8) >> 3;
+		@Pc(53) int local53 = local33 - (local29 * FogManager.anInt3921 >> 8) >> 3;
 		if (arg0 != 0 && arg0 != 1 && (arg2 || arg3)) {
 			method4210(Sprites.floorShadows[arg0], shadowMapImage, local43 + 1, local53 + 1, arg1, arg2);
 		} else {
@@ -335,8 +335,8 @@ public final class Static242 {
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;III)V")
 	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;
+			@Pc(12) int local12 = arg1 - (arg2 * FogManager.anInt3920 >> 8) >> 3;
+			@Pc(22) int local22 = arg3 - (arg2 * FogManager.anInt3921 >> 8) >> 3;
 			method4202(arg0, shadowMapImage, local12 + 1, local22 + 1);
 		}
 	}
@@ -368,8 +368,8 @@ public final class Static242 {
 		if (arg0 == null) {
 			return false;
 		} else {
-			@Pc(13) int local13 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3;
-			@Pc(23) int local23 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3;
+			@Pc(13) int local13 = arg1 - (arg2 * FogManager.anInt3920 >> 8) >> 3;
+			@Pc(23) int local23 = arg3 - (arg2 * FogManager.anInt3921 >> 8) >> 3;
 			return method4200(arg0, shadowMapImage, local13 + 1, local23 + 1);
 		}
 	}
@@ -412,8 +412,8 @@ public final class Static242 {
 	@OriginalMember(owner = "client!tj", name = "c", descriptor = "(Lclient!ek;III)V")
 	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;
+			@Pc(12) int local12 = arg1 - (arg2 * FogManager.anInt3920 >> 8) >> 3;
+			@Pc(22) int local22 = arg3 - (arg2 * FogManager.anInt3921 >> 8) >> 3;
 			method4194(arg0, shadowMapImage, local12 + 1, local22 + 1);
 		}
 	}
diff --git a/client/src/main/java/rt4/Static245.java b/client/src/main/java/rt4/Static245.java
index c3daadd..468c4ed 100644
--- a/client/src/main/java/rt4/Static245.java
+++ b/client/src/main/java/rt4/Static245.java
@@ -6,13 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static245 {
 
-	@OriginalMember(owner = "client!tm", name = "g", descriptor = "I")
-	public static int anInt5375;
-
-	@OriginalMember(owner = "client!tm", name = "i", descriptor = "I")
-	public static int anInt5377 = 0;
-
-	@OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
+    @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
 	public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
 		@Pc(17) int local17;
 		if (!arg9) {
@@ -37,9 +31,9 @@ public final class Static245 {
 			for (local103 = 0; local103 < 64; local103++) {
 				for (local108 = 0; local108 < 64; local108++) {
 					if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) {
-						Static278.readTile(0, 0, arg9, local96, Static202.method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, Static214.method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2);
+						SceneGraph.readTile(0, 0, arg9, local96, Static202.method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, Static214.method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2);
 					} else {
-						Static278.readTile(0, 0, arg9, local96, -1, -1, 0, 0);
+						SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0);
 					}
 				}
 			}
@@ -86,7 +80,7 @@ public final class Static245 {
 						}
 						while (local237 > local232) {
 							while (local417 < local255) {
-								Static232.aByteArrayArrayArray13[arg2][local232][local417] = 0;
+								SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0;
 								local417++;
 							}
 							local232++;
@@ -103,7 +97,7 @@ public final class Static245 {
 											local316 = arg1 + Static214.method4360(arg0, local266 & 0x7, local255 & 0x7);
 											@Pc(328) int local328 = Static202.method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4;
 											if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) {
-												Static232.aByteArrayArrayArray13[arg2][local316][local328] = local246;
+												SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246;
 											}
 										}
 									}
@@ -134,7 +128,7 @@ public final class Static245 {
 					if (local472 == null) {
 						local472 = new Environment();
 					}
-					Static192.aClass92ArrayArray1[arg1 >> 3][arg4 >> 3] = local472;
+					Static103.aClass92ArrayArray1[arg1 >> 3][arg4 >> 3] = local472;
 					break label207;
 				} while (local497 <= 0);
 				for (local232 = 0; local232 < local497; local232++) {
@@ -165,7 +159,7 @@ public final class Static245 {
 		local108 = arg4 + 7;
 		for (local497 = arg1; local497 < local103; local497++) {
 			for (local232 = arg4; local232 < local108; local232++) {
-				Static232.aByteArrayArrayArray13[arg2][local497][local232] = 0;
+				SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0;
 			}
 		}
 	}
diff --git a/client/src/main/java/rt4/Static246.java b/client/src/main/java/rt4/Static246.java
index 7643082..d5ee9f8 100644
--- a/client/src/main/java/rt4/Static246.java
+++ b/client/src/main/java/rt4/Static246.java
@@ -1,31 +1,10 @@
 package rt4;
 
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static246 {
 
 	@OriginalMember(owner = "client!u", name = "i", descriptor = "I")
 	public static int anInt5393;
 
-	@OriginalMember(owner = "client!u", name = "a", descriptor = "I")
-	public static int anInt5388 = 0;
-
-	@OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
-	public static void method4239() {
-		for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {
-			@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
-			if (local15.anInt606 != Player.level || local15.aBoolean41) {
-				local9.unlink();
-			} else if (local15.anInt590 <= client.loop) {
-				local15.method558(Static178.anInt4247);
-				if (local15.aBoolean41) {
-					local9.unlink();
-				} else {
-					Static43.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false);
-				}
-			}
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static247.java b/client/src/main/java/rt4/Static247.java
index 84d4d57..978413e 100644
--- a/client/src/main/java/rt4/Static247.java
+++ b/client/src/main/java/rt4/Static247.java
@@ -6,6 +6,19 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static247 {
 
+	@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
+	public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };
+	@OriginalMember(owner = "client!uj", name = "A", descriptor = "[I")
+	public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 };
+	@OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I")
+	public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 };
+	@OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
+	public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 };
+	@OriginalMember(owner = "client!hb", name = "t", descriptor = "[I")
+	public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 };
+	@OriginalMember(owner = "client!bl", name = "X", descriptor = "I")
+	public static int anInt730 = -1;
+
     @OriginalMember(owner = "client!ub", name = "a", descriptor = "(IIIIIII)V")
 	public static void method4244(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
 		if (TextureOp29.anInt4164 <= arg1 && TextureOp29.anInt5063 >= arg3 && TextureOp29.anInt5773 <= arg2 && arg4 <= TextureOp29.anInt2869) {
@@ -73,11 +86,11 @@ public final class Static247 {
 													if (var10 != Static152.anInt3604) {
 														Static152.anInt3604 = var10;
 														WaterMaterialRenderer.method619(var10);
-														Static161.method3066(WaterMaterialRenderer.method2422());
+														FogManager.method3066(WaterMaterialRenderer.method2422());
 													}
 													local65 = var9 >>> 24 << 3;
-													if (local65 != Static22.anInt730) {
-														Static22.anInt730 = local65;
+													if (local65 != anInt730) {
+														anInt730 = local65;
 														Static147.method2761(local65);
 													}
 													local115 = SceneGraph.surfaceTileHeights[0][local18][local21] + SceneGraph.surfaceTileHeights[0][local18 + 1][local21] + SceneGraph.surfaceTileHeights[0][local18][local21 + 1] + SceneGraph.surfaceTileHeights[0][local18 + 1][local21 + 1] >> 2;
@@ -221,23 +234,23 @@ public final class Static247 {
 												local8.anInt670 = Static191.anIntArray386[var10];
 											}
 											if (local616 != null) {
-												if ((local616.anInt3049 & Static90.anIntArray215[var10]) == 0) {
+												if ((local616.anInt3049 & anIntArray215[var10]) == 0) {
 													local8.anInt663 = 0;
 												} else if (local616.anInt3049 == 16) {
 													local8.anInt663 = 3;
-													local8.anInt665 = Static128.anIntArray294[var10];
+													local8.anInt665 = anIntArray294[var10];
 													local8.anInt667 = 3 - local8.anInt665;
 												} else if (local616.anInt3049 == 32) {
 													local8.anInt663 = 6;
-													local8.anInt665 = Static254.anIntArray489[var10];
+													local8.anInt665 = anIntArray489[var10];
 													local8.anInt667 = 6 - local8.anInt665;
 												} else if (local616.anInt3049 == 64) {
 													local8.anInt663 = 12;
-													local8.anInt665 = Static86.anIntArray211[var10];
+													local8.anInt665 = anIntArray211[var10];
 													local8.anInt667 = 12 - local8.anInt665;
 												} else {
 													local8.anInt663 = 9;
-													local8.anInt665 = Static131.anIntArray307[var10];
+													local8.anInt665 = anIntArray307[var10];
 													local8.anInt667 = 9 - local8.anInt665;
 												}
 												if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) {
@@ -253,7 +266,7 @@ public final class Static247 {
 													local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
 												}
 											}
-											if (local619 != null && !Static276.method4611(local27, local18, local21, local619.primary.getMaxY())) {
+											if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMaxY())) {
 												if (GlRenderer.enabled) {
 													GlRenderer.method4159(local33 - 0.5F);
 												}
@@ -570,7 +583,7 @@ public final class Static247 {
 			}
 			if (local8.anInt670 != 0) {
 				@Pc(2109) WallDecor local2109 = local8.wallDecor;
-				if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.primary.getMaxY())) {
+				if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMaxY())) {
 					if ((local2109.anInt1395 & local8.anInt670) != 0) {
 						if (GlRenderer.enabled) {
 							LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@@ -621,7 +634,7 @@ public final class Static247 {
 				}
 			}
 			@Pc(2388) Tile local2388;
-			if (local24 < Static126.anInt3114 - 1) {
+			if (local24 < SceneGraph.anInt3114 - 1) {
 				local2388 = SceneGraph.tiles[local24 + 1][local18][local21];
 				if (local2388 != null && local2388.aBoolean46) {
 					Static7.aClass69_32.addTail(local2388);
@@ -656,7 +669,7 @@ public final class Static247 {
 
 	@OriginalMember(owner = "client!ub", name = "b", descriptor = "(IIIIIII)V")
 	public static void method4246(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
-		@Pc(8) Component local8 = Static201.method1418(arg0, arg1);
+		@Pc(8) Component local8 = InterfaceList.method1418(arg0, arg1);
 		if (local8 != null && local8.onUse != null) {
 			@Pc(19) HookRequest local19 = new HookRequest();
 			local19.source = local8;
@@ -678,4 +691,14 @@ public final class Static247 {
 		return arg0 & 0xFF;
 	}
 
+	@OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z")
+	public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+		if (Static9.method187(arg0, arg1, arg2)) {
+			@Pc(10) int local10 = arg1 << 7;
+			@Pc(14) int local14 = arg2 << 7;
+			return SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
+		} else {
+			return false;
+		}
+	}
 }
diff --git a/client/src/main/java/rt4/Static248.java b/client/src/main/java/rt4/Static248.java
index 1027618..d744a96 100644
--- a/client/src/main/java/rt4/Static248.java
+++ b/client/src/main/java/rt4/Static248.java
@@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static248 {
 
-	@OriginalMember(owner = "client!uc", name = "f", descriptor = "I")
-	public static int anInt4232;
-
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "I")
 	public static int anInt4229 = 2;
 
@@ -24,13 +21,13 @@ public final class Static248 {
 		@Pc(32) int local32;
 		@Pc(37) int local37;
 		@Pc(183) int local183;
-		for (@Pc(23) int local23 = Static235.anInt5276; local23 < Static126.anInt3114; local23++) {
+		for (@Pc(23) int local23 = Static235.anInt5276; local23 < SceneGraph.anInt3114; local23++) {
 			@Pc(30) Tile[][] local30 = SceneGraph.tiles[local23];
 			for (local32 = Static31.anInt987; local32 < Static2.anInt15; local32++) {
 				for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) {
 					@Pc(46) Tile local46 = local30[local32][local37];
 					if (local46 != null) {
-						if (Static48.aBooleanArrayArray1[local32 + Static277.tileVisibilityDistance - Static167.anInt4069][local37 + Static277.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
+						if (Static48.aBooleanArrayArray1[local32 + Static123.tileVisibilityDistance - Static167.anInt4069][local37 + Static123.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
 							local46.aBoolean45 = true;
 							local46.aBoolean46 = true;
 							if (local46.sceneryLen > 0) {
@@ -85,14 +82,14 @@ public final class Static248 {
 				MaterialManager.renderingUnderwater = true;
 				UnderwaterMaterialRenderer.method4609();
 				Static152.anInt3604 = -1;
-				Static22.anInt730 = -1;
-				for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) {
-					@Pc(285) GlTile local285 = Static182.aClass3_Sub14ArrayArray2[0][local32];
+				Static247.anInt730 = -1;
+				for (local32 = 0; local32 < SceneGraph.underwaterHdTiles[0].length; local32++) {
+					@Pc(285) GlTile local285 = SceneGraph.underwaterHdTiles[0][local32];
 					@Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F);
 					if (local285.underwaterColor != Static152.anInt3604) {
 						Static152.anInt3604 = local285.underwaterColor;
 						WaterMaterialRenderer.method619(local285.underwaterColor);
-						Static161.method3066(WaterMaterialRenderer.method2422());
+						FogManager.method3066(WaterMaterialRenderer.method2422());
 					}
 					local285.method1944(SceneGraph.tiles, local294, false);
 				}
@@ -100,12 +97,12 @@ public final class Static248 {
 			} else {
 				local32 = Static235.anInt5276;
 				while (true) {
-					if (local32 >= Static126.anInt3114) {
+					if (local32 >= SceneGraph.anInt3114) {
 						LightingManager.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles);
 						break;
 					}
-					for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) {
-						@Pc(336) GlTile local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37];
+					for (local37 = 0; local37 < SceneGraph.underwaterHdTiles[local32].length; local37++) {
+						@Pc(336) GlTile local336 = SceneGraph.underwaterHdTiles[local32][local37];
 						@Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.blend ? 1.0F : 0.5F);
 						if (local336.texture != -1 && Rasteriser.textureProvider.getMaterialType(local336.texture) == MaterialManager.WATER && Preferences.highWaterDetail) {
 							WaterMaterialRenderer.method619(local336.underwaterColor);
@@ -114,7 +111,7 @@ public final class Static248 {
 					}
 					if (local32 == 0 && Preferences.sceneryShadowsType > 0) {
 						GlRenderer.method4159(101.5F);
-						Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, SceneGraph.tileHeights[0]);
+						Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static123.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, SceneGraph.tileHeights[0]);
 					}
 					local32++;
 				}
@@ -128,13 +125,13 @@ public final class Static248 {
 		@Pc(406) Tile[][] local406;
 		@Pc(415) int local415;
 		@Pc(428) int local428;
-		for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) {
+		for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) {
 			local406 = SceneGraph.tiles[local399];
-			for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) {
+			for (local37 = -Static123.tileVisibilityDistance; local37 <= 0; local37++) {
 				local415 = Static167.anInt4069 + local37;
 				local183 = Static167.anInt4069 - local37;
 				if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) {
-					for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) {
+					for (local428 = -Static123.tileVisibilityDistance; local428 <= 0; local428++) {
 						local434 = Static193.anInt4539 + local428;
 						local438 = Static193.anInt4539 - local428;
 						if (local415 >= Static31.anInt987) {
@@ -175,13 +172,13 @@ public final class Static248 {
 				}
 			}
 		}
-		for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) {
+		for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) {
 			local406 = SceneGraph.tiles[local399];
-			for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) {
+			for (local37 = -Static123.tileVisibilityDistance; local37 <= 0; local37++) {
 				local415 = Static167.anInt4069 + local37;
 				local183 = Static167.anInt4069 - local37;
 				if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) {
-					for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) {
+					for (local428 = -Static123.tileVisibilityDistance; local428 <= 0; local428++) {
 						local434 = Static193.anInt4539 + local428;
 						local438 = Static193.anInt4539 - local428;
 						if (local415 >= Static31.anInt987) {
diff --git a/client/src/main/java/rt4/Static249.java b/client/src/main/java/rt4/Static249.java
deleted file mode 100644
index 5589f61..0000000
--- a/client/src/main/java/rt4/Static249.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static249 {
-
-    @OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1039 = JagString.parse(" x ");
-
-	@OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z")
-	public static boolean method4265(@OriginalArg(1) Component arg0) {
-		if (arg0.anInt453 == 205) {
-			Static267.anInt5775 = 250;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static250.java b/client/src/main/java/rt4/Static250.java
index ce099a2..c0c2297 100644
--- a/client/src/main/java/rt4/Static250.java
+++ b/client/src/main/java/rt4/Static250.java
@@ -1,7 +1,6 @@
 package rt4;
 
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static250 {
 
@@ -17,34 +16,4 @@ public final class Static250 {
 	@OriginalMember(owner = "client!uf", name = "t", descriptor = "I")
 	public static int anInt5444 = 0;
 
-	@OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V")
-	public static void method4273() {
-		@Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291;
-		@Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774;
-		if (Camera.cameraX - playerX < -500 || Camera.cameraX - playerX > 500 || Camera.cameraZ - playerZ < -500 || Camera.cameraZ - playerZ > 500) {
-			Camera.cameraX = playerX;
-			Camera.cameraZ = playerZ;
-		}
-		if (Camera.cameraZ != playerZ) {
-			Camera.cameraZ += (playerZ - Camera.cameraZ) / 16;
-		}
-		if (Camera.cameraX != playerX) {
-			Camera.cameraX += (playerX - Camera.cameraX) / 16;
-		}
-		if (Preferences.aBoolean63) {
-			for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) {
-				@Pc(104) int code = InterfaceList.keyCodes[local93];
-				if (code == Keyboard.KEY_UP) {
-					Camera.pitchTarget += 47;
-				} else if (code == Keyboard.KEY_DOWN) {
-					Camera.pitchTarget -= 17;
-				} else if (code == Keyboard.KEY_LEFT) {
-					Camera.yawTarget -= 65;
-				} else if (code == Keyboard.KEY_RIGHT) {
-					Camera.yawTarget += 191;
-				}
-			}
-			Camera.clampCameraAngle();
-		}
-	}
 }
diff --git a/client/src/main/java/rt4/Static251.java b/client/src/main/java/rt4/Static251.java
index f2bb20e..de8ee8c 100644
--- a/client/src/main/java/rt4/Static251.java
+++ b/client/src/main/java/rt4/Static251.java
@@ -5,13 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static251 {
 
-    @OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
-	public static int anInt5449;
-
-	@OriginalMember(owner = "client!ug", name = "p", descriptor = "I")
-	public static int anInt5457;
-
-	@OriginalMember(owner = "client!ug", name = "b", descriptor = "[F")
+    @OriginalMember(owner = "client!ug", name = "b", descriptor = "[F")
 	public static final float[] aFloatArray28 = new float[4];
 
 	@OriginalMember(owner = "client!ug", name = "r", descriptor = "I")
diff --git a/client/src/main/java/rt4/Static252.java b/client/src/main/java/rt4/Static252.java
index 2dad851..a80a205 100644
--- a/client/src/main/java/rt4/Static252.java
+++ b/client/src/main/java/rt4/Static252.java
@@ -13,8 +13,8 @@ public final class Static252 {
 		if (Static236.method4047() != 2) {
 			return;
 		}
-		@Pc(27) byte local27 = (byte) (Static136.anInt3325 - 4 & 0xFF);
-		@Pc(31) int local31 = Static136.anInt3325 % 104;
+		@Pc(27) byte local27 = (byte) (Static253.anInt3325 - 4 & 0xFF);
+		@Pc(31) int local31 = Static253.anInt3325 % 104;
 		@Pc(33) int local33;
 		@Pc(40) int local40;
 		for (local33 = 0; local33 < 4; local33++) {
@@ -32,28 +32,28 @@ public final class Static252 {
 			Static243.anIntArray476[local33] = 1000000;
 			Static50.anIntArray134[local33] = 0;
 		}
-		if (Static227.cameraType != 1) {
-			local33 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ);
-			if (local33 - Static5.anInt40 < 800 && (SceneGraph.tileFlags[Player.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) {
-				Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, SceneGraph.tiles, 1);
+		if (Camera.cameraType != 1) {
+			local33 = SceneGraph.getTileHeight(Player.level, Camera.renderX, Camera.renderZ);
+			if (local33 - Static5.anInt40 < 800 && (SceneGraph.tileFlags[Player.level][Camera.renderX >> 7][Camera.renderZ >> 7] & 0x4) != 0) {
+				Static254.method4348(false, Camera.renderX >> 7, Camera.renderZ >> 7, SceneGraph.tiles, 1);
 			}
 			return;
 		}
 		if ((SceneGraph.tileFlags[Player.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) {
 			Static254.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, SceneGraph.tiles, 0);
 		}
-		if (Static240.cameraPitch >= 310) {
+		if (Camera.cameraPitch >= 310) {
 			return;
 		}
 		@Pc(135) int local135 = PlayerList.self.zFine >> 7;
-		local40 = Static134.renderZ >> 7;
+		local40 = Camera.renderZ >> 7;
 		@Pc(146) int local146;
 		if (local40 < local135) {
 			local146 = local135 - local40;
 		} else {
 			local146 = local40 - local135;
 		}
-		local33 = Static138.renderX >> 7;
+		local33 = Camera.renderX >> 7;
 		@Pc(162) int local162 = PlayerList.self.xFine >> 7;
 		@Pc(174) int local174;
 		if (local162 > local33) {
diff --git a/client/src/main/java/rt4/Static253.java b/client/src/main/java/rt4/Static253.java
index baf4079..e389725 100644
--- a/client/src/main/java/rt4/Static253.java
+++ b/client/src/main/java/rt4/Static253.java
@@ -6,94 +6,95 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static253 {
 
-	@OriginalMember(owner = "client!ui", name = "T", descriptor = "F")
-	public static float aFloat36;
+    @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z")
+    public static boolean aBoolean43 = true;
+    @OriginalMember(owner = "client!wi", name = "bb", descriptor = "I")
+    public static int anInt5854 = 0;
+    @OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
+	public static int anInt3325 = 0;
 
-	@OriginalMember(owner = "client!ui", name = "mb", descriptor = "F")
-	public static float aFloat37;
-
-	@OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V")
+    @OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V")
 	public static void method4326(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
-		Static136.anInt3325++;
-		Static210.method3711();
+		anInt3325++;
+		method3711();
 		if (!arg1) {
-			Static38.method964(true);
-			Static173.method3240(true);
-			Static38.method964(false);
+			method964(true);
+			method3240(true);
+			method964(false);
 		}
-		Static173.method3240(false);
+		method3240(false);
 		if (!arg1) {
-			Static195.method3532();
+			method3532();
 		}
-		Static246.method4239();
+		method4239();
 		if (GlRenderer.enabled) {
 			Static115.method2314(arg3, arg4, arg0, arg2, true);
-			arg2 = Static7.anInt983;
-			arg4 = Static24.anInt773;
-			arg3 = Static166.anInt4055;
-			arg0 = Static245.anInt5377;
+			arg2 = Static115.anInt983;
+			arg4 = Static115.anInt773;
+			arg3 = Static115.anInt4055;
+			arg0 = Static115.anInt5377;
 		}
 		@Pc(59) int local59;
 		@Pc(57) int local57;
-		if (Static227.cameraType == 1) {
+		if (Camera.cameraType == 1) {
 			local57 = Static230.anInt5161 + (int)Camera.yawTarget & 0x7FF;
 			local59 = (int)Camera.pitchTarget;
 			if (local59 < Static234.anInt5245 / 256) {
 				local59 = Static234.anInt5245 / 256;
 			}
-			if (Static176.customCameraActive[4] && Static276.cameraAmplitude[4] + 128 > local59) {
-				local59 = Static276.cameraAmplitude[4] + 128;
+			if (Static176.customCameraActive[4] && Camera.cameraAmplitude[4] + 128 > local59) {
+				local59 = Camera.cameraAmplitude[4] + 128;
 			}
 			Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Camera.cameraZ, local59);
 		}
 		local57 = Static5.anInt40;
-		local59 = Static138.renderX;
-		@Pc(121) int local121 = Static134.renderZ;
-		@Pc(123) int local123 = Static240.cameraPitch;
-		@Pc(125) int local125 = Static184.cameraYaw;
+		local59 = Camera.renderX;
+		@Pc(121) int local121 = Camera.renderZ;
+		@Pc(123) int local123 = Camera.cameraPitch;
+		@Pc(125) int local125 = Camera.cameraYaw;
 		@Pc(127) int local127;
 		@Pc(171) int local171;
 		for (local127 = 0; local127 < 5; local127++) {
 			if (Static176.customCameraActive[local127]) {
-				local171 = (int) ((double) -Static222.cameraJitter[local127] + (double) (Static222.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]);
+				local171 = (int) ((double) -Camera.cameraJitter[local127] + (double) (Camera.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Camera.cameraFrequency[local127] / 100.0D)) * (double) Camera.cameraAmplitude[local127]);
 				if (local127 == 3) {
-					Static184.cameraYaw = local171 + Static184.cameraYaw & 0x7FF;
+					Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF;
 				}
 				if (local127 == 4) {
-					Static240.cameraPitch += local171;
-					if (Static240.cameraPitch < 128) {
-						Static240.cameraPitch = 128;
+					Camera.cameraPitch += local171;
+					if (Camera.cameraPitch < 128) {
+						Camera.cameraPitch = 128;
 					}
-					if (Static240.cameraPitch > 383) {
-						Static240.cameraPitch = 383;
+					if (Camera.cameraPitch > 383) {
+						Camera.cameraPitch = 383;
 					}
 				}
 				if (local127 == 2) {
-					Static134.renderZ += local171;
+					Camera.renderZ += local171;
 				}
 				if (local127 == 1) {
 					Static5.anInt40 += local171;
 				}
 				if (local127 == 0) {
-					Static138.renderX += local171;
+					Camera.renderX += local171;
 				}
 			}
 		}
 		Static252.method4302();
 		if (GlRenderer.enabled) {
 			GlRaster.setClip(arg2, arg4, arg2 + arg3, arg4 - -arg0);
-			@Pc(248) float local248 = (float) Static240.cameraPitch * 0.17578125F;
-			@Pc(253) float local253 = (float) Static184.cameraYaw * 0.17578125F;
-			if (Static227.cameraType == 3) {
+			@Pc(248) float local248 = (float) Camera.cameraPitch * 0.17578125F;
+			@Pc(253) float local253 = (float) Camera.cameraYaw * 0.17578125F;
+			if (Camera.cameraType == 3) {
 				local248 = Static146.aFloat15 * 360.0F / 6.2831855F;
 				local253 = Static84.aFloat10 * 360.0F / 6.2831855F;
 			}
-			GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029);
+			GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static115.anInt5029, Static115.anInt5029);
 		} else {
 			SoftwareRaster.setClip(arg2, arg4, arg3 + arg2, arg0 + arg4);
 			Rasteriser.prepare();
 		}
-		if (Static60.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) {
+		if (Static40.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) {
 			Static39.aBoolean77 = false;
 			Static2.anInt7 = 0;
 		} else {
@@ -107,31 +108,31 @@ public final class Static253 {
 			Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344;
 		}
 		client.audioLoop();
-		@Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) Static136.anInt3325 : 1;
+		@Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) anInt3325 : 1;
 		if (GlRenderer.enabled) {
 			GlRenderer.restoreLighting();
 			GlRenderer.setDepthTestEnabled(true);
 			GlRenderer.setFogEnabled(true);
 			if (client.gameState == 10) {
-				local171 = Static103.method2235(Static178.anInt4247, Static134.renderZ >> 10, Preferences.brightness, Static138.renderX >> 10);
+				local171 = Static103.method2235(Static178.anInt4247, Camera.renderZ >> 10, Preferences.brightness, Camera.renderX >> 10);
 			} else {
 				local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3);
 			}
 			LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn);
 			GlRenderer.clearColorAndDepthBuffers(local171);
-			Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw);
+			Static143.method2731(Camera.cameraPitch, Camera.renderZ, Static5.anInt40, Camera.renderX, Camera.cameraYaw);
 			GlRenderer.anInt5323 = client.loop;
-			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
+			Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
 			Static263.aBoolean299 = true;
 			LightingManager.method2390();
 			Static143.method2731(0, 0, 0, 0, 0);
 			client.audioLoop();
 			Static223.method3858();
-			method2726(arg4, arg3, arg2, Static223.anInt5029, arg0, Static223.anInt5029);
-			Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4);
+			method2726(arg4, arg3, arg2, Static115.anInt5029, arg0, Static115.anInt5029);
+			Static233.method4000(arg3, arg2, arg0, Static115.anInt5029, Static115.anInt5029, arg4);
 		} else {
 			SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0);
-			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
+			Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
 			client.audioLoop();
 			Static223.method3858();
 			method2726(arg4, arg3, arg2, 256, arg0, 256);
@@ -139,15 +140,15 @@ public final class Static253 {
 		}
 		((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247);
 		Static115.method2310(arg3, arg4, arg0, arg2);
-		Static240.cameraPitch = local123;
-		Static134.renderZ = local121;
+		Camera.cameraPitch = local123;
+		Camera.renderZ = local121;
 		Static5.anInt40 = local57;
-		Static138.renderX = local59;
-		Static184.cameraYaw = local125;
-		if (Static19.aBoolean43 && client.js5NetQueue.method2328() == 0) {
-			Static19.aBoolean43 = false;
+		Camera.renderX = local59;
+		Camera.cameraYaw = local125;
+		if (aBoolean43 && client.js5NetQueue.method2328() == 0) {
+			aBoolean43 = false;
 		}
-		if (Static19.aBoolean43) {
+		if (aBoolean43) {
 			if (GlRenderer.enabled) {
 				GlRaster.method1186(arg2, arg4, arg3, arg0, 0);
 			} else {
@@ -155,14 +156,14 @@ public final class Static253 {
 			}
 			Static114.drawTextOnScreen(false, LocalizedText.LOADING);
 		}
-		if (!arg1 && !Static19.aBoolean43 && !Static60.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) {
+		if (!arg1 && !aBoolean43 && !Static40.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) {
 			MiniMenu.addEntries(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751);
 		}
 	}
 
     @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V")
     public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
-        Static277.anInt5854 = 0;
+        anInt5854 = 0;
         @Pc(5) int local5;
         @Pc(642) int local642;
         @Pc(74) int local74;
@@ -253,16 +254,16 @@ public final class Static253 {
                 }
                 if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) {
                     Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
-                    if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
-                        Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
-                        Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight;
-                        Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951;
-                        Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548;
-                        Static191.anIntArray390[Static277.anInt5854] = local17.chatColor;
-                        Static191.anIntArray391[Static277.anInt5854] = local17.chatEffect;
-                        Static191.anIntArray384[Static277.anInt5854] = local17.chatLoops;
-                        Static191.aClass100Array132[Static277.anInt5854] = local17.chatMessage;
-                        Static277.anInt5854++;
+                    if (Static65.anInt1951 > -1 && anInt5854 < Static191.anInt4506) {
+                        Static191.anIntArray389[anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
+                        Static191.anIntArray387[anInt5854] = Fonts.b12Full.lineHeight;
+                        Static191.anIntArray385[anInt5854] = Static65.anInt1951;
+                        Static191.anIntArray392[anInt5854] = Static16.anInt548;
+                        Static191.anIntArray390[anInt5854] = local17.chatColor;
+                        Static191.anIntArray391[anInt5854] = local17.chatEffect;
+                        Static191.anIntArray384[anInt5854] = local17.chatLoops;
+                        Static191.aClass100Array132[anInt5854] = local17.chatMessage;
+                        anInt5854++;
                     }
                 }
                 if (local17.hitpointsBarVisibleUntil > client.loop) {
@@ -343,7 +344,7 @@ public final class Static253 {
                 }
             }
         }
-        for (local5 = 0; local5 < Static277.anInt5854; local5++) {
+        for (local5 = 0; local5 < anInt5854; local5++) {
             local74 = Static191.anIntArray392[local5];
             @Pc(859) int local859 = Static191.anIntArray385[local5];
             local310 = Static191.anIntArray387[local5];
@@ -367,13 +368,13 @@ public final class Static253 {
                     local639 = Static16.anIntArray52[Static191.anIntArray390[local5]];
                 }
                 if (Static191.anIntArray390[local5] == 6) {
-                    local639 = Static136.anInt3325 % 20 >= 10 ? 16776960 : 16711680;
+                    local639 = anInt3325 % 20 >= 10 ? 16776960 : 16711680;
                 }
                 if (Static191.anIntArray390[local5] == 7) {
-                    local639 = Static136.anInt3325 % 20 < 10 ? 255 : 65535;
+                    local639 = anInt3325 % 20 < 10 ? 255 : 65535;
                 }
                 if (Static191.anIntArray390[local5] == 8) {
-                    local639 = Static136.anInt3325 % 20 >= 10 ? 8454016 : 45056;
+                    local639 = anInt3325 % 20 >= 10 ? 8454016 : 45056;
                 }
                 if (Static191.anIntArray390[local5] == 9) {
                     local642 = 150 - Static191.anIntArray384[local5];
@@ -409,13 +410,13 @@ public final class Static253 {
                     Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
                 }
                 if (Static191.anIntArray391[local5] == 1) {
-                    Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
+                    Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325);
                 }
                 if (Static191.anIntArray391[local5] == 2) {
-                    Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
+                    Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, anInt3325);
                 }
                 if (Static191.anIntArray391[local5] == 3) {
-                    Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]);
+                    Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325, 150 - Static191.anIntArray384[local5]);
                 }
                 if (Static191.anIntArray391[local5] == 4) {
                     local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150;
@@ -456,4 +457,315 @@ public final class Static253 {
             }
         }
     }
+
+    @OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V")
+    public static void method3711() {
+        for (@Pc(7) int local7 = 0; local7 < 104; local7++) {
+            for (@Pc(14) int local14 = 0; local14 < 104; local14++) {
+                Static31.anIntArrayArray6[local7][local14] = 0;
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V")
+    public static void method964(@OriginalArg(0) boolean arg0) {
+        @Pc(3) int local3 = PlayerList.size;
+        if (LoginManager.mapFlagX == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == LoginManager.mapFlagZ) {
+            LoginManager.mapFlagX = 0;
+        }
+        if (arg0) {
+            local3 = 1;
+        }
+        @Pc(28) int local28;
+        @Pc(39) Player local39;
+        @Pc(82) int local82;
+        @Pc(182) int local182;
+        @Pc(200) int local200;
+        @Pc(214) int local214;
+        @Pc(223) int local223;
+        @Pc(106) int local106;
+        for (local28 = 0; local28 < local3; local28++) {
+            if (arg0) {
+                local39 = PlayerList.self;
+            } else {
+                local39 = PlayerList.players[PlayerList.ids[local28]];
+            }
+            if (local39 != null && local39.method2682()) {
+                @Pc(55) int local55 = local39.getSize();
+                @Pc(77) int local77;
+                if (local55 == 1) {
+                    if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
+                        local77 = local39.xFine >> 7;
+                        local82 = local39.zFine >> 7;
+                        if (local77 >= 0 && local77 < 104 && local82 >= 0 && local82 < 104) {
+                            local106 = Static31.anIntArrayArray6[local77][local82]++;
+                        }
+                    }
+                } else if (((local55 & 0x1) != 0 || (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64)) {
+                    local77 = local39.xFine - local55 * 64 >> 7;
+                    local82 = local39.zFine - local55 * 64 >> 7;
+                    local182 = local39.getSize() + local77;
+                    if (local182 > 104) {
+                        local182 = 104;
+                    }
+                    if (local77 < 0) {
+                        local77 = 0;
+                    }
+                    local200 = local82 + local39.getSize();
+                    if (local82 < 0) {
+                        local82 = 0;
+                    }
+                    if (local200 > 104) {
+                        local200 = 104;
+                    }
+                    for (local214 = local77; local214 < local182; local214++) {
+                        for (local223 = local82; local223 < local200; local223++) {
+                            local106 = Static31.anIntArrayArray6[local214][local223]++;
+                        }
+                    }
+                }
+            }
+        }
+        label220: for (local28 = 0; local28 < local3; local28++) {
+            @Pc(272) long local272;
+            if (arg0) {
+                local39 = PlayerList.self;
+                local272 = 8791798054912L;
+            } else {
+                local39 = PlayerList.players[PlayerList.ids[local28]];
+                local272 = (long) PlayerList.ids[local28] << 32;
+            }
+            if (local39 != null && local39.method2682()) {
+                local39.aBoolean98 = false;
+                if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) {
+                    local39.aBoolean98 = true;
+                }
+                local82 = local39.getSize();
+                if (local82 == 1) {
+                    if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
+                        local182 = local39.xFine >> 7;
+                        local200 = local39.zFine >> 7;
+                        if (local182 < 0 || local182 >= 104 || local200 < 0 || local200 >= 104) {
+                            continue;
+                        }
+                        if (Static31.anIntArrayArray6[local182][local200] > 1) {
+                            local106 = Static31.anIntArrayArray6[local182][local200]--;
+                            continue;
+                        }
+                    }
+                } else if ((local82 & 0x1) == 0 && (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 0) {
+                    local182 = local39.xFine - local82 * 64 >> 7;
+                    local214 = local82 + local182;
+                    local200 = local39.zFine - local82 * 64 >> 7;
+                    if (local214 > 104) {
+                        local214 = 104;
+                    }
+                    if (local182 < 0) {
+                        local182 = 0;
+                    }
+                    local223 = local82 + local200;
+                    if (local200 < 0) {
+                        local200 = 0;
+                    }
+                    @Pc(468) boolean local468 = true;
+                    if (local223 > 104) {
+                        local223 = 104;
+                    }
+                    @Pc(476) int local476;
+                    @Pc(485) int local485;
+                    for (local476 = local182; local476 < local214; local476++) {
+                        for (local485 = local200; local485 < local223; local485++) {
+                            if (Static31.anIntArrayArray6[local476][local485] <= 1) {
+                                local468 = false;
+                                break;
+                            }
+                        }
+                    }
+                    if (local468) {
+                        local476 = local182;
+                        while (true) {
+                            if (local476 >= local214) {
+                                continue label220;
+                            }
+                            for (local485 = local200; local485 < local223; local485++) {
+                                local106 = Static31.anIntArrayArray6[local476][local485]--;
+                            }
+                            local476++;
+                        }
+                    }
+                }
+                if (local39.attachment == null || client.loop < local39.anInt3390 || local39.anInt3375 <= client.loop) {
+                    local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
+                    Static43.method1141(Player.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
+                } else {
+                    local39.aBoolean98 = false;
+                    local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
+                    Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.atachmentX0, local39.attachmentZ0, local39.attachmentX1, local39.attachmentZ1);
+                }
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V")
+	public static void method3240(@OriginalArg(1) boolean arg0) {
+		@Pc(7) int local7;
+		@Pc(16) Npc local16;
+		@Pc(107) int local107;
+		@Pc(113) int local113;
+		@Pc(133) int local133;
+		@Pc(149) int local149;
+		@Pc(158) int local158;
+		@Pc(171) int local171;
+		for (local7 = 0; local7 < NpcList.size; local7++) {
+			local16 = NpcList.npcs[NpcList.ids[local7]];
+			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
+				@Pc(42) int local42 = local16.getSize();
+				@Pc(97) int local97;
+				if (local42 == 1) {
+					if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
+						local97 = local16.xFine >> 7;
+						local107 = local16.zFine >> 7;
+						if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
+							local171 = Static31.anIntArrayArray6[local97][local107]++;
+						}
+					}
+				} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
+					local97 = local16.xFine - local42 * 64 >> 7;
+					local107 = local16.zFine - local42 * 64 >> 7;
+					local113 = local16.getSize() + local97;
+					if (local97 < 0) {
+						local97 = 0;
+					}
+					if (local113 > 104) {
+						local113 = 104;
+					}
+					local133 = local107 + local16.getSize();
+					if (local107 < 0) {
+						local107 = 0;
+					}
+					if (local133 > 104) {
+						local133 = 104;
+					}
+					for (local149 = local97; local149 < local113; local149++) {
+						for (local158 = local107; local158 < local133; local158++) {
+							local171 = Static31.anIntArrayArray6[local149][local158]++;
+						}
+					}
+				}
+			}
+		}
+		label200: for (local7 = 0; local7 < NpcList.size; local7++) {
+			local16 = NpcList.npcs[NpcList.ids[local7]];
+			@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
+			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
+				local107 = local16.getSize();
+				if (local107 == 1) {
+					if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
+						local113 = local16.xFine >> 7;
+						local133 = local16.zFine >> 7;
+						if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
+							continue;
+						}
+						if (Static31.anIntArrayArray6[local113][local133] > 1) {
+							local171 = Static31.anIntArrayArray6[local113][local133]--;
+							continue;
+						}
+					}
+				} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
+					local113 = local16.xFine - local107 * 64 >> 7;
+					local133 = local16.zFine - local107 * 64 >> 7;
+					local158 = local133 + local107;
+					if (local133 < 0) {
+						local133 = 0;
+					}
+					@Pc(368) boolean local368 = true;
+					local149 = local113 + local107;
+					if (local158 > 104) {
+						local158 = 104;
+					}
+					if (local113 < 0) {
+						local113 = 0;
+					}
+					if (local149 > 104) {
+						local149 = 104;
+					}
+					@Pc(396) int local396;
+					@Pc(401) int local401;
+					for (local396 = local113; local396 < local149; local396++) {
+						for (local401 = local133; local401 < local158; local401++) {
+							if (Static31.anIntArrayArray6[local396][local401] <= 1) {
+								local368 = false;
+								break;
+							}
+						}
+					}
+					if (local368) {
+						local396 = local113;
+						while (true) {
+							if (local396 >= local149) {
+								continue label200;
+							}
+							for (local401 = local133; local401 < local158; local401++) {
+								local171 = Static31.anIntArrayArray6[local396][local401]--;
+							}
+							local396++;
+						}
+					}
+				}
+				if (!local16.type.aBoolean183) {
+					local262 |= Long.MIN_VALUE;
+				}
+				local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine);
+				Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
+			}
+		}
+	}
+
+    @OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V")
+	public static void method3532() {
+		for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.head(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) {
+			@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
+			if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) {
+				local16.unlink();
+			} else if (client.loop >= local21.anInt4822) {
+				if (local21.anInt4819 > 0) {
+					@Pc(54) Npc local54 = NpcList.npcs[local21.anInt4819 - 1];
+					if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) {
+						local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine);
+					}
+				}
+				if (local21.anInt4819 < 0) {
+					@Pc(102) int local102 = -local21.anInt4819 - 1;
+					@Pc(107) Player local107;
+					if (PlayerList.selfId == local102) {
+						local107 = PlayerList.self;
+					} else {
+						local107 = PlayerList.players[local102];
+					}
+					if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) {
+						local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine);
+					}
+				}
+				local21.method3704(Static178.anInt4247);
+				Static43.method1141(Player.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
+			}
+		}
+	}
+
+    @OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
+	public static void method4239() {
+		for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {
+			@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
+			if (local15.anInt606 != Player.level || local15.aBoolean41) {
+				local9.unlink();
+			} else if (local15.anInt590 <= client.loop) {
+				local15.method558(Static178.anInt4247);
+				if (local15.aBoolean41) {
+					local9.unlink();
+				} else {
+					Static43.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false);
+				}
+			}
+		}
+	}
 }
diff --git a/client/src/main/java/rt4/Static254.java b/client/src/main/java/rt4/Static254.java
index cf38e4f..e7939ae 100644
--- a/client/src/main/java/rt4/Static254.java
+++ b/client/src/main/java/rt4/Static254.java
@@ -6,21 +6,12 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static254 {
 
-	@OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
-	public static int anInt5556;
-
-	@OriginalMember(owner = "client!uj", name = "H", descriptor = "I")
+    @OriginalMember(owner = "client!uj", name = "H", descriptor = "I")
 	public static int anInt5559;
 
-    @OriginalMember(owner = "client!uj", name = "s", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1061 = JagString.parse("null");
-
-    @OriginalMember(owner = "client!uj", name = "A", descriptor = "[I")
-	public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 };
-
 	@OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z")
 	public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) {
-		@Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF);
+		@Pc(14) byte local14 = arg0 ? 1 : (byte) (Static253.anInt3325 & 0xFF);
 		if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) {
 			return false;
 		} else if ((SceneGraph.tileFlags[Player.level][arg1][arg2] & 0x4) == 0) {
@@ -52,18 +43,18 @@ public final class Static254 {
 						@Pc(358) int local358;
 						if (local130 && arg3[local150][local108][local122] != null) {
 							if (arg3[local150][local108][local122].wall != null) {
-								local191 = Static104.method2251(local94);
+								local191 = SceneGraph.method2251(local94);
 								if (arg3[local150][local108][local122].wall.anInt3049 == local191 || arg3[local150][local108][local122].wall.anInt3052 == local191) {
 									continue;
 								}
 								if (local102 != 0) {
-									local227 = Static104.method2251(local102);
+									local227 = SceneGraph.method2251(local102);
 									if (local227 == arg3[local150][local108][local122].wall.anInt3049 || arg3[local150][local108][local122].wall.anInt3052 == local227) {
 										continue;
 									}
 								}
 								if (local116 != 0) {
-									local227 = Static104.method2251(local116);
+									local227 = SceneGraph.method2251(local116);
 									if (local227 == arg3[local150][local108][local122].wall.anInt3049 || local227 == arg3[local150][local108][local122].wall.anInt3052) {
 										continue;
 									}
diff --git a/client/src/main/java/rt4/Static258.java b/client/src/main/java/rt4/Static258.java
index c07471e..f681692 100644
--- a/client/src/main/java/rt4/Static258.java
+++ b/client/src/main/java/rt4/Static258.java
@@ -1,13 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-
 public final class Static258 {
 
-	@OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z")
-	public static boolean isLetter(@OriginalArg(0) int arg0) {
-		return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90;
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static259.java b/client/src/main/java/rt4/Static259.java
deleted file mode 100644
index 8c3f6e7..0000000
--- a/client/src/main/java/rt4/Static259.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static259 {
-
-	@OriginalMember(owner = "client!vc", name = "V", descriptor = "[J")
-	public static final long[] aLongArray11 = new long[1000];
-
-}
diff --git a/client/src/main/java/rt4/Static26.java b/client/src/main/java/rt4/Static26.java
index b3463e5..b47aba9 100644
--- a/client/src/main/java/rt4/Static26.java
+++ b/client/src/main/java/rt4/Static26.java
@@ -14,18 +14,18 @@ public final class Static26 {
 
     @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V")
 	public static void method743(@OriginalArg(0) boolean arg0) {
-		@Pc(13) int local13 = Static273.mapFilesBuffer.length;
+		@Pc(13) int local13 = LoginManager.mapFilesBuffer.length;
 		@Pc(19) byte[][] local19;
 		if (GlRenderer.enabled && arg0) {
-			local19 = Static19.underWaterLocationsMapFilesBuffer;
+			local19 = LoginManager.underWaterLocationsMapFilesBuffer;
 		} else {
-			local19 = Static156.locationMapFilesBuffer;
+			local19 = LoginManager.locationMapFilesBuffer;
 		}
 		for (@Pc(25) int local25 = 0; local25 < local13; local25++) {
 			@Pc(32) byte[] local32 = local19[local25];
 			if (local32 != null) {
-				@Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Static225.originX;
-				@Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Static142.originZ;
+				@Pc(45) int local45 = (LoginManager.regionBitPacked[local25] >> 8) * 64 - Camera.originX;
+				@Pc(56) int local56 = (LoginManager.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ;
 				client.audioLoop();
 				Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps);
 			}
diff --git a/client/src/main/java/rt4/Static260.java b/client/src/main/java/rt4/Static260.java
index 6bce356..72f466c 100644
--- a/client/src/main/java/rt4/Static260.java
+++ b/client/src/main/java/rt4/Static260.java
@@ -11,33 +11,6 @@ public final class Static260 {
     @OriginalMember(owner = "client!eg", name = "a", descriptor = "I")
     public static int anInt1744;
 
-    @OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")
-	public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
-		Static133.anInt5230 = arg2;
-		Static265.anInt5765 = arg1;
-		Static233.anInt5217 = arg4;
-		Static251.anInt5449 = arg3;
-		anInt1744 = arg0;
-		if (Static233.anInt5217 >= 100) {
-			@Pc(30) int local30 = Static251.anInt5449 * 128 + 64;
-			@Pc(36) int local36 = Static265.anInt5765 * 128 + 64;
-			@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - anInt1744;
-			@Pc(49) int local49 = local44 - Static5.anInt40;
-			@Pc(54) int local54 = local30 - Static138.renderX;
-			@Pc(59) int local59 = local36 - Static134.renderZ;
-			@Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54));
-			Static240.cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF;
-			Static184.cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF;
-			if (Static240.cameraPitch < 128) {
-				Static240.cameraPitch = 128;
-			}
-			if (Static240.cameraPitch > 383) {
-				Static240.cameraPitch = 383;
-			}
-		}
-		Static227.cameraType = 2;
-	}
-
 	@OriginalMember(owner = "client!vd", name = "b", descriptor = "(IIII)Z")
 	public static boolean method3850(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (!Static9.method187(arg0, arg1, arg2)) {
diff --git a/client/src/main/java/rt4/Static261.java b/client/src/main/java/rt4/Static261.java
deleted file mode 100644
index c2b7eae..0000000
--- a/client/src/main/java/rt4/Static261.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static261 {
-
-    @OriginalMember(owner = "client!ve", name = "t", descriptor = "I")
-	public static int anInt5731;
-
-	@OriginalMember(owner = "client!ve", name = "w", descriptor = "Z")
-	public static boolean aBoolean298 = false;
-
-}
diff --git a/client/src/main/java/rt4/Static262.java b/client/src/main/java/rt4/Static262.java
deleted file mode 100644
index e896e15..0000000
--- a/client/src/main/java/rt4/Static262.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static262 {
-
-	@OriginalMember(owner = "client!vf", name = "c", descriptor = "I")
-	public static int anInt5752;
-
-	@OriginalMember(owner = "client!vf", name = "g", descriptor = "[I")
-	public static final int[] anIntArray515 = new int[14];
-
-	@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIJ)V")
-	public static void method4508(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8) {
-		if (arg4 == null && arg5 == null) {
-			return;
-		}
-		@Pc(8) Wall local8 = new Wall();
-		local8.key = arg8;
-		local8.anInt3048 = arg1 * 128 + 64;
-		local8.anInt3044 = arg2 * 128 + 64;
-		local8.anInt3051 = arg3;
-		local8.primary = arg4;
-		local8.aClass8_6 = arg5;
-		local8.anInt3049 = arg6;
-		local8.anInt3052 = arg7;
-		for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) {
-			if (SceneGraph.tiles[local42][arg1][arg2] == null) {
-				SceneGraph.tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2);
-			}
-		}
-		SceneGraph.tiles[arg0][arg1][arg2].wall = local8;
-	}
-
-	@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
-	public static JagString method4510(@OriginalArg(0) int arg0) {
-		return arg0 >= 999999999 ? Static220.aClass100_930 : JagString.parseInt(arg0);
-	}
-}
diff --git a/client/src/main/java/rt4/Static263.java b/client/src/main/java/rt4/Static263.java
index a983db7..db191da 100644
--- a/client/src/main/java/rt4/Static263.java
+++ b/client/src/main/java/rt4/Static263.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static263 {
 
-	@OriginalMember(owner = "client!vg", name = "a", descriptor = "[Lclient!na;")
-	public static JagString[] aClass100Array174;
-
 	@OriginalMember(owner = "client!vg", name = "e", descriptor = "[I")
 	public static int[] anIntArray516;
 
@@ -18,10 +15,7 @@ public final class Static263 {
 	@OriginalMember(owner = "client!vg", name = "c", descriptor = "Z")
 	public static boolean aBoolean299 = false;
 
-	@OriginalMember(owner = "client!vg", name = "d", descriptor = "I")
-	public static int anInt5755 = 2;
-
-    @OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S")
+	@OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S")
 	public static short[] method4511(@OriginalArg(1) short[] arg0) {
 		if (arg0 == null) {
 			return null;
diff --git a/client/src/main/java/rt4/Static264.java b/client/src/main/java/rt4/Static264.java
index 0acb964..643325c 100644
--- a/client/src/main/java/rt4/Static264.java
+++ b/client/src/main/java/rt4/Static264.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static264 {
 
-	@OriginalMember(owner = "client!vh", name = "e", descriptor = "I")
-	public static int anInt4623;
-
-	@OriginalMember(owner = "client!vh", name = "b", descriptor = "[I")
+    @OriginalMember(owner = "client!vh", name = "b", descriptor = "[I")
 	public static final int[] anIntArray410 = new int[100];
 
 	@OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;")
diff --git a/client/src/main/java/rt4/Static265.java b/client/src/main/java/rt4/Static265.java
index 0d21364..87cc50c 100644
--- a/client/src/main/java/rt4/Static265.java
+++ b/client/src/main/java/rt4/Static265.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static265 {
 
-	@OriginalMember(owner = "client!vj", name = "d", descriptor = "I")
-	public static int anInt5765;
-
-	@OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J")
+    @OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J")
 	public static long method4521(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
 		return local7 == null || local7.wall == null ? 0L : local7.wall.key;
diff --git a/client/src/main/java/rt4/Static269.java b/client/src/main/java/rt4/Static269.java
index bfc9b56..6d2e72c 100644
--- a/client/src/main/java/rt4/Static269.java
+++ b/client/src/main/java/rt4/Static269.java
@@ -35,7 +35,7 @@ public final class Static269 {
 		for (local14 = 0; local14 < local99; local14++) {
 			for (local21 = 0; local21 < 64; local21++) {
 				for (local117 = 0; local117 < 64; local117++) {
-					Static278.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14);
+					SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14);
 				}
 			}
 		}
@@ -79,7 +79,7 @@ public final class Static269 {
 					}
 					while (local243 < local188) {
 						while (local190 < local194) {
-							Static232.aByteArrayArrayArray13[local117][local243][local190] = 0;
+							SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0;
 							local190++;
 						}
 						local243++;
@@ -91,7 +91,7 @@ public final class Static269 {
 							for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) {
 								for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) {
 									if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) {
-										Static232.aByteArrayArrayArray13[local117][local194][local320] = local305;
+										SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305;
 									}
 								}
 							}
@@ -124,7 +124,7 @@ public final class Static269 {
 					}
 					while (local188 > local243) {
 						while (local190 < local194) {
-							Static232.aByteArrayArrayArray13[local117][local243][local190] = Static232.aByteArrayArrayArray13[local117 - 1][local243][local190];
+							SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190];
 							local190++;
 						}
 						local243++;
@@ -157,7 +157,7 @@ public final class Static269 {
 							local243 = local117 + (arg4 >> 3);
 							local188 = (arg3 >> 3) + local515;
 							if (local243 >= 0 && local243 < 13 && local188 >= 0 && local188 < 13) {
-								Static192.aClass92ArrayArray1[local243][local188] = local490;
+								Static103.aClass92ArrayArray1[local243][local188] = local490;
 							}
 						}
 					}
@@ -190,7 +190,7 @@ public final class Static269 {
 					local243 = (arg4 >> 2) + local117;
 					local188 = local515 + (arg3 >> 2);
 					if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) {
-						Static232.aByteArrayArrayArray13[local21][local243][local188] = 0;
+						SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0;
 					}
 				}
 			}
@@ -208,7 +208,7 @@ public final class Static269 {
 			Static232.method3993(512);
 			Static132.method2608();
 		} else {
-			Static38.method960((byte) (Static136.anInt3325 - 4 & 0xFF));
+			Static38.method960((byte) (Static253.anInt3325 - 4 & 0xFF));
 			Static232.method3993(2);
 		}
 	}
diff --git a/client/src/main/java/rt4/Static27.java b/client/src/main/java/rt4/Static27.java
deleted file mode 100644
index 0896c49..0000000
--- a/client/src/main/java/rt4/Static27.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static27 {
-
-	@OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;")
-	public static final JagString aClass100_164 = JagString.parse(" )2> <col=00ffff>");
-
-}
diff --git a/client/src/main/java/rt4/Static270.java b/client/src/main/java/rt4/Static270.java
index 81d2bfe..fbae261 100644
--- a/client/src/main/java/rt4/Static270.java
+++ b/client/src/main/java/rt4/Static270.java
@@ -17,111 +17,6 @@ public final class Static270 {
 	@OriginalMember(owner = "client!wb", name = "c", descriptor = "I")
 	public static int anInt5794 = -1;
 
-    @OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1090 = JagString.parse("l");
-
-    @OriginalMember(owner = "client!wb", name = "a", descriptor = "(IIIIIIII)V")
-	public static void method4594(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
-		@Pc(7) int local7 = 0;
-		@Pc(9) int local9 = arg5;
-		@Pc(11) int local11 = 0;
-		@Pc(16) int local16 = arg4 - arg6;
-		@Pc(20) int local20 = arg4 * arg4;
-		@Pc(25) int local25 = arg5 - arg6;
-		@Pc(29) int local29 = arg5 * arg5;
-		@Pc(33) int local33 = local25 * local25;
-		@Pc(37) int local37 = local29 << 1;
-		@Pc(41) int local41 = local20 << 1;
-		@Pc(45) int local45 = local33 << 1;
-		@Pc(49) int local49 = local16 * local16;
-		@Pc(53) int local53 = local49 << 1;
-		@Pc(57) int local57 = arg5 << 1;
-		@Pc(61) int local61 = local25 << 1;
-		@Pc(70) int local70 = local29 - (local57 - 1) * local41;
-		@Pc(80) int local80 = local49 * (1 - local61) + local45;
-		@Pc(89) int local89 = (1 - local57) * local20 + local37;
-		@Pc(93) int local93 = local20 << 2;
-		@Pc(102) int local102 = local33 - local53 * (local61 - 1);
-		@Pc(106) int local106 = local49 << 2;
-		@Pc(110) int local110 = local29 << 2;
-		@Pc(114) int local114 = local33 << 2;
-		@Pc(120) int local120 = (local57 - 3) * local41;
-		@Pc(124) int local124 = local37 * 3;
-		@Pc(130) int local130 = (local61 - 3) * local53;
-		@Pc(134) int local134 = local45 * 3;
-		@Pc(136) int local136 = local110;
-		@Pc(138) int local138 = local114;
-		@Pc(144) int local144 = (local25 - 1) * local106;
-		@Pc(162) int local162 = (arg5 - 1) * local93;
-		@Pc(166) int[] local166 = Static71.anIntArrayArray10[arg2];
-		Static131.method2576(local166, arg1 - arg4, -local16 + arg1, arg3);
-		Static131.method2576(local166, arg1 - local16, arg1 - -local16, arg0);
-		Static131.method2576(local166, arg1 + local16, arg4 + arg1, arg3);
-		while (local9 > 0) {
-			if (local89 < 0) {
-				while (local89 < 0) {
-					local70 += local136;
-					local89 += local124;
-					local7++;
-					local136 += local110;
-					local124 += local110;
-				}
-			}
-			if (local70 < 0) {
-				local89 += local124;
-				local7++;
-				local124 += local110;
-				local70 += local136;
-				local136 += local110;
-			}
-			@Pc(258) boolean local258 = local9 <= local25;
-			if (local258) {
-				if (local80 < 0) {
-					while (local80 < 0) {
-						local80 += local134;
-						local134 += local114;
-						local11++;
-						local102 += local138;
-						local138 += local114;
-					}
-				}
-				if (local102 < 0) {
-					local80 += local134;
-					local11++;
-					local134 += local114;
-					local102 += local138;
-					local138 += local114;
-				}
-				local102 += -local130;
-				local130 -= local106;
-				local80 += -local144;
-				local144 -= local106;
-			}
-			local89 += -local162;
-			local70 += -local120;
-			local120 -= local93;
-			local9--;
-			@Pc(348) int local348 = arg2 - local9;
-			@Pc(352) int local352 = local7 + arg1;
-			local162 -= local93;
-			@Pc(360) int local360 = local9 + arg2;
-			@Pc(365) int local365 = arg1 - local7;
-			if (local258) {
-				@Pc(371) int local371 = arg1 + local11;
-				@Pc(376) int local376 = arg1 - local11;
-				Static131.method2576(Static71.anIntArrayArray10[local348], local365, local376, arg3);
-				Static131.method2576(Static71.anIntArrayArray10[local348], local376, local371, arg0);
-				Static131.method2576(Static71.anIntArrayArray10[local348], local371, local352, arg3);
-				Static131.method2576(Static71.anIntArrayArray10[local360], local365, local376, arg3);
-				Static131.method2576(Static71.anIntArrayArray10[local360], local376, local371, arg0);
-				Static131.method2576(Static71.anIntArrayArray10[local360], local371, local352, arg3);
-			} else {
-				Static131.method2576(Static71.anIntArrayArray10[local348], local365, local352, arg3);
-				Static131.method2576(Static71.anIntArrayArray10[local360], local365, local352, arg3);
-			}
-		}
-	}
-
 	@OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I")
 	public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) {
 		if (arg1 == 1) {
diff --git a/client/src/main/java/rt4/Static271.java b/client/src/main/java/rt4/Static271.java
deleted file mode 100644
index 6a8846b..0000000
--- a/client/src/main/java/rt4/Static271.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static271 {
-
-	@OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
-	public static int anInt5804 = 0;
-
-	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
-	public static void writeRandom(@OriginalArg(0) Buffer arg0) {
-		if (client.uid != null) {
-			try {
-				client.uid.seek(0L);
-				client.uid.write(arg0.data, arg0.offset, 24);
-			} catch (@Pc(16) Exception local16) {
-			}
-		}
-		arg0.offset += 24;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static272.java b/client/src/main/java/rt4/Static272.java
deleted file mode 100644
index 7c5ee58..0000000
--- a/client/src/main/java/rt4/Static272.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static272 {
-
-    @OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V")
-	public static void setVarbit(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(14) VarbitType local14 = VarbitTypeList.get(arg1);
-		@Pc(17) int local17 = local14.baseVar;
-		@Pc(20) int local20 = local14.endBit;
-		@Pc(23) int local23 = local14.startBit;
-		@Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local20 - local23];
-		if (arg0 < 0 || local29 < arg0) {
-			arg0 = 0;
-		}
-		local29 <<= local23;
-		VarpDomain.set(arg0 << local23 & local29 | ~local29 & VarpDomain.varp[local17], local17);
-	}
-}
diff --git a/client/src/main/java/rt4/Static273.java b/client/src/main/java/rt4/Static273.java
deleted file mode 100644
index 70ae9e6..0000000
--- a/client/src/main/java/rt4/Static273.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static273 {
-
-	@OriginalMember(owner = "client!we", name = "H", descriptor = "[[B")
-	public static byte[][] mapFilesBuffer;
-
-	@OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
-	public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
-		if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) {
-			return -2;
-		}
-		try {
-			@Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0];
-			@Pc(35) byte local35 = 0;
-			@Pc(37) int local37 = 0;
-			@Pc(39) int local39 = 0;
-			while (true) {
-				@Pc(41) int local41 = 0;
-				@Pc(46) int local46 = local33[local39++];
-				@Pc(48) byte local48 = 0;
-				if (local46 == 0) {
-					return local37;
-				}
-				if (local46 == 15) {
-					local48 = 1;
-				}
-				if (local46 == 16) {
-					local48 = 2;
-				}
-				if (local46 == 1) {
-					local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]];
-				}
-				if (local46 == 17) {
-					local48 = 3;
-				}
-				if (local46 == 2) {
-					local41 = PlayerSkillXpTable.baseLevels[local33[local39++]];
-				}
-				if (local46 == 3) {
-					local41 = PlayerSkillXpTable.experience[local33[local39++]];
-				}
-				@Pc(124) int local124;
-				@Pc(135) Component local135;
-				@Pc(140) int local140;
-				@Pc(152) int local152;
-				if (local46 == 4) {
-					local124 = local33[local39++] << 16;
-					@Pc(131) int local131 = local124 + local33[local39++];
-					local135 = InterfaceList.getComponent(local131);
-					local140 = local33[local39++];
-					if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
-						for (local152 = 0; local152 < local135.objTypes.length; local152++) {
-							if (local140 + 1 == local135.objTypes[local152]) {
-								local41 += local135.objCounts[local152];
-							}
-						}
-					}
-				}
-				if (local46 == 5) {
-					local41 = VarpDomain.activeVarps[local33[local39++]];
-				}
-				if (local46 == 6) {
-					local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1];
-				}
-				if (local46 == 7) {
-					local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875;
-				}
-				if (local46 == 8) {
-					local41 = PlayerList.self.combatLevel;
-				}
-				if (local46 == 9) {
-					for (local124 = 0; local124 < 25; local124++) {
-						if (Static182.aBooleanArray97[local124]) {
-							local41 += PlayerSkillXpTable.baseLevels[local124];
-						}
-					}
-				}
-				if (local46 == 10) {
-					local124 = local33[local39++] << 16;
-					local124 += local33[local39++];
-					local135 = InterfaceList.getComponent(local124);
-					local140 = local33[local39++];
-					if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
-						for (local152 = 0; local152 < local135.objTypes.length; local152++) {
-							if (local135.objTypes[local152] == local140 + 1) {
-								local41 = 999999999;
-								break;
-							}
-						}
-					}
-				}
-				if (local46 == 11) {
-					local41 = Player.runEnergy;
-				}
-				if (local46 == 12) {
-					local41 = Player.weight;
-				}
-				if (local46 == 13) {
-					local124 = VarpDomain.activeVarps[local33[local39++]];
-					@Pc(353) int local353 = local33[local39++];
-					local41 = (0x1 << local353 & local124) == 0 ? 0 : 1;
-				}
-				if (local46 == 14) {
-					local124 = local33[local39++];
-					local41 = Static155.getVarbit(local124);
-				}
-				if (local46 == 18) {
-					local41 = (PlayerList.self.xFine >> 7) + Static225.originX;
-				}
-				if (local46 == 19) {
-					local41 = (PlayerList.self.zFine >> 7) + Static142.originZ;
-				}
-				if (local46 == 20) {
-					local41 = local33[local39++];
-				}
-				if (local48 == 0) {
-					if (local35 == 0) {
-						local37 += local41;
-					}
-					if (local35 == 1) {
-						local37 -= local41;
-					}
-					if (local35 == 2 && local41 != 0) {
-						local37 /= local41;
-					}
-					if (local35 == 3) {
-						local37 *= local41;
-					}
-					local35 = 0;
-				} else {
-					local35 = local48;
-				}
-			}
-		} catch (@Pc(464) Exception local464) {
-			return -1;
-		}
-	}
-
-	@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
-	public static void method3214(@OriginalArg(1) int arg0) {
-		for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) {
-			if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) {
-				local11.unlink();
-			}
-		}
-	}
-}
diff --git a/client/src/main/java/rt4/Static276.java b/client/src/main/java/rt4/Static276.java
deleted file mode 100644
index e9b1f1b..0000000
--- a/client/src/main/java/rt4/Static276.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static276 {
-
-	@OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;")
-	public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
-
-	@OriginalMember(owner = "client!wh", name = "m", descriptor = "[I")
-	public static final int[] cameraAmplitude = new int[5];
-
-    @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z")
-	public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		if (Static9.method187(arg0, arg1, arg2)) {
-			@Pc(10) int local10 = arg1 << 7;
-			@Pc(14) int local14 = arg2 << 7;
-			return SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
-		} else {
-			return false;
-		}
-	}
-
-	@OriginalMember(owner = "client!wh", name = "b", descriptor = "(B)Lclient!ok;")
-	public static IndexedSprite method4614() {
-		@Pc(27) IndexedSprite local27;
-		if (GlRenderer.enabled) {
-			local27 = new GlIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette);
-		} else {
-			local27 = new SoftwareIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette);
-		}
-		SpriteLoader.clear();
-		return local27;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static277.java b/client/src/main/java/rt4/Static277.java
deleted file mode 100644
index 72a34aa..0000000
--- a/client/src/main/java/rt4/Static277.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static277 {
-
-	@OriginalMember(owner = "client!wi", name = "R", descriptor = "[Lclient!qf;")
-	public static Sprite[] hintMapEdge;
-
-	@OriginalMember(owner = "client!wi", name = "db", descriptor = "I")
-	public static int tileVisibilityDistance;
-
-	@OriginalMember(owner = "client!wi", name = "W", descriptor = "I")
-	public static int anInt5850 = 0;
-
-	@OriginalMember(owner = "client!wi", name = "X", descriptor = "[[B")
-	public static final byte[][] aByteArrayArray16 = new byte[1000][];
-
-	@OriginalMember(owner = "client!wi", name = "bb", descriptor = "I")
-	public static int anInt5854 = 0;
-
-	@OriginalMember(owner = "client!wi", name = "hb", descriptor = "[[Z")
-	public static final boolean[][] aBooleanArrayArray4 = new boolean[][] { { true, true, true }, { false, false }, { false, true }, { true, false }, { false, true, true }, { true, false, true }, { false, true, false }, { true, false, false } };
-
-	@OriginalMember(owner = "client!wi", name = "c", descriptor = "(II)Z")
-	public static boolean method4640(@OriginalArg(0) int arg0) {
-		if (arg0 < 0) {
-			return false;
-		}
-		@Pc(12) int local12 = MiniMenu.actions[arg0];
-		if (local12 >= 2000) {
-			local12 -= 2000;
-		}
-		return local12 == 1003;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static278.java b/client/src/main/java/rt4/Static278.java
deleted file mode 100644
index d0e1f3e..0000000
--- a/client/src/main/java/rt4/Static278.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static278 {
-
-    @OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1103 = JagString.parse("ul");
-
-	@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIIIIII)V")
-	public static void method4647(@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) int arg6) {
-		@Pc(3) Class120 local3 = new Class120();
-		local3.anInt4452 = arg1 / 128;
-		local3.anInt4446 = arg2 / 128;
-		local3.anInt4461 = arg3 / 128;
-		local3.anInt4464 = arg4 / 128;
-		local3.anInt4453 = arg0;
-		local3.anInt4460 = arg1;
-		local3.anInt4445 = arg2;
-		local3.anInt4458 = arg3;
-		local3.anInt4449 = arg4;
-		local3.anInt4444 = arg5;
-		local3.anInt4447 = arg6;
-		SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3;
-	}
-
-	@OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V")
-	public static void setRenderTiles(@OriginalArg(0) boolean arg0) {
-		if (arg0) {
-			SceneGraph.tiles = SceneGraph.underWaterGroundTiles;
-			SceneGraph.tileHeights = SceneGraph.underwaterTileHeights;
-			Static182.aClass3_Sub14ArrayArray2 = SceneGraph.underWaterHdTiles;
-		} else {
-			SceneGraph.tiles = SceneGraph.surfaceGroundTiles;
-			SceneGraph.tileHeights = SceneGraph.surfaceTileHeights;
-			Static182.aClass3_Sub14ArrayArray2 = SceneGraph.surfaceHdTiles;
-		}
-		Static126.anInt3114 = SceneGraph.tiles.length;
-	}
-
-	@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIZLclient!wa;IIBII)V")
-	public static void readTile(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) Buffer arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
-		@Pc(32) int local32;
-		if (arg5 < 0 || arg5 >= 104 || arg4 < 0 || arg4 >= 104) {
-			while (true) {
-				local32 = arg3.g1();
-				if (local32 == 0) {
-					break;
-				}
-				if (local32 == 1) {
-					arg3.g1();
-					break;
-				}
-				if (local32 <= 49) {
-					arg3.g1();
-				}
-			}
-			return;
-		}
-		if (!arg2) {
-			SceneGraph.tileFlags[arg7][arg5][arg4] = 0;
-		}
-		while (true) {
-			local32 = arg3.g1();
-			if (local32 == 0) {
-				if (arg2) {
-					SceneGraph.tileHeights[0][arg5][arg4] = SceneGraph.surfaceTileHeights[0][arg5][arg4];
-				} else if (arg7 == 0) {
-					SceneGraph.tileHeights[0][arg5][arg4] = -PerlinNoise.getTileHeight(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8;
-				} else {
-					SceneGraph.tileHeights[arg7][arg5][arg4] = SceneGraph.tileHeights[arg7 - 1][arg5][arg4] - 240;
-				}
-				break;
-			}
-			if (local32 == 1) {
-				@Pc(111) int local111 = arg3.g1();
-				if (arg2) {
-					SceneGraph.tileHeights[0][arg5][arg4] = SceneGraph.surfaceTileHeights[0][arg5][arg4] + local111 * 8;
-				} else {
-					if (local111 == 1) {
-						local111 = 0;
-					}
-					if (arg7 == 0) {
-						SceneGraph.tileHeights[0][arg5][arg4] = -local111 * 8;
-					} else {
-						SceneGraph.tileHeights[arg7][arg5][arg4] = SceneGraph.tileHeights[arg7 - 1][arg5][arg4] - local111 * 8;
-					}
-				}
-				break;
-			}
-			if (local32 <= 49) {
-				SceneGraph.tileOverlays[arg7][arg5][arg4] = arg3.g1s();
-				SceneGraph.tileShapes[arg7][arg5][arg4] = (byte) ((local32 - 2) / 4);
-				SceneGraph.tileAngles[arg7][arg5][arg4] = (byte) (local32 + arg6 - 2 & 0x3);
-			} else if (local32 > 81) {
-				SceneGraph.tileUnderlays[arg7][arg5][arg4] = (byte) (local32 - 81);
-			} else if (!arg2) {
-				SceneGraph.tileFlags[arg7][arg5][arg4] = (byte) (local32 - 49);
-			}
-		}
-	}
-
-	@OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V")
-	public static void processLogout() {
-		if (Protocol.socket != null) {
-			Protocol.socket.close();
-			Protocol.socket = null;
-		}
-		client.method3768();
-		SceneGraph.clear();
-		@Pc(19) int local19;
-		for (local19 = 0; local19 < 4; local19++) {
-			PathFinder.collisionMaps[local19].resetFlags();
-		}
-		WorldMap.clear(false);
-		System.gc();
-		MidiPlayer.method801();
-		MidiPlayer.jingle = false;
-		MusicPlayer.groupId = -1;
-		AreaSoundManager.clear(true);
-		Static230.dynamicMapRegion = false;
-		Static142.originZ = 0;
-		Static80.centralZoneX = 0;
-		Static52.anInt1695 = 0;
-		Static225.originX = 0;
-		for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) {
-			Static143.hintMapMarkers[local19] = null;
-		}
-		PlayerList.size = 0;
-		NpcList.size = 0;
-		for (local19 = 0; local19 < 2048; local19++) {
-			PlayerList.players[local19] = null;
-			PlayerList.appearanceCache[local19] = null;
-		}
-		for (local19 = 0; local19 < 32768; local19++) {
-			NpcList.npcs[local19] = null;
-		}
-		for (local19 = 0; local19 < 4; local19++) {
-			for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
-				for (@Pc(122) int local122 = 0; local122 < 104; local122++) {
-					SceneGraph.objStacks[local19][local115][local122] = null;
-				}
-			}
-		}
-		Static35.resetCameraEffects();
-		Protocol.verifyId = 0;
-		VarpDomain.reset();
-		Static73.method1596(true);
-	}
-}
diff --git a/client/src/main/java/rt4/Static28.java b/client/src/main/java/rt4/Static28.java
index 416e53a..85538e6 100644
--- a/client/src/main/java/rt4/Static28.java
+++ b/client/src/main/java/rt4/Static28.java
@@ -9,7 +9,7 @@ public final class Static28 {
 	public static void method792(@OriginalArg(3) int tileVisibility, @OriginalArg(4) boolean hasUnderWaterMap) {
 		SceneGraph.mapSizeX = 104;
 		SceneGraph.mapSizeZ = 104;
-		Static277.tileVisibilityDistance = tileVisibility;
+		Static123.tileVisibilityDistance = tileVisibility;
 		SceneGraph.surfaceGroundTiles = new Tile[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ];
 		SceneGraph.surfaceTileHeights = new int[4][SceneGraph.mapSizeX + 1][SceneGraph.mapSizeZ + 1];
 		if (GlRenderer.enabled) {
@@ -28,7 +28,7 @@ public final class Static28 {
 			SceneGraph.underwaterTileHeights = null;
 			SceneGraph.underWaterHdTiles = null;
 		}
-		Static278.setRenderTiles(false);
+		SceneGraph.setRenderTiles(false);
 		SceneGraph.aClass120Array1 = new Class120[500];
 		SceneGraph.anInt917 = 0;
 		SceneGraph.aClass120Array2 = new Class120[500];
@@ -37,8 +37,8 @@ public final class Static28 {
 		SceneGraph.aClass31Array3 = new Scenery[5000];
 		SceneGraph.anInt726 = 0;
 		SceneGraph.aClass31Array2 = new Scenery[100];
-		Static48.aBooleanArrayArray1 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1];
-		Static89.aBooleanArrayArray3 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2];
-		Static232.aByteArrayArrayArray13 = new byte[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ];
+		Static48.aBooleanArrayArray1 = new boolean[Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1][Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1];
+		Static89.aBooleanArrayArray3 = new boolean[Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2][Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2];
+		SceneGraph.aByteArrayArrayArray13 = new byte[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ];
 	}
 }
diff --git a/client/src/main/java/rt4/Static280.java b/client/src/main/java/rt4/Static280.java
index 53ae118..c34cd7d 100644
--- a/client/src/main/java/rt4/Static280.java
+++ b/client/src/main/java/rt4/Static280.java
@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static280 {
 
@@ -12,619 +10,4 @@ public final class Static280 {
 	@OriginalMember(owner = "client!wl", name = "u", descriptor = "I")
 	public static int anInt5895 = 0;
 
-	@OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V")
-	public static void method4667(@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) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) {
-		@Pc(7) int local7 = arg2;
-		if (SoftwareRaster.clipRight <= arg2) {
-			return;
-		}
-		if (arg2 < SoftwareRaster.clipLeft) {
-			local7 = SoftwareRaster.clipLeft;
-		}
-		@Pc(30) int local30 = arg7 + arg2;
-		if (SoftwareRaster.clipLeft >= local30) {
-			return;
-		}
-		if (SoftwareRaster.clipRight < local30) {
-			local30 = SoftwareRaster.clipRight;
-		}
-		@Pc(43) int local43 = arg8;
-		if (SoftwareRaster.clipBottom <= arg8) {
-			return;
-		}
-		@Pc(56) int local56 = arg8 + arg6;
-		if (arg8 < SoftwareRaster.clipTop) {
-			local43 = SoftwareRaster.clipTop;
-		}
-		if (local56 <= SoftwareRaster.clipTop) {
-			return;
-		}
-		@Pc(79) int local79 = local7 + SoftwareRaster.width * local43;
-		if (arg5 == 9) {
-			arg3 = arg3 + 1 & 0x3;
-			arg5 = 1;
-		}
-		@Pc(99) int local99 = local7 + SoftwareRaster.width - local30;
-		local43 -= arg8;
-		@Pc(108) int local108 = arg6 - local43;
-		if (SoftwareRaster.clipBottom < local56) {
-			local56 = SoftwareRaster.clipBottom;
-		}
-		if (arg5 == 10) {
-			arg3 = arg3 + 3 & 0x3;
-			arg5 = 1;
-		}
-		local7 -= arg2;
-		@Pc(136) int local136 = arg7 - local7;
-		if (arg5 == 11) {
-			arg3 = arg3 + 3 & 0x3;
-			arg5 = 8;
-		}
-		local30 -= arg2;
-		@Pc(157) int local157 = arg7 - local30;
-		local56 -= arg8;
-		@Pc(165) int local165 = arg6 - local56;
-		@Pc(175) int local175;
-		@Pc(184) int local184;
-		if (arg5 == 1) {
-			if (arg3 == 0) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local184 <= local175) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 1) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local175 >= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 2) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local184 >= local175) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 3) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local184 >= local175) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			}
-		} else if (arg5 == 2) {
-			if (arg3 == 0) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local175 >> 1 >= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 1) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local79 >= 0 && local79 < arg0.length) {
-							if (local175 << 1 <= local184) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						} else {
-							local79++;
-						}
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 2) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local136 - 1; local184 >= local157; local184--) {
-						if (local175 >> 1 >= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 3) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local136 - 1; local184 >= local157; local184--) {
-						if (local175 << 1 <= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			}
-		} else if (arg5 == 3) {
-			if (arg3 == 0) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local136 - 1; local184 >= local157; local184--) {
-						if (local175 >> 1 >= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 1) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local184 >= local175 << 1) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 2) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local184 <= local175 >> 1) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 3) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local136 - 1; local184 >= local157; local184--) {
-						if (local175 << 1 <= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			}
-		} else if (arg5 == 4) {
-			if (arg3 == 0) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local175 >> 1 <= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 1) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local7; local184 < local30; local184++) {
-						if (local175 << 1 >= local184) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 2) {
-				for (local175 = local43; local175 < local56; local175++) {
-					for (local184 = local136 - 1; local184 >= local157; local184--) {
-						if (local184 >= local175 >> 1) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			} else if (arg3 == 3) {
-				for (local175 = local108 - 1; local175 >= local165; local175--) {
-					for (local184 = local136 - 1; local184 >= local157; local184--) {
-						if (local184 <= local175 << 1) {
-							arg0[local79] = arg1;
-						} else if (arg9) {
-							arg0[local79] = arg4;
-						}
-						local79++;
-					}
-					local79 += local99;
-				}
-			}
-		} else if (arg5 != 5) {
-			if (arg5 == 6) {
-				if (arg3 == 0) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local184 <= arg7 / 2) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 1) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local175 <= arg6 / 2) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 2) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local184 >= arg7 / 2) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 3) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local175 >= arg6 / 2) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-			}
-			if (arg5 == 7) {
-				if (arg3 == 0) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local184 <= local175 - arg6 / 2) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 1) {
-					for (local175 = local108 - 1; local175 >= local165; local175--) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local175 - arg6 / 2 >= local184) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 2) {
-					for (local175 = local108 - 1; local175 >= local165; local175--) {
-						for (local184 = local136 - 1; local184 >= local157; local184--) {
-							if (local184 <= local175 - arg6 / 2) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 3) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local136 - 1; local184 >= local157; local184--) {
-							if (local175 - arg6 / 2 >= local184) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-			}
-			if (arg5 == 8) {
-				if (arg3 == 0) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local175 - arg6 / 2 <= local184) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 1) {
-					for (local175 = local108 - 1; local175 >= local165; local175--) {
-						for (local184 = local7; local184 < local30; local184++) {
-							if (local175 - arg6 / 2 <= local184) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 2) {
-					for (local175 = local108 - 1; local175 >= local165; local175--) {
-						for (local184 = local136 - 1; local184 >= local157; local184--) {
-							if (local184 >= local175 - arg6 / 2) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-				if (arg3 == 3) {
-					for (local175 = local43; local175 < local56; local175++) {
-						for (local184 = local136 - 1; local184 >= local157; local184--) {
-							if (local175 - arg6 / 2 <= local184) {
-								arg0[local79] = arg1;
-							} else if (arg9) {
-								arg0[local79] = arg4;
-							}
-							local79++;
-						}
-						local79 += local99;
-					}
-					return;
-				}
-			}
-		} else if (arg3 == 0) {
-			for (local175 = local108 - 1; local175 >= local165; local175--) {
-				for (local184 = local136 - 1; local184 >= local157; local184--) {
-					if (local175 >> 1 <= local184) {
-						arg0[local79] = arg1;
-					} else if (arg9) {
-						arg0[local79] = arg4;
-					}
-					local79++;
-				}
-				local79 += local99;
-			}
-		} else if (arg3 == 1) {
-			for (local175 = local108 - 1; local175 >= local165; local175--) {
-				for (local184 = local7; local184 < local30; local184++) {
-					if (local184 <= local175 << 1) {
-						arg0[local79] = arg1;
-					} else if (arg9) {
-						arg0[local79] = arg4;
-					}
-					local79++;
-				}
-				local79 += local99;
-			}
-		} else if (arg3 == 2) {
-			for (local175 = local43; local175 < local56; local175++) {
-				for (local184 = local7; local184 < local30; local184++) {
-					if (local184 >= local175 >> 1) {
-						arg0[local79] = arg1;
-					} else if (arg9) {
-						arg0[local79] = arg4;
-					}
-					local79++;
-				}
-				local79 += local99;
-			}
-		} else if (arg3 == 3) {
-			for (local175 = local43; local175 < local56; local175++) {
-				for (local184 = local136 - 1; local184 >= local157; local184--) {
-					if (local175 << 1 >= local184) {
-						arg0[local79] = arg1;
-					} else if (arg9) {
-						arg0[local79] = arg4;
-					}
-					local79++;
-				}
-				local79 += local99;
-			}
-		}
-	}
-
-	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;")
-	public static Component method4668(@OriginalArg(0) Component arg0) {
-		if (arg0.layer != -1) {
-			return InterfaceList.getComponent(arg0.layer);
-		}
-		@Pc(28) int local28 = arg0.id >>> 16;
-		@Pc(33) HashTableIterator local33 = new HashTableIterator(InterfaceList.openInterfaces);
-		for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) {
-			if (local28 == local38.anInt5878) {
-				return InterfaceList.getComponent((int) local38.key);
-			}
-		}
-		return null;
-	}
-
-	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V")
-	public static void method4670(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
-		@Pc(18) int local18 = arg2 - arg4;
-		Static251.method4278(arg2);
-		@Pc(23) int local23 = 0;
-		if (local18 < 0) {
-			local18 = 0;
-		}
-		@Pc(32) int local32 = arg2;
-		@Pc(35) int local35 = -arg2;
-		@Pc(38) int local38 = -local18;
-		@Pc(40) int local40 = local18;
-		@Pc(42) int local42 = -1;
-		@Pc(61) int local61;
-		@Pc(69) int local69;
-		@Pc(78) int local78;
-		@Pc(87) int local87;
-		if (arg1 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg1) {
-			@Pc(52) int[] local52 = Static71.anIntArrayArray10[arg1];
-			local61 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164);
-			local69 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164);
-			local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164);
-			local87 = Static78.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164);
-			Static131.method2576(local52, local61, local78, arg3);
-			Static131.method2576(local52, local78, local87, arg0);
-			Static131.method2576(local52, local87, local69, arg3);
-		}
-		@Pc(107) int local107 = -1;
-		while (local23 < local32) {
-			local42 += 2;
-			local107 += 2;
-			local38 += local107;
-			local35 += local42;
-			if (local38 >= 0 && local40 >= 1) {
-				local40--;
-				Static241.anIntArray522[local40] = local23;
-				local38 -= local40 << 1;
-			}
-			local23++;
-			@Pc(264) int local264;
-			@Pc(273) int local273;
-			@Pc(280) int[] local280;
-			@Pc(161) int local161;
-			if (local35 >= 0) {
-				local32--;
-				local35 -= local32 << 1;
-				local161 = arg1 - local32;
-				local61 = arg1 + local32;
-				if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
-					if (local32 >= local18) {
-						local69 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
-						local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
-						if (TextureOp29.anInt2869 >= local61) {
-							Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
-						}
-						if (local161 >= TextureOp29.anInt5773) {
-							Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
-						}
-					} else {
-						local69 = Static241.anIntArray522[local32];
-						local78 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
-						local87 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
-						local264 = Static78.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164);
-						local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164);
-						if (TextureOp29.anInt2869 >= local61) {
-							local280 = Static71.anIntArrayArray10[local61];
-							Static131.method2576(local280, local87, local273, arg3);
-							Static131.method2576(local280, local273, local264, arg0);
-							Static131.method2576(local280, local264, local78, arg3);
-						}
-						if (local161 >= TextureOp29.anInt5773) {
-							local280 = Static71.anIntArrayArray10[local161];
-							Static131.method2576(local280, local87, local273, arg3);
-							Static131.method2576(local280, local273, local264, arg0);
-							Static131.method2576(local280, local264, local78, arg3);
-						}
-					}
-				}
-			}
-			local161 = arg1 - local23;
-			local61 = arg1 + local23;
-			if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
-				local69 = arg5 + local32;
-				local78 = arg5 - local32;
-				if (local69 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= local78) {
-					local69 = Static78.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164);
-					local78 = Static78.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164);
-					if (local23 < local18) {
-						local87 = local40 >= local23 ? local40 : Static241.anIntArray522[local23];
-						local264 = Static78.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164);
-						local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164);
-						if (TextureOp29.anInt2869 >= local61) {
-							local280 = Static71.anIntArrayArray10[local61];
-							Static131.method2576(local280, local78, local273, arg3);
-							Static131.method2576(local280, local273, local264, arg0);
-							Static131.method2576(local280, local264, local69, arg3);
-						}
-						if (local161 >= TextureOp29.anInt5773) {
-							local280 = Static71.anIntArrayArray10[local161];
-							Static131.method2576(local280, local78, local273, arg3);
-							Static131.method2576(local280, local273, local264, arg0);
-							Static131.method2576(local280, local264, local69, arg3);
-						}
-					} else {
-						if (TextureOp29.anInt2869 >= local61) {
-							Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
-						}
-						if (local161 >= TextureOp29.anInt5773) {
-							Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
-						}
-					}
-				}
-			}
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static3.java b/client/src/main/java/rt4/Static3.java
deleted file mode 100644
index 91a7b0d..0000000
--- a/client/src/main/java/rt4/Static3.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static3 {
-
-	@OriginalMember(owner = "client!ab", name = "b", descriptor = "I")
-	public static int anInt5868 = 0;
-
-    @OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;")
-	public static Class114[] method4660() {
-		if (Static105.aClass114Array1 == null) {
-			@Pc(16) Class114[] local16 = Static197.method3558(GameShell.signLink);
-			@Pc(20) Class114[] local20 = new Class114[local16.length];
-			@Pc(22) int local22 = 0;
-			label52: for (@Pc(24) int local24 = 0; local24 < local16.length; local24++) {
-				@Pc(32) Class114 local32 = local16[local24];
-				if ((local32.anInt4251 <= 0 || local32.anInt4251 >= 24) && local32.anInt4248 >= 800 && local32.anInt4250 >= 600) {
-					for (@Pc(52) int local52 = 0; local52 < local22; local52++) {
-						@Pc(59) Class114 local59 = local20[local52];
-						if (local32.anInt4248 == local59.anInt4248 && local59.anInt4250 == local32.anInt4250) {
-							if (local32.anInt4251 > local59.anInt4251) {
-								local20[local52] = local32;
-							}
-							continue label52;
-						}
-					}
-					local20[local22] = local32;
-					local22++;
-				}
-			}
-			Static105.aClass114Array1 = new Class114[local22];
-			ArrayUtils.copy(local20, 0, Static105.aClass114Array1, 0, local22);
-			@Pc(112) int[] local112 = new int[Static105.aClass114Array1.length];
-			for (@Pc(114) int local114 = 0; local114 < Static105.aClass114Array1.length; local114++) {
-				@Pc(122) Class114 local122 = Static105.aClass114Array1[local114];
-				local112[local114] = local122.anInt4250 * local122.anInt4248;
-			}
-			Static181.method3346(local112, Static105.aClass114Array1);
-		}
-		return Static105.aClass114Array1;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static31.java b/client/src/main/java/rt4/Static31.java
index b141e28..2d5687f 100644
--- a/client/src/main/java/rt4/Static31.java
+++ b/client/src/main/java/rt4/Static31.java
@@ -15,8 +15,8 @@ public final class Static31 {
 
 	@OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V")
 	public static void method846() {
-		if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Player.level) {
-			Static127.method2463(Player.level, Static52.anInt1695, Static80.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]);
+		if (!SceneGraph.allLevelsAreVisible() && LoginManager.centralPlane != Player.level) {
+			LoginManager.method2463(Player.level, LoginManager.centralZoneZ, LoginManager.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]);
 		} else if (Player.level != Static107.anInt2875 && MiniMap.renderMap(Player.level)) {
 			Static107.anInt2875 = Player.level;
 			Static269.method2218();
diff --git a/client/src/main/java/rt4/Static33.java b/client/src/main/java/rt4/Static33.java
index 887f853..72160f1 100644
--- a/client/src/main/java/rt4/Static33.java
+++ b/client/src/main/java/rt4/Static33.java
@@ -12,6 +12,8 @@ public final class Static33 {
 	public static final JagString aClass100_351 = JagString.parse(" ");
 	@OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;")
 	public static final JagString aClass100_461 = JagString.parse(")1 ");
+	@OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;")
+	public static final JagString aClass100_376 = JagString.parse(" GMT");
 	@OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;")
 	public static PrivilegedRequest openUrlRequest;
 
@@ -61,7 +63,7 @@ public final class Static33 {
 		@Pc(36) int local36 = Static35.aCalendar1.get(Calendar.HOUR_OF_DAY);
 		@Pc(40) int local40 = Static35.aCalendar1.get(Calendar.MINUTE);
 		@Pc(44) int local44 = Static35.aCalendar1.get(Calendar.SECOND);
-		return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, JagString.parseInt(local32), aClass100_351, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), Static264.COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), Static264.COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), Static55.aClass100_376 });
+		return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, JagString.parseInt(local32), aClass100_351, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), Static264.COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), Static264.COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), aClass100_376 });
 	}
 
 	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZIIIIIIFB)[[I")
diff --git a/client/src/main/java/rt4/Static35.java b/client/src/main/java/rt4/Static35.java
index 6d04d1c..3102b0e 100644
--- a/client/src/main/java/rt4/Static35.java
+++ b/client/src/main/java/rt4/Static35.java
@@ -8,10 +8,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static35 {
 
-    @OriginalMember(owner = "client!cl", name = "V", descriptor = "[I")
-	public static int[] underWaterLocationsMapFileIds;
-
-	@OriginalMember(owner = "client!cl", name = "X", descriptor = "I")
+    @OriginalMember(owner = "client!cl", name = "X", descriptor = "I")
 	public static int anInt1091;
 
 	@OriginalMember(owner = "client!cl", name = "K", descriptor = "Ljava/util/Calendar;")
@@ -99,15 +96,4 @@ public final class Static35 {
 		return 0L;
 	}
 
-	@OriginalMember(owner = "client!cl", name = "e", descriptor = "(I)V")
-	public static void resetCameraEffects() {
-		for (@Pc(3) int local3 = 0; local3 < 5; local3++) {
-			Static176.customCameraActive[local3] = false;
-		}
-		Static133.anInt5230 = 0;
-		Static233.anInt5217 = 0;
-		Static155.anInt3718 = -1;
-		Static52.anInt1694 = -1;
-		Static227.cameraType = 1;
-	}
 }
diff --git a/client/src/main/java/rt4/Static36.java b/client/src/main/java/rt4/Static36.java
index 499109a..9584668 100644
--- a/client/src/main/java/rt4/Static36.java
+++ b/client/src/main/java/rt4/Static36.java
@@ -6,10 +6,12 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static36 {
 
-    @OriginalMember(owner = "client!client", name = "lb", descriptor = "[I")
-	public static int[] mapFileIds;
-    @OriginalMember(owner = "client!fk", name = "e", descriptor = "I")
+	@OriginalMember(owner = "client!fk", name = "e", descriptor = "I")
     public static int anInt1885;
+	@OriginalMember(owner = "client!bj", name = "s", descriptor = "I")
+	public static int anInt660 = -1;
+    @OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
+    public static int anInt3337 = 0;
 
     @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;")
 	public static Component method938(@OriginalArg(0) Component arg0) {
@@ -30,7 +32,7 @@ public final class Static36 {
 	public static void method946(@OriginalArg(0) Component[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
 		for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) {
 			@Pc(9) Component component = arg0[local1];
-			if (component != null && component.layer == arg1 && (!component.usingScripts || component.type == 0 || component.aBoolean25 || InterfaceList.getServerActiveProperties(component).accessMask != 0 || component == Static4.aClass13_1 || component.anInt453 == 1338) && (!component.usingScripts || !method947(component))) {
+			if (component != null && component.layer == arg1 && (!component.usingScripts || component.type == 0 || component.aBoolean25 || InterfaceList.getServerActiveProperties(component).accessMask != 0 || component == Static40.aClass13_1 || component.anInt453 == 1338) && (!component.usingScripts || !method947(component))) {
 				@Pc(50) int local50 = component.x + arg6;
 				@Pc(55) int local55 = component.y + arg7;
 				@Pc(61) int local61;
@@ -54,10 +56,10 @@ public final class Static36 {
 					local65 = local73 < arg4 ? local73 : arg4;
 					local67 = local78 < arg5 ? local78 : arg5;
 				}
-				if (component == Static105.aClass13_14) {
+				if (component == Static40.aClass13_14) {
 					Static44.aBoolean83 = true;
 					Static124.anInt3075 = local50;
-					Static20.anInt660 = local55;
+					anInt660 = local55;
 				}
 				if (!component.usingScripts || local61 < local65 && local63 < local67) {
 					if (component.type == 0) {
@@ -71,11 +73,11 @@ public final class Static36 {
 									local164.source.aBoolean19 = false;
 								}
 							}
-							if (Static213.anInt4851 == 0) {
-								Static105.aClass13_14 = null;
-								Static4.aClass13_1 = null;
+							if (Static40.anInt4851 == 0) {
+								Static40.aClass13_14 = null;
+								Static40.aClass13_1 = null;
 							}
-							Static137.anInt3337 = 0;
+							anInt3337 = 0;
 						}
 					}
 					if (component.usingScripts) {
@@ -121,25 +123,25 @@ public final class Static36 {
 						if (local221) {
 							Static40.method1015(Mouse.clickY - local55, Mouse.clickX - local50, component);
 						}
-						if (Static105.aClass13_14 != null && Static105.aClass13_14 != component && local207 && InterfaceList.getServerActiveProperties(component).method509()) {
+						if (Static40.aClass13_14 != null && Static40.aClass13_14 != component && local207 && InterfaceList.getServerActiveProperties(component).method509()) {
 							Static56.aClass13_12 = component;
 						}
-						if (component == Static4.aClass13_1) {
+						if (component == Static40.aClass13_1) {
 							Static146.aBoolean174 = true;
 							Static81.anInt2225 = local50;
 							Static228.anInt5103 = local55;
 						}
 						if (component.aBoolean25 || component.anInt453 != 0) {
 							@Pc(399) HookRequest request;
-							if (local207 && Static58.wheelRotation != 0 && component.onScroll != null) {
+							if (local207 && MouseWheel.wheelRotation != 0 && component.onScroll != null) {
 								request = new HookRequest();
 								request.aBoolean158 = true;
 								request.source = component;
-								request.mouseY = Static58.wheelRotation;
+								request.mouseY = MouseWheel.wheelRotation;
 								request.arguments = component.onScroll;
 								InterfaceList.lowPriorityRequests.addTail(request);
 							}
-							if (Static105.aClass13_14 != null || Static118.aClass13_15 != null || Static60.aBoolean108 || component.anInt453 != 1400 && Static137.anInt3337 > 0) {
+							if (Static40.aClass13_14 != null || Static118.aClass13_15 != null || Static40.aBoolean108 || component.anInt453 != 1400 && anInt3337 > 0) {
 								local221 = false;
 								local212 = false;
 								local207 = false;
@@ -169,27 +171,27 @@ public final class Static36 {
 											@Pc(520) int local520 = k + WorldMap.originX;
 											@Pc(528) int local528 = WorldMap.length + WorldMap.originZ - local516 - 1;
 											Cheat.teleport(local520, local528, 0);
-											ClientProt.method2909();
+											ClientProt.closeWidget();
 											continue;
 										}
-										Static137.anInt3337 = 1;
-										Static246.anInt5388 = Mouse.anInt4873;
-										Static165.anInt4035 = Mouse.anInt5032;
+										anInt3337 = 1;
+										Static40.anInt5388 = Mouse.anInt4873;
+										Static40.anInt4035 = Mouse.anInt5032;
 										continue;
 									}
-									if (local212 && Static137.anInt3337 > 0) {
-										if (Static137.anInt3337 == 1 && (Static246.anInt5388 != Mouse.anInt4873 || Static165.anInt4035 != Mouse.anInt5032)) {
+									if (local212 && anInt3337 > 0) {
+										if (anInt3337 == 1 && (Static40.anInt5388 != Mouse.anInt4873 || Static40.anInt4035 != Mouse.anInt5032)) {
 											Static197.anInt4620 = WorldMap.anInt435;
 											anInt1885 = WorldMap.anInt919;
-											Static137.anInt3337 = 2;
+											anInt3337 = 2;
 										}
-										if (Static137.anInt3337 == 2) {
-											WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static246.anInt5388 - Mouse.anInt4873) * 2.0D / (double) WorldMap.targetZoom));
-											WorldMap.method4641(anInt1885 + (int) ((double) (Static165.anInt4035 - Mouse.anInt5032) * 2.0D / (double) WorldMap.targetZoom));
+										if (anInt3337 == 2) {
+											WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static40.anInt5388 - Mouse.anInt4873) * 2.0D / (double) WorldMap.targetZoom));
+											WorldMap.method4641(anInt1885 + (int) ((double) (Static40.anInt4035 - Mouse.anInt5032) * 2.0D / (double) WorldMap.targetZoom));
 										}
 										continue;
 									}
-									Static137.anInt3337 = 0;
+									anInt3337 = 0;
 									continue;
 								}
 								if (component.anInt453 == 1401) {
@@ -440,7 +442,7 @@ public final class Static36 {
 									InterfaceList.lowPriorityRequests.addTail(local1430);
 								}
 							}
-							if (Static13.aBoolean16 && component.onMinimapUnlock != null) {
+							if (Camera.aBoolean16 && component.onMinimapUnlock != null) {
 								request = new HookRequest();
 								request.source = component;
 								request.arguments = component.onMinimapUnlock;
@@ -448,7 +450,7 @@ public final class Static36 {
 							}
 						}
 					}
-					if (!component.usingScripts && Static105.aClass13_14 == null && Static118.aClass13_15 == null && !Static60.aBoolean108) {
+					if (!component.usingScripts && Static40.aClass13_14 == null && Static118.aClass13_15 == null && !Static40.aBoolean108) {
 						if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) {
 							if (component.anInt470 >= 0) {
 								Static180.aClass13_22 = arg0[component.anInt470];
diff --git a/client/src/main/java/rt4/Static37.java b/client/src/main/java/rt4/Static37.java
deleted file mode 100644
index 83912dc..0000000
--- a/client/src/main/java/rt4/Static37.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rt4;
-
-public final class Static37 {
-
-}
diff --git a/client/src/main/java/rt4/Static38.java b/client/src/main/java/rt4/Static38.java
index 5eea936..0c70b3b 100644
--- a/client/src/main/java/rt4/Static38.java
+++ b/client/src/main/java/rt4/Static38.java
@@ -156,143 +156,4 @@ public final class Static38 {
 		return -1;
 	}
 
-	@OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V")
-	public static void method964(@OriginalArg(0) boolean arg0) {
-		@Pc(3) int local3 = PlayerList.size;
-		if (Static115.mapFlagX == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == Static84.anInt2255) {
-			Static115.mapFlagX = 0;
-		}
-		if (arg0) {
-			local3 = 1;
-		}
-		@Pc(28) int local28;
-		@Pc(39) Player local39;
-		@Pc(82) int local82;
-		@Pc(182) int local182;
-		@Pc(200) int local200;
-		@Pc(214) int local214;
-		@Pc(223) int local223;
-		@Pc(106) int local106;
-		for (local28 = 0; local28 < local3; local28++) {
-			if (arg0) {
-				local39 = PlayerList.self;
-			} else {
-				local39 = PlayerList.players[PlayerList.ids[local28]];
-			}
-			if (local39 != null && local39.method2682()) {
-				@Pc(55) int local55 = local39.getSize();
-				@Pc(77) int local77;
-				if (local55 == 1) {
-					if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
-						local77 = local39.xFine >> 7;
-						local82 = local39.zFine >> 7;
-						if (local77 >= 0 && local77 < 104 && local82 >= 0 && local82 < 104) {
-							local106 = Static31.anIntArrayArray6[local77][local82]++;
-						}
-					}
-				} else if (((local55 & 0x1) != 0 || (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64)) {
-					local77 = local39.xFine - local55 * 64 >> 7;
-					local82 = local39.zFine - local55 * 64 >> 7;
-					local182 = local39.getSize() + local77;
-					if (local182 > 104) {
-						local182 = 104;
-					}
-					if (local77 < 0) {
-						local77 = 0;
-					}
-					local200 = local82 + local39.getSize();
-					if (local82 < 0) {
-						local82 = 0;
-					}
-					if (local200 > 104) {
-						local200 = 104;
-					}
-					for (local214 = local77; local214 < local182; local214++) {
-						for (local223 = local82; local223 < local200; local223++) {
-							local106 = Static31.anIntArrayArray6[local214][local223]++;
-						}
-					}
-				}
-			}
-		}
-		label220: for (local28 = 0; local28 < local3; local28++) {
-			@Pc(272) long local272;
-			if (arg0) {
-				local39 = PlayerList.self;
-				local272 = 8791798054912L;
-			} else {
-				local39 = PlayerList.players[PlayerList.ids[local28]];
-				local272 = (long) PlayerList.ids[local28] << 32;
-			}
-			if (local39 != null && local39.method2682()) {
-				local39.aBoolean98 = false;
-				if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) {
-					local39.aBoolean98 = true;
-				}
-				local82 = local39.getSize();
-				if (local82 == 1) {
-					if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
-						local182 = local39.xFine >> 7;
-						local200 = local39.zFine >> 7;
-						if (local182 < 0 || local182 >= 104 || local200 < 0 || local200 >= 104) {
-							continue;
-						}
-						if (Static31.anIntArrayArray6[local182][local200] > 1) {
-							local106 = Static31.anIntArrayArray6[local182][local200]--;
-							continue;
-						}
-					}
-				} else if ((local82 & 0x1) == 0 && (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 0) {
-					local182 = local39.xFine - local82 * 64 >> 7;
-					local214 = local82 + local182;
-					local200 = local39.zFine - local82 * 64 >> 7;
-					if (local214 > 104) {
-						local214 = 104;
-					}
-					if (local182 < 0) {
-						local182 = 0;
-					}
-					local223 = local82 + local200;
-					if (local200 < 0) {
-						local200 = 0;
-					}
-					@Pc(468) boolean local468 = true;
-					if (local223 > 104) {
-						local223 = 104;
-					}
-					@Pc(476) int local476;
-					@Pc(485) int local485;
-					for (local476 = local182; local476 < local214; local476++) {
-						for (local485 = local200; local485 < local223; local485++) {
-							if (Static31.anIntArrayArray6[local476][local485] <= 1) {
-								local468 = false;
-								break;
-							}
-						}
-					}
-					if (local468) {
-						local476 = local182;
-						while (true) {
-							if (local476 >= local214) {
-								continue label220;
-							}
-							for (local485 = local200; local485 < local223; local485++) {
-								local106 = Static31.anIntArrayArray6[local476][local485]--;
-							}
-							local476++;
-						}
-					}
-				}
-				if (local39.attachment == null || client.loop < local39.anInt3390 || local39.anInt3375 <= client.loop) {
-					local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
-					Static43.method1141(Player.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
-				} else {
-					local39.aBoolean98 = false;
-					local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
-					Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.atachmentX0, local39.attachmentZ0, local39.attachmentX1, local39.attachmentZ1);
-				}
-			}
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static4.java b/client/src/main/java/rt4/Static4.java
index 42255a3..c5528a5 100644
--- a/client/src/main/java/rt4/Static4.java
+++ b/client/src/main/java/rt4/Static4.java
@@ -8,16 +8,10 @@ public final class Static4 {
 	@OriginalMember(owner = "client!ac", name = "i", descriptor = "Lclient!ih;")
 	public static final LinkedList highPriorityRequests = new LinkedList();
 
-	@OriginalMember(owner = "client!ac", name = "k", descriptor = "S")
-	public static short aShort1 = 32767;
-
-	@OriginalMember(owner = "client!ac", name = "n", descriptor = "I")
+    @OriginalMember(owner = "client!ac", name = "n", descriptor = "I")
 	public static int anInt36 = 0;
 
-	@OriginalMember(owner = "client!ac", name = "p", descriptor = "Lclient!be;")
-	public static Component aClass13_1 = null;
-
-	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(IIII)I")
+    @OriginalMember(owner = "client!ac", name = "a", descriptor = "(IIII)I")
 	public static int method22(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
 		if ((SceneGraph.tileFlags[arg2][arg1][arg0] & 0x8) == 0) {
 			return arg2 <= 0 || (SceneGraph.tileFlags[1][arg1][arg0] & 0x2) == 0 ? arg2 : arg2 - 1;
diff --git a/client/src/main/java/rt4/Static40.java b/client/src/main/java/rt4/Static40.java
index 0d46959..031c6c6 100644
--- a/client/src/main/java/rt4/Static40.java
+++ b/client/src/main/java/rt4/Static40.java
@@ -8,8 +8,44 @@ public final class Static40 {
 
 	@OriginalMember(owner = "client!da", name = "ab", descriptor = "I")
 	public static int anInt1275;
+	@OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
+	public static Component aClass13_14 = null;
+	@OriginalMember(owner = "client!ac", name = "p", descriptor = "Lclient!be;")
+	public static Component aClass13_1 = null;
+	@OriginalMember(owner = "client!u", name = "a", descriptor = "I")
+	public static int anInt5388 = 0;
+	@OriginalMember(owner = "client!km", name = "pc", descriptor = "Z")
+	public static boolean aBoolean172 = false;
+	@OriginalMember(owner = "client!re", name = "y", descriptor = "I")
+	public static int anInt4851;
+	@OriginalMember(owner = "client!nb", name = "d", descriptor = "I")
+	public static int anInt4035 = 0;
+	@OriginalMember(owner = "client!em", name = "z", descriptor = "Z")
+	public static boolean aBoolean108 = false;
+	@OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
+	public static int anInt2910;
+	@OriginalMember(owner = "client!ug", name = "p", descriptor = "I")
+	public static int anInt5457;
+	@OriginalMember(owner = "client!sm", name = "b", descriptor = "I")
+	public static int anInt5208;
+	@OriginalMember(owner = "client!ee", name = "c", descriptor = "I")
+	public static int anInt1736;
+	@OriginalMember(owner = "client!gl", name = "d", descriptor = "I")
+	public static int anInt2261;
+	@OriginalMember(owner = "client!nf", name = "e", descriptor = "I")
+	public static int anInt4073;
+	@OriginalMember(owner = "client!kk", name = "i", descriptor = "I")
+	public static int anInt3324;
+	@OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
+	public static int anInt5556;
+	@OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
+	public static int anInt4581;
+	@OriginalMember(owner = "client!vf", name = "c", descriptor = "I")
+	public static int anInt5752;
+	@OriginalMember(owner = "client!ve", name = "w", descriptor = "Z")
+	public static boolean aBoolean298 = false;
 
-    @OriginalMember(owner = "client!da", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;")
+	@OriginalMember(owner = "client!da", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;")
 	public static String method1014(@OriginalArg(0) String arg0, @OriginalArg(1) String arg1, @OriginalArg(3) String arg2) {
 		for (@Pc(5) int local5 = arg2.indexOf(arg0); local5 != -1; local5 = arg2.indexOf(arg0, local5 + arg1.length())) {
 			arg2 = arg2.substring(0, local5) + arg1 + arg2.substring(arg0.length() + local5);
@@ -19,53 +55,39 @@ public final class Static40 {
 
 	@OriginalMember(owner = "client!da", name = "a", descriptor = "(IIILclient!be;)V")
 	public static void method1015(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
-		if (Static105.aClass13_14 != null || Static60.aBoolean108 || (arg2 == null || Static89.method1836(arg2) == null)) {
+		if (aClass13_14 != null || aBoolean108 || (arg2 == null || method1836(arg2) == null)) {
 			return;
 		}
-		Static105.aClass13_14 = arg2;
-		Static4.aClass13_1 = Static89.method1836(arg2);
-		Static246.anInt5388 = arg1;
-		Static138.aBoolean172 = false;
-		Static213.anInt4851 = 0;
-		Static165.anInt4035 = arg0;
+		aClass13_14 = arg2;
+		aClass13_1 = method1836(arg2);
+		anInt5388 = arg1;
+		aBoolean172 = false;
+		anInt4851 = 0;
+		anInt4035 = arg0;
 	}
 
-	@OriginalMember(owner = "client!da", name = "a", descriptor = "(IIIILclient!na;JI)V")
-	public static void method1016(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) JagString password, @OriginalArg(5) long name, @OriginalArg(6) int arg5) {
-		@Pc(8) Buffer local8 = new Buffer(GlobalConfig.LOGIN_USE_STRINGS ? 129 : 128);
-		local8.p1(10);
-		local8.p2((int) (Math.random() * 99999.0D));
-		local8.p2(530);
-		if (GlobalConfig.LOGIN_USE_STRINGS) {
-			local8.pjstr(Base37.decode37(name));
-		} else {
-			local8.p8(name);
-		}
-		local8.p4((int) (Math.random() * 9.9999999E7D));
-		local8.pjstr(password);
-		local8.p4((int) (Math.random() * 9.9999999E7D));
-		local8.p2(client.affiliate);
-		local8.p1(arg0);
-		local8.p1(arg2);
-		local8.p4((int) (Math.random() * 9.9999999E7D));
-		local8.p2(arg5);
-		local8.p2(arg1);
-		local8.p4((int) (Math.random() * 9.9999999E7D));
-		local8.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS);
-		Protocol.outboundBuffer.offset = 0;
-		Protocol.outboundBuffer.p1(36);
-		Protocol.outboundBuffer.p1(local8.offset);
-		Protocol.outboundBuffer.pBytes(local8.data, local8.offset);
-		CreateManager.reply = -3;
-		CreateManager.step = 1;
-		CreateManager.loops = 0;
-		CreateManager.errors = 0;
-	}
-
-	@OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V")
+    @OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V")
 	public static void method1019() {
 		Component.sprites.method3103();
 		Component.models.method3103();
 		Component.fonts.method3103();
 	}
+
+	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(ILclient!be;)Lclient!be;")
+	public static Component method1836(@OriginalArg(1) Component arg0) {
+		@Pc(12) Component local12 = Static36.method938(arg0);
+		if (local12 == null) {
+			local12 = arg0.aClass13_5;
+		}
+		return local12;
+	}
+
+	@OriginalMember(owner = "client!j", name = "g", descriptor = "(I)V")
+	public static void method4637() {
+		Static165.aClass3_Sub2_Sub1_8 = null;
+		Static39.aClass3_Sub2_Sub1_1 = null;
+		Static112.aClass3_Sub2_Sub1_6 = null;
+		Static181.aClass3_Sub2_Sub1_9 = null;
+		Static204.aClass3_Sub2_Sub1_10 = null;
+	}
 }
diff --git a/client/src/main/java/rt4/Static41.java b/client/src/main/java/rt4/Static41.java
deleted file mode 100644
index 26dff64..0000000
--- a/client/src/main/java/rt4/Static41.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static41 {
-
-	@OriginalMember(owner = "client!dc", name = "ab", descriptor = "I")
-	public static int anInt1316 = 0;
-
-}
diff --git a/client/src/main/java/rt4/Static44.java b/client/src/main/java/rt4/Static44.java
index e2761e4..47528d5 100644
--- a/client/src/main/java/rt4/Static44.java
+++ b/client/src/main/java/rt4/Static44.java
@@ -16,9 +16,9 @@ public final class Static44 {
 	public static void method1146() {
 		Protocol.outboundBuffer.offset = 0;
 		Protocol.opcode3 = -1;
-		Static60.aBoolean108 = false;
+		Static40.aBoolean108 = false;
 		Protocol.length = 0;
-		Static115.mapFlagX = 0;
+		LoginManager.mapFlagX = 0;
 		MiniMenu.size = 0;
 		Protocol.opcode2 = -1;
 		MiniMap.state = 0;
@@ -39,7 +39,7 @@ public final class Static44 {
 			}
 		}
 		Inv.method2073();
-		Static227.cameraType = 1;
+		Camera.cameraType = 1;
 		client.setGameState(30);
 		for (local35 = 0; local35 < 100; local35++) {
 			Static186.aBooleanArray100[local35] = true;
@@ -70,7 +70,7 @@ public final class Static44 {
 			}
 		}
 		if (MiniMenu.size == 1) {
-			Static60.aBoolean108 = false;
+			Static40.aBoolean108 = false;
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
 		} else {
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
@@ -82,7 +82,7 @@ public final class Static44 {
 				}
 			}
 			Static24.anInt761 = local53 + 8;
-			Static13.anInt436 = MiniMenu.size * 15 + (Static261.aBoolean298 ? 26 : 22);
+			Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
 		}
 		if (local28 != null) {
 			Static17.method531(local28, false);
diff --git a/client/src/main/java/rt4/Static45.java b/client/src/main/java/rt4/Static45.java
index b9612ae..c92914a 100644
--- a/client/src/main/java/rt4/Static45.java
+++ b/client/src/main/java/rt4/Static45.java
@@ -6,7 +6,10 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static45 {
 
-	@OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V")
+    @OriginalMember(owner = "client!gm", name = "R", descriptor = "I")
+	public static int anInt2293 = (int) (Math.random() * 17.0D) - 8;
+
+    @OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V")
 	public static void method1169(@OriginalArg(0) CollisionMap[] collisionMaps, @OriginalArg(1) boolean underwater) {
 		@Pc(10) int level;
 		@Pc(15) int x;
@@ -33,12 +36,12 @@ public final class Static45 {
 			if (Static183.anInt4272 > 16) {
 				Static183.anInt4272 = 16;
 			}
-			Static86.anInt2293 += (int) (Math.random() * 5.0D) - 2;
-			if (Static86.anInt2293 < -8) {
-				Static86.anInt2293 = -8;
+			anInt2293 += (int) (Math.random() * 5.0D) - 2;
+			if (anInt2293 < -8) {
+				anInt2293 = -8;
 			}
-			if (Static86.anInt2293 > 8) {
-				Static86.anInt2293 = 8;
+			if (anInt2293 > 8) {
+				anInt2293 = 8;
 			}
 		}
 		@Pc(128) byte local128;
@@ -47,7 +50,7 @@ public final class Static45 {
 		} else {
 			local128 = 4;
 		}
-		level = Static86.anInt2293 >> 2 << 10;
+		level = anInt2293 >> 2 << 10;
 		@Pc(142) int[][] local142 = new int[104][104];
 		@Pc(146) int[][] local146 = new int[104][104];
 		x = Static183.anInt4272 >> 1;
@@ -93,9 +96,9 @@ public final class Static45 {
 					}
 				}
 			} else {
-				local168 = (int) Static161.aFloatArray18[0];
-				local173 = (int) Static161.aFloatArray18[1];
-				local178 = (int) Static161.aFloatArray18[2];
+				local168 = (int) FogManager.aFloatArray18[0];
+				local173 = (int) FogManager.aFloatArray18[1];
+				local178 = (int) FogManager.aFloatArray18[2];
 				local194 = (int) Math.sqrt((double) (local173 * local173 + local168 * local168 + local178 * local178));
 				local200 = local194 * 1024 >> 8;
 				for (local202 = 1; local202 < 103; local202++) {
@@ -178,7 +181,7 @@ public final class Static45 {
 			}
 			for (local168 = 1; local168 < 103; local168++) {
 				label771: for (local173 = 1; local173 < 103; local173++) {
-					if (underwater || SceneGraph.allLevelsAreVisible() || (SceneGraph.tileFlags[0][local168][local173] & 0x2) != 0 || (SceneGraph.tileFlags[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == Static41.anInt1316) {
+					if (underwater || SceneGraph.allLevelsAreVisible() || (SceneGraph.tileFlags[0][local168][local173] & 0x2) != 0 || (SceneGraph.tileFlags[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == LoginManager.centralPlane) {
 						if (SceneGraph.firstVisibleLevel > local152) {
 							SceneGraph.firstVisibleLevel = local152;
 						}
@@ -396,7 +399,7 @@ public final class Static45 {
 						if (local202 >= 8) {
 							local349 = SceneGraph.tileHeights[local200][local168][local173] - 240;
 							local234 = SceneGraph.tileHeights[local194][local168][local173];
-							Static278.method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234);
+							method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234);
 							for (local254 = local194; local254 <= local200; local254++) {
 								for (local267 = local173; local267 <= local178; local267++) {
 									SceneGraph.anIntArrayArrayArray6[local254][local168][local267] &= 0xFFFFFFFE;
@@ -431,7 +434,7 @@ public final class Static45 {
 						if (local202 >= 8) {
 							local349 = SceneGraph.tileHeights[local200][local173][local2204] - 240;
 							local234 = SceneGraph.tileHeights[local194][local173][local2204];
-							Static278.method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234);
+							method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234);
 							for (local254 = local194; local254 <= local200; local254++) {
 								for (local267 = local173; local267 <= local178; local267++) {
 									SceneGraph.anIntArrayArrayArray6[local254][local267][local2204] &= 0xFFFFFFFD;
@@ -464,7 +467,7 @@ public final class Static45 {
 						}
 						if ((local178 + 1 - local173) * (local200 - (local194 - 1)) >= 4) {
 							local202 = SceneGraph.tileHeights[local152][local173][local194];
-							Static278.method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202);
+							method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202);
 							for (local209 = local173; local209 <= local178; local209++) {
 								for (local349 = local194; local349 <= local200; local349++) {
 									SceneGraph.anIntArrayArrayArray6[local152][local209][local349] &= 0xFFFFFFFB;
@@ -477,4 +480,20 @@ public final class Static45 {
 		}
 	}
 
+    @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIIIIII)V")
+    public static void method4647(@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) int arg6) {
+        @Pc(3) Class120 local3 = new Class120();
+        local3.anInt4452 = arg1 / 128;
+        local3.anInt4446 = arg2 / 128;
+        local3.anInt4461 = arg3 / 128;
+        local3.anInt4464 = arg4 / 128;
+        local3.anInt4453 = arg0;
+        local3.anInt4460 = arg1;
+        local3.anInt4445 = arg2;
+        local3.anInt4458 = arg3;
+        local3.anInt4449 = arg4;
+        local3.anInt4444 = arg5;
+        local3.anInt4447 = arg6;
+        SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3;
+    }
 }
diff --git a/client/src/main/java/rt4/Static49.java b/client/src/main/java/rt4/Static49.java
index 5768dc9..641cb15 100644
--- a/client/src/main/java/rt4/Static49.java
+++ b/client/src/main/java/rt4/Static49.java
@@ -56,7 +56,7 @@ public final class Static49 {
 				local39 = true;
 				if (!local95.isReady()) {
 					local15 = false;
-					Static271.anInt5804++;
+					ClientProt.anInt5804++;
 				}
 			}
 		}
diff --git a/client/src/main/java/rt4/Static52.java b/client/src/main/java/rt4/Static52.java
index c5b151b..7b89f99 100644
--- a/client/src/main/java/rt4/Static52.java
+++ b/client/src/main/java/rt4/Static52.java
@@ -14,13 +14,8 @@ public final class Static52 {
 	public static final JagString aClass100_559 = JagString.parse("<col=ffff00>");
 	@OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;")
 	public static final JagString aClass100_594 = JagString.parse("<)4col>");
-	@OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
-	public static int anInt1695;
 
-	@OriginalMember(owner = "client!eb", name = "t", descriptor = "I")
-	public static int anInt1694 = -1;
-
-	@OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I")
+    @OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I")
 	public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
 		if ((arg2 & 0x1) == 1) {
 			@Pc(10) int local10 = arg4;
diff --git a/client/src/main/java/rt4/Static53.java b/client/src/main/java/rt4/Static53.java
index bd01ae7..9f7d8c0 100644
--- a/client/src/main/java/rt4/Static53.java
+++ b/client/src/main/java/rt4/Static53.java
@@ -67,7 +67,7 @@ public final class Static53 {
 		if (!Static241.aBoolean302) {
 			return;
 		}
-		@Pc(19) Component local19 = Static201.method1418(MiniMenu.anInt2512, MiniMenu.anInt506);
+		@Pc(19) Component local19 = InterfaceList.method1418(MiniMenu.anInt2512, MiniMenu.anInt506);
 		if (local19 != null && local19.onUseWith != null) {
 			@Pc(29) HookRequest local29 = new HookRequest();
 			local29.arguments = local19.onUseWith;
diff --git a/client/src/main/java/rt4/Static55.java b/client/src/main/java/rt4/Static55.java
deleted file mode 100644
index 8ee7b50..0000000
--- a/client/src/main/java/rt4/Static55.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static55 {
-
-    @OriginalMember(owner = "client!ee", name = "c", descriptor = "I")
-	public static int anInt1736;
-
-	@OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;")
-	public static final JagString aClass100_376 = JagString.parse(" GMT");
-
-    @OriginalMember(owner = "client!ee", name = "f", descriptor = "S")
-	public static short aShort12 = 1;
-
-	@OriginalMember(owner = "client!ee", name = "j", descriptor = "[I")
-	public static final int[] anIntArray140 = new int[5];
-}
diff --git a/client/src/main/java/rt4/Static58.java b/client/src/main/java/rt4/Static58.java
index a413777..96707e1 100644
--- a/client/src/main/java/rt4/Static58.java
+++ b/client/src/main/java/rt4/Static58.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static58 {
 
-	@OriginalMember(owner = "client!eh", name = "j", descriptor = "I")
-	public static int wheelRotation = 0;
-
 	@OriginalMember(owner = "client!eh", name = "a", descriptor = "(I[[I[[FI[[FIBIIBZBI[[FILclient!hg;)V")
 	public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) GlTile arg14) {
 		@Pc(11) int local11 = (arg0 << 8) + 255;
diff --git a/client/src/main/java/rt4/Static59.java b/client/src/main/java/rt4/Static59.java
index 9a87cce..90b917c 100644
--- a/client/src/main/java/rt4/Static59.java
+++ b/client/src/main/java/rt4/Static59.java
@@ -9,16 +9,10 @@ public final class Static59 {
 	@OriginalMember(owner = "client!ej", name = "X", descriptor = "I")
 	public static int anInt1815;
 
-	@OriginalMember(owner = "client!ej", name = "bb", descriptor = "F")
-	public static float aFloat6;
-
-	@OriginalMember(owner = "client!ej", name = "W", descriptor = "I")
-	public static int anInt1814 = 0;
-
-	@OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V")
+    @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V")
 	public static void method1372() {
 		if (Static226.anInt3953 == 2) {
-			if (Static155.anInt3751 == Static277.anInt5850 && Static60.anInt1892 == Static280.anInt5895) {
+			if (Static155.anInt3751 == Mouse.anInt5850 && Static60.anInt1892 == Static280.anInt5895) {
 				Static226.anInt3953 = 0;
 				if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) {
 					MiniMenu.doAction(MiniMenu.size - 2);
@@ -36,7 +30,7 @@ public final class Static59 {
 		} else {
 			Static280.anInt5895 = Mouse.clickY;
 			Static226.anInt3953 = 2;
-			Static277.anInt5850 = Mouse.clickX;
+			Mouse.anInt5850 = Mouse.clickX;
 		}
 	}
 
diff --git a/client/src/main/java/rt4/Static60.java b/client/src/main/java/rt4/Static60.java
index 9d5fd67..25e1341 100644
--- a/client/src/main/java/rt4/Static60.java
+++ b/client/src/main/java/rt4/Static60.java
@@ -10,7 +10,4 @@ public final class Static60 {
 	@OriginalMember(owner = "client!em", name = "D", descriptor = "I")
 	public static int gregorianDateSeed;
 
-	@OriginalMember(owner = "client!em", name = "z", descriptor = "Z")
-	public static boolean aBoolean108 = false;
-
 }
diff --git a/client/src/main/java/rt4/Static61.java b/client/src/main/java/rt4/Static61.java
index 497e150..e05546b 100644
--- a/client/src/main/java/rt4/Static61.java
+++ b/client/src/main/java/rt4/Static61.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static61 {
 
-	@OriginalMember(owner = "client!en", name = "z", descriptor = "F")
-	public static float aFloat7;
-
-	@OriginalMember(owner = "client!en", name = "h", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!en", name = "h", descriptor = "Lclient!na;")
 	public static final JagString CHALREQ = JagString.parse(":chalreq:");
 
 }
diff --git a/client/src/main/java/rt4/Static67.java b/client/src/main/java/rt4/Static67.java
index 988e485..fe97c7b 100644
--- a/client/src/main/java/rt4/Static67.java
+++ b/client/src/main/java/rt4/Static67.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static67 {
 
-	@OriginalMember(owner = "client!fe", name = "lc", descriptor = "[Lclient!qf;")
-	public static Sprite[] mapfuncs;
-
-	@OriginalMember(owner = "client!fe", name = "I", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!fe", name = "I", descriptor = "Lclient!na;")
 	public static final JagString aClass100_639 = JagString.parse(" ");
 
 	@OriginalMember(owner = "client!fe", name = "R", descriptor = "Z")
@@ -16,6 +13,4 @@ public final class Static67 {
     @OriginalMember(owner = "client!fe", name = "lb", descriptor = "[I")
 	public static final int[] anIntArray320 = new int[100];
 
-	@OriginalMember(owner = "client!fe", name = "nc", descriptor = "[Lclient!hj;")
-	public static final GoSubFrame[] callStack = new GoSubFrame[50];
 }
diff --git a/client/src/main/java/rt4/Static69.java b/client/src/main/java/rt4/Static69.java
index 61a363f..10d62ec 100644
--- a/client/src/main/java/rt4/Static69.java
+++ b/client/src/main/java/rt4/Static69.java
@@ -62,7 +62,7 @@ public final class Static69 {
 		@Pc(11) int local11 = arg3 - 1;
 		@Pc(15) int local15 = arg3 + arg5;
 		for (@Pc(17) int local17 = arg1; local17 <= arg1 + 1; local17++) {
-			if (local17 != Static126.anInt3114) {
+			if (local17 != SceneGraph.anInt3114) {
 				for (@Pc(28) int local28 = local3; local28 <= local7; local28++) {
 					if (local28 >= 0 && local28 < SceneGraph.mapSizeX) {
 						for (@Pc(39) int local39 = local11; local39 <= local15; local39++) {
diff --git a/client/src/main/java/rt4/Static7.java b/client/src/main/java/rt4/Static7.java
index 0da80a5..98d7629 100644
--- a/client/src/main/java/rt4/Static7.java
+++ b/client/src/main/java/rt4/Static7.java
@@ -8,21 +8,18 @@ public final class Static7 {
     @OriginalMember(owner = "client!ah", name = "t", descriptor = "I")
 	public static int anInt986;
 
-    @OriginalMember(owner = "client!ah", name = "n", descriptor = "I")
-	public static int anInt983 = 0;
-
-	@OriginalMember(owner = "client!ah", name = "p", descriptor = "Lclient!ih;")
+    @OriginalMember(owner = "client!ah", name = "p", descriptor = "Lclient!ih;")
 	public static final LinkedList aClass69_32 = new LinkedList();
 
 	@OriginalMember(owner = "client!ah", name = "b", descriptor = "(I)V")
 	public static void method843() {
-		if (Static118.aClass13_15 != null || Static105.aClass13_14 != null) {
+		if (Static118.aClass13_15 != null || Static40.aClass13_14 != null) {
 			return;
 		}
 		@Pc(20) int local20 = Mouse.clickButton;
 		@Pc(93) int local93;
 		@Pc(99) int local99;
-		if (!Static60.aBoolean108) {
+		if (!Static40.aBoolean108) {
 			if (local20 == 1 && MiniMenu.size > 0) {
 				@Pc(37) short local37 = MiniMenu.actions[MiniMenu.size - 1];
 				if (local37 == 25 || local37 == 23 || local37 == 48 || local37 == 7 || local37 == 13 || local37 == 47 || local37 == 5 || local37 == 43 || local37 == 35 || local37 == 58 || local37 == 22 || local37 == 1006) {
@@ -45,7 +42,7 @@ public final class Static7 {
 					}
 				}
 			}
-			if (local20 == 1 && (Static116.anInt2952 == 1 && MiniMenu.size > 2 || Static277.method4640(MiniMenu.size - 1))) {
+			if (local20 == 1 && (Static116.anInt2952 == 1 && MiniMenu.size > 2 || MiniMenu.method4640(MiniMenu.size - 1))) {
 				local20 = 2;
 			}
 			if (local20 == 2 && MiniMenu.size > 0 || Static226.anInt3953 == 1) {
@@ -61,7 +58,7 @@ public final class Static7 {
 			local93 = Mouse.anInt5032;
 			local204 = Mouse.anInt4873;
 			if (local204 < Static183.anInt4271 - 10 || local204 > Static24.anInt761 + Static183.anInt4271 + 10 || Static229.anInt5138 - 10 > local93 || local93 > Static13.anInt436 + Static229.anInt5138 + 10) {
-				Static60.aBoolean108 = false;
+				Static40.aBoolean108 = false;
 				Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
 			}
 		}
@@ -76,7 +73,7 @@ public final class Static7 {
 		@Pc(269) int local269 = -1;
 		for (@Pc(271) int local271 = 0; local271 < MiniMenu.size; local271++) {
 			@Pc(289) int local289;
-			if (Static261.aBoolean298) {
+			if (Static40.aBoolean298) {
 				local289 = (MiniMenu.size - local271 - 1) * 15 + local93 + 35;
 			} else {
 				local289 = (MiniMenu.size - local271 - 1) * 15 + local93 + 31;
@@ -88,7 +85,7 @@ public final class Static7 {
 		if (local269 != -1) {
 			MiniMenu.doAction(local269);
 		}
-		Static60.aBoolean108 = false;
+		Static40.aBoolean108 = false;
 		Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
 	}
 }
diff --git a/client/src/main/java/rt4/Static72.java b/client/src/main/java/rt4/Static72.java
index 9f47908..d4c0e79 100644
--- a/client/src/main/java/rt4/Static72.java
+++ b/client/src/main/java/rt4/Static72.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static72 {
 
-	@OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I")
-	public static int[][] regionsXteaKeys;
-
-	@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
+    @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
 	public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
 		@Pc(17) int local17 = 0;
diff --git a/client/src/main/java/rt4/Static73.java b/client/src/main/java/rt4/Static73.java
index d90e6ec..ade5003 100644
--- a/client/src/main/java/rt4/Static73.java
+++ b/client/src/main/java/rt4/Static73.java
@@ -39,23 +39,23 @@ public final class Static73 {
 			client.setGameState(10);
 			return;
 		}
-		if (Static227.cameraType == 2) {
-			Static138.renderX = Static245.anInt5375 << 7;
-			Static134.renderZ = Static248.anInt4232 << 7;
+		if (Camera.cameraType == 2) {
+			Camera.renderX = Camera.anInt5375 << 7;
+			Camera.renderZ = Camera.anInt4232 << 7;
 		} else {
 			Camera.updateLoginScreenCamera();
 		}
-		Static86.setInstantFade();
+		Static103.setInstantFade();
 		LoginManager.setupLoadingScreenRegion();
 		client.setGameState(28);
 	}
 
 	@OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZII)V")
 	public static void setLightPosition(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-		Static85.anInt2263 = Static192.aClass92ArrayArray1[arg1][arg0].anInt3530;
-		Static159.anInt3893 = Static192.aClass92ArrayArray1[arg1][arg0].anInt3528;
-		Static148.anInt3534 = Static192.aClass92ArrayArray1[arg1][arg0].anInt3527;
-		Static161.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534);
+		Static85.anInt2263 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3530;
+		Static159.anInt3893 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3528;
+		Static148.anInt3534 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3527;
+		FogManager.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534);
 	}
 
 	@OriginalMember(owner = "client!fm", name = "a", descriptor = "(ILclient!na;Lclient!na;Lclient!na;I)V")
diff --git a/client/src/main/java/rt4/Static74.java b/client/src/main/java/rt4/Static74.java
index 346e723..bafaf31 100644
--- a/client/src/main/java/rt4/Static74.java
+++ b/client/src/main/java/rt4/Static74.java
@@ -6,54 +6,23 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static74 {
 
-	@OriginalMember(owner = "client!fn", name = "a", descriptor = "(ZIIIIIII)V")
+    @OriginalMember(owner = "client!bj", name = "V", descriptor = "I")
+    public static final int anInt671 = 3353893;
+
+    @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ZIIIIIII)V")
 	public static void method1623(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
 		if (arg3 == arg6) {
-			Static152.method2826(arg0, arg2, arg5, arg6, arg1, arg4);
+			method2826(arg0, arg2, arg5, arg6, arg1, arg4);
 		} else if (arg1 - arg6 >= TextureOp29.anInt4164 && arg6 + arg1 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg2 - arg3 && TextureOp29.anInt2869 >= arg2 + arg3) {
-			Static270.method4594(arg5, arg1, arg2, arg4, arg6, arg3, arg0);
+			method4594(arg5, arg1, arg2, arg4, arg6, arg3, arg0);
 		} else {
-			Static231.method3981(arg6, arg5, arg4, arg0, arg2, arg1, arg3);
+			method3981(arg6, arg5, arg4, arg0, arg2, arg1, arg3);
 		}
 	}
 
-	@OriginalMember(owner = "client!fn", name = "a", descriptor = "(BIIIII)V")
-	public static void method1624(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
-		Sprites.scrollbars[0].renderTransparent(arg2, arg3);
-		Sprites.scrollbars[1].renderTransparent(arg2, arg4 + arg3 - 16);
-		@Pc(35) int local35 = arg4 * (arg4 - 32) / arg1;
-		if (local35 < 8) {
-			local35 = 8;
-		}
-		@Pc(54) int local54 = arg0 * (arg4 - local35 - 32) / (arg1 - arg4);
-		if (!GlRenderer.enabled) {
-			SoftwareRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306);
-			SoftwareRaster.fillRect(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704);
-			SoftwareRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, Static219.anInt4938);
-			SoftwareRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938);
-			SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 16, 16, Static219.anInt4938);
-			SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 17, 16, Static219.anInt4938);
-			SoftwareRaster.drawVerticalLine(arg2 + 15, local54 + 16 + arg3, local35, Static20.anInt671);
-			SoftwareRaster.drawVerticalLine(arg2 + 14, arg3 - -17 - -local54, local35 - 1, Static20.anInt671);
-			SoftwareRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, Static20.anInt671);
-			SoftwareRaster.drawHorizontalLine(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, Static20.anInt671);
-			return;
-		}
-		GlRaster.method1186(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306);
-		GlRaster.method1186(arg2, arg3 + local54 + 16, 16, local35, Static53.anInt1704);
-		GlRaster.method1176(arg2, local54 + arg3 + 16, local35, Static219.anInt4938);
-		GlRaster.method1176(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938);
-		GlRaster.method1174(arg2, local54 + arg3 + 16, 16, Static219.anInt4938);
-		GlRaster.method1174(arg2, local54 + arg3 + 17, 16, Static219.anInt4938);
-		GlRaster.method1176(arg2 + 15, arg3 + (16 - -local54), local35, Static20.anInt671);
-		GlRaster.method1176(arg2 + 14, arg3 - -local54 + 17, local35 - 1, Static20.anInt671);
-		GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, Static20.anInt671);
-		GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, Static20.anInt671);
-	}
-
 	@OriginalMember(owner = "client!fn", name = "a", descriptor = "(ILclient!be;)V")
 	public static void update(@OriginalArg(1) Component arg0) {
-		@Pc(7) Component local7 = Static280.method4668(arg0);
+		@Pc(7) Component local7 = method4668(arg0);
 		@Pc(19) int local19;
 		@Pc(17) int local17;
 		if (local7 == null) {
@@ -84,4 +53,254 @@ public final class Static74 {
 		}
 	}
 
+	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;")
+	public static Component method4668(@OriginalArg(0) Component arg0) {
+		if (arg0.layer != -1) {
+			return InterfaceList.getComponent(arg0.layer);
+		}
+		@Pc(28) int local28 = arg0.id >>> 16;
+		@Pc(33) HashTableIterator local33 = new HashTableIterator(InterfaceList.openInterfaces);
+		for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) {
+			if (local28 == local38.anInt5878) {
+				return InterfaceList.getComponent((int) local38.key);
+			}
+		}
+		return null;
+	}
+
+	@OriginalMember(owner = "client!wb", name = "a", descriptor = "(IIIIIIII)V")
+	public static void method4594(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
+		@Pc(7) int local7 = 0;
+		@Pc(9) int local9 = arg5;
+		@Pc(11) int local11 = 0;
+		@Pc(16) int local16 = arg4 - arg6;
+		@Pc(20) int local20 = arg4 * arg4;
+		@Pc(25) int local25 = arg5 - arg6;
+		@Pc(29) int local29 = arg5 * arg5;
+		@Pc(33) int local33 = local25 * local25;
+		@Pc(37) int local37 = local29 << 1;
+		@Pc(41) int local41 = local20 << 1;
+		@Pc(45) int local45 = local33 << 1;
+		@Pc(49) int local49 = local16 * local16;
+		@Pc(53) int local53 = local49 << 1;
+		@Pc(57) int local57 = arg5 << 1;
+		@Pc(61) int local61 = local25 << 1;
+		@Pc(70) int local70 = local29 - (local57 - 1) * local41;
+		@Pc(80) int local80 = local49 * (1 - local61) + local45;
+		@Pc(89) int local89 = (1 - local57) * local20 + local37;
+		@Pc(93) int local93 = local20 << 2;
+		@Pc(102) int local102 = local33 - local53 * (local61 - 1);
+		@Pc(106) int local106 = local49 << 2;
+		@Pc(110) int local110 = local29 << 2;
+		@Pc(114) int local114 = local33 << 2;
+		@Pc(120) int local120 = (local57 - 3) * local41;
+		@Pc(124) int local124 = local37 * 3;
+		@Pc(130) int local130 = (local61 - 3) * local53;
+		@Pc(134) int local134 = local45 * 3;
+		@Pc(136) int local136 = local110;
+		@Pc(138) int local138 = local114;
+		@Pc(144) int local144 = (local25 - 1) * local106;
+		@Pc(162) int local162 = (arg5 - 1) * local93;
+		@Pc(166) int[] local166 = Static71.anIntArrayArray10[arg2];
+		Static131.method2576(local166, arg1 - arg4, -local16 + arg1, arg3);
+		Static131.method2576(local166, arg1 - local16, arg1 - -local16, arg0);
+		Static131.method2576(local166, arg1 + local16, arg4 + arg1, arg3);
+		while (local9 > 0) {
+			if (local89 < 0) {
+				while (local89 < 0) {
+					local70 += local136;
+					local89 += local124;
+					local7++;
+					local136 += local110;
+					local124 += local110;
+				}
+			}
+			if (local70 < 0) {
+				local89 += local124;
+				local7++;
+				local124 += local110;
+				local70 += local136;
+				local136 += local110;
+			}
+			@Pc(258) boolean local258 = local9 <= local25;
+			if (local258) {
+				if (local80 < 0) {
+					while (local80 < 0) {
+						local80 += local134;
+						local134 += local114;
+						local11++;
+						local102 += local138;
+						local138 += local114;
+					}
+				}
+				if (local102 < 0) {
+					local80 += local134;
+					local11++;
+					local134 += local114;
+					local102 += local138;
+					local138 += local114;
+				}
+				local102 += -local130;
+				local130 -= local106;
+				local80 += -local144;
+				local144 -= local106;
+			}
+			local89 += -local162;
+			local70 += -local120;
+			local120 -= local93;
+			local9--;
+			@Pc(348) int local348 = arg2 - local9;
+			@Pc(352) int local352 = local7 + arg1;
+			local162 -= local93;
+			@Pc(360) int local360 = local9 + arg2;
+			@Pc(365) int local365 = arg1 - local7;
+			if (local258) {
+				@Pc(371) int local371 = arg1 + local11;
+				@Pc(376) int local376 = arg1 - local11;
+				Static131.method2576(Static71.anIntArrayArray10[local348], local365, local376, arg3);
+				Static131.method2576(Static71.anIntArrayArray10[local348], local376, local371, arg0);
+				Static131.method2576(Static71.anIntArrayArray10[local348], local371, local352, arg3);
+				Static131.method2576(Static71.anIntArrayArray10[local360], local365, local376, arg3);
+				Static131.method2576(Static71.anIntArrayArray10[local360], local376, local371, arg0);
+				Static131.method2576(Static71.anIntArrayArray10[local360], local371, local352, arg3);
+			} else {
+				Static131.method2576(Static71.anIntArrayArray10[local348], local365, local352, arg3);
+				Static131.method2576(Static71.anIntArrayArray10[local360], local365, local352, arg3);
+			}
+		}
+	}
+
+	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(IIBIIII)V")
+	public static void method2826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+		if (arg4 - arg3 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg4 + arg3 && TextureOp29.anInt5773 <= arg1 - arg3 && TextureOp29.anInt2869 >= arg3 + arg1) {
+			Static8.method120(arg5, arg0, arg1, arg2, arg3, arg4);
+		} else {
+			Static152.method4670(arg2, arg1, arg3, arg5, arg0, arg4);
+		}
+	}
+
+	@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIBIII)V")
+	public static void method3981(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
+		@Pc(7) int local7 = 0;
+		@Pc(12) int local12 = arg0 - arg3;
+		@Pc(14) int local14 = 0;
+		@Pc(16) int local16 = arg6;
+		@Pc(20) int local20 = arg6 * arg6;
+		@Pc(25) int local25 = arg6 - arg3;
+		@Pc(29) int local29 = arg0 * arg0;
+		@Pc(33) int local33 = local20 << 1;
+		@Pc(37) int local37 = local25 * local25;
+		@Pc(41) int local41 = local12 * local12;
+		@Pc(45) int local45 = local29 << 1;
+		@Pc(49) int local49 = local37 << 1;
+		@Pc(53) int local53 = local41 << 1;
+		@Pc(57) int local57 = local25 << 1;
+		@Pc(61) int local61 = arg6 << 1;
+		@Pc(70) int local70 = local33 + local29 * (1 - local61);
+		@Pc(79) int local79 = local20 - (local61 - 1) * local45;
+		@Pc(88) int local88 = local49 + local41 * (1 - local57);
+		@Pc(96) int local96 = local37 - local53 * (local57 - 1);
+		@Pc(100) int local100 = local20 << 2;
+		@Pc(104) int local104 = local29 << 2;
+		@Pc(108) int local108 = local37 << 2;
+		@Pc(112) int local112 = local33 * 3;
+		@Pc(118) int local118 = (local61 - 3) * local45;
+		@Pc(130) int local130 = local41 << 2;
+		@Pc(134) int local134 = local49 * 3;
+		@Pc(140) int local140 = (local57 - 3) * local53;
+		@Pc(146) int local146 = (arg6 - 1) * local104;
+		@Pc(148) int local148 = local108;
+		@Pc(150) int local150 = local100;
+		@Pc(156) int local156 = (local25 - 1) * local130;
+		@Pc(174) int local174;
+		@Pc(183) int local183;
+		@Pc(192) int local192;
+		@Pc(201) int local201;
+		if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
+			@Pc(166) int[] local166 = Static71.anIntArrayArray10[arg4];
+			local174 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg0, TextureOp29.anInt4164);
+			local183 = Static78.method1690(TextureOp29.anInt5063, arg5 + arg0, TextureOp29.anInt4164);
+			local192 = Static78.method1690(TextureOp29.anInt5063, arg5 - local12, TextureOp29.anInt4164);
+			local201 = Static78.method1690(TextureOp29.anInt5063, arg5 + local12, TextureOp29.anInt4164);
+			Static131.method2576(local166, local174, local192, arg2);
+			Static131.method2576(local166, local192, local201, arg1);
+			Static131.method2576(local166, local201, local183, arg2);
+		}
+		while (local16 > 0) {
+			if (local70 < 0) {
+				while (local70 < 0) {
+					local70 += local112;
+					local112 += local100;
+					local7++;
+					local79 += local150;
+					local150 += local100;
+				}
+			}
+			@Pc(255) boolean local255 = local16 <= local25;
+			if (local79 < 0) {
+				local79 += local150;
+				local70 += local112;
+				local7++;
+				local150 += local100;
+				local112 += local100;
+			}
+			if (local255) {
+				if (local88 < 0) {
+					while (local88 < 0) {
+						local14++;
+						local96 += local148;
+						local148 += local108;
+						local88 += local134;
+						local134 += local108;
+					}
+				}
+				if (local96 < 0) {
+					local14++;
+					local96 += local148;
+					local88 += local134;
+					local148 += local108;
+					local134 += local108;
+				}
+				local88 += -local156;
+				local156 -= local130;
+				local96 += -local140;
+				local140 -= local130;
+			}
+			local79 += -local118;
+			local70 += -local146;
+			local146 -= local104;
+			local118 -= local104;
+			local16--;
+			local183 = arg4 + local16;
+			local174 = arg4 - local16;
+			if (TextureOp29.anInt5773 <= local183 && TextureOp29.anInt2869 >= local174) {
+				local192 = Static78.method1690(TextureOp29.anInt5063, arg5 + local7, TextureOp29.anInt4164);
+				local201 = Static78.method1690(TextureOp29.anInt5063, arg5 - local7, TextureOp29.anInt4164);
+				if (local255) {
+					@Pc(404) int local404 = Static78.method1690(TextureOp29.anInt5063, arg5 + local14, TextureOp29.anInt4164);
+					@Pc(412) int local412 = Static78.method1690(TextureOp29.anInt5063, arg5 - local14, TextureOp29.anInt4164);
+					@Pc(420) int[] local420;
+					if (TextureOp29.anInt5773 <= local174) {
+						local420 = Static71.anIntArrayArray10[local174];
+						Static131.method2576(local420, local201, local412, arg2);
+						Static131.method2576(local420, local412, local404, arg1);
+						Static131.method2576(local420, local404, local192, arg2);
+					}
+					if (local183 <= TextureOp29.anInt2869) {
+						local420 = Static71.anIntArrayArray10[local183];
+						Static131.method2576(local420, local201, local412, arg2);
+						Static131.method2576(local420, local412, local404, arg1);
+						Static131.method2576(local420, local404, local192, arg2);
+					}
+				} else {
+					if (TextureOp29.anInt5773 <= local174) {
+						Static131.method2576(Static71.anIntArrayArray10[local174], local201, local192, arg2);
+					}
+					if (TextureOp29.anInt2869 >= local183) {
+						Static131.method2576(Static71.anIntArrayArray10[local183], local201, local192, arg2);
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/client/src/main/java/rt4/Static75.java b/client/src/main/java/rt4/Static75.java
index 7c317ab..637bb5d 100644
--- a/client/src/main/java/rt4/Static75.java
+++ b/client/src/main/java/rt4/Static75.java
@@ -6,15 +6,12 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static75 {
 
-	@OriginalMember(owner = "client!g", name = "d", descriptor = "I")
-	public static int anInt2119 = 0;
-
-	@OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V")
+    @OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V")
 	public static void setDefaultChunksAtmosphere() {
 		@Pc(9) Environment local9 = new Environment();
 		for (@Pc(18) int local18 = 0; local18 < 13; local18++) {
 			for (@Pc(25) int local25 = 0; local25 < 13; local25++) {
-				Static192.aClass92ArrayArray1[local18][local25] = local9;
+				Static103.aClass92ArrayArray1[local18][local25] = local9;
 			}
 		}
 	}
diff --git a/client/src/main/java/rt4/Static79.java b/client/src/main/java/rt4/Static79.java
index 2d284ff..1a3f3eb 100644
--- a/client/src/main/java/rt4/Static79.java
+++ b/client/src/main/java/rt4/Static79.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static79 {
 
-	@OriginalMember(owner = "client!ge", name = "q", descriptor = "I")
-	public static int anInt2161;
-
-	@OriginalMember(owner = "client!ge", name = "k", descriptor = "[I")
+    @OriginalMember(owner = "client!ge", name = "k", descriptor = "[I")
 	public static int[] anIntArray205 = new int[2];
 
 	@OriginalMember(owner = "client!ge", name = "m", descriptor = "I")
@@ -49,7 +46,7 @@ public final class Static79 {
 			if ((SceneGraph.tileFlags[arg2][arg1][arg4] & 0x8) != 0) {
 				local39 = 0;
 			}
-			if (local39 != Static41.anInt1316) {
+			if (local39 != LoginManager.centralPlane) {
 				return;
 			}
 		}
diff --git a/client/src/main/java/rt4/Static8.java b/client/src/main/java/rt4/Static8.java
index ce413f3..54857e5 100644
--- a/client/src/main/java/rt4/Static8.java
+++ b/client/src/main/java/rt4/Static8.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static8 {
 
-	@OriginalMember(owner = "client!aj", name = "X", descriptor = "F")
-	public static float aFloat1;
-
-	@OriginalMember(owner = "client!aj", name = "Z", descriptor = "[I")
+    @OriginalMember(owner = "client!aj", name = "Z", descriptor = "[I")
 	public static int[] anIntArray8;
 
 	@OriginalMember(owner = "client!aj", name = "a", descriptor = "(IIIZIII)V")
diff --git a/client/src/main/java/rt4/Static80.java b/client/src/main/java/rt4/Static80.java
index 167369c..304a06d 100644
--- a/client/src/main/java/rt4/Static80.java
+++ b/client/src/main/java/rt4/Static80.java
@@ -10,10 +10,7 @@ public final class Static80 {
 	@OriginalMember(owner = "client!gf", name = "M", descriptor = "I")
 	public static int anInt4698;
 
-    @OriginalMember(owner = "client!gf", name = "R", descriptor = "I")
-	public static int centralZoneX;
-
-	@OriginalMember(owner = "client!gf", name = "S", descriptor = "[I")
+    @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I")
 	public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 };
 
 }
diff --git a/client/src/main/java/rt4/Static82.java b/client/src/main/java/rt4/Static82.java
index da25654..e9edc79 100644
--- a/client/src/main/java/rt4/Static82.java
+++ b/client/src/main/java/rt4/Static82.java
@@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static82 {
 
-    @OriginalMember(owner = "client!gi", name = "H", descriptor = "I")
-	public static int anInt2252 = 0;
-
 	@OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V")
 	public static void method1760(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (arg1 - arg0 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg0 + arg1 && arg3 - arg0 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg0 + arg3) {
diff --git a/client/src/main/java/rt4/Static83.java b/client/src/main/java/rt4/Static83.java
index 2a316d2..f79e5d7 100644
--- a/client/src/main/java/rt4/Static83.java
+++ b/client/src/main/java/rt4/Static83.java
@@ -6,17 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static83 {
 
-    @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z")
-	public static boolean isAlphaNumeric(@OriginalArg(0) int arg0) {
-		if (arg0 >= 97 && arg0 <= 122) {
-			return true;
-		} else if (arg0 >= 65 && arg0 <= 90) {
-			return true;
-		} else {
-			return arg0 >= 48 && arg0 <= 57;
-		}
-	}
-
 	@OriginalMember(owner = "client!gj", name = "a", descriptor = "([JII[II)V")
 	public static void method436(@OriginalArg(0) long[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3) {
 		if (arg1 >= arg2) {
diff --git a/client/src/main/java/rt4/Static84.java b/client/src/main/java/rt4/Static84.java
index 8688938..aa8e53b 100644
--- a/client/src/main/java/rt4/Static84.java
+++ b/client/src/main/java/rt4/Static84.java
@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static84 {
@@ -11,22 +10,4 @@ public final class Static84 {
 	@OriginalMember(owner = "client!gk", name = "g", descriptor = "Z")
 	public static boolean aBoolean127 = false;
 
-	@OriginalMember(owner = "client!gk", name = "h", descriptor = "I")
-	public static int anInt2255 = 0;
-
-	@OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V")
-	public static void method1771() {
-		Light.anIntArray150 = Static206.method3679(0.4F);
-	}
-
-	@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
-	public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) {
-		if (arg1.aClass3_Sub2_66 != null) {
-			arg1.method4365();
-		}
-		arg1.aClass3_Sub2_66 = arg0;
-		arg1.aClass3_Sub2_67 = arg0.aClass3_Sub2_67;
-		arg1.aClass3_Sub2_66.aClass3_Sub2_67 = arg1;
-		arg1.aClass3_Sub2_67.aClass3_Sub2_66 = arg1;
-	}
 }
diff --git a/client/src/main/java/rt4/Static85.java b/client/src/main/java/rt4/Static85.java
index 65ac837..b065ff7 100644
--- a/client/src/main/java/rt4/Static85.java
+++ b/client/src/main/java/rt4/Static85.java
@@ -1,34 +1,10 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static85 {
 
-	@OriginalMember(owner = "client!gl", name = "d", descriptor = "I")
-	public static int anInt2261;
-
-	@OriginalMember(owner = "client!gl", name = "f", descriptor = "I")
+    @OriginalMember(owner = "client!gl", name = "f", descriptor = "I")
 	public static int anInt2263;
 
-    @OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V")
-	public static void refreshMagicVarp(@OriginalArg(1) int arg0) {
-		InterfaceList.redrawActiveInterfaces();
-		AreaSoundManager.updateMulti();
-		@Pc(17) int local17 = VarpTypeList.get(arg0).clientCode;
-		if (local17 == 0) {
-			return;
-		}
-		@Pc(25) int local25 = VarpDomain.activeVarps[arg0];
-		if (local17 == 6) {
-			Static79.anInt2157 = local25;
-		}
-		if (local17 == 5) {
-			Static116.anInt2952 = local25;
-		}
-		if (local17 == 9) {
-			Static179.anInt4254 = local25;
-		}
-	}
 }
diff --git a/client/src/main/java/rt4/Static86.java b/client/src/main/java/rt4/Static86.java
deleted file mode 100644
index 64f9206..0000000
--- a/client/src/main/java/rt4/Static86.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static86 {
-
-    @OriginalMember(owner = "client!gm", name = "R", descriptor = "I")
-	public static int anInt2293 = (int) (Math.random() * 17.0D) - 8;
-
-	@OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;")
-	public static final JagString aClass100_488 = JagString.parse("_");
-
-    @OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I")
-	public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 };
-
-	@OriginalMember(owner = "client!gm", name = "f", descriptor = "(B)V")
-	public static void setInstantFade() {
-		Static222.instantScreenFade = true;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static87.java b/client/src/main/java/rt4/Static87.java
index 50e70f4..bf8bb6e 100644
--- a/client/src/main/java/rt4/Static87.java
+++ b/client/src/main/java/rt4/Static87.java
@@ -38,10 +38,10 @@ public final class Static87 {
 		@Pc(9) byte[][] local9;
 		if (GlRenderer.enabled && arg0) {
 			local7 = 1;
-			local9 = Static186.underWaterMapFilesBuffer;
+			local9 = LoginManager.underWaterMapFilesBuffer;
 		} else {
 			local7 = 4;
-			local9 = Static273.mapFilesBuffer;
+			local9 = LoginManager.mapFilesBuffer;
 		}
 		@Pc(18) int local18 = local9.length;
 		@Pc(20) int local20;
@@ -49,19 +49,19 @@ public final class Static87 {
 		@Pc(49) int local49;
 		@Pc(53) byte[] local53;
 		for (local20 = 0; local20 < local18; local20++) {
-			local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Static225.originX;
-			local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ;
+			local38 = (LoginManager.regionBitPacked[local20] >> 8) * 64 - Camera.originX;
+			local49 = (LoginManager.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
 			local53 = local9[local20];
 			if (local53 != null) {
 				client.audioLoop();
-				Static269.method2203(PathFinder.collisionMaps, arg0, Static80.centralZoneX * 8 - 48, local49, local38, (Static52.anInt1695 - 6) * 8, local53);
+				Static269.method2203(PathFinder.collisionMaps, arg0, LoginManager.centralZoneX * 8 - 48, local49, local38, (LoginManager.centralZoneZ - 6) * 8, local53);
 			}
 		}
 		for (local20 = 0; local20 < local18; local20++) {
-			local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Static225.originX;
-			local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ;
+			local38 = (LoginManager.regionBitPacked[local20] >> 8) * 64 - Camera.originX;
+			local49 = (LoginManager.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
 			local53 = local9[local20];
-			if (local53 == null && Static52.anInt1695 < 800) {
+			if (local53 == null && LoginManager.centralZoneZ < 800) {
 				client.audioLoop();
 				for (@Pc(130) int local130 = 0; local130 < local7; local130++) {
 					Static23.method645(local130, local49, local38, 64, 64);
@@ -87,7 +87,7 @@ public final class Static87 {
 		}
 		for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) {
 			@Pc(30) Component local30 = arg3[local18];
-			if (local30 != null && (local30.layer == arg5 || arg5 == -1412584499 && local30 == Static105.aClass13_14)) {
+			if (local30 != null && (local30.layer == arg5 || arg5 == -1412584499 && local30 == Static40.aClass13_14)) {
 				@Pc(57) int local57;
 				if (arg8 == -1) {
 					Static264.anIntArray410[InterfaceList.anInt766] = arg2 + local30.x;
@@ -112,30 +112,30 @@ public final class Static87 {
 					}
 					@Pc(166) int local166;
 					@Pc(164) int local164;
-					if (local30 == Static105.aClass13_14) {
+					if (local30 == Static40.aClass13_14) {
 						if (arg5 != -1412584499 && !local30.dragRenderBehavior) {
 							Static80.anInt4696 = arg2;
 							Static127.anInt3126 = arg1;
 							Static241.aClass13Array13 = arg3;
 							continue;
 						}
-						if (Static138.aBoolean172 && Static146.aBoolean174) {
+						if (Static40.aBoolean172 && Static146.aBoolean174) {
 							local164 = Mouse.anInt5032;
 							local166 = Mouse.anInt4873;
-							local164 -= Static165.anInt4035;
+							local164 -= Static40.anInt4035;
 							if (local164 < Static228.anInt5103) {
 								local164 = Static228.anInt5103;
 							}
-							if (local164 + local30.height > Static4.aClass13_1.height + Static228.anInt5103) {
-								local164 = Static4.aClass13_1.height + Static228.anInt5103 - local30.height;
+							if (local164 + local30.height > Static40.aClass13_1.height + Static228.anInt5103) {
+								local164 = Static40.aClass13_1.height + Static228.anInt5103 - local30.height;
 							}
 							local114 = local164;
-							local166 -= Static246.anInt5388;
+							local166 -= Static40.anInt5388;
 							if (Static81.anInt2225 > local166) {
 								local166 = Static81.anInt2225;
 							}
-							if (Static4.aClass13_1.width + Static81.anInt2225 < local30.width + local166) {
-								local166 = Static4.aClass13_1.width + Static81.anInt2225 - local30.width;
+							if (Static40.aClass13_1.width + Static81.anInt2225 < local30.width + local166) {
+								local166 = Static40.aClass13_1.width + Static81.anInt2225 - local30.width;
 							}
 							local123 = local166;
 						}
@@ -196,7 +196,7 @@ public final class Static87 {
 								} else {
 									SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 								}
-								if (MiniMap.state != 0 && MiniMap.state != 3 || Static60.aBoolean108 || local166 > Static155.anInt3751 || Static60.anInt1892 < local164 || Static155.anInt3751 >= local302 || local291 <= Static60.anInt1892) {
+								if (MiniMap.state != 0 && MiniMap.state != 3 || Static40.aBoolean108 || local166 > Static155.anInt3751 || Static60.anInt1892 < local164 || Static155.anInt3751 >= local302 || local291 <= Static60.anInt1892) {
 									continue;
 								}
 								local270 = Static155.anInt3751 - local123;
@@ -206,7 +206,7 @@ public final class Static87 {
 									continue;
 								}
 								local276 -= local30.height / 2;
-								memory = (int)Camera.yawTarget + Static59.anInt1814 & 0x7FF;
+								memory = (int)Camera.yawTarget + MiniMap.anInt1814 & 0x7FF;
 								local270 -= local30.width / 2;
 								color = MathUtils.sin[memory];
 								cardMemory = MathUtils.cos[memory];
@@ -217,7 +217,7 @@ public final class Static87 {
 								local563 = PlayerList.self.xFine + local556 >> 7;
 								local571 = PlayerList.self.zFine - objId >> 7;
 								if (Static241.aBoolean302 && (MiniMenu.anInt4999 & 0x40) != 0) {
-									@Pc(583) Component local583 = Static201.method1418(MiniMenu.anInt2512, MiniMenu.anInt506);
+									@Pc(583) Component local583 = InterfaceList.method1418(MiniMenu.anInt2512, MiniMenu.anInt506);
 									if (local583 == null) {
 										Static53.method1294();
 									} else {
@@ -321,7 +321,7 @@ public final class Static87 {
 								continue;
 							}
 						}
-						if (!Static60.aBoolean108) {
+						if (!Static40.aBoolean108) {
 							if (local30.type == 0 && local30.noClickThrough && Static155.anInt3751 >= local166 && Static60.anInt1892 >= local164 && Static155.anInt3751 < local302 && local291 > Static60.anInt1892 && !Static121.aBoolean154) {
 								MiniMenu.size = 1;
 								MiniMenu.cursors[0] = Static35.anInt1092;
@@ -351,7 +351,7 @@ public final class Static87 {
 							}
 							@Pc(1186) ComponentPointer local1186 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local30.id);
 							if (local1186 != null) {
-								if (local1186.anInt5879 == 0 && !Static60.aBoolean108 && Static155.anInt3751 >= local166 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && Static60.anInt1892 < local291 && !Static121.aBoolean154) {
+								if (local1186.anInt5879 == 0 && !Static40.aBoolean108 && Static155.anInt3751 >= local166 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && Static60.anInt1892 < local291 && !Static121.aBoolean154) {
 									MiniMenu.ops[0] = LocalizedText.CANCEL;
 									MiniMenu.size = 1;
 									MiniMenu.cursors[0] = Static35.anInt1092;
@@ -369,7 +369,7 @@ public final class Static87 {
 						}
 						if (Static223.aBooleanArray116[local57] || Cheat.rectDebug > 1) {
 							if (local30.type == 0 && !local30.usingScripts && local30.scrollMaxV > local30.height) {
-								Static74.method1624(local30.scrollY, local30.scrollMaxV, local30.width + local123, local114, local30.height);
+								method1624(local30.scrollY, local30.scrollMaxV, local30.width + local123, local114, local30.height);
 							}
 
 							if (local30.type != 1) {
@@ -475,7 +475,7 @@ public final class Static87 {
 												@Pc(1381) Sprite local1381 = local30.method482(local270);
 												if (local1381 != null) {
 													local1381.render(x, y);
-												} else if (Static211.aBoolean72) {
+												} else if (Component.aBoolean72) {
 													InterfaceList.redraw(local30);
 												}
 											}
@@ -496,7 +496,7 @@ public final class Static87 {
 										}
 									}
 									if (local117 == 0) {
-										if (local30.aBoolean30) {
+										if (local30.filled) {
 											if (GlRenderer.enabled) {
 												GlRaster.method1186(local123, local114, local30.width, local30.height, local270);
 											} else {
@@ -507,7 +507,7 @@ public final class Static87 {
 										} else {
 											SoftwareRaster.drawRect(local123, local114, local30.width, local30.height, local270);
 										}
-									} else if (local30.aBoolean30) {
+									} else if (local30.filled) {
 										if (GlRenderer.enabled) {
 											GlRaster.fillRectAlpha(local123, local114, local30.width, local30.height, local270, 256 - (local117 & 0xFF));
 										} else {
@@ -542,7 +542,7 @@ public final class Static87 {
 												@Pc(1989) ObjType local1989 = ObjTypeList.get(local30.objId);
 												local1934 = local1989.name;
 												if (local1934 == null) {
-													local1934 = Static92.NULL;
+													local1934 = MiniMenu.NULL;
 												}
 												if ((local1989.stackable == 1 || local30.objCount != 1) && local30.objCount != -1) {
 													local1934 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) });
@@ -553,10 +553,10 @@ public final class Static87 {
 												local1934 = LocalizedText.PLEASEWAIT;
 											}
 											if (!local30.usingScripts) {
-												local1934 = Static127.method2465(local30, local1934);
+												local1934 = JagString.method2465(local30, local1934);
 											}
 											local1921.method2852(local1934, local123, local114, local30.width, local30.height, local276, local30.textAntiMacro ? 0 : -1, local30.anInt460, local30.anInt478, local30.anInt467);
-										} else if (Static211.aBoolean72) {
+										} else if (Component.aBoolean72) {
 											InterfaceList.redraw(local30);
 										}
 									} else if (local30.type == 5) {
@@ -646,14 +646,14 @@ public final class Static87 {
 														sprite.renderResized(local123, local114, local30.width, local30.height);
 													}
 												}
-											} else if (Static211.aBoolean72) {
+											} else if (Component.aBoolean72) {
 												InterfaceList.redraw(local30);
 											}
 										} else {
 											sprite = local30.method489(Static154.method2926(local30));
 											if (sprite != null) {
 												sprite.render(local123, local114);
-											} else if (Static211.aBoolean72) {
+											} else if (Component.aBoolean72) {
 												InterfaceList.redraw(local30);
 											}
 										}
@@ -696,13 +696,13 @@ public final class Static87 {
 												}
 											} else if (local276 == -1) {
 												local2589 = local30.method488(-1, null, -1, 0, local2587, PlayerList.self.appearance);
-												if (local2589 == null && Static211.aBoolean72) {
+												if (local2589 == null && Component.aBoolean72) {
 													InterfaceList.redraw(local30);
 												}
 											} else {
 												@Pc(2689) SeqType local2689 = SeqTypeList.get(local276);
 												local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, PlayerList.self.appearance);
-												if (local2589 == null && Static211.aBoolean72) {
+												if (local2589 == null && Component.aBoolean72) {
 													InterfaceList.redraw(local30);
 												}
 											}
@@ -729,7 +729,7 @@ public final class Static87 {
 													GlRenderer.restoreLighting();
 													GlRenderer.setDepthTestEnabled(true);
 													GlRenderer.setFogEnabled(false);
-													Static229.method3935(Preferences.brightness);
+													FogManager.method3935(Preferences.brightness);
 													if (Static263.aBoolean299) {
 														GlRaster.method1177();
 														GlRenderer.clearDepthBuffer();
@@ -767,7 +767,7 @@ public final class Static87 {
 											if (local30.type == 7) {
 												local1921 = local30.method491(Sprites.nameIcons);
 												if (local1921 == null) {
-													if (Static211.aBoolean72) {
+													if (Component.aBoolean72) {
 														InterfaceList.redraw(local30);
 													}
 													continue;
@@ -802,7 +802,7 @@ public final class Static87 {
 												local270 = 0;
 												@Pc(3297) JagString local3297 = local30.text;
 												@Pc(3299) Font local3299 = Fonts.p12Full;
-												local3297 = Static127.method2465(local30, local3297);
+												local3297 = JagString.method2465(local30, local3297);
 												@Pc(3325) JagString local3325;
 												while (local3297.length() > 0) {
 													cardMemory = local3297.indexOf(Static269.aClass100_556);
@@ -841,7 +841,7 @@ public final class Static87 {
 												}
 												local3297 = local30.text;
 												objId = local556 + local3299.lineHeight + 2;
-												local3297 = Static127.method2465(local30, local3297);
+												local3297 = JagString.method2465(local30, local3297);
 												while (local3297.length() > 0) {
 													local563 = local3297.indexOf(Static269.aClass100_556);
 													if (local563 == -1) {
@@ -901,4 +901,38 @@ public final class Static87 {
 		}
 		return arg0 + (arg1 & 0xFF80);
 	}
+
+	@OriginalMember(owner = "client!fn", name = "a", descriptor = "(BIIIII)V")
+	public static void method1624(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
+		Sprites.scrollbars[0].renderTransparent(arg2, arg3);
+		Sprites.scrollbars[1].renderTransparent(arg2, arg4 + arg3 - 16);
+		@Pc(35) int local35 = arg4 * (arg4 - 32) / arg1;
+		if (local35 < 8) {
+			local35 = 8;
+		}
+		@Pc(54) int local54 = arg0 * (arg4 - local35 - 32) / (arg1 - arg4);
+		if (!GlRenderer.enabled) {
+			SoftwareRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306);
+			SoftwareRaster.fillRect(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704);
+			SoftwareRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, Static219.anInt4938);
+			SoftwareRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938);
+			SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 16, 16, Static219.anInt4938);
+			SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 17, 16, Static219.anInt4938);
+			SoftwareRaster.drawVerticalLine(arg2 + 15, local54 + 16 + arg3, local35, Static74.anInt671);
+			SoftwareRaster.drawVerticalLine(arg2 + 14, arg3 - -17 - -local54, local35 - 1, Static74.anInt671);
+			SoftwareRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, Static74.anInt671);
+			SoftwareRaster.drawHorizontalLine(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, Static74.anInt671);
+			return;
+		}
+		GlRaster.method1186(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306);
+		GlRaster.method1186(arg2, arg3 + local54 + 16, 16, local35, Static53.anInt1704);
+		GlRaster.method1176(arg2, local54 + arg3 + 16, local35, Static219.anInt4938);
+		GlRaster.method1176(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938);
+		GlRaster.method1174(arg2, local54 + arg3 + 16, 16, Static219.anInt4938);
+		GlRaster.method1174(arg2, local54 + arg3 + 17, 16, Static219.anInt4938);
+		GlRaster.method1176(arg2 + 15, arg3 + (16 - -local54), local35, Static74.anInt671);
+		GlRaster.method1176(arg2 + 14, arg3 - -local54 + 17, local35 - 1, Static74.anInt671);
+		GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, Static74.anInt671);
+		GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, Static74.anInt671);
+	}
 }
diff --git a/client/src/main/java/rt4/Static89.java b/client/src/main/java/rt4/Static89.java
index 3309d35..2abbab5 100644
--- a/client/src/main/java/rt4/Static89.java
+++ b/client/src/main/java/rt4/Static89.java
@@ -16,9 +16,9 @@ public final class Static89 {
 		@Pc(13) byte[][] local13;
 		if (GlRenderer.enabled && arg0) {
 			local11 = 1;
-			local13 = Static186.underWaterMapFilesBuffer;
+			local13 = LoginManager.underWaterMapFilesBuffer;
 		} else {
-			local13 = Static273.mapFilesBuffer;
+			local13 = LoginManager.mapFilesBuffer;
 			local11 = 4;
 		}
 		for (@Pc(21) int local21 = 0; local21 < local11; local21++) {
@@ -34,8 +34,8 @@ public final class Static89 {
 							@Pc(82) int local82 = local52 >> 1 & 0x3;
 							@Pc(88) int local88 = local52 >> 14 & 0x3FF;
 							@Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8;
-							for (@Pc(100) int local100 = 0; local100 < Static238.regionBitPacked.length; local100++) {
-								if (Static238.regionBitPacked[local100] == local98 && local13[local100] != null) {
+							for (@Pc(100) int local100 = 0; local100 < LoginManager.regionBitPacked.length; local100++) {
+								if (LoginManager.regionBitPacked[local100] == local98 && local13[local100] != null) {
 									Static245.method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0);
 									local54 = true;
 									break;
@@ -51,15 +51,6 @@ public final class Static89 {
 		}
 	}
 
-	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(ILclient!be;)Lclient!be;")
-	public static Component method1836(@OriginalArg(1) Component arg0) {
-		@Pc(12) Component local12 = Static36.method938(arg0);
-		if (local12 == null) {
-			local12 = arg0.aClass13_5;
-		}
-		return local12;
-	}
-
 	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(II)[B")
 	public static byte[] method1837(@OriginalArg(1) int arg0) {
 		@Pc(10) ByteArrayNode local10 = (ByteArrayNode) Static53.aClass54_5.get((long) arg0);
@@ -96,9 +87,9 @@ public final class Static89 {
 
 	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(I)V")
 	public static void method1841() {
-		if (!Static60.aBoolean108) {
+		if (!Static40.aBoolean108) {
 			if (Static226.anInt3953 != 0) {
-				Static155.anInt3751 = Static277.anInt5850;
+				Static155.anInt3751 = Mouse.anInt5850;
 				Static60.anInt1892 = Static280.anInt5895;
 			} else if (Mouse.clickButton == 0) {
 				Static155.anInt3751 = Mouse.anInt4873;
@@ -142,8 +133,8 @@ public final class Static89 {
 			SoftwareRaster.method2503();
 		}
 		MiniMenu.sort();
-		if (Static60.aBoolean108) {
-			if (Static261.aBoolean298) {
+		if (Static40.aBoolean108) {
+			if (Static40.aBoolean298) {
 				Static112.method2297();
 			} else {
 				Static145.method2744();
@@ -153,7 +144,7 @@ public final class Static89 {
 		} else if (Static97.anInt2503 != -1) {
 			Static49.method1207(null, Static214.anInt5574, Static97.anInt2503);
 		}
-		local60 = Static60.aBoolean108 ? -1 : Static235.method4044();
+		local60 = Static40.aBoolean108 ? -1 : Static235.method4044();
 		if (local60 == -1) {
 			local60 = Static270.anInt5794;
 		}
diff --git a/client/src/main/java/rt4/Static9.java b/client/src/main/java/rt4/Static9.java
index 838d2f2..9fa6a1a 100644
--- a/client/src/main/java/rt4/Static9.java
+++ b/client/src/main/java/rt4/Static9.java
@@ -17,7 +17,7 @@ public final class Static9 {
 		Static241.aClass13Array13 = null;
 		Static6.method86(InterfaceList.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0);
 		if (Static241.aClass13Array13 != null) {
-			Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static4.aClass13_1.anInt517);
+			Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static40.aClass13_1.anInt517);
 			Static241.aClass13Array13 = null;
 		}
 	}
diff --git a/client/src/main/java/rt4/Static90.java b/client/src/main/java/rt4/Static90.java
deleted file mode 100644
index 7335555..0000000
--- a/client/src/main/java/rt4/Static90.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static90 {
-
-    @OriginalMember(owner = "client!hb", name = "t", descriptor = "[I")
-	public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 };
-
-}
diff --git a/client/src/main/java/rt4/Static92.java b/client/src/main/java/rt4/Static92.java
deleted file mode 100644
index b0bdf36..0000000
--- a/client/src/main/java/rt4/Static92.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static92 {
-
-	@OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;")
-	public static Sprite aClass3_Sub2_Sub1_6;
-
-	@OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;")
-	public static final JagString NULL = JagString.parse("null");
-
-	@OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIIIIII)V")
-	public static void method1881(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
-		if (arg5 < 0 || arg3 < 0 || arg5 >= 103 || arg3 >= 103) {
-			return;
-		}
-		@Pc(38) int local38;
-		if (arg4 == 0) {
-			@Pc(28) Wall local28 = SceneGraph.getWall(arg0, arg5, arg3);
-			if (local28 != null) {
-				local38 = Integer.MAX_VALUE & (int) (local28.key >>> 32);
-				if (arg2 == 2) {
-					local28.primary = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.primary);
-					local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6);
-				} else {
-					local28.primary = new Loc(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.primary);
-				}
-			}
-		}
-		if (arg4 == 1) {
-			@Pc(106) WallDecor local106 = SceneGraph.getWallDecor(arg0, arg5, arg3);
-			if (local106 != null) {
-				local38 = (int) (local106.key >>> 32) & Integer.MAX_VALUE;
-				if (arg2 == 4 || arg2 == 5) {
-					local106.primary = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.primary);
-				} else if (arg2 == 6) {
-					local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
-				} else if (arg2 == 7) {
-					local106.primary = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.primary);
-				} else if (arg2 == 8) {
-					local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
-					local106.aClass8_2 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2);
-				}
-			}
-		}
-		if (arg4 == 2) {
-			if (arg2 == 11) {
-				arg2 = 10;
-			}
-			@Pc(255) Scenery local255 = SceneGraph.getScenery(arg0, arg5, arg3);
-			if (local255 != null) {
-				local255.primary = new Loc((int) (local255.key >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary);
-			}
-		}
-		if (arg4 == 3) {
-			@Pc(290) GroundDecor local290 = SceneGraph.getGroundDecor(arg0, arg5, arg3);
-			if (local290 != null) {
-				local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.key >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary);
-			}
-		}
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static96.java b/client/src/main/java/rt4/Static96.java
index 6373691..1b6d9db 100644
--- a/client/src/main/java/rt4/Static96.java
+++ b/client/src/main/java/rt4/Static96.java
@@ -8,10 +8,7 @@ public final class Static96 {
 	@OriginalMember(owner = "client!hh", name = "p", descriptor = "[I")
 	public static int[] anIntArray234;
 
-	@OriginalMember(owner = "client!hh", name = "r", descriptor = "[I")
-	public static int[] anIntArray235;
-
-	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V")
+    @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V")
 	public static void method1949(@OriginalArg(1) int arg0) {
 		if (InterfaceList.load(arg0)) {
 			Static118.method2354(-1, InterfaceList.components[arg0]);
diff --git a/client/src/main/java/rt4/Static97.java b/client/src/main/java/rt4/Static97.java
index d97c42c..0487558 100644
--- a/client/src/main/java/rt4/Static97.java
+++ b/client/src/main/java/rt4/Static97.java
@@ -34,7 +34,7 @@ public final class Static97 {
 			return;
 		}
 		local30 -= 10;
-		@Pc(58) int local58 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
+		@Pc(58) int local58 = MiniMap.anInt1814 + (int)Camera.yawTarget & 0x7FF;
 		@Pc(62) int local62 = MathUtils.cos[local58];
 		@Pc(66) int local66 = MathUtils.sin[local58];
 		@Pc(74) int local74 = local66 * 256 / (MiniMap.anInt4130 + 256);
@@ -45,9 +45,9 @@ public final class Static97 {
 		@Pc(117) int local117 = (int) (Math.sin(local110) * (double) local30);
 		@Pc(124) int local124 = (int) (Math.cos(local110) * (double) local30);
 		if (GlRenderer.enabled) {
-			((GlSprite) Static277.hintMapEdge[arg0]).method1428((arg5.width / 2 + arg2 + local117) * 16, (arg5.height / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D));
+			((GlSprite) Sprites.hintMapEdge[arg0]).method1428((arg5.width / 2 + arg2 + local117) * 16, (arg5.height / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D));
 		} else {
-			((SoftwareSprite) Static277.hintMapEdge[arg0]).method306(local117 + arg5.width / 2 + arg2 - 10, arg5.height / 2 + -10 + arg1 + -local124, local110);
+			((SoftwareSprite) Sprites.hintMapEdge[arg0]).method306(local117 + arg5.width / 2 + arg2 - 10, arg5.height / 2 + -10 + arg1 + -local124, local110);
 		}
 	}
 
diff --git a/client/src/main/java/rt4/Static99.java b/client/src/main/java/rt4/Static99.java
index ac63e05..e6e1223 100644
--- a/client/src/main/java/rt4/Static99.java
+++ b/client/src/main/java/rt4/Static99.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static99 {
 
-    @OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I")
-	public static int[] underWaterMapFileIds;
-
-	@OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;")
+    @OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;")
 	public static final LinkedList aClass69_64 = new LinkedList();
 
 }
diff --git a/client/src/main/java/rt4/StringUtils.java b/client/src/main/java/rt4/StringUtils.java
new file mode 100644
index 0000000..77b4a18
--- /dev/null
+++ b/client/src/main/java/rt4/StringUtils.java
@@ -0,0 +1,43 @@
+package rt4;
+
+import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalMember;
+
+public class StringUtils {
+    @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z")
+	public static boolean isAlphaNumeric(@OriginalArg(0) int arg0) {
+		if (arg0 >= 97 && arg0 <= 122) {
+			return true;
+		} else if (arg0 >= 65 && arg0 <= 90) {
+			return true;
+		} else {
+			return arg0 >= 48 && arg0 <= 57;
+		}
+	}
+
+	@OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z")
+	public static boolean isLetter(@OriginalArg(0) int arg0) {
+		return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90;
+	}
+
+	@OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z")
+	public static boolean isDigit(@OriginalArg(1) int arg0) {
+		return arg0 >= 48 && arg0 <= 57;
+	}
+
+	@OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
+	public static boolean isValidChar(@OriginalArg(1) int arg0) {
+		if (arg0 >= 32 && arg0 <= 126) {
+			return true;
+		} else if (arg0 >= 160 && arg0 <= 255) {
+			return true;
+		} else {
+			return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159;
+		}
+	}
+
+    @OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
+    public static JagString method4510(@OriginalArg(0) int arg0) {
+        return arg0 >= 999999999 ? Static220.aClass100_930 : JagString.parseInt(arg0);
+    }
+}
diff --git a/client/src/main/java/rt4/SynthFilter.java b/client/src/main/java/rt4/SynthFilter.java
index 5f8f5cd..7226849 100644
--- a/client/src/main/java/rt4/SynthFilter.java
+++ b/client/src/main/java/rt4/SynthFilter.java
@@ -8,6 +8,14 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!nl")
 public final class SynthFilter {
 
+	@OriginalMember(owner = "client!nl", name = "f", descriptor = "[[I")
+	public static final int[][] anIntArrayArray32 = new int[2][8];
+	@OriginalMember(owner = "client!nl", name = "b", descriptor = "[[F")
+	public static final float[][] aFloatArrayArray2 = new float[2][8];
+	@OriginalMember(owner = "client!nl", name = "d", descriptor = "F")
+	public static float aFloat22;
+	@OriginalMember(owner = "client!nl", name = "g", descriptor = "I")
+	public static int anInt4191;
 	@OriginalMember(owner = "client!nl", name = "e", descriptor = "[I")
 	public final int[] anIntArray368 = new int[2];
 
@@ -20,6 +28,12 @@ public final class SynthFilter {
 	@OriginalMember(owner = "client!nl", name = "h", descriptor = "[I")
 	private final int[] anIntArray369 = new int[2];
 
+	@OriginalMember(owner = "client!nl", name = "a", descriptor = "(F)F")
+	public static float method3250(@OriginalArg(0) float arg0) {
+		@Pc(7) float local7 = (float) Math.pow(2.0D, (double) arg0) * 32.703197F;
+		return local7 * 3.1415927F / 11025.0F;
+	}
+
 	@OriginalMember(owner = "client!nl", name = "a", descriptor = "(Lclient!wa;Lclient!ff;)V")
 	public final void method3249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) SynthEnvelope arg1) {
 		@Pc(3) int local3 = arg0.g1();
@@ -62,35 +76,35 @@ public final class SynthFilter {
 		if (arg0 == 0) {
 			local20 = (float) this.anIntArray369[0] + (float) (this.anIntArray369[1] - this.anIntArray369[0]) * arg1;
 			@Pc(24) float local24 = local20 * 0.0030517578F;
-			Static174.aFloat22 = (float) Math.pow(0.1D, (double) (local24 / 20.0F));
-			Static174.anInt4191 = (int) (Static174.aFloat22 * 65536.0F);
+			aFloat22 = (float) Math.pow(0.1D, (double) (local24 / 20.0F));
+			anInt4191 = (int) (aFloat22 * 65536.0F);
 		}
 		if (this.anIntArray368[arg0] == 0) {
 			return 0;
 		}
 		local20 = this.method3253(arg0, 0, arg1);
-		Static174.aFloatArrayArray2[arg0][0] = -2.0F * local20 * (float) Math.cos((double) this.method3254(arg0, 0, arg1));
-		Static174.aFloatArrayArray2[arg0][1] = local20 * local20;
+		aFloatArrayArray2[arg0][0] = -2.0F * local20 * (float) Math.cos((double) this.method3254(arg0, 0, arg1));
+		aFloatArrayArray2[arg0][1] = local20 * local20;
 		@Pc(77) int local77;
 		for (local77 = 1; local77 < this.anIntArray368[arg0]; local77++) {
 			local20 = this.method3253(arg0, local77, arg1);
 			@Pc(102) float local102 = -2.0F * local20 * (float) Math.cos((double) this.method3254(arg0, local77, arg1));
 			@Pc(106) float local106 = local20 * local20;
-			Static174.aFloatArrayArray2[arg0][local77 * 2 + 1] = Static174.aFloatArrayArray2[arg0][local77 * 2 - 1] * local106;
-			Static174.aFloatArrayArray2[arg0][local77 * 2] = Static174.aFloatArrayArray2[arg0][local77 * 2 - 1] * local102 + Static174.aFloatArrayArray2[arg0][local77 * 2 - 2] * local106;
+			aFloatArrayArray2[arg0][local77 * 2 + 1] = aFloatArrayArray2[arg0][local77 * 2 - 1] * local106;
+			aFloatArrayArray2[arg0][local77 * 2] = aFloatArrayArray2[arg0][local77 * 2 - 1] * local102 + aFloatArrayArray2[arg0][local77 * 2 - 2] * local106;
 			for (@Pc(162) int local162 = local77 * 2 - 1; local162 >= 2; local162--) {
-				Static174.aFloatArrayArray2[arg0][local162] += Static174.aFloatArrayArray2[arg0][local162 - 1] * local102 + Static174.aFloatArrayArray2[arg0][local162 - 2] * local106;
+				aFloatArrayArray2[arg0][local162] += aFloatArrayArray2[arg0][local162 - 1] * local102 + aFloatArrayArray2[arg0][local162 - 2] * local106;
 			}
-			Static174.aFloatArrayArray2[arg0][1] += Static174.aFloatArrayArray2[arg0][0] * local102 + local106;
-			Static174.aFloatArrayArray2[arg0][0] += local102;
+			aFloatArrayArray2[arg0][1] += aFloatArrayArray2[arg0][0] * local102 + local106;
+			aFloatArrayArray2[arg0][0] += local102;
 		}
 		if (arg0 == 0) {
 			for (local77 = 0; local77 < this.anIntArray368[0] * 2; local77++) {
-				Static174.aFloatArrayArray2[0][local77] *= Static174.aFloat22;
+				aFloatArrayArray2[0][local77] *= aFloat22;
 			}
 		}
 		for (local77 = 0; local77 < this.anIntArray368[arg0] * 2; local77++) {
-			Static174.anIntArrayArray32[arg0][local77] = (int) (Static174.aFloatArrayArray2[arg0][local77] * 65536.0F);
+			anIntArrayArray32[arg0][local77] = (int) (aFloatArrayArray2[arg0][local77] * 65536.0F);
 		}
 		return this.anIntArray368[arg0] * 2;
 	}
@@ -106,6 +120,6 @@ public final class SynthFilter {
 	private float method3254(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) float arg2) {
 		@Pc(30) float local30 = (float) this.anIntArrayArrayArray14[arg0][0][arg1] + arg2 * (float) (this.anIntArrayArrayArray14[arg0][1][arg1] - this.anIntArrayArrayArray14[arg0][0][arg1]);
 		@Pc(34) float local34 = local30 * 1.2207031E-4F;
-		return Static174.method3250(local34);
+		return method3250(local34);
 	}
 }
diff --git a/client/src/main/java/rt4/SynthInstrument.java b/client/src/main/java/rt4/SynthInstrument.java
index 6533a99..492f15d 100644
--- a/client/src/main/java/rt4/SynthInstrument.java
+++ b/client/src/main/java/rt4/SynthInstrument.java
@@ -214,12 +214,12 @@ public final class SynthInstrument {
 				}
 				@Pc(523) int local523;
 				while (local198 < local203) {
-					local356 = (int) ((long) anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16);
+					local356 = (int) ((long) anIntArray398[local198 + local185] * (long) SynthFilter.anInt4191 >> 16);
 					for (local523 = 0; local523 < local185; local523++) {
-						local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
+						local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[0][local523] >> 16);
 					}
 					for (local523 = 0; local523 < local198; local523++) {
-						local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
+						local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[1][local523] >> 16);
 					}
 					anIntArray398[local198] = local356;
 					local102 = this.aClass42_6.method1512(arg0 + 1);
@@ -231,12 +231,12 @@ public final class SynthInstrument {
 						local203 = arg0 - local185;
 					}
 					while (local198 < local203) {
-						local356 = (int) ((long) anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16);
+						local356 = (int) ((long) anIntArray398[local198 + local185] * (long) SynthFilter.anInt4191 >> 16);
 						for (local523 = 0; local523 < local185; local523++) {
-							local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
+							local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[0][local523] >> 16);
 						}
 						for (local523 = 0; local523 < local190; local523++) {
-							local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
+							local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[1][local523] >> 16);
 						}
 						anIntArray398[local198] = local356;
 						local102 = this.aClass42_6.method1512(arg0 + 1);
@@ -246,10 +246,10 @@ public final class SynthInstrument {
 						while (local198 < arg0) {
 							local356 = 0;
 							for (local523 = local198 + local185 - arg0; local523 < local185; local523++) {
-								local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
+								local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[0][local523] >> 16);
 							}
 							for (local523 = 0; local523 < local190; local523++) {
-								local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
+								local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[1][local523] >> 16);
 							}
 							anIntArray398[local198] = local356;
 							this.aClass42_6.method1512(arg0 + 1);
diff --git a/client/src/main/java/rt4/TextureOp29.java b/client/src/main/java/rt4/TextureOp29.java
index aae1f39..f7c7ef7 100644
--- a/client/src/main/java/rt4/TextureOp29.java
+++ b/client/src/main/java/rt4/TextureOp29.java
@@ -81,7 +81,7 @@ public final class TextureOp29 extends TextureOp {
 				} else if (local24 == 2) {
 					this.aClass18Array1[local11] = Static156.method2960(arg1);
 				} else if (local24 == 3) {
-					this.aClass18Array1[local11] = Static137.method2664(arg1);
+					this.aClass18Array1[local11] = TextureOp29SubOp2.method2664(arg1);
 				}
 			}
 		} else if (arg0 == 1) {
diff --git a/client/src/main/java/rt4/TextureOp29SubOp2.java b/client/src/main/java/rt4/TextureOp29SubOp2.java
index aad2984..71943bf 100644
--- a/client/src/main/java/rt4/TextureOp29SubOp2.java
+++ b/client/src/main/java/rt4/TextureOp29SubOp2.java
@@ -29,6 +29,11 @@ public final class TextureOp29SubOp2 extends TextureOp29SubOp {
 		this.anInt3159 = arg2;
 	}
 
+	@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
+	public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) {
+		return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1());
+	}
+
 	@OriginalMember(owner = "client!kc", name = "c", descriptor = "(III)V")
 	@Override
 	public final void method4013(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
diff --git a/client/src/main/java/rt4/TextureOpSprite.java b/client/src/main/java/rt4/TextureOpSprite.java
index 9d1acd1..eaed5b2 100644
--- a/client/src/main/java/rt4/TextureOpSprite.java
+++ b/client/src/main/java/rt4/TextureOpSprite.java
@@ -32,7 +32,7 @@ public class TextureOpSprite extends TextureOp {
 		} else if (this.anInt3235 < 0) {
 			return false;
 		} else {
-			@Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? Static164.method3117(Static176.aClass153_76, this.anInt3235) : SpriteLoader.loadSoftwareSprite(this.anInt3235, Static176.aClass153_76, Static215.anInt4868);
+			@Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? SpriteLoader.method3117(Static176.aClass153_76, this.anInt3235) : SpriteLoader.loadSoftwareSprite(this.anInt3235, Static176.aClass153_76, Static215.anInt4868);
 			local43.trim();
 			this.anInt3240 = local43.height;
 			this.anInt3239 = local43.width;
diff --git a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java
index bdceaef..4219a51 100644
--- a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java
+++ b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java
@@ -12,6 +12,8 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer {
 
     @OriginalMember(owner = "client!wg", name = "b", descriptor = "Z")
     public static boolean aBoolean308 = false;
+    @OriginalMember(owner = "client!nh", name = "Z", descriptor = "I")
+	public static int anInt3241 = 128;
     @OriginalMember(owner = "client!wg", name = "c", descriptor = "I")
 	private int anInt5805 = -1;
 
@@ -206,9 +208,9 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer {
 			local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, WaterMaterialRenderer.method2422(), 0);
 			if (arg0 >= 0) {
 				this.aFloatArray29[0] = 0.0F;
-				this.aFloatArray29[1] = 1.0F / (float) Static170.anInt3241;
+				this.aFloatArray29[1] = 1.0F / (float) anInt3241;
 				this.aFloatArray29[2] = 0.0F;
-				this.aFloatArray29[3] = (float) arg0 * 1.0F / (float) Static170.anInt3241;
+				this.aFloatArray29[3] = (float) arg0 * 1.0F / (float) anInt3241;
 				local1.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray29, 0);
 				local1.glEnable(GL2.GL_TEXTURE_GEN_S);
 			} else {
diff --git a/client/src/main/java/rt4/VarpDomain.java b/client/src/main/java/rt4/VarpDomain.java
index d30633a..ab15b51 100644
--- a/client/src/main/java/rt4/VarpDomain.java
+++ b/client/src/main/java/rt4/VarpDomain.java
@@ -11,6 +11,8 @@ public class VarpDomain {
 	public static final int[] varp = new int[3500];
     @OriginalMember(owner = "client!ah", name = "j", descriptor = "[I")
     public static final int[] activeVarps = new int[3500];
+    @OriginalMember(owner = "client!uj", name = "s", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1061 = JagString.parse("null");
     @OriginalMember(owner = "client!fi", name = "n", descriptor = "I")
     public static int updatedVarpsWriterIndex = 0;
     @OriginalMember(owner = "client!qc", name = "K", descriptor = "Lclient!sc;")
@@ -39,4 +41,74 @@ public class VarpDomain {
         }
         aClass133_20 = new HashTable(16);
     }
+
+    @OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
+	public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+		activeVarps[arg0] = arg1;
+		@Pc(21) LongNode local21 = (LongNode) aClass133_20.get((long) arg0);
+		if (local21 == null) {
+			local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
+			aClass133_20.put(local21, (long) arg0);
+		} else {
+			local21.value = MonotonicClock.currentTimeMillis() + 500L;
+		}
+	}
+
+    @OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I")
+	public static int getVarbit(@OriginalArg(1) int arg0) {
+		@Pc(13) VarbitType local13 = VarbitTypeList.get(arg0);
+		@Pc(16) int local16 = local13.baseVar;
+		@Pc(19) int local19 = local13.endBit;
+		@Pc(22) int local22 = local13.startBit;
+		@Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local19 - local22];
+		return activeVarps[local16] >> local22 & local29;
+	}
+
+    @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V")
+    public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+        @Pc(7) VarbitType local7 = VarbitTypeList.get(arg0);
+        @Pc(10) int local10 = local7.endBit;
+        @Pc(16) int local16 = local7.startBit;
+        @Pc(19) int local19 = local7.baseVar;
+        @Pc(25) int local25 = Song_Class3_Sub9.anIntArray135[local10 - local16];
+        if (arg1 < 0 || arg1 > local25) {
+            arg1 = 0;
+        }
+        local25 <<= local16;
+        method2766(local19, local25 & arg1 << local16 | activeVarps[local19] & ~local25);
+    }
+
+    @OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V")
+	public static void setVarbit(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
+		@Pc(14) VarbitType local14 = VarbitTypeList.get(arg1);
+		@Pc(17) int local17 = local14.baseVar;
+		@Pc(20) int local20 = local14.endBit;
+		@Pc(23) int local23 = local14.startBit;
+		@Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local20 - local23];
+		if (arg0 < 0 || local29 < arg0) {
+			arg0 = 0;
+		}
+		local29 <<= local23;
+		set(arg0 << local23 & local29 | ~local29 & varp[local17], local17);
+	}
+
+    @OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V")
+	public static void refreshMagicVarp(@OriginalArg(1) int arg0) {
+		InterfaceList.redrawActiveInterfaces();
+		AreaSoundManager.updateMulti();
+		@Pc(17) int local17 = VarpTypeList.get(arg0).clientCode;
+		if (local17 == 0) {
+			return;
+		}
+		@Pc(25) int local25 = activeVarps[arg0];
+		if (local17 == 6) {
+			Static79.anInt2157 = local25;
+		}
+		if (local17 == 5) {
+			Static116.anInt2952 = local25;
+		}
+		if (local17 == 9) {
+			Static179.anInt4254 = local25;
+		}
+	}
 }
diff --git a/client/src/main/java/rt4/WaterMaterialRenderer.java b/client/src/main/java/rt4/WaterMaterialRenderer.java
index 6e91873..9f6041c 100644
--- a/client/src/main/java/rt4/WaterMaterialRenderer.java
+++ b/client/src/main/java/rt4/WaterMaterialRenderer.java
@@ -12,7 +12,9 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
 
     @OriginalMember(owner = "client!v", name = "c", descriptor = "[F")
     public static final float[] aFloatArray2 = new float[] { 0.073F, 0.169F, 0.24F, 1.0F };
-    @OriginalMember(owner = "client!pd", name = "a", descriptor = "I")
+	@OriginalMember(owner = "client!pd", name = "b", descriptor = "[F")
+	public static final float[] aFloatArray22 = new float[] { 0.1F, 0.1F, 0.15F, 0.1F };
+	@OriginalMember(owner = "client!pd", name = "a", descriptor = "I")
 	private int anInt4440 = -1;
 
 	@OriginalMember(owner = "client!pd", name = "c", descriptor = "[F")
@@ -32,8 +34,8 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
 
 	@OriginalMember(owner = "client!jj", name = "a", descriptor = "(B)[F")
 	public static float[] method2422() {
-		@Pc(3) float local3 = Static161.method3068() + Static161.method3059();
-		@Pc(9) int local9 = Static161.method3064();
+		@Pc(3) float local3 = FogManager.method3068() + FogManager.method3059();
+		@Pc(9) int local9 = FogManager.method3064();
 		@Pc(18) float local18 = (float) (local9 >> 16 & 0xFF) / 255.0F;
 		Static251.aFloatArray28[3] = 1.0F;
 		@Pc(37) float local37 = (float) (local9 >> 8 & 0xFF) / 255.0F;
@@ -187,7 +189,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
 		local1.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray23, 0);
 		local1.glPopMatrix();
 		local1.glActiveTexture(GL2.GL_TEXTURE0);
-		local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, Static188.aFloatArray22, 0);
+		local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, aFloatArray22, 0);
 	}
 
 	@OriginalMember(owner = "client!pd", name = "c", descriptor = "()I")
diff --git a/client/src/main/java/rt4/WordPack.java b/client/src/main/java/rt4/WordPack.java
index c43b3a8..099efbc 100644
--- a/client/src/main/java/rt4/WordPack.java
+++ b/client/src/main/java/rt4/WordPack.java
@@ -2,6 +2,7 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
 
 public class WordPack {
     @OriginalMember(owner = "client!vl", name = "f", descriptor = "Lclient!na;")
@@ -13,4 +14,13 @@ public class WordPack {
     public static void init(@OriginalArg(0) HuffmanCodec arg0) {
         codec = arg0;
     }
+
+    @OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
+	public static int encode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) {
+		@Pc(6) int local6 = arg0.offset;
+		@Pc(14) byte[] local14 = arg1.method3148();
+		arg0.pSmart1or2(local14.length);
+		arg0.offset += codec.method1550(local14.length, arg0.data, local14, 0, arg0.offset);
+		return arg0.offset - local6;
+	}
 }
diff --git a/client/src/main/java/rt4/WorldMap.java b/client/src/main/java/rt4/WorldMap.java
index 921b6bf..3d75942 100644
--- a/client/src/main/java/rt4/WorldMap.java
+++ b/client/src/main/java/rt4/WorldMap.java
@@ -21,6 +21,8 @@ public class WorldMap {
     public static final int anInt3254 = (int) (Math.random() * 17.0D) - 8;
     @OriginalMember(owner = "client!lf", name = "c", descriptor = "Lclient!ih;")
     public static final LinkedList mapElements = new LinkedList();
+    @OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;")
+    public static final JagString aClass100_517 = JagString.parse("");
     @OriginalMember(owner = "client!wa", name = "ub", descriptor = "Lclient!bn;")
     public static Map currentMap;
     @OriginalMember(owner = "client!dc", name = "O", descriptor = "I")
@@ -137,9 +139,9 @@ public class WorldMap {
                 targetZoom = 8.0F;
             }
 
-            @Pc(144) int local144 = (PlayerList.self.xFine >> 7) + Static225.originX - originX;
+            @Pc(144) int local144 = (PlayerList.self.xFine >> 7) + Camera.originX - originX;
             @Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5;
-            @Pc(168) int local168 = originZ + length - Static142.originZ - (PlayerList.self.zFine >> 7) - 1;
+            @Pc(168) int local168 = originZ + length - Camera.originZ - (PlayerList.self.zFine >> 7) - 1;
             @Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5;
             if (local153 >= 0 && width > local153 && local177 >= 0 && local177 < length) {
                 anInt435 = local153;
@@ -154,7 +156,7 @@ public class WorldMap {
             @Pc(235) int length = WorldMap.length >> 6;
             @Pc(239) int width = WorldMap.width >> 6;
             aByteArrayArrayArray8 = new byte[width][length][];
-            @Pc(249) int local249 = Static86.anInt2293 >> 2 << 10;
+            @Pc(249) int local249 = Static45.anInt2293 >> 2 << 10;
             aByteArrayArrayArray7 = new byte[width][length][];
             underlayColors = new int[width][length][];
             aByteArrayArrayArray3 = new byte[width][length][];
@@ -691,7 +693,7 @@ public class WorldMap {
                                     if (local437 == 0 || local62 <= 1 || local238 <= 1) {
                                         SoftwareRaster.fillRect(local47, mapScene, local62, local238, local372);
                                     } else {
-                                        Static280.method4667(SoftwareRaster.pixels, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, mapScene, true);
+                                        method4667(SoftwareRaster.pixels, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, mapScene, true);
                                     }
                                 }
                                 if (local395 != 0) {
@@ -703,7 +705,7 @@ public class WorldMap {
                                     if (local437 == 0 || local62 <= 1 || local238 <= 1) {
                                         SoftwareRaster.fillRect(local47, mapScene, local62, local238, local395);
                                     }
-                                    Static280.method4667(SoftwareRaster.pixels, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, mapScene, local372 == 0);
+                                    method4667(SoftwareRaster.pixels, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, mapScene, local372 == 0);
                                 }
                             }
                             if (local197[angle] != null) {
@@ -1023,7 +1025,7 @@ public class WorldMap {
     @OriginalMember(owner = "client!rc", name = "a", descriptor = "(Lclient!na;Z)Lclient!na;")
     public static JagString method923(@OriginalArg(0) JagString arg0) {
         @Pc(12) int local12 = Static171.method3218(arg0);
-        return local12 == -1 ? Static211.aClass100_517 : labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872);
+        return local12 == -1 ? aClass100_517 : labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872);
     }
 
     @OriginalMember(owner = "client!rg", name = "d", descriptor = "(B)Lclient!bn;")
@@ -1093,4 +1095,488 @@ public class WorldMap {
 		}
 		return -1;
 	}
+
+    @OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V")
+    public static void method4667(@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) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) {
+        @Pc(7) int local7 = arg2;
+        if (SoftwareRaster.clipRight <= arg2) {
+            return;
+        }
+        if (arg2 < SoftwareRaster.clipLeft) {
+            local7 = SoftwareRaster.clipLeft;
+        }
+        @Pc(30) int local30 = arg7 + arg2;
+        if (SoftwareRaster.clipLeft >= local30) {
+            return;
+        }
+        if (SoftwareRaster.clipRight < local30) {
+            local30 = SoftwareRaster.clipRight;
+        }
+        @Pc(43) int local43 = arg8;
+        if (SoftwareRaster.clipBottom <= arg8) {
+            return;
+        }
+        @Pc(56) int local56 = arg8 + arg6;
+        if (arg8 < SoftwareRaster.clipTop) {
+            local43 = SoftwareRaster.clipTop;
+        }
+        if (local56 <= SoftwareRaster.clipTop) {
+            return;
+        }
+        @Pc(79) int local79 = local7 + SoftwareRaster.width * local43;
+        if (arg5 == 9) {
+            arg3 = arg3 + 1 & 0x3;
+            arg5 = 1;
+        }
+        @Pc(99) int local99 = local7 + SoftwareRaster.width - local30;
+        local43 -= arg8;
+        @Pc(108) int local108 = arg6 - local43;
+        if (SoftwareRaster.clipBottom < local56) {
+            local56 = SoftwareRaster.clipBottom;
+        }
+        if (arg5 == 10) {
+            arg3 = arg3 + 3 & 0x3;
+            arg5 = 1;
+        }
+        local7 -= arg2;
+        @Pc(136) int local136 = arg7 - local7;
+        if (arg5 == 11) {
+            arg3 = arg3 + 3 & 0x3;
+            arg5 = 8;
+        }
+        local30 -= arg2;
+        @Pc(157) int local157 = arg7 - local30;
+        local56 -= arg8;
+        @Pc(165) int local165 = arg6 - local56;
+        @Pc(175) int local175;
+        @Pc(184) int local184;
+        if (arg5 == 1) {
+            if (arg3 == 0) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local184 <= local175) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 1) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local175 >= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 2) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local184 >= local175) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 3) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local184 >= local175) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            }
+        } else if (arg5 == 2) {
+            if (arg3 == 0) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local175 >> 1 >= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 1) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local79 >= 0 && local79 < arg0.length) {
+                            if (local175 << 1 <= local184) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        } else {
+                            local79++;
+                        }
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 2) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local136 - 1; local184 >= local157; local184--) {
+                        if (local175 >> 1 >= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 3) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local136 - 1; local184 >= local157; local184--) {
+                        if (local175 << 1 <= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            }
+        } else if (arg5 == 3) {
+            if (arg3 == 0) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local136 - 1; local184 >= local157; local184--) {
+                        if (local175 >> 1 >= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 1) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local184 >= local175 << 1) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 2) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local184 <= local175 >> 1) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 3) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local136 - 1; local184 >= local157; local184--) {
+                        if (local175 << 1 <= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            }
+        } else if (arg5 == 4) {
+            if (arg3 == 0) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local175 >> 1 <= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 1) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local7; local184 < local30; local184++) {
+                        if (local175 << 1 >= local184) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 2) {
+                for (local175 = local43; local175 < local56; local175++) {
+                    for (local184 = local136 - 1; local184 >= local157; local184--) {
+                        if (local184 >= local175 >> 1) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            } else if (arg3 == 3) {
+                for (local175 = local108 - 1; local175 >= local165; local175--) {
+                    for (local184 = local136 - 1; local184 >= local157; local184--) {
+                        if (local184 <= local175 << 1) {
+                            arg0[local79] = arg1;
+                        } else if (arg9) {
+                            arg0[local79] = arg4;
+                        }
+                        local79++;
+                    }
+                    local79 += local99;
+                }
+            }
+        } else if (arg5 != 5) {
+            if (arg5 == 6) {
+                if (arg3 == 0) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local184 <= arg7 / 2) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 1) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local175 <= arg6 / 2) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 2) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local184 >= arg7 / 2) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 3) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local175 >= arg6 / 2) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+            }
+            if (arg5 == 7) {
+                if (arg3 == 0) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local184 <= local175 - arg6 / 2) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 1) {
+                    for (local175 = local108 - 1; local175 >= local165; local175--) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local175 - arg6 / 2 >= local184) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 2) {
+                    for (local175 = local108 - 1; local175 >= local165; local175--) {
+                        for (local184 = local136 - 1; local184 >= local157; local184--) {
+                            if (local184 <= local175 - arg6 / 2) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 3) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local136 - 1; local184 >= local157; local184--) {
+                            if (local175 - arg6 / 2 >= local184) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+            }
+            if (arg5 == 8) {
+                if (arg3 == 0) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local175 - arg6 / 2 <= local184) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 1) {
+                    for (local175 = local108 - 1; local175 >= local165; local175--) {
+                        for (local184 = local7; local184 < local30; local184++) {
+                            if (local175 - arg6 / 2 <= local184) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 2) {
+                    for (local175 = local108 - 1; local175 >= local165; local175--) {
+                        for (local184 = local136 - 1; local184 >= local157; local184--) {
+                            if (local184 >= local175 - arg6 / 2) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+                if (arg3 == 3) {
+                    for (local175 = local43; local175 < local56; local175++) {
+                        for (local184 = local136 - 1; local184 >= local157; local184--) {
+                            if (local175 - arg6 / 2 <= local184) {
+                                arg0[local79] = arg1;
+                            } else if (arg9) {
+                                arg0[local79] = arg4;
+                            }
+                            local79++;
+                        }
+                        local79 += local99;
+                    }
+                    return;
+                }
+            }
+        } else if (arg3 == 0) {
+            for (local175 = local108 - 1; local175 >= local165; local175--) {
+                for (local184 = local136 - 1; local184 >= local157; local184--) {
+                    if (local175 >> 1 <= local184) {
+                        arg0[local79] = arg1;
+                    } else if (arg9) {
+                        arg0[local79] = arg4;
+                    }
+                    local79++;
+                }
+                local79 += local99;
+            }
+        } else if (arg3 == 1) {
+            for (local175 = local108 - 1; local175 >= local165; local175--) {
+                for (local184 = local7; local184 < local30; local184++) {
+                    if (local184 <= local175 << 1) {
+                        arg0[local79] = arg1;
+                    } else if (arg9) {
+                        arg0[local79] = arg4;
+                    }
+                    local79++;
+                }
+                local79 += local99;
+            }
+        } else if (arg3 == 2) {
+            for (local175 = local43; local175 < local56; local175++) {
+                for (local184 = local7; local184 < local30; local184++) {
+                    if (local184 >= local175 >> 1) {
+                        arg0[local79] = arg1;
+                    } else if (arg9) {
+                        arg0[local79] = arg4;
+                    }
+                    local79++;
+                }
+                local79 += local99;
+            }
+        } else if (arg3 == 3) {
+            for (local175 = local43; local175 < local56; local175++) {
+                for (local184 = local136 - 1; local184 >= local157; local184--) {
+                    if (local175 << 1 >= local184) {
+                        arg0[local79] = arg1;
+                    } else if (arg9) {
+                        arg0[local79] = arg4;
+                    }
+                    local79++;
+                }
+                local79 += local99;
+            }
+        }
+    }
 }
diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java
index e1ffd93..da853a1 100644
--- a/client/src/main/java/rt4/client.java
+++ b/client/src/main/java/rt4/client.java
@@ -24,7 +24,11 @@ public final class client extends GameShell {
     public static final Js5CachedResourceProvider[] js5Providers = new Js5CachedResourceProvider[28];
     @OriginalMember(owner = "client!d", name = "S", descriptor = "Ljava/util/Random;")
     public static final Random aRandom1 = new Random();
-    @OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;")
+	@OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I")
+	public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+	@OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;")
+	public static final JagString aClass100_974 = JagString.parse("<br>(X");
+	@OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;")
 	static final JagString aClass100_603 = JagString.parse("");
 	@OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;")
 	public static JagString mainLoadSecondaryText = aClass100_603;
@@ -297,7 +301,7 @@ public final class client extends GameShell {
             Static233.aClass95_4 = null;
         }
         if (arg0 == 25 || arg0 == 28) {
-            Static271.anInt5804 = 0;
+            ClientProt.anInt5804 = 0;
             Static230.anInt5150 = 1;
             Static233.loadingScreenState = 0;
             Static38.anInt1196 = 1;
@@ -453,14 +457,14 @@ public final class client extends GameShell {
         MiniMap.sprite = null;
         Static107.anInt2875 = -1;
         method3768();
-        Static255.cache.clear();
+        DeadClass.cache.clear();
         LocType.aClass139_1 = new Loc_Class139();
         ((Js5GlTextureProvider) Rasteriser.textureProvider).clear();
         LightingManager.lightCount = 0;
         LightingManager.lights = new Light[255];
         GlModel.method4120();
         Static242.method4203();
-        Static115.clear();
+        Sprites.clear();
         WorldMap.clear(false);
         TitleScreen.clear();
         for (@Pc(39) int local39 = 0; local39 < 2048; local39++) {
@@ -477,7 +481,7 @@ public final class client extends GameShell {
         Sprites.load(js5Archive8);
         Static204.aClass3_Sub2_Sub1_10 = null;
         Static39.aClass3_Sub2_Sub1_1 = null;
-        Static92.aClass3_Sub2_Sub1_6 = null;
+        Static112.aClass3_Sub2_Sub1_6 = null;
         Static165.aClass3_Sub2_Sub1_8 = null;
         Static181.aClass3_Sub2_Sub1_9 = null;
         if (gameState == 5) {
@@ -513,14 +517,14 @@ public final class client extends GameShell {
             Static143.hintMapMarkers[local3506] = null;
         }
         MiniMenu.size = 0;
-        Static60.aBoolean108 = false;
+        Static40.aBoolean108 = false;
         Mouse.setIdleLoops(0);
         for (local3506 = 0; local3506 < 100; local3506++) {
             Chat.messages[local3506] = null;
         }
         MiniMenu.anInt5014 = 0;
         Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50;
-        Static84.anInt2255 = 0;
+        LoginManager.mapFlagZ = 0;
         Camera.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF;
         Static107.anInt2875 = -1;
         PlayerList.size = 0;
@@ -529,8 +533,8 @@ public final class client extends GameShell {
         Static241.aBoolean302 = false;
         MiniMap.anInt4130 = (int) (Math.random() * 30.0D) - 20;
         SoundPlayer.anInt4451 = 0;
-        Static115.mapFlagX = 0;
-        Static59.anInt1814 = (int) (Math.random() * 120.0D) - 60;
+        LoginManager.mapFlagX = 0;
+        MiniMap.anInt1814 = (int) (Math.random() * 120.0D) - 60;
         Chat.size = 0;
         Static230.anInt5161 = (int) (Math.random() * 80.0D) - 40;
         NpcList.size = 0;
@@ -560,12 +564,12 @@ public final class client extends GameShell {
         DelayedStateChange.clear();
         Static133.anInt5230 = 0;
         Static233.anInt5217 = 0;
-        Static265.anInt5765 = 0;
+        Camera.anInt5765 = 0;
         Static231.anInt5203 = 0;
-        Static248.anInt4232 = 0;
-        Static245.anInt5375 = 0;
+        Camera.anInt4232 = 0;
+        Camera.anInt5375 = 0;
         Static260.anInt1744 = 0;
-        Static251.anInt5449 = 0;
+        Camera.anInt5449 = 0;
         Static113.anInt4612 = 0;
         Static233.anInt5225 = 0;
         for (local3506 = 0; local3506 < VarcDomain.varcs.length; local3506++) {
@@ -581,7 +585,7 @@ public final class client extends GameShell {
         InterfaceList.openInterfaces = new HashTable(8);
         InterfaceList.method1287();
         Static39.aClass13_10 = null;
-        Static60.aBoolean108 = false;
+        Static40.aBoolean108 = false;
         MiniMenu.size = 0;
         PlayerAppearance.DEFAULT.method1950(new int[] { 0, 0, 0, 0, 0 }, -1, false, null, -1);
         for (local3506 = 0; local3506 < 8; local3506++) {
@@ -590,7 +594,7 @@ public final class client extends GameShell {
             Player.cursors[local3506] = -1;
         }
         Inv.method2073();
-        Static19.aBoolean43 = true;
+        Static253.aBoolean43 = true;
         for (local3506 = 0; local3506 < 100; local3506++) {
             Static186.aBooleanArray100[local3506] = true;
         }
@@ -606,19 +610,34 @@ public final class client extends GameShell {
             PlayerSkillXpTable.experience[local3506] = 0;
         }
         if (GlRenderer.enabled) {
-            Static86.setInstantFade();
+            Static103.setInstantFade();
         }
         Static197.aBoolean228 = true;
         Protocol.verifyId = 0;
         Static195.walkText = LocalizedText.WALKHERE;
         Static127.neverRemoveRoofs = false;
         aShortArray88 = aShortArray19 = aShortArray74 = aShortArray87 = new short[256];
-        Static114.method4637();
-        Static261.aBoolean298 = false;
+        Static40.method4637();
+        Static40.aBoolean298 = false;
         ClientProt.method1373();
     }
 
-    @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V")
+	@OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
+	public static void method930() {
+		if (musicChannel != null) {
+			musicChannel.quit();
+		}
+		if (soundChannel != null) {
+			soundChannel.quit();
+		}
+		AudioChannel.init(Preferences.stereo);
+		musicChannel = AudioChannel.create(22050, signLink, canvas, 0);
+		musicChannel.setStream(musicStream);
+		soundChannel = AudioChannel.create(2048, signLink, canvas, 1);
+		soundChannel.setStream(soundStream);
+	}
+
+	@OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V")
 	@Override
 	protected final void mainRedraw() {
 		if (gameState == 1000) {
@@ -629,7 +648,7 @@ public final class client extends GameShell {
 			musicChannel.method3570();
 		}
 		if ((gameState == 30 || gameState == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) {
-			Static241.setWindowMode(GameShell.replaceCanvas, Static144.getWindowMode(), Preferences.fullScreenWidth, Preferences.fullScreenHeight);
+			DisplayMode.setWindowMode(GameShell.replaceCanvas, DisplayMode.getWindowMode(), Preferences.fullScreenWidth, Preferences.fullScreenHeight);
 		}
 		@Pc(80) int local80;
 		@Pc(84) int local84;
@@ -650,12 +669,12 @@ public final class client extends GameShell {
 				local84 -= local90.top + local90.bottom;
 			}
 			if (local80 != GameShell.frameWidth || local84 != GameShell.frameHeight) {
-				Static203.method3662();
+				GameShell.method3662();
 				Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L;
 			}
 		}
 		if (GameShell.fullScreenFrame != null && !GameShell.focus && (gameState == 30 || gameState == 10)) {
-			Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
+			DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
 		}
 		@Pc(158) boolean local158 = false;
 		if (GameShell.fullRedraw) {
@@ -682,13 +701,13 @@ public final class client extends GameShell {
 					Static230.anInt5150 = Static175.mapFilesMissingCount;
 				}
 				local80 = (Static230.anInt5150 - Static175.mapFilesMissingCount) * 50 / Static230.anInt5150;
-				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 }));
+				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 }));
 			} else if (Static233.loadingScreenState == 2) {
-				if (Static38.anInt1196 < Static271.anInt5804) {
-					Static38.anInt1196 = Static271.anInt5804;
+				if (Static38.anInt1196 < ClientProt.anInt5804) {
+					Static38.anInt1196 = ClientProt.anInt5804;
 				}
-				local80 = (Static38.anInt1196 - Static271.anInt5804) * 50 / Static38.anInt1196 + 50;
-				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 }));
+				local80 = (Static38.anInt1196 - ClientProt.anInt5804) * 50 / Static38.anInt1196 + 50;
+				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 }));
 			} else {
 				Static114.drawTextOnScreen(false, LocalizedText.LOADING);
 			}
@@ -870,7 +889,7 @@ public final class client extends GameShell {
 	@OriginalMember(owner = "client!client", name = "g", descriptor = "(I)V")
 	@Override
 	protected final void mainInit() {
-		Static203.method3662();
+		GameShell.method3662();
 		js5CacheQueue = new Js5CacheQueue();
 		js5NetQueue = new Js5NetQueue();
 		if (modeWhat != 0) {
@@ -892,8 +911,8 @@ public final class client extends GameShell {
 		}
 		if (game == 1) {
 			Cheat.shiftClick = true;
-			Static161.anInt3923 = 16777215;
-			Static161.anInt3922 = 0;
+			FogManager.anInt3923 = 16777215;
+			FogManager.anInt3922 = 0;
 			PlayerAppearance.aShortArrayArray2 = PlayerAppearance.aShortArrayArray4;
 			PlayerAppearance.aShortArrayArray7 = PlayerAppearance.aShortArrayArray1;
 			PlayerAppearance.aShortArray65 = PlayerAppearance.aShortArray1;
@@ -1010,12 +1029,12 @@ public final class client extends GameShell {
 		if (!GlRenderer.enabled) {
 			Flames.update();
 		} else if (LoginManager.step == 0 && CreateManager.step == 0) {
-			if (Static227.cameraType == 2) {
+			if (Camera.cameraType == 2) {
 				Camera.updateLockedCamera();
 			} else {
 				Camera.updateLoginScreenCamera();
 			}
-			if (Static138.renderX >> 7 < 14 || Static138.renderX >> 7 >= 90 || Static134.renderZ >> 7 < 14 || Static134.renderZ >> 7 >= 90) {
+			if (Camera.renderX >> 7 < 14 || Camera.renderX >> 7 >= 90 || Camera.renderZ >> 7 < 14 || Camera.renderZ >> 7 >= 90) {
 				LoginManager.setupLoadingScreenRegion();
 			}
 		}
@@ -1034,7 +1053,7 @@ public final class client extends GameShell {
 									do {
 										priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead();
 										if (priorityRequest == null) {
-											if (Static105.aClass13_14 != null) {
+											if (Static40.aClass13_14 != null) {
 												ClientProt.method28();
 											}
 											if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) {
@@ -1260,7 +1279,7 @@ public final class client extends GameShell {
 		} else if (mainLoadState == 40) {
 			percentage = 0;
 			for (i = 0; i < 28; i++) {
-				percentage += js5Providers[i].getIndexPercentageComplete() * Static170.JS5_ARCHIVE_WEIGHTS[i] / 100;
+				percentage += js5Providers[i].getIndexPercentageComplete() * JS5_ARCHIVE_WEIGHTS[i] / 100;
 			}
 			if (percentage == 100) {
 				mainLoadPercentage = 20;
@@ -1484,7 +1503,7 @@ public final class client extends GameShell {
 			}
 			Preferences.safeMode = true;
 			Preferences.write(GameShell.signLink);
-			Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
+			DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1);
 			mainLoadPercentage = 100;
 			mainLoadState = 160;
 			mainLoadSecondaryText = LocalizedText.MAINLOAD150B;
@@ -1518,7 +1537,7 @@ public final class client extends GameShell {
 		}
 		if (mouseWheel != null) {
 			@Pc(75) int wheelRotation = mouseWheel.getRotation();
-			Static58.wheelRotation = wheelRotation;
+			MouseWheel.wheelRotation = wheelRotation;
 		}
 		if (gameState == 0) {
 			this.mainLoad();
@@ -1542,7 +1561,7 @@ public final class client extends GameShell {
 				if (LoginManager.reply == 15) {
 					Static44.method1146();
 				} else if (LoginManager.reply != 2) {
-					Static278.processLogout();
+					LoginManager.processLogout();
 				}
 			}
 		}
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/playground/src/main/java/com/itspazaz/rt4/Playground.java b/playground/src/main/java/com/itspazaz/rt4/Playground.java
index c94f64c..08b1a80 100644
--- a/playground/src/main/java/com/itspazaz/rt4/Playground.java
+++ b/playground/src/main/java/com/itspazaz/rt4/Playground.java
@@ -4,6 +4,7 @@ import com.jogamp.opengl.GL2;
 import com.jogamp.opengl.GLContext;
 import com.jogamp.opengl.util.GLBuffers;
 import rt4.*;
+import rt4.DisplayMode;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -106,7 +107,7 @@ public class Playground extends GameShell {
             LoadingBarAwt.render(null, true, JagString.parse("Initializing sprites"), 1);
             percentage = 0;
             for (int i = 0; i < 28; i++) {
-                percentage += js5Providers[i].getIndexPercentageComplete() * Static170.JS5_ARCHIVE_WEIGHTS[i] / 100;
+                percentage += js5Providers[i].getIndexPercentageComplete() * client.JS5_ARCHIVE_WEIGHTS[i] / 100;
             }
             if (percentage == 100) {
                 Sprites.init(archives[8]);
@@ -227,7 +228,7 @@ public class Playground extends GameShell {
             GlRenderer.setDepthTestEnabled(true);
             GlRenderer.enableDepthMask();
             GlRenderer.setFogEnabled(true);
-            Static241.setWindowMode(false, 2, GameShell.canvasWidth, GameShell.canvasHeight);
+            DisplayMode.setWindowMode(false, 2, GameShell.canvasWidth, GameShell.canvasHeight);
             orientation = 292;
             x = 100;
             z = 218;
diff --git a/ref/cs2-names.txt b/ref/cs2-names.txt
new file mode 100644
index 0000000..831408b
--- /dev/null
+++ b/ref/cs2-names.txt
@@ -0,0 +1,1897 @@
+NXT Beta
+
+1: if_setonstocktransmit
+2: userflowflags
+3: player_group_member_get_rank
+4: worldmap_getmap
+5: cam2_setlookatacceleration
+6: detail_bgsoundvol
+7: cc_setonplayergroupvarptransmit
+8: stockmarket_getoffercount
+9: ttv_stream_getstate
+10: if_setmouseovercursor
+11: cc_setsize
+12: cam_forceangle
+13: if_setplayermodel_self
+14: detailcanmod_animdetail
+15: chatcat_getphrasecount
+16: if_setoptkeyignoreheld
+17: if_setonhold
+18: cc_getcolour
+19: ttv_livestreams_getstream_next
+20: coordz
+21: chatcat_findsubcatbyshortcut
+22: friend_is_referred
+23: cc_getscrolly
+24: cc_getmodelangle_y
+25: if_getinvobject
+26: cc_gety
+27: cam2_removealleffects
+28: if_setcolour
+29: struct_param
+30: resume_clanforumqfcdialog
+31: detailcanset_reflections
+32: enum_hasoutput
+33: get_mousebuttons
+34: sound_speech_volume
+35: push_array_int
+36: cc_setonmouseleave
+37: os_physicalmemorysize
+38: is_npc_visible
+39: player_group_find
+40: get_npc_name
+41: cam2_setpositionangularinterpolation
+42: inv_getnum
+43: detail_particles
+44: chat_playername_unfiltered
+45: if_setoncamfinished
+46: cam_setfollowheight
+47: detailcanmod_spotshadows
+48: get_selfyangle
+49: worldmap_getzoom
+50: cc_setaspect
+51: get_minimenu_length
+52: userdetail_lobby_lastloginday
+53: sound_synth
+54: cc_setdragdeadzone
+55: worldmap_isloaded
+56: if_debug_button6
+57: if_debug_button2
+58: if_resume_pausebutton
+59: worldlist_specific_thisworld
+60: oc_shardcount
+61: oc_hasvarobj
+62: worldmap_3dview_gettextfont
+63: cc_setpausetext
+64: player_group_member_is_owner
+65: ttv_livestreams_getstream_start
+66: cc_setonplayergrouptransmit
+67: detail_lightdetail_high
+68: telemetry_get_row_index
+69: if_setgraphic
+70: if_setdragdeadtime
+71: opcount
+72: stockmarket_getoffercompletedcount
+73: branch_greater_than
+74: worldmap_setflashtics_default
+75: create_step_reached
+76: oc_cert
+77: if_debug_getcomname
+78: detail_speechvol
+79: cc_setmaxlines
+80: oc_findnext
+81: worldlist_switch
+82: pop_int_local
+83: fps_stats
+84: activeclansettings_getbanneddisplayname
+85: if_setoutline
+86: worldmap_setflashtics
+87: autosetup_dosetup
+88: if_setonkey
+89: cam2_setlookatorientation_yrotation
+90: ttv_webcam_start
+91: if_setdraggable
+92: worldmap_perpetualflash
+93: if_getmodel
+94: create_suggest_name_request
+95: friend_getslotfromname
+96: if_setlinedirection
+97: get_loc_screen_position
+98: oc_members
+99: login_request
+100: worldmap_jumptosourcecoord_instant
+101: detailcanset_vsync
+102: detailget_ambientocclusion
+103: cc_setobject_alwaysnum
+104: login_request_social_network
+105: stat_base
+106: detailget_customcursors
+107: cc_setopcursor
+108: cam2_getlookatmode
+109: if_setopcursor
+110: if_set2dangle
+111: stockmarket_getoffertype
+112: cc_setonclanchanneltransmit
+113: cam2_enable
+114: login_ban_duration
+115: cam_moveto
+116: cam2_setlookatangularinterpolation
+117: fullscreen_enter
+118: detail_loadingscreentype
+119: ttv_livestreams_update
+120: is_gamescreen_state
+121: cc_create
+122: ignore_add
+123: cam2_setpositionmode
+124: quit
+125: worldmap_3dview_getcoordfine
+126: cc_getgraphicdimensions
+127: if_sethflip
+128: profile_cpu
+129: if_gettrans
+130: mec_category
+131: worldlist_specific
+132: sound_song_volume
+133: get_obj_screen_position
+134: if_getscrollheight
+135: detailget_canchoosesafemode
+136: if_opensubclient
+137: notify_accountcreated
+138: chatcat_getsubcatshortcut
+139: lobby_entergamereply
+140: if_settext
+141: cam2_setlookatorientation_vector
+142: detailcanmod_antialiasingmode
+143: if_setonstattransmit
+144: chat_getfilter_public
+145: if_setonmisctransmit
+146: quest_varpreq_count
+147: push_int_local
+148: detailcanset_orthographic
+149: cc_setonvarcstrtransmit
+150: keyheld_alt
+151: if_getmodelxof
+152: if_getcharindexatpos
+153: if_setobject_wearcol_nonum
+154: if_sethide
+155: if_setonclanchanneltransmit
+156: db_getfield
+157: cc_setlinkfriend
+158: get_entity_bounding_box
+159: activeclansettings_getbannedcount
+160: detail_soundvol
+161: quest_varbitreq_count
+162: os_ismac
+163: cc_sethide
+164: chat_getfilter_trade
+165: preload_percent
+166: if_getlayer
+167: activeclansettings_getaffinedmuted
+168: activechatphrase_setdynamicint
+169: cam2_setpositionacceleration
+170: map_isowner
+171: cc_setontimer
+172: cam2_setpositionmaxspeed_axis
+173: if_setonrelease
+174: facing_fine
+175: mes
+176: shader_preload_throttle
+177: if_setpausetext
+178: fullscreen_getmode
+179: append
+180: sound_vorbis_volume
+181: cc_setdragrenderbehaviour
+182: inv_getobj
+183: chat_setfilter
+184: cc_callonresize
+185: detailcanmod_antialiasing_quality
+186: if_setop
+187: detailget_safemode
+188: cc_setmodelzoom
+189: cc_setretex
+190: detailget_particles
+191: stockmarket_getofferprice
+192: create_name_validate_reply
+193: detailget_fog_on
+194: if_settextshadow
+195: worldmap_setmap
+196: date_isleapyear
+197: worldmap_getconfigorigin
+198: stockmarket_isofferadding
+199: activeclanchannel_find_affined
+200: cam2_getpositionmode
+201: if_setongamepadtrigger
+202: cc_setonscrollwheel
+203: add
+204: cc_getop
+205: cc_setgraphicshadow
+206: detailcanmod_ambientocclusion
+207: basematerial
+208: tostring_localised
+209: get_obj_bounding_box
+210: setobj
+211: movecoord
+212: clan_getchatuserworld
+213: if_getinvcount
+214: detail_antialiasing_default
+215: is_targeted_entity
+216: testbit
+217: if_get2dangle
+218: detailget_texturing
+219: comlevel_active
+220: detail_skydetail
+221: detailget_chosesafemode
+222: cc_invalidate
+223: cam2_setlookatentity_npc
+224: cc_gettext
+225: if_setnoclickthrough
+226: ttv_library_getstate
+227: activeclansettings_find_listened
+228: create_setunder13
+229: worldmap_jumptodisplaycoord_instant
+230: detail_idleanims_many
+231: or
+232: oc_cost
+233: autosetup_blackflaglast
+234: if_settrans
+235: fullscreen_exit
+236: userdetail_lobby_jcoins_balance
+237: cc_getopbase
+238: if_debug_getcomcount
+239: sethardcodedopcursors
+240: worldmap_jumptodisplaycoord
+241: worldmap_setflashloops_default
+242: cc_dragpickup
+243: and
+244: autosetup_getlevel
+245: cc_deleteall
+246: if_setobject_nonum
+247: if_setmodelangle
+248: cc_getx
+249: if_getscrollx
+250: clan_getchatdisplayname
+251: activeclansettings_find_affined
+252: map_lang
+253: branch_equals
+254: detailcanset_bloom
+255: if_gettext
+256: cam2_setfieldofview
+257: runenergy_visible
+258: push_constant_int
+259: shader_preload_percent
+260: branch_if_true
+261: enum_getreversecount_string
+262: cam2_setspringproperties
+263: db_find_with_count
+264: push_array_int_and_index
+265: activechatphrase_setdynamicobj
+266: if_settextalign
+267: cc_setvflip
+268: detailget_bgsoundvol
+269: defaultminimenu
+270: video_advert_play
+271: chatphrase_find
+272: if_setlinkplayergroup
+273: define_array
+274: ignore_setnotes
+275: detailget_idleanims_many
+276: map_world
+277: resume_namedialog
+278: oc_wearpos
+279: chatphrase_findnext
+280: cam2_setpositionacceleration_axis
+281: getwindowmode
+282: cc_setonvartransmit
+283: chatcat_findphrasebyshortcut
+284: autosetup_setmin
+285: detail_cpuusage
+286: worldmap_closemap
+287: cc_getmodel
+288: quest_param
+289: sound_group_start
+290: get_obj_overlay_height
+291: cc_npc_setcustomretex
+292: worldmap_setcategorypriority
+293: if_setfill
+294: if_setongamepadaxis
+295: bug_report
+296: pop_varbit
+297: cc_getmodelxof
+298: cc_setdraggable
+299: switch
+300: if_getfontgraphic
+301: openurl_shim
+302: ttv_stream_stop
+303: player_find_active_minimenu_entry
+304: player_group_is_members_only
+305: detailcanset_waterdetail
+306: cam_reset
+307: cam_removeroof
+308: has_html5
+309: get_second_minimenu_entry
+310: nc_param
+311: worldlist_fetch
+312: coordx_fine
+313: detail_customcursors
+314: db_findnext
+315: if_setscrollpos
+316: login_accountappeal
+317: quest_questreq_count
+318: if_setopkey
+319: if_getnextsubid
+320: if_setonsubchange
+321: login_inprogress
+322: coordz_fine
+323: worldmap_getcurrentmap
+324: email_validation_change_address
+325: detailget_orthographic
+326: cc_gettargetmask
+327: detailget_reflections
+328: chatphrase_getdynamiccommandparam_enum
+329: detailget_hardshadows
+330: append_num
+331: cc_getgraphic
+332: if_settextantimacro
+333: mes_typed
+334: mec_param
+335: detailget_musicvol
+336: if_getcharposatindex
+337: ignore_del
+338: autosetup_sethigh
+339: stockmarket_getoffercompletedgold
+340: worldlist_pingworlds
+341: cam_smoothreset
+342: sound_synth_rate
+343: affinedclansettings_setmuted_fromchannel
+344: if_setonclansettingstransmit
+345: append_char
+346: detail_loginvol
+347: if_setretex
+348: get_active_minimenu_entry
+349: quest_statreq_met
+350: oc_stackable
+351: worldmap_disableelement
+352: if_setmodelorigin
+353: date_runeday_todate
+354: if_setlinkfriend
+355: if_setnpchead
+356: autosetup_setmedium
+357: worldmap_getsourcecoord
+358: quest_allreqmet
+359: if_get_gamescreen
+360: cc_setcolour
+361: cam2_setpositionspline_spline
+362: cam2_legacycam_ready
+363: keyheld_ctrl
+364: enum_hasoutput_string
+365: cc_setmodelangle
+366: mec_textsize
+367: detailcanmod_particles
+368: quest_getname
+369: if_npc_setcustomretex
+370: enum_getoutputcount
+371: if_debug_button8
+372: if_setopbase
+373: clan_getchatuserrank
+374: if_setobject_alwaysnum
+375: cc_setfill
+376: inv_stockbase
+377: cc_settrans
+378: sound_synth_volume
+379: sound_jingle
+380: cc_setongamepadtrigger
+381: invother_getnum
+382: telemetry_get_column_id
+383: detailcanset_particles
+384: oc_minimenu_colour_overridden
+385: if_setonop
+386: create_reply
+387: scale
+388: cam2_setlookatorientation_xmovement
+389: chatphrase_getdynamiccommandcount
+390: quest_questreq
+391: oc_unshard
+392: create_createrequest
+393: if_npc_setcustomheadmodel
+394: cc_getinvobject
+395: text_switch
+396: cam_dec_y
+397: force_interface_drag
+398: viewport_getfov
+399: can_run_java_client
+400: cc_resume_pausebutton
+401: friend_setrank
+402: cc_getfontgraphic
+403: worldmap_flashelement
+404: ttv_chat_sendmessage
+405: detail_shadows
+406: cc_setlinkfriendchat
+407: detailcanmod_vsync
+408: if_find
+409: detailcanset_groundblending
+410: interpolate
+411: telemetry_get_group_count
+412: cc_getscrollwidth
+413: detailget_flickering_on
+414: detail_stereo
+415: if_setoninvtransmit
+416: if_close
+417: cc_getcharindexatpos
+418: if_setscrollsize
+419: min
+420: cam2_setpositionentity_npc
+421: if_setobject_wearcol_alwaysnum
+422: friend_getworldname
+423: cc_set2dangle
+424: userdetail_lobby_graceexpiry
+425: os_islinux
+426: userdetail_lobby_lastloginaddress
+427: if_setobject_wearcol
+428: append_signnum
+429: oc_multistacksize
+430: detailget_lightdetail_high
+431: cc_getmodelzoom
+432: quest_statreq_stat
+433: cc_setmodeltint
+434: ttv_webcam_getstate
+435: cc_setobject_wearcol_nonum
+436: cc_getlayer
+437: detailget_buildarea
+438: cc_setonclansettingstransmit
+439: sound_mixbuss_setlevel
+440: cc_setonop
+441: if_setondragcomplete
+442: detailcanset_hardshadows
+443: os_iswindows
+444: oc_findrestart
+445: cam2_setlookatspline_spline
+446: cc_getmodelangle_x
+447: detail_idleanims
+448: detail_maxscreensize
+449: ttv_chat_getstate
+450: if_getx
+451: cam2_setpositionspringproperties
+452: ignore_is_temp
+453: cc_setoninvtransmit
+454: detailcanset_fog
+455: if_debug_button1
+456: cc_settextshadow
+457: player_group_get_create_seconds_to_now
+458: detail_grounddecor_on
+459: quest_type
+460: cc_setlinkactiveclanchannel
+461: friend_is_referrer
+462: worldmap_disabletextsize
+463: ttv_library_request
+464: if_setclickmask
+465: playercountry
+466: tostring
+467: detailcanmod_grounddecor
+468: worldmap_getdisableelement
+469: detail_buildarea
+470: notify_accountcreatestarted
+471: divide
+472: userdetail_quickchat
+473: cc_sethflip
+474: cc_setparam
+475: detailcanset_antialiasingmode
+476: cam2_setlookatorientation_xrotation
+477: detail_removeroofs_option
+478: sound_vorbis_rate
+479: if_setlinkactiveclanchannel
+480: if_getwidth
+481: cc_setonvarctransmit
+482: worldlist_sort
+483: cc_resetmodellighting
+484: friend_platform
+485: detailcanmod_lightingquality
+486: lobby_enterlobby_social_network
+487: cancel_interface_drag
+488: chat_sendprivate
+489: cc_getinvcount
+490: stat_visible_xp_actual
+491: activeclanchannel_getuserrank
+492: cc_setobject_wearcol_alwaysnum
+493: if_setonclickrepeat
+494: cam2_setlookatspringproperties
+495: enum_getreversecount
+496: worldmap_getsize
+497: friend_getname
+498: lobby_leavelobby
+499: affinedclansettings_addbanned_fromchannel
+500: oc_param
+501: cc_setdragdeadtime
+502: detailget_antialiasing_default
+503: docheat
+504: ignore_getname_unfiltered
+505: activeclanchannel_getuserdisplayname
+506: npc_find_active_minimenu_entry
+507: worldmap_setflashloops
+508: telemetry_get_group_id
+509: get_entity_screen_position
+510: viewport_geteffectivesize
+511: stat_visible_xp
+512: detailget_spotshadows_on
+513: oc_category
+514: ttv_webcam_stop
+515: friend_getworld
+516: if_setondialogabort
+517: resume_stringdialog
+518: chat_setmode
+519: cc_setonkey
+520: cc_setonmouseover
+521: cam2_setlookatacceleration_axis
+522: sound_group_stop
+523: detailget_maxdiskcachesize
+524: detailget_toolkit_default
+525: if_setondrag
+526: string_length
+527: resume_hsldialog
+528: detailget_animdetail
+529: if_setopchar
+530: detail_shadowquality
+531: cam2_getpositionentity_lookatangleoffsets
+532: detail_waterdetail_high
+533: affiliate
+534: detailget_lightingquality
+535: activeclansettings_getaffineddisplayname
+536: ttv_webcam_getcap_count
+537: telemetry_is_row_pinned
+538: cc_setnpcmodel
+539: clan_getchatcount
+540: detail_toolkit_default
+541: gender
+542: worldmap_disableelements
+543: ttv_stream_start
+544: not
+545: login_hoptime
+546: minimenuopen
+547: ttv_setdebugouput
+548: ttv_logout
+549: cc_setnpchead
+550: login_disallowtrigger
+551: viewport_clampfov
+552: detailget_diskcachesize
+553: worldmap_jumptosourcecoord
+554: clientclock
+555: parawidth
+556: if_setonplayergroupvarptransmit
+557: cc_setondrag
+558: cc_setparam_int
+559: worldmap_getdisableelementcategory
+560: cc_setonhold
+561: inv_freespace
+562: string_distance
+563: detailcanset_shadowquality
+564: date_minutes
+565: if_setongamepadbutton
+566: chat_gethistorylength
+567: cc_setopkeyignoreheld
+568: spline_addpoint
+569: detail_fog_on
+570: targetmode_active
+571: worldmap_flashelementcategory
+572: cc_setoncamfinished
+573: cc_setonclick
+574: get_entity_overlay_height
+575: ignore_getname
+576: is_npc_active
+577: oc_find
+578: pop_array_int
+579: player_group_member_get_same_world_var
+580: db_getfieldcount
+581: detail_diskcachesize
+582: cc_setoutline
+583: detailget_maxscreensize
+584: self_player_uid
+585: worldmap_getconfigbounds
+586: if_setvflip
+587: player_group_get_owner_slot
+588: activeclanchannel_getusercount
+589: email_validation_submit_code
+590: map_build_complete
+591: detailcanset_buildarea
+592: email_validation_add_new_address
+593: chat_sendabusereport
+594: pop_string_discard
+595: detailget_groundblending
+596: clan_kickuser
+597: stringwidth
+598: enum_getreverseindex_string
+599: detailget_drawdistance
+600: chatcat_getsubcatcount
+601: enum_getreverseindex
+602: invother_getobj
+603: detail_ambientocclusion
+604: telemetry_get_group_index
+605: cc_setmodelorigin
+606: chatcat_getdesc
+607: cc_setlinewid
+608: detailcanset_animdetail
+609: activeclansettings_getranktalk
+610: activeclansettings_getaffinedjoinruneday
+611: detailcanmod_texturing
+612: detailget_loadingscreentype
+613: char_isprintable
+614: cc_setopkey
+615: worldmap_listelement_start
+616: char_touppercase
+617: player_group_member_get_team
+618: oc_icursor
+619: detailcanmod_shadowquality
+620: urlencode
+621: cam2_setlookatmaxspeed_axis
+622: if_setoncameraupdatetransmit
+623: player_group_get_overall_status
+624: cc_gethide
+625: cc_setondragcomplete
+626: detailget_antialiasingmode
+627: cam2_setcollisionmode
+628: ttv_stream_getquality
+629: cc_setopkeyrate
+630: inv_totalparam
+631: friend_test
+632: telemetry_get_row_count
+633: detailcanset_maxscreensize
+634: detailget_cpuusage
+635: get_loc_bounding_box
+636: player_group_member_count
+637: get_mousex
+638: activeclansettings_getrankkick
+639: worldmap_disabletype
+640: array_sort
+641: if_settargetopcursor
+642: inv_total
+643: worldmap_coordinmap
+644: cc_setonmisctransmit
+645: coordy_fine
+646: detail_reflections
+647: cc_getscrollheight
+648: oc_iop
+649: targetmode_cancel
+650: ignore_test
+651: branch_less_than_or_equals
+652: cc_sendtofront
+653: ttv_webcam_getdevice_byuniquename
+654: if_debug_button4
+655: detailget_bloom
+656: detailcanmod_groundblending
+657: spline_new
+658: if_getscrollwidth
+659: inv_totalcat
+660: detail_animdetail
+661: sound_song
+662: chatphrase_getautoresponsecount
+663: worldmap_setmap_coord
+664: stockmarket_isofferfinished
+665: if_getfontmetrics
+666: lobby_enterlobbyreply
+667: detailcanmod_bloom
+668: stockmarket_isofferempty
+669: setdefaultwindowmode
+670: cc_delete
+671: detailcanset_texturing
+672: shader_preload_allow
+673: if_getopbase
+674: bas_getanim_ready
+675: coordy
+676: clienttype
+677: detailget_performance_metric
+678: activechatphrase_sendprivate
+679: cc_settargetcursors
+680: worldmap_3dview_enable
+681: detailget_vsync
+682: cc_sendtoback
+683: cc_setongamepadbutton
+684: cam2_removeeffect
+685: if_setonmouseleave
+686: detail_antialiasing_quality
+687: player_group_member_get_last_seen_node_id
+688: baseidkit
+689: chat_sendpublic
+690: quest_varbitreq_desc
+691: pop_long_discard
+692: if_setonvarcstrtransmit
+693: cc_setonrelease
+694: cam_followcoord
+695: sound_vorbis_volume_rate_group
+696: if_setoptkey
+697: cc_setmodellighting
+698: if_sendtofront
+699: string_indexof_char
+700: ttv_hasprerequisites
+701: friend_getrank
+702: cc_getscrollx
+703: cc_getid
+704: spline_length
+705: detailget_shadows
+706: cam2_setlinearmovementmode
+707: if_dragpickup
+708: if_setalpha
+709: activeclansettings_getreplacementowner_slot
+710: quest_getdifficulty
+711: create_connectrequest
+712: mec_sprite
+713: keyheld_shift
+714: worldmap_listelement_next
+715: lowercase
+716: if_gethide
+717: detailcanset_antialiasing
+718: worldmap_3dview_settextfont
+719: cc_setalpha
+720: chat_playername
+721: ignore_getnotes
+722: if_setonopt
+723: cc_setparam_string
+724: quest_getsortname
+725: join_string
+726: compare
+727: viewport_getzoom
+728: emoji_enable_auto_chatline
+729: cc_setoptkeyrate
+730: activeclansettings_getranklootshare
+731: resume_objdialog
+732: if_debug_getopenifcount
+733: activeclanchannel_getuserslot
+734: friend_del
+735: if_setmodelorthog
+736: detailcanmod_skydetail
+737: sub
+738: cc_settextantimacro
+739: login_cancel
+740: activeclanchannel_getranktalk
+741: create_connect_reply
+742: clan_getchatusername
+743: get_npc_vislevel
+744: getclipboard
+745: resume_countdialog
+746: cc_setonclantransmit
+747: viewport_setfov
+748: activeclansettings_getcurrentowner_slot
+749: oc_uncert
+750: ttv_stream_settitle
+751: ttv_webcam_supported
+752: cc_find
+753: sound_distancefocusfilter_setparams
+754: if_debug_target
+755: multiply
+756: worldlist_start
+757: cc_setmodelorthog
+758: date_runeday
+759: cc_getmodelangle_z
+760: pop_var
+761: frombilling
+762: get_loc_overlay_height
+763: runjavascript
+764: telemetry_get_grid_value
+765: activeclansettings_getsortedaffinedslot
+766: quest_getmembers
+767: player_group_member_get_status
+768: activeclansettings_getallowunaffined
+769: paraheight
+770: activeclansettings_getaffinedextrainfo
+771: autosetup_setultra
+772: cam2_setpositionpoint_point
+773: cam_getfollowheight
+774: emoji_removeall
+775: activeclanchannel_kickuser
+776: if_triggerop
+777: detail_groundblending
+778: removetags
+779: if_resetmodellighting
+780: if_setonfriendtransmit
+781: detailget_skydetail
+782: pow
+783: ttv_webcam_getcap_byuniqueid
+784: userdetail_lobby_membersstats
+785: cc_setonstattransmit
+786: if_getmodelangle_z
+787: oc_wearpos2
+788: worldmap_getdisplayposition
+789: worldlist_autoworld
+790: if_gettop
+791: worldmap_3dview_getscreenposition
+792: chat_getprevuid
+793: if_setgraphicshadow
+794: if_closesubclient
+795: quest_finished
+796: cc_setobject_nonum
+797: cc_npc_setcustomheadmodel
+798: date_runeday_fromdate
+799: date_year
+800: detailget_removeroofs_option
+801: detailcanset_lightingquality
+802: worldmap_setzoom
+803: stat_base_actual
+804: getdefaultwindowmode
+805: video_advert_allow_skip
+806: lobby_enterlobby
+807: detailget_recommendeddiskcachesize
+808: substring
+809: oc_op
+810: cam2_getpositionentity_lookatangle
+811: detail_hardshadows
+812: if_setonresize
+813: if_setonvarctransmit
+814: cc_setonsubchange
+815: detail_antialiasingmode
+816: escape
+817: cc_setmodelanim
+818: lc_param
+819: if_setontargetenter
+820: if_gety
+821: activeclanchannel_getuserworld
+822: branch_if_false
+823: cc_param
+824: detailget_antialiasing
+825: if_getscrolly
+826: inv_getvar
+827: seq_param
+828: cc_setonstocktransmit
+829: chatphrase_getautoresponse
+830: automatedtestflags
+831: pop_long_local
+832: push_string_local
+833: if_settargetcursors
+834: detailcanmod_orthographic
+835: map_quickchat
+836: pop_int_discard
+837: setbit
+838: if_setrecol
+839: cam2_getpositionpoint_point
+840: cc_setobject_wearcol
+841: detailcanset_spotshadows
+842: detailget_shadowquality
+843: oc_wearpos3
+844: cam2_isenabled
+845: userdetail_lobby_playage
+846: clan_leavechat
+847: paraline
+848: worldmap_getconfigzoom
+849: cc_clearops
+850: create_get_email
+851: get_displayname_withextras
+852: userdetail_lobby_recoveryday
+853: clan_getchatrank
+854: sound_song_stop
+855: pop_array_int_leave_value_on_stack
+856: cc_setlinedirection
+857: text_gender
+858: cc_setondialogabort
+859: cam_dec_x
+860: cc_setmodel
+861: detailcanset_grounddecor
+862: ttv_login
+863: player_group_member_is_online
+864: string_indexof_string
+865: push_long_constant
+866: player_group_member_is_member
+867: cc_resetlinkplayer
+868: if_clearscripthooks
+869: cam2_setdepthplanes
+870: invother_getvar
+871: if_getmodelzoom
+872: writeconsole
+873: push_array_int_leave_index_on_stack
+874: stockmarket_getofferitem
+875: cam2_resetsnapdistances
+876: db_find
+877: chatcat_getphraseshortcut
+878: friend_getnotes
+879: create_suggest_name_reply
+880: emoji_add
+881: detail_lightingquality
+882: if_debug_button9
+883: cc_get2dangle
+884: userdetail_lobby_unreadmessages
+885: cc_getparentlayer
+886: userdetail_lobby_dobrequested
+887: long_branch_not
+888: cam2_getpositionentity_lookatdistance
+889: telemetry_get_column_index
+890: cc_setopchar
+891: inv_size
+892: cam2_setsnapdistances
+893: create_under13
+894: cc_setplayermodel_self
+895: detailcanmod_fog
+896: detail_spotshadows_on
+897: if_setposition
+898: login_reply
+899: get_col_tag
+900: if_setplayermodel
+901: worldmap_getdisableelements
+902: oc_minimenu_colour
+903: if_setnpcmodel
+904: if_resetlinkplayer
+905: if_setmaxlines
+906: cc_settiling
+907: activeclanchannel_find_listened
+908: cam_inc_x
+909: if_setfontmono
+910: cc_getwidth
+911: cam2_setlookatorientation_maxdistanceclamping
+912: viewport_setzoom
+913: if_setonmouseover
+914: inv_totalparam_stack
+915: branch_greater_than_or_equals
+916: chat_getnextuid
+917: if_gettargetmask
+918: if_setparam_string
+919: if_debug_button3
+920: if_setmodelzoom
+921: if_setontimer
+922: cc_setplayerhead_self
+923: sound_jingle_volume
+924: worldmap_getconfigsize
+925: coord_fine
+926: opplayer
+927: worldmap_getdisabletextsize
+928: cc_settextfont
+929: userdetail_lobby_membership
+930: cc_setontargetenter
+931: cc_npc_setcustomrecol
+932: if_setonclantransmit
+933: if_setonmouserepeat
+934: enum_string
+935: oc_shard
+936: if_debug_button10
+937: cc_setmouseovercursor
+938: detail_drawdistance
+939: if_hassuboverlay
+940: if_settextfont
+941: cc_setplayermodel
+942: telemetry_get_row_id
+943: random_sound_pitch
+944: worldmap_disableelementcategory
+945: detailget_speechvol
+946: activeclansettings_getaffinedslot
+947: if_setonvarclantransmit
+948: coord_finetogrid
+949: player_group_member_get_join_xp
+950: cc_npc_setcustombodymodel
+951: cam2_getpositionentity_angleoffsets
+952: chat_getfilter_private
+953: cc_setonvarclantransmit
+954: enum
+955: cc_setoptkey
+956: login_last_transfer_reply
+957: worldlist_next
+958: hsvtorgb
+959: cam2_updateeffect_ztilt
+960: worldmap_3dview_setloddistance
+961: login_continue
+962: worldmap_getsourceposition
+963: stockmarket_isofferstable
+964: cam_getangle_ya
+965: cam2_setlookatmaxspeed
+966: if_npc_setcustomrecol
+967: if_hassubmodal
+968: cc_getcharposatindex
+969: invpow
+970: openurl_nologin
+971: cam2_setfieldofviewscreen
+972: cam2_setlookatentity_player
+973: if_setoptkeyrate
+974: ignore_getslotfromname
+975: cam_getangle_xa
+976: cc_settargetverb
+977: push_long_local
+978: friend_count
+979: if_setobject
+980: detailcanset_shadows
+981: detailcanmod_toolkit_default
+982: cc_getmodelyof
+983: activeclanchannel_getrankkick
+984: cc_triggerop
+985: detailget_brightness
+986: worldmap_getmapname
+987: detail_vsync
+988: setwindowmode
+989: cc_setclickmask
+990: if_setontargetleave
+991: cam_lookat
+992: login_disallowresult
+993: userdetail_dob
+994: quest_questreq_met
+995: playermod
+996: cc_setontargetleave
+997: detailget_idleanims
+998: worldmap_getdisplaycoord
+999: get_mousey
+1000: long_branch_greater_than_or_equals
+1001: cam2_setlookatmode
+1002: if_getmodelyof
+1003: cc_setonchattransmit
+1004: if_setsize
+1005: chatphrase_gettext
+1006: branch_not
+1007: cc_setopbase
+1008: activeclansettings_getclanname
+1009: if_setonplayergrouptransmit
+1010: player_group_get_max_size
+1011: detail_bloom
+1012: detailget_mindiskcachesize
+1013: friend_setnotes
+1014: quest_pointsreq
+1015: if_setopkeyignoreheld
+1016: format_datetime_from_minutes
+1017: cc_setonfriendtransmit
+1018: if_setlinkfriendchat
+1019: if_setoptchar
+1020: detailget_stereo
+1021: detail_brightness
+1022: clan_isself
+1023: if_setparam_int
+1024: if_setmodeltint
+1025: login_resetreply
+1026: playermember
+1027: emoji_substitute
+1028: detailcanset_antialiasing_quality
+1029: if_setopkeyrate
+1030: gosub_with_params
+1031: if_setdragrenderbehaviour
+1032: stat
+1033: cc_setposition
+1034: map_loadedpercent
+1035: npc_type
+1036: abort_dialog
+1037: quest_varbitreq_met
+1038: opplayert
+1039: ttv_stream_setsmoothresize
+1040: if_clearops
+1041: player_group_get_displayname
+1042: addpercent
+1043: worldmap_3dview_getloddistance
+1044: cam2_setpositionmaxspeed
+1045: invother_total
+1046: date_minutes_fromruneday
+1047: clearbit
+1048: modulo
+1049: quest_points
+1050: if_sendtoback
+1051: if_getgraphicdimensions
+1052: get_minimenu_target
+1053: cam2_addeffect_ztilt
+1054: if_getgraphic
+1055: char_tolowercase
+1056: basecolour
+1057: clanprofile_find
+1058: player_group_banned_get_displayname
+1059: detail_texturing
+1060: char_isnumeric
+1061: movecoord_fine
+1062: player_group_member_get_displayname
+1063: get_npc_stat
+1064: if_getop
+1065: setdefaultcursors
+1066: detailcanset_skydetail
+1067: detailcanmod_hardshadows
+1068: quest_varpreq_desc
+1069: if_getmodelangle_y
+1070: if_debug_getname
+1071: setgender
+1072: create_email_validate_reply
+1073: coord
+1074: detailcanmod_antialiasing
+1075: friend_add
+1076: cc_gettrans
+1077: if_setdragdeadzone
+1078: detail_toolkit
+1079: clan_getchatminkick
+1080: cc_setobject
+1081: if_getheight
+1082: detailcanmod_buildarea
+1083: detailcanset_toolkit_default
+1084: video_advert_force_remove
+1085: map_preload
+1086: userdetail_lobby_loyalty_balance
+1087: if_getmodelangle_x
+1088: cc_setgraphic
+1089: cc_setonclickrepeat
+1090: push_constant_string
+1091: cam2_getcontrolmode
+1092: userdetail_lobby_emailstatus
+1093: cc_setlinkplayergroup
+1094: userdetail_lobby_ccexpiry
+1095: max
+1096: branch
+1097: if_setlinewid
+1098: if_npc_setcustombodymodel
+1099: detailcanmod_maxscreensize
+1100: push_varbit
+1101: formatminimenu
+1102: fullscreen_lastmode
+1103: cc_setfontmono
+1104: player_group_banned_count
+1105: clan_getchatusername_unfiltered
+1106: cc_setscrollpos
+1107: activeclansettings_getaffinedrank
+1108: pop_string_local
+1109: autosetup_setlow
+1110: telemetry_get_column_count
+1111: ttv_webcam_getdevice_byindex
+1112: cc_setoptkeyignoreheld
+1113: autosetup_setcustom
+1114: cc_settext
+1115: worldmap_setmap_coord_override
+1116: clan_getchatownername
+1117: char_isalpha
+1118: detail_antialiasing
+1119: cc_setscrollsize
+1120: setup_messagebox
+1121: get_entity_say
+1122: if_setaspect
+1123: cam2_setlookatpoint_point
+1124: cam2_setlookatorientation_zmovement
+1125: randominc
+1126: fullscreen_modecount
+1127: activechatphrase_prepare
+1128: detail_flickering_on
+1129: if_getparentlayer
+1130: staffmodlevel
+1131: fromdate
+1132: clanforumqfc_tostring
+1133: detailget_waterdetail_high
+1134: detailget_grounddecor_on
+1135: if_debug_button5
+1136: activeclansettings_getaffinedcount
+1137: detailget_antialiasing_quality
+1138: detailcanmod_shadows
+1139: emoji_remove
+1140: quest_statreq_count
+1141: branch_less_than
+1142: detailget_soundvol
+1143: video_advert_has_finished
+1144: worldmap_getcategorypriority
+1145: cam2_setpositionentity_player
+1146: create_availablerequest
+1147: clan_getchatuserworldname
+1148: quest_pointsreq_met
+1149: if_settiling
+1150: cc_setonopt
+1151: cc_getfontmetrics
+1152: cc_getheight
+1153: if_debug_getopenifid
+1154: if_setonchattransmit
+1155: chat_gethistory_byuid
+1156: getgridcoordrelativetocamera
+1157: chat_gethistory_bytypeandline
+1158: applet_hasfocus
+1159: activechatphrase_send
+1160: chatcat_getphrase
+1161: player_group_get_create_mins_since_epoch
+1162: detailcanmod_waterdetail
+1163: cc_settargetopcursor
+1164: oc_name
+1165: if_setongamepadbuttonheld
+1166: chatcat_getsubcat
+1167: worldmap_3dview_active
+1168: worldmap_stopcurrentflashes
+1169: cc_setongamepadaxis
+1170: worldmap_getdisabletype
+1171: detailcanset_ambientocclusion
+1172: cc_setoncameraupdatetransmit
+1173: if_callonresize
+1174: lastlogin
+1175: if_setmodelanim
+1176: cc_clearscripthooks
+1177: cam_modeisfollowplayer
+1178: activeclanchannel_getsorteduserslot
+1179: long_branch_less_than
+1180: if_setonscrollwheel
+1181: clan_joinchat
+1182: playerdemo
+1183: chatphrase_getdynamiccommand
+1184: ttv_webcam_flip
+1185: lobby_entergame
+1186: activeclanchannel_getclanname
+1187: push_var
+1188: setsubmenuminlength
+1189: detail_removeroofs_option_override
+1190: coordx
+1191: map_members
+1192: reboottimer
+1193: sound_mixbuss_add
+1194: openurl
+1195: cc_setonmouserepeat
+1196: quest_varpreq_met
+1197: detail_musicvol
+1198: create_name_availablerequest
+1199: cc_settextalign
+1200: friend_getworldflags
+1201: return
+1202: cc_setrecol
+1203: telemetry_is_grid_processor_set
+1204: if_hassub
+1205: long_branch_equals
+1206: ttv_login_getstate
+1207: cam_inc_y
+1208: long_branch_less_than_or_equals
+1209: if_settargetverb
+1210: worldmap_3dview_disable
+1211: quest_statreq_level
+1212: quest_started
+1213: if_debug_button7
+1214: coordlevel_fine
+1215: cam_movealong
+1216: char_isalphanumeric
+1217: worldmap_3dview_setlighting
+1218: ignore_count
+1219: cc_setongamepadbuttonheld
+1220: detailget_toolkit
+1221: if_getcolour
+1222: resend_uid_passport_request
+1223: cam2_settraildistance
+1224: cam2_setpositionpointcollision
+1225: runweight_visible
+1226: cam2_addeffect_shake
+1227: ttv_webcam_getcap_byindex
+1228: if_setonvartransmit
+1229: seqlength
+1230: activeclansettings_getcoinshare
+1231: if_setmodel
+1232: mec_text
+1233: cc_setonresize
+1234: ttv_webcam_getdevice_count
+1235: get_currentcursor
+1236: movescripted
+1237: chatphrase_findrestart
+1238: random
+1239: cc_setoptchar
+1240: if_debug_getservertriggers
+1241: if_setplayerhead_self
+1242: detailcanmod_reflections
+1243: detailget_loginvol
+1244: long_branch_greater_than
+1245: if_set_gamescreen_enabled
+1246: ignore_add_temp
+1247: ttv_stream_getviewers
+1248: playermodlevel
+1249: coord_gridtofine
+1250: cc_setnoclickthrough
+1251: if_setonclick
+1252: cc_setop
+1253: if_setmodellighting
+1254: has_nxt
+1255: worldmap_findnearestelement
+0: chat_getfilter_private
+1: cc_setonvartransmit
+2: if_setonvarclantransmit
+3: cc_setscrollsize
+4: long_branch_not
+5: pop_int_local
+6: detail_bgsoundvol
+7: cc_setonplayergroupvarptransmit
+8: cc_setonhold
+9: openurl_nologin
+10: branch_equals
+11: cc_setsize
+12: cam_forceangle
+13: if_setplayermodel_self
+14: push_constant_string
+15: chatcat_getphrasecount
+16: if_setoptkeyignoreheld
+17: if_setonhold
+18: cc_getcolour
+19: if_setontargetenter
+20: coordz
+21: if_setongamepadaxis
+22: cc_setparam_string
+23: cc_getscrolly
+24: cc_getmodelangle_y
+25: if_getinvobject
+26: cc_gety
+27: cam2_removealleffects
+28: if_setcolour
+29: struct_param
+30: resume_clanforumqfcdialog
+31: if_setmodellighting
+32: detail_antialiasing_quality
+33: get_mousebuttons
+34: sound_speech_volume
+36: cc_setonmouseleave
+37: viewport_clampfov
+38: is_npc_visible
+39: clan_getchatownername
+40: if_sendtoback
+41: oc_findrestart
+42: inv_getnum
+43: detail_particles
+44: if_closesubclient
+45: if_setoncamfinished
+46: cam_setfollowheight
+47: cc_setonmisctransmit
+48: cc_create
+49: worldmap_getzoom
+50: if_resume_pausebutton
+51: coordy
+52: cc_setposition
+53: sound_synth
+54: cc_setdragdeadzone
+55: worldmap_isloaded
+56: cc_setmodeltint
+57: resume_stringdialog
+59: if_setopkeyignoreheld
+60: oc_shardcount
+61: if_settextantimacro
+62: if_debug_button9
+63: cc_setpausetext
+64: if_setnpchead
+65: cc_settargetopcursor
+66: cc_setontimer
+67: cc_setonvarctransmit
+68: cc_setonstocktransmit
+69: if_setgraphic
+70: if_setdragdeadtime
+71: if_setparam_int
+72: pop_var
+74: autosetup_setcustom
+75: create_step_reached
+76: cc_setnpchead
+77: cc_sethflip
+78: docheat
+79: cc_setmaxlines
+80: cc_set2dangle
+81: friend_setnotes
+83: cc_setscrollpos
+84: activeclansettings_getbanneddisplayname
+85: if_setoutline
+86: cc_setoptkeyignoreheld
+87: cc_setgraphicshadow
+88: if_setnoclickthrough
+89: push_int_local
+90: activechatphrase_send
+91: cc_callonresize
+92: cc_settext
+93: if_getmodel
+94: worldmap_disabletextsize
+95: if_gethide
+96: if_setlinedirection
+97: worldmap_disableelements
+98: oc_members
+99: login_request
+100: pop_string_local
+101: if_setparam_string
+102: clan_isself
+103: cc_setobject_alwaysnum
+104: login_request_social_network
+105: stat_base
+106: push_long_local
+107: cc_setopcursor
+108: coord_fine
+109: if_setopcursor
+110: if_set2dangle
+111: stockmarket_getoffertype
+112: cc_setonclanchanneltransmit
+113: cam2_enable
+114: detail_drawdistance
+115: cc_resume_pausebutton
+116: cam2_setlookatangularinterpolation
+117: activeclanchannel_find_listened
+118: detail_loadingscreentype
+119: ttv_livestreams_update
+120: basematerial
+122: ignore_add
+123: cam2_setpositionmode
+124: quit
+125: worldmap_3dview_getcoordfine
+126: targetmode_active
+127: if_sethflip
+128: profile_cpu
+129: if_gettrans
+130: mec_category
+131: worldlist_specific
+132: sound_song_volume
+133: get_obj_screen_position
+134: email_validation_add_new_address
+135: friend_setrank
+136: cc_setdragrenderbehaviour
+137: notify_accountcreated
+138: chatcat_getsubcatshortcut
+139: lobby_entergamereply
+140: if_settext
+141: cam2_setpositionspringproperties
+142: if_getgraphic
+143: if_setonstattransmit
+144: chat_getfilter_public
+145: if_setonmisctransmit
+146: quest_varpreq_count
+148: cc_clearops
+149: cc_setonvarcstrtransmit
+150: cam2_resetsnapdistances
+151: if_getmodelxof
+152: if_getcharindexatpos
+153: if_setobject_wearcol_nonum
+154: if_sethide
+155: if_setonclanchanneltransmit
+156: pop_varbit
+158: get_entity_bounding_box
+159: activeclansettings_getbannedcount
+160: detail_soundvol
+161: worldmap_3dview_getloddistance
+162: branch_greater_than
+164: if_dragpickup
+165: formatminimenu
+166: if_getlayer
+167: if_setmodelorthog
+168: activechatphrase_setdynamicint
+169: if_close
+170: worldmap_3dview_enable
+172: cam2_setpositionmaxspeed_axis
+173: if_setonrelease
+174: facing_fine
+175: mes
+176: shader_preload_throttle
+177: if_setpausetext
+178: if_setfontmono
+179: worldlist_autoworld
+180: sound_vorbis_volume
+182: inv_getobj
+183: chat_setfilter
+185: return
+186: if_setop
+187: setwindowmode
+190: if_setoptkeyrate
+191: stockmarket_getofferprice
+192: cc_setplayermodel
+193: if_npc_setcustomrecol
+194: if_settextshadow
+195: worldmap_setmap
+196: cc_setopbase
+197: if_setfill
+198: cc_getid
+199: resume_countdialog
+200: opplayer
+201: if_setongamepadtrigger
+203: add
+204: cc_getop
+206: ignore_add_temp
+208: cc_setonsubchange
+209: get_obj_bounding_box
+211: cc_setmodelorigin
+212: clan_getchatuserworld
+213: cc_setlinewid
+214: cc_setobject_wearcol_alwaysnum
+215: cc_setdragdeadtime
+216: if_setonsubchange
+217: if_get2dangle
+218: viewport_setfov
+219: if_getscrollwidth
+220: detail_skydetail
+221: sound_synth_volume
+223: cam2_setlookatentity_npc
+224: cc_gettext
+226: push_array_int_and_index
+227: activeclansettings_find_listened
+228: create_setunder13
+229: autosetup_setlow
+230: cam2_setlookatorientation_xrotation
+231: or
+232: branch_if_false
+233: cc_setnpcmodel
+235: fullscreen_exit
+236: addpercent
+237: cc_getopbase
+238: if_resetmodellighting
+239: sethardcodedopcursors
+240: if_setopbase
+241: worldmap_setflashloops_default
+242: cc_dragpickup
+243: if_setonfriendtransmit
+244: invother_total
+248: cc_getx
+249: if_getscrollx
+250: if_setoptkey
+251: join_string
+252: map_lang
+254: resend_uid_passport_request
+255: if_gettext
+256: cam2_setfieldofview
+257: runenergy_visible
+259: cc_setfontmono
+261: enum_getreversecount_string
+262: cam2_setspringproperties
+263: map_members
+265: activechatphrase_setdynamicobj
+268: cam2_setlookatentity_player
+269: defaultminimenu
+270: if_setonplayergrouptransmit
+271: push_array_int
+274: ignore_setnotes
+275: cam2_updateeffect_ztilt
+276: cc_sendtofront
+277: resume_namedialog
+278: pop_long_local
+279: cc_setmodelorthog
+280: cam2_setpositionacceleration_axis
+281: cc_settextshadow
+283: cam2_setdepthplanes
+284: autosetup_setmin
+285: detail_cpuusage
+286: cc_setongamepadtrigger
+287: spline_addpoint
+288: userdetail_lobby_emailstatus
+289: max
+290: if_getop
+291: cc_npc_setcustomretex
+292: worldmap_setcategorypriority
+295: bug_report
+297: cc_getmodelxof
+300: if_getfontgraphic
+301: openurl_shim
+302: worldmap_getcategorypriority
+303: player_find_active_minimenu_entry
+304: if_getmodelangle_z
+305: worldmap_3dview_setlighting
+306: if_setobject_alwaysnum
+307: cam_removeroof
+308: if_gettargetmask
+309: get_second_minimenu_entry
+310: nc_param
+311: worldlist_fetch
+312: coordx_fine
+313: detail_customcursors
+314: branch_less_than_or_equals
+316: cc_setoptkey
+317: quest_questreq_count
+319: if_getnextsubid
+321: worldmap_getdisabletextsize
+322: coordz_fine
+323: setobj
+324: if_setmodelangle
+325: branch_if_true
+326: cc_gettargetmask
+327: if_setplayerhead_self
+328: writeconsole
+329: get_col_tag
+330: append_num
+331: define_array
+334: mec_param
+335: cam2_setfieldofviewscreen
+336: if_getcharposatindex
+337: ignore_del
+338: autosetup_sethigh
+339: cc_delete
+340: worldlist_pingworlds
+341: cam_smoothreset
+343: if_setretex
+345: if_npc_setcustomretex
+346: detail_loginvol
+348: cc_setopkey
+349: quest_statreq_met
+350: cc_param
+351: sound_jingle
+353: activeclansettings_getclanname
+356: autosetup_setmedium
+357: worldmap_getsourcecoord
+358: cc_setonclickrepeat
+359: if_setonclantransmit
+361: cam2_setpositionspline_spline
+362: cam2_removeeffect
+363: keyheld_ctrl
+364: enum_hasoutput_string
+366: spline_new
+367: cc_setrecol
+368: quest_getname
+370: baseidkit
+371: if_debug_button8
+373: clan_getchatuserrank
+376: inv_stockbase
+381: cc_setondrag
+382: playerdemo
+383: detailget_toolkit
+384: cc_setobject_wearcol
+386: if_hassuboverlay
+387: scale
+388: cam2_setlookatorientation_xmovement
+389: detail_waterdetail_high
+390: friend_add
+391: oc_unshard
+392: create_createrequest
+394: cc_sethide
+395: text_switch
+396: cam_dec_y
+397: cc_deleteall
+398: if_getmodelyof
+399: clan_getchatusername_unfiltered
+402: cc_resetmodellighting
+404: cc_setonopt
+405: cc_setretex
+407: playermodlevel
+408: if_find
+409: cc_setonop
+410: cam2_setpositionpoint_point
+411: if_callonresize
+412: if_setonplayergroupvarptransmit
+413: worldmap_3dview_setloddistance
+414: lobby_enterlobby_social_network
+417: pop_array_int
+419: pow
+420: if_setobject_wearcol
+422: friend_getworldname
+424: userdetail_lobby_graceexpiry
+425: cc_setongamepadaxis
+426: coordy_fine
+428: append_signnum
+429: setbit
+430: cc_setplayerhead_self
+431: cc_setparam_int
+432: cc_setobject
+434: cc_settrans
+436: cc_getlayer
+437: if_setontimer
+439: sound_mixbuss_setlevel
+442: cam_movealong
+443: cc_setfill
+446: cc_getmodelangle_x
+447: detail_idleanims
+448: detail_maxscreensize
+449: cc_setmodelzoom
+450: if_getx
+452: cc_setalpha
+454: cc_settextfont
+455: if_setondialogabort
+457: cam2_setlookatmaxspeed
+458: detail_grounddecor_on
+459: cc_invalidate
+461: if_setonopt
+463: branch_less_than
+465: cc_setmodelangle
+466: tostring
+467: cc_setonmouserepeat
+468: if_resetlinkplayer
+469: if_setonclickrepeat
+471: divide
+472: if_setopkeyrate
+475: if_setonclick
+480: cc_setoutline
+482: worldlist_sort
+484: friend_platform
+485: long_branch_greater_than
+487: detail_shadowquality
+489: cc_setonclick
+490: cc_setopkeyrate
+491: activeclanchannel_getuserrank
+495: chat_sendpublic
+496: worldmap_getsize
+497: cam_followcoord
+500: detail_animdetail
+502: ignore_getslotfromname
+504: ignore_getnotes
+505: activeclanchannel_getuserdisplayname
+506: npc_find_active_minimenu_entry
+507: worldmap_setflashloops
+508: if_setmodelanim
+509: cc_setongamepadbutton
+510: long_branch_greater_than_or_equals
+511: cam2_setcollisionmode
+512: login_continue
+513: oc_category
+514: chatcat_getphrase
+515: friend_getworld
+522: branch
+523: playermod
+524: detailget_toolkit_default
+526: string_length
+528: get_mousey
+531: cam2_getpositionentity_lookatangleoffsets
+533: affiliate
+534: cc_settextantimacro
+535: activeclansettings_getaffineddisplayname
+536: ttv_webcam_getcap_count
+537: long_branch_less_than
+539: worldmap_jumptosourcecoord
+541: cc_setobject_wearcol_nonum
+543: activeclanchannel_kickuser
+544: not
+545: cc_setmouseovercursor
+546: branch_greater_than_or_equals
+547: if_setongamepadbuttonheld
+548: ttv_logout
+550: cc_setonvarclantransmit
+552: if_setplayermodel
+554: clientclock
+555: parawidth
+559: if_setnpcmodel
+561: sound_song
+562: escape
+563: char_isalphanumeric
+564: cc_setonchattransmit
+566: chat_gethistorylength
+574: if_setonresize
+575: ignore_getname
+576: clanprofile_find
+577: if_setrecol
+579: detail_antialiasing
+580: openurl
+583: cc_npc_setcustombodymodel
+584: cc_sendtoback
+585: worldmap_getconfigbounds
+587: activeclansettings_getaffinedcount
+588: activeclanchannel_getusercount
+590: cc_setlinkplayergroup
+591: if_getcolour
+595: if_setobject
+597: stringwidth
+598: if_setonvarcstrtransmit
+599: detailget_drawdistance
+600: cc_setlinkfriendchat
+601: pop_long_discard
+602: invother_getobj
+603: if_setlinkfriendchat
+604: worldmap_setmap_coord
+606: cc_setondialogabort
+608: resume_objdialog
+609: activeclansettings_getranktalk
+610: activeclansettings_getaffinedjoinruneday
+611: ttv_login_getstate
+612: cc_setclickmask
+613: stat_base_actual
+615: cc_setplayermodel_self
+616: if_setonvarctransmit
+617: setup_messagebox
+618: pop_int_discard
+619: create_name_availablerequest
+623: cc_setonmouseover
+626: cc_setoptchar
+628: clan_getchatuserworldname
+630: inv_totalparam
+631: friend_test
+632: cc_clearscripthooks
+633: cc_setonkey
+634: cc_getmodelyof
+635: cc_setdraggable
+636: affinedclansettings_addbanned_fromchannel
+637: get_mousex
+638: cc_setoptkeyrate
+643: sound_vorbis_rate
+646: activechatphrase_sendprivate
+648: cc_find
+650: if_setclickmask
+653: chat_gethistory_byuid
+655: cc_settargetverb
+656: long_branch_equals
+662: if_setlinkactiveclanchannel
+664: stockmarket_isofferfinished
+666: activeclansettings_getaffinedslot
+667: if_hassub
+668: stockmarket_isofferempty
+671: cc_setonclansettingstransmit
+672: cc_getwidth
+674: paraline
+676: if_setmodelorigin
+677: cc_triggerop
+681: detailget_vsync
+687: detail_groundblending
+690: pop_string_discard
+695: if_setlinewid
+699: string_indexof_char
+700: cc_setmodel
+704: if_setonmouseover
+705: cc_setcolour
+709: activeclansettings_getreplacementowner_slot
+710: setgender
+712: login_resetreply
+713: cc_resetlinkplayer
+714: worldmap_listelement_next
+715: lowercase
+717: if_setalpha
+720: chat_playername
+724: sound_synth_rate
+726: cc_setobject_nonum
+727: cam2_setlookatmode
+728: detail_removeroofs_option_override
+730: activeclansettings_getranklootshare
+732: cc_setlinkfriend
+733: activeclanchannel_getuserslot
+736: if_getheight
+737: sub
+740: notify_accountcreatestarted
+741: cc_setonstattransmit
+743: if_getgraphicdimensions
+744: pop_array_int_leave_value_on_stack
+749: oc_uncert
+750: cam2_setpositionentity_player
+751: cc_getheight
+753: push_varbit
+755: activeclansettings_getallowunaffined
+756: cam2_setlookatspline_spline
+758: if_setsize
+762: basecolour
+763: friend_del
+764: chat_sendabusereport
+766: if_settextfont
+767: if_setaspect
+769: switch
+771: cc_settiling
+773: sound_jingle_volume
+774: push_var
+778: removetags
+781: detailget_skydetail
+783: setdefaultwindowmode
+784: if_clearops
+787: push_string_local
+788: cc_setopchar
+790: cc_setmodelanim
+791: cc_setopkeyignoreheld
+792: cc_setlinedirection
+795: cam2_setsnapdistances
+798: chatphrase_gettext
+799: branch_not
+800: detailget_removeroofs_option
+801: cc_setnoclickthrough
+804: viewport_setzoom
+807: cc_setonrelease
+808: substring
+809: detail_diskcachesize
+810: cc_setontargetenter
+815: cc_setonresize
+818: if_settargetcursors
+824: if_hassubmodal
+827: seq_param
+829: push_long_constant
+830: if_setonop
+834: if_settargetverb
+841: worldmap_disabletype
+842: stockmarket_isofferstable
+844: if_settextalign
+845: userdetail_lobby_playage
+848: if_setposition
+850: push_constant_int
+851: get_displayname_withextras
+852: if_setdragrenderbehaviour
+854: abort_dialog
+861: if_debug_button7
+862: cc_getcharposatindex
+863: if_setobject_wearcol_alwaysnum
+866: cam2_setlookatorientation_zmovement
+876: coordx
+879: create_suggest_name_reply
+880: lobby_entergame
+881: if_setmodeltint
+884: cc_setondragcomplete
+886: opplayert
+888: cc_npc_setcustomrecol
+889: clan_joinchat
+893: create_under13
+895: long_branch_less_than_or_equals
+898: if_setondrag
+901: oc_minimenu_colour
+929: gosub_with_params
+942: if_debug_target
+945: worldmap_getmapname
+949: cam_inc_x
+957: cc_setontargetleave
+980: if_settargetopcursor
+981: worldmap_3dview_disable
+987: cc_setoncameraupdatetransmit
+993: userdetail_dob
+994: cc_gettrans
+1010: cc_setonscrollwheel
+1014: if_setdragdeadzone
+1027: setsubmenuminlength
+1028: cc_setongamepadbuttonheld
+1035: lobby_enterlobby
+1037: cc_setgraphic
+1039: lobby_leavelobby
+1041: staffmodlevel
+1049: coord
+1058: if_setvflip
+1062: randominc
+1066: if_setonclansettingstransmit
+1067: if_setlinkfriend
+1068: video_advert_force_remove
+1074: if_sendtofront
+1082: clanforumqfc_tostring
+1083: if_setonvartransmit
+1099: cam_inc_y
+1104: cc_setparam
+1110: if_setonscrollwheel
+1111: if_setonchattransmit
+1138: detailget_loginvol
+1139: cc_setonclantransmit
+1156: getgridcoordrelativetocamera
+1162: cc_settextalign
+1171: cc_setop
+1242: cc_setlinkactiveclanchannel
\ No newline at end of file