Merge with master and fix web moves

charmap.txt

@@ -401,6 +401,8 @@ B_ATK_TRAINER_CLASS = FD 36
 B_ATK_TEAM1 = FD 37
 B_ATK_TEAM2 = FD 38
 B_DEF_NAME = FD 39
+B_DEF_TEAM1 = FD 3A
+B_DEF_TEAM2 = FD 3B
 
 @ indicates the end of a town/city name (before " TOWN" or " CITY")
 NAME_END = FC 00