[Fixed] A few trainer Z's in Coronet

Change-Id: I83374f981343c06b1bce4f19cd49b0a926721e76
Merge "[Fixed] A few trainer Z's in Coronet" into unstable