Fix some doubles incompatibilities
Specifically, pokemon.id should never be passed to battle.add()