Functions for getting potions, pokeballs and pokemon are now in non-static classes. This will make it easier to manage other npc trainers in the future.