summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-11-04 16:31:27 -0600
committerGitHub <noreply@github.com>2019-11-04 16:31:27 -0600
commita4b4ecd470622c2e28bcd9dc93e236a71344dafd (patch)
tree43a827e7eac7696bd2cbb1c64c828193f2fd2cf1 /include/battle.h
parent347d1e20b62cf18d24084f7dab0291ecc4282564 (diff)
parent5fd44d1e74019fd07c342f36b3995a6d71fbaab9 (diff)
Merge pull request #787 from GriffinRichards/rename-tablecmds
Rename table cmds
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h
index 32eabc6de..f8c685fb0 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -478,7 +478,7 @@ struct BattleScripting
u8 animArg1;
u8 animArg2;
u16 tripleKickPower;
- u8 atk49_state;
+ u8 moveendState;
u8 battlerWithAbility;
u8 multihitMoveEffect;
u8 battler;
@@ -486,9 +486,9 @@ struct BattleScripting
u8 animTargetsHit;
u8 statChanger;
bool8 statAnimPlayed;
- u8 atk23_state;
+ u8 getexpState;
u8 battleStyle;
- u8 atk6C_state;
+ u8 drawlvlupboxState;
u8 learnMoveState;
u8 field_20;
u8 reshowMainState;