Accidents happen!
Merge github.com:kanzure/pokecrystal-demo
Merge github.com:kanzure/pokecrystal-demo
Changed KrissHouse2F.asm warps to original
Revert "Accidents happen!"

This reverts commit 53955c4445bdeab694682e5d5b255086185e1884.

This changes pokecrystal.bat back to the working version.
Merge remote-tracking branch 'tysonrss/master'