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_controllers.h
+++ b/include/battle_controllers.h
@@ -41,8 +41,8 @@ struct MovePpInfo
 struct ChooseMoveStruct
 {
    u16 moves[4];
-    u8 ppNumbers[4];
-    u8 ppWithBonusNumbers[4];
+    u8 currentPp[4];
+    u8 maxPp[4];
    u16 species;
    u8 monType1;
    u8 monType2;