Mark pokemon as caught when scanned for localstorage
Fix some conflicts