diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-15 18:59:30 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-15 18:59:30 -0500 |
| commit | ce391ed0696c22e8fa1f33430b4025a08a3bc360 (patch) | |
| tree | dbdd06262cd738bb682d8a9304293ac5d944a071 /include/battle.h | |
| parent | bdb0628c913fe7f2e77598d6390f8f7d951b1703 (diff) | |
| parent | ed152b1566fa5c39ee72ca190c49fbfe30708036 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
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 27ed57045..c94325cd5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -473,7 +473,7 @@ struct sideTimer u8 lightscreenTimer; //0x1 u8 mistTimer; //0x2 u8 field3; //0x3 - u16 field4; //0x4 + u16 field4; //0x4 u8 spikesAmount; //0x6 u8 safeguardTimer; //0x7 u8 followmeTimer; //0x8 |