[z1832] Rename MOVEMENTFLAG for master compatibility

Also sync code style a little

(cleaned version of 0980aff)

(based on commit [s1390] - 75307bf)