and other clean up
Conflicts: engine/evos_moves.asm engine/overworld/healing_machine.asm
also use more joypad constants