I see you reset (or rather, recall precomputed LSA value) for both ADPCM types now? Well, your call. I'm pretty sure you're going to be reverting those changes once you get more acquainted with type 3 in MESS *evil grin*.

I'm going to test few more type 2 with non-zero LSA later, so far simple reset always worked for me. Now that I have several DSF players I have some reference source.