1. Note the Psychics in Blue
2. Note the Hex maniac in Red
3. Note the Hex maniac sprite used in R/S

Conclusion: Hex maniacs won't have qt witch hats in the remakes, and some trainer classes will likely be reused.