YOKOHAMA - Tetsuto Yamada homered and drove in four runs to help move Japan to within two wins of the Tokyo Olympic gold medal game with a 7-4 group stage win over Mexico on Saturday afternoon.