Revert "Clean up and bug fixes in melee2.c (large)"

This reverts commit a2c93d022784d7def34839fb62d7a2096c013756.