Conflicts: engine/evos_moves.asm engine/overworld/healing_machine.asm
rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
For unknown addresses, use "w<address>". Label overleads are still an issue.