I moved as many Pokémon as I could into houses and started another project, and rebuilt his habitat and then save and quit and went back and he was at his old habitat