Fix crash on long click pokemon on first turn of battle
Merge remote-tracking branch 'main/master'