new change in battle and inventory activities
Revert "new change in battle and inventory activities"

This reverts commit 3467937f262c427e39f8124c76a27662a9f0dea0.