summaryrefslogtreecommitdiff
path: root/include/battle_controllers.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-10 11:48:16 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-10 11:48:16 +0200
commite382a73e9d706fee763723b5a275b36db3b0fc97 (patch)
tree0a93d36a2cca12a56d5f441194d6fda311208978 /include/battle_controllers.h
parentab03b03c4bb872af131a9c52ef285c488b8e4865 (diff)
parent8914645231c9301579ed39bdd9200ad50e5296d0 (diff)
merge branch master
Diffstat (limited to 'include/battle_controllers.h')
-rw-r--r--include/battle_controllers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index ea614a6b2..75cdf457b 100644
--- 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;