[z1973] Use a few more enums instead of magic numbers

(based on commit e19471f)

Signed-off-by: Nighoo <nighoo@gmail.com>

(cleaned version of 538325d)

(based on commit [s1562] - 8c031fd)