Review if we need to port these commits from vanilla newbox. https://github.com/fellowship-of-the-roms/pokecrystal/commit/dac9a5379454698d77a1d4092cb6cd817f331f35 https://github.com/fellowship-of-the-roms/pokecrystal/commit/570932f57a5794b3881abdd8ef515a9760cf64ae