summaryrefslogtreecommitdiff
path: root/include/battle_controllers.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-10-09 20:25:41 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-10-09 20:25:41 -0400
commitf1d07acc48e483f00f8d6d573af12199f68123d4 (patch)
tree6e9ace8e4822e19224561dc99728d80699eaa635 /include/battle_controllers.h
parent6d66081be0b1b26ce55a6f1a2a20644e2ae5c7f7 (diff)
parent8914645231c9301579ed39bdd9200ad50e5296d0 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
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 2281fdaff..eea544b55 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -39,8 +39,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;