diff --git a/share/deob/map/client.yaml b/share/deob/map/client.yaml
index e829bb74..d73b2862 100644
--- a/share/deob/map/client.yaml
+++ b/share/deob/map/client.yaml
@@ -245,7 +245,7 @@ classes:
   client!td: "ObjType"
   client!te: "AnimFrameset"
   client!tf: "Class4_Sub6"
-  client!tg: "Class4_Sub31"
+  client!tg: "Song"
   client!ti: "TextureOp24"
   client!tj: "AudioChannel"
   client!tm: "ImageProducerFrameBuffer"
@@ -9759,10 +9759,10 @@ fields:
     owner: "Class4_Sub6"
     name: "aBoolean289"
   client!tg.o [B:
-    owner: "Class4_Sub31"
-    name: "aByteArray67"
+    owner: "Song"
+    name: "midiBytes"
   client!tg.p Lclient!ic;:
-    owner: "Class4_Sub31"
+    owner: "Song"
     name: "aClass84_23"
   client!th.a I:
     owner: "Static6"
@@ -40993,89 +40993,89 @@ methods:
     arguments: {}
     locals: {}
   client!tg.<init> (Lclient!fd;)V:
-    owner: "Class4_Sub31"
+    owner: "Song"
     name: "<init>"
     arguments:
-      0: "arg0"
+      0: "in"
     locals:
-      12: "local12"
-      16: "local16"
-      22: "local22"
-      27: "local27"
-      29: "local29"
-      31: "local31"
-      33: "local33"
-      35: "local35"
-      37: "local37"
-      39: "local39"
-      41: "local41"
-      43: "local43"
-      48: "local48"
-      52: "local52"
-      115: "local115"
-      138: "local138"
-      156: "local156"
-      158: "local158"
-      174: "local174"
-      177: "local177"
-      179: "local179"
-      181: "local181"
-      183: "local183"
-      185: "local185"
-      187: "local187"
-      189: "local189"
-      191: "local191"
-      193: "local193"
-      195: "local195"
-      197: "local197"
-      199: "local199"
-      201: "local201"
-      203: "local203"
-      205: "local205"
-      295: "local295"
-      298: "local298"
-      307: "local307"
-      316: "local316"
-      325: "local325"
-      334: "local334"
-      343: "local343"
-      352: "local352"
-      361: "local361"
-      374: "local374"
-      383: "local383"
-      392: "local392"
-      401: "local401"
-      410: "local410"
-      419: "local419"
-      428: "local428"
-      437: "local437"
-      446: "local446"
-      455: "local455"
-      464: "local464"
-      473: "local473"
-      482: "local482"
-      500: "local500"
-      530: "local530"
-      532: "local532"
-      534: "local534"
-      536: "local536"
-      538: "local538"
-      540: "local540"
-      542: "local542"
-      545: "local545"
-      547: "local547"
-      549: "local549"
-      565: "local565"
-      567: "local567"
-      571: "local571"
-      583: "local583"
-      590: "local590"
-      634: "local634"
-      775: "local775"
-      910: "local910"
-      940: "local940"
+      12: "tracks"
+      16: "division"
+      22: "midiLen"
+      27: "tempoChanges"
+      29: "controllerEvents"
+      31: "noteOnEvents"
+      33: "noteOffEvents"
+      35: "pitchWheelEvents"
+      37: "channelPressureEvents"
+      39: "keyPressureEvents"
+      41: "bankSelectEvents"
+      43: "i"
+      48: "status"
+      52: "statusAndChannel"
+      115: "midiLen2"
+      138: "deltaTimePos"
+      156: "events"
+      158: "i"
+      174: "midiLen3"
+      177: "controllerPos"
+      179: "modulationWheelMsbEvents"
+      181: "modulationWheelLsbEvents"
+      183: "channelVolumeMsbEvents"
+      185: "channelVolumeLsbEvents"
+      187: "panMsbEvents"
+      189: "panLsbEvents"
+      191: "nonRegisteredMsbEvents"
+      193: "nonRegisteredLsbEvents"
+      195: "registeredMsbEvents"
+      197: "registeredLsbEvents"
+      199: "otherKnownControllerEvents"
+      201: "unknownControllerEvents"
+      203: "controller"
+      205: "i"
+      295: "messagePos"
+      298: "otherKnownControllerPos"
+      307: "keyPressurePos"
+      316: "channelPressurePos"
+      325: "pitchWheelMsbPos"
+      334: "modulationWheelMsbPos"
+      343: "channelVolumeMsbPos"
+      352: "panMsbPos"
+      361: "keyPos"
+      374: "onVelocityPos"
+      383: "unknownControllerPos"
+      392: "offVelocityPos"
+      401: "modulationWheelLsbPos"
+      410: "channelVolumeLsbPos"
+      419: "panLsbPos"
+      428: "bankSelectPos"
+      437: "pitchWheelLsbPos"
+      446: "nonRegisteredMsbPos"
+      455: "nonRegisteredLsbPos"
+      464: "registeredMsbPos"
+      473: "registeredLsbPos"
+      482: "tempoPos"
+      500: "out"
+      530: "channel"
+      532: "key"
+      534: "onVelocity"
+      536: "offVelocity"
+      538: "pitchWheel"
+      540: "channelPressure"
+      542: "keyPressure"
+      545: "values"
+      547: "controller2"
+      549: "i"
+      565: "trackLenPosition"
+      567: "status"
+      571: "deltaTime"
+      583: "statusAndChannel"
+      590: "statusChanged"
+      634: "tempoPos2"
+      775: "valueDelta"
+      910: "value"
+      940: "pitchWheelLsb"
   client!tg.a ()V:
-    owner: "Class4_Sub31"
+    owner: "Song"
     name: "method4163"
     arguments: {}
     locals:
@@ -41108,7 +41108,7 @@ methods:
     locals:
       5: "local5"
   client!tg.b ()V:
-    owner: "Class4_Sub31"
+    owner: "Song"
     name: "method4164"
     arguments: {}
     locals: {}