further bug fixes in Shock decomp

Marco Rattorequested to merge
rattoma:shock_decomp into master

both fixes should be cherry picked to 4.5. 48fa05b1 needs manual cherry pick since names list became cell arrays in 4.6

Merge request reports