diff --git a/share/deob/map/client.yaml b/share/deob/map/client.yaml
index b9edc28d23..dab74b8cac 100644
--- a/share/deob/map/client.yaml
+++ b/share/deob/map/client.yaml
@@ -121,7 +121,7 @@ classes:
   client!kb: "Class102_Sub1"
   client!kc: "Class103"
   client!ke: "Class4_Sub3_Sub5_Sub2"
-  client!kf: "Class104"
+  client!kf: "Bzip2DState"
   client!kg: "Class105"
   client!kh: "Class4_Sub3_Sub4_Sub2"
   client!ki: "DirectByteArray"
@@ -939,8 +939,8 @@ fields:
     owner: "Static1"
     name: "aLong20"
   client!bm.a Lclient!kf;:
-    owner: "Static1"
-    name: "aClass104_1"
+    owner: "Bzip2Decompressor"
+    name: "state"
   client!bn.B I:
     owner: "Static1"
     name: "anInt402"
@@ -4725,44 +4725,44 @@ fields:
     owner: "Class4_Sub3_Sub5_Sub2"
     name: "aByteArrayArray18"
   client!kf.A I:
-    owner: "Class104"
-    name: "anInt2846"
+    owner: "Bzip2DState"
+    name: "strmAvailOut"
   client!kf.B I:
-    owner: "Class104"
-    name: "anInt2847"
+    owner: "Bzip2DState"
+    name: "strmNextInPtr"
   client!kf.D B:
-    owner: "Class104"
-    name: "aByte4"
+    owner: "Bzip2DState"
+    name: "stateOutCh"
   client!kf.E [[I:
-    owner: "Class104"
-    name: "anIntArrayArray22"
+    owner: "Bzip2DState"
+    name: "limit"
   client!kf.F [[I:
-    owner: "Class104"
-    name: "anIntArrayArray23"
+    owner: "Bzip2DState"
+    name: "perm"
   client!kf.G [I:
-    owner: "Class104"
-    name: "anIntArray255"
+    owner: "Bzip2DState"
+    name: "unfztab"
   client!kf.H I:
-    owner: "Class104"
-    name: "anInt2848"
+    owner: "Bzip2DState"
+    name: "nblockused"
   client!kf.I [B:
-    owner: "Class104"
-    name: "aByteArray27"
+    owner: "Bzip2DState"
+    name: "seqToUnseq"
   client!kf.J [B:
-    owner: "Class104"
-    name: "aByteArray28"
+    owner: "Bzip2DState"
+    name: "selector"
   client!kf.K Ljava/lang/String;:
     owner: "LocalisedText"
     name: "CHATEFFECT3"
   client!kf.M I:
-    owner: "Class104"
-    name: "anInt2850"
+    owner: "Bzip2DState"
+    name: "saveNblock"
   client!kf.N I:
-    owner: "Class104"
-    name: "anInt2851"
+    owner: "Bzip2DState"
+    name: "strmNextOutPtr"
   client!kf.O I:
-    owner: "Class104"
-    name: "anInt2852"
+    owner: "Bzip2DState"
+    name: "bsLive"
   client!kf.P I:
     owner: "Static4"
     name: "anInt2853"
@@ -4770,53 +4770,53 @@ fields:
     owner: "Static4"
     name: "anInt2832"
   client!kf.b [B:
-    owner: "Class104"
-    name: "aByteArray23"
+    owner: "Bzip2DState"
+    name: "strmNextIn"
   client!kf.c I:
-    owner: "Class104"
-    name: "anInt2833"
+    owner: "Bzip2DState"
+    name: "strmTotalOutLo32"
   client!kf.d [B:
-    owner: "Class104"
-    name: "aByteArray24"
+    owner: "Bzip2DState"
+    name: "selectorMtf"
   client!kf.e I:
-    owner: "Class104"
-    name: "anInt2834"
+    owner: "Bzip2DState"
+    name: "bsBuff"
   client!kf.f [I:
-    owner: "Class104"
-    name: "anIntArray252"
+    owner: "Bzip2DState"
+    name: "mtfbase"
   client!kf.g [B:
-    owner: "Class104"
-    name: "aByteArray25"
+    owner: "Bzip2DState"
+    name: "mfta"
   client!kf.h [I:
-    owner: "Class104"
-    name: "anIntArray253"
+    owner: "Bzip2DState"
+    name: "cftab"
   client!kf.j [Z:
-    owner: "Class104"
-    name: "aBooleanArray14"
+    owner: "Bzip2DState"
+    name: "inUse16"
   client!kf.k I:
-    owner: "Class104"
-    name: "anInt2836"
+    owner: "Bzip2DState"
+    name: "origPtr"
   client!kf.l [Z:
-    owner: "Class104"
-    name: "aBooleanArray15"
+    owner: "Bzip2DState"
+    name: "inUse"
   client!kf.m [[B:
-    owner: "Class104"
-    name: "aByteArrayArray19"
+    owner: "Bzip2DState"
+    name: "len"
   client!kf.n I:
-    owner: "Class104"
-    name: "anInt2837"
+    owner: "Bzip2DState"
+    name: "stateOutLen"
   client!kf.o [I:
-    owner: "Class104"
-    name: "anIntArray254"
+    owner: "Bzip2DState"
+    name: "minLens"
   client!kf.p I:
-    owner: "Class104"
-    name: "anInt2838"
+    owner: "Bzip2DState"
+    name: "tPos"
   client!kf.r I:
-    owner: "Class104"
-    name: "anInt2840"
+    owner: "Bzip2DState"
+    name: "blockSize100k"
   client!kf.s I:
-    owner: "Class104"
-    name: "anInt2841"
+    owner: "Bzip2DState"
+    name: "k0"
   client!kf.t I:
     owner: "Static4"
     name: "anInt2842"
@@ -4824,17 +4824,17 @@ fields:
     owner: "Static4"
     name: "aClass40_12"
   client!kf.v I:
-    owner: "Class104"
-    name: "anInt2843"
+    owner: "Bzip2DState"
+    name: "nInUse"
   client!kf.w [B:
-    owner: "Class104"
-    name: "aByteArray26"
+    owner: "Bzip2DState"
+    name: "strmNextOut"
   client!kf.x [[I:
-    owner: "Class104"
-    name: "anIntArrayArray21"
+    owner: "Bzip2DState"
+    name: "base"
   client!kf.z I:
-    owner: "Class104"
-    name: "anInt2845"
+    owner: "Bzip2DState"
+    name: "strmTotalInLo32"
   client!kg.a Lclient!vn;:
     owner: "Class105"
     name: "aClass4_Sub3_Sub14_Sub1_5"
@@ -4956,8 +4956,8 @@ fields:
     owner: "Static4"
     name: "aClass26_28"
   client!km.cb [I:
-    owner: "Static4"
-    name: "anIntArray265"
+    owner: "Bzip2DState"
+    name: "tt"
   client!km.db I:
     owner: "Static4"
     name: "anInt2959"
@@ -13730,182 +13730,177 @@ methods:
     locals:
       15: "local15"
   client!bm.a (ILclient!kf;)I:
-    owner: "Static10"
-    name: "method350"
+    owner: "Bzip2Decompressor"
+    name: "getBits"
     arguments:
-      0: "arg0"
-      1: "arg1"
+      0: "nn"
+      1: "state"
     locals:
-      17: "local17"
+      17: "vvv"
   client!bm.a (Lclient!kf;)V:
-    owner: "Static10"
-    name: "method348"
+    owner: "Bzip2Decompressor"
+    name: "makeMapsD"
     arguments:
-      0: "arg0"
+      0: "state"
     locals:
-      4: "local4"
+      4: "i"
   client!bm.a ([BI[BII)I:
-    owner: "Static10"
-    name: "method351"
+    owner: "Bzip2Decompressor"
+    name: "bunzip2"
     arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      3: "arg3"
+      0: "dest"
+      1: "destLen"
+      2: "src"
+      3: "srcLen"
     locals: {}
   client!bm.a ([I[I[I[BIII)V:
-    owner: "Static10"
-    name: "method356"
-    arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      3: "arg3"
-      4: "arg4"
-      5: "arg5"
-      6: "arg6"
-    locals:
-      1: "local1"
-      3: "local3"
-      8: "local8"
-      27: "local27"
-      38: "local38"
-      56: "local56"
-      74: "local74"
-      85: "local85"
-      87: "local87"
-      102: "local102"
-      118: "local118"
+    owner: "Bzip2Decompressor"
+    name: "hbCreateDecodeTables"
+    arguments:
+      0: "limit"
+      1: "base"
+      2: "perm"
+      3: "length"
+      4: "minLen"
+      5: "maxLen"
+      6: "alphaSize"
+    locals:
+      1: "pp"
+      3: "i"
+      8: "j"
+      27: "i"
+      38: "i"
+      56: "i"
+      74: "i"
+      85: "vec"
+      87: "i"
+      102: "vec2"
+      118: "i"
   client!bm.b (Lclient!kf;)B:
-    owner: "Static10"
-    name: "method349"
+    owner: "Bzip2Decompressor"
+    name: "getUchar"
     arguments:
-      0: "arg0"
+      0: "state"
     locals: {}
   client!bm.c (Lclient!kf;)B:
-    owner: "Static10"
-    name: "method352"
+    owner: "Bzip2Decompressor"
+    name: "getBit"
     arguments:
-      0: "arg0"
+      0: "state"
     locals: {}
   client!bm.d (Lclient!kf;)V:
-    owner: "Static10"
-    name: "method354"
-    arguments:
-      0: "arg0"
-    locals:
-      56: "local56"
-      61: "local61"
-      68: "local68"
-      103: "local103"
-      141: "local141"
-      147: "local147"
-      165: "local165"
-      177: "local177"
-      187: "local187"
-      193: "local193"
-      216: "local216"
-      220: "local220"
-      224: "local224"
-      226: "local226"
-      231: "local231"
-      234: "local234"
-      250: "local250"
-      252: "local252"
-      267: "local267"
-      275: "local275"
-      279: "local279"
-      308: "local308"
-      315: "local315"
-      317: "local317"
-      323: "local323"
-      329: "local329"
-      349: "local349"
-      354: "local354"
-      356: "local356"
-      358: "local358"
-      425: "local425"
-      427: "local427"
-      431: "local431"
-      443: "local443"
-      445: "local445"
-      449: "local449"
-      475: "local475"
-      478: "local478"
-      480: "local480"
-      485: "local485"
-      490: "local490"
-      495: "local495"
-      500: "local500"
-      505: "local505"
-      506: "local506"
-      508: "local508"
-      512: "local512"
-      522: "local522"
-      537: "local537"
-      548: "local548"
-      550: "local550"
-      582: "local582"
-      605: "local605"
-      609: "local609"
-      619: "local619"
-      640: "local640"
-      653: "local653"
-      655: "local655"
-      678: "local678"
-      686: "local686"
-      693: "local693"
-      700: "local700"
-      776: "local776"
-      780: "local780"
-      787: "local787"
-      815: "local815"
-      825: "local825"
-      855: "local855"
-      873: "local873"
-      875: "local875"
-      879: "local879"
-      918: "local918"
-      943: "local943"
-      966: "local966"
-      970: "local970"
-      980: "local980"
-      1009: "local1009"
-      1026: "local1026"
-      1031: "local1031"
-      1046: "local1046"
-      1056: "local1056"
-      1057: "local1057"
-      1063: "local1063"
-      1077: "local1077"
+    owner: "Bzip2Decompressor"
+    name: "decompress"
+    arguments:
+      0: "state"
+    locals:
+      56: "gotoBzXBlkhdr1"
+      61: "uc"
+      68: "uc2"
+      103: "uc3"
+      141: "i"
+      147: "uc4"
+      165: "i"
+      177: "i"
+      187: "j"
+      193: "uc4"
+      216: "alphaSize"
+      220: "nGroups"
+      224: "nSelectors"
+      226: "i"
+      231: "j"
+      234: "uc4"
+      250: "pos"
+      252: "v"
+      267: "i"
+      275: "v2"
+      279: "tmp"
+      308: "t"
+      315: "curr"
+      317: "i"
+      323: "uc4"
+      329: "uc5"
+      349: "t"
+      354: "minLen"
+      356: "maxLen"
+      358: "i"
+      425: "eob"
+      427: "groupNo"
+      431: "i"
+      443: "kk"
+      445: "ii"
+      449: "jj"
+      475: "nblock"
+      478: "groupNo2"
+      480: "groupPos"
+      485: "gSel"
+      490: "gMinlen"
+      495: "gLimit"
+      500: "gPerm"
+      505: "gBase"
+      506: "groupPos2"
+      508: "zn"
+      512: "zvec"
+      522: "zj"
+      537: "nextSym"
+      548: "es"
+      550: "n"
+      582: "gSel2"
+      605: "zn2"
+      609: "zvec2"
+      619: "zj2"
+      640: "es2"
+      653: "uc4"
+      655: "unfztab"
+      678: "nn"
+      686: "pp"
+      693: "uc4"
+      700: "z"
+      776: "lno"
+      780: "off"
+      787: "pp2"
+      873: "kk2"
+      875: "ii"
+      879: "jj"
+      943: "gSel2"
+      966: "zn2"
+      970: "zvec2"
+      980: "zj2"
+      1009: "i"
+      1026: "i"
+      1031: "cftab"
+      1046: "i"
+      1056: "uc4"
+      1057: "tt"
+      1063: "cftab"
   client!bm.e (Lclient!kf;)V:
-    owner: "Static10"
-    name: "method355"
-    arguments:
-      0: "arg0"
-    locals:
-      2: "local2"
-      5: "local5"
-      8: "local8"
-      11: "local11"
-      13: "local13"
-      16: "local16"
-      19: "local19"
-      22: "local22"
-      25: "local25"
-      27: "local27"
-      32: "local32"
-      62: "local62"
-      79: "local79"
-      84: "local84"
-      131: "local131"
-      136: "local136"
-      157: "local157"
-      162: "local162"
-      181: "local181"
-      186: "local186"
-      191: "local191"
-      215: "local215"
+    owner: "Bzip2Decompressor"
+    name: "unRleObufToOutputFast"
+    arguments:
+      0: "state"
+    locals:
+      2: "cStateOutCh"
+      5: "cStateOutLen"
+      8: "cNblockUsed"
+      11: "cK0"
+      13: "cTt"
+      16: "cTPos"
+      19: "csNextOut"
+      22: "csNextOutPtr"
+      25: "csAvailOut"
+      27: "csAvailOutOld"
+      32: "sSaveNblockPp"
+      62: "gotoReturnNotr"
+      79: "cTPos2"
+      84: "k1"
+      131: "cTPos2"
+      136: "k1"
+      157: "cTPos3"
+      162: "k12"
+      181: "cTPos4"
+      186: "k13"
+      191: "cNblockUsed2"
+      215: "totalOutLo32Old"
   client!bn.<init> (Lclient!ld;)V:
     owner: "Class4_Sub6_Sub1"
     name: "<init>"