merge branch master

2017-10-10 11:48:16 +02:00
parent ab03b03c4b 8914645231
commit e382a73e9d
94 changed files with 18136 additions and 6683 deletions
--- a/include/battle.h
+++ b/include/battle.h
@@ -604,7 +604,7 @@ struct BattleStruct
    u8 field_8B;
    u8 field_8C;
    u8 field_8D;
-    u8 field_8E;
+    u8 stringMoveType;
    u8 expGetterBank;
    u8 field_90;
    u8 field_91;