begun switch to new spawner
More spawning code
fixed up darkness pokemon spawning
Merge remote-tracking branch 'original/master'