Revert "Actions modified, fight fixed, Tannenbaum values added, Stockemon extended"

This reverts commit 497184505b300c87a762c1ef698d3f6b51d8de62.
Revert "Revert "Actions modified, fight fixed, Tannenbaum values added, Stockemon extended""

This reverts commit 665308f4463ae9e040984c71ebd30943254f5950.
Merge branch 'master' of https://github.com/AnkeAnke/Stockemon