diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:31:04 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:54:27 -0600 |
| commit | 2592803460fcaeb2dd804080eb8770c85613773e (patch) | |
| tree | ba53079591d9629dcf4672b544f13651f346d425 /include/battle.h | |
| parent | cd994f4935b9de81383d8e0a17d790414652a4d6 (diff) | |
| parent | b2ac3b6d6f06ed4a2d64af90e97796c66bcdeb5f (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index c06bdaad5..52c4ee8ae 100644 --- a/include/battle.h +++ b/include/battle.h @@ -623,7 +623,7 @@ struct BattleHealthboxInfo u8 battlerBounceSpriteId; u8 animationState; u8 field_5; - u8 field_6; + u8 matrixNum; u8 shadowSpriteId; u8 field_8; u8 field_9; |