diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-12 01:57:52 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-12 01:57:52 -0400 |
| commit | de67e7cf5fbe55bdfcb4dcd069e7ffa64187c72a (patch) | |
| tree | 7cb13c4e6d90c1f1ec03e4e16dbb26b20c9610e6 /include/global.berry.h | |
| parent | 0354f2cc5ae9771d745e6ffadd4715bdc8ff5221 (diff) | |
| parent | 184436635fdca28399d03e805814a0deda67d200 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/global.berry.h')
| -rw-r--r-- | include/global.berry.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/global.berry.h b/include/global.berry.h index b7938868d..6632e55e2 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -34,10 +34,10 @@ struct EnigmaBerry struct BattleEnigmaBerry { - u8 name[7]; - u8 holdEffect; - u8 itemEffect[18]; - u8 holdEffectParam; + /*0x00*/ u8 name[7]; + /*0x07*/ u8 holdEffect; + /*0x08*/ u8 itemEffect[18]; + /*0x1A*/ u8 holdEffectParam; }; struct BerryTree @@ -45,7 +45,7 @@ struct BerryTree u8 berry; u8 stage:7; u8 growthSparkle:1; - u16 secondsUntilNextStage; + u16 minutesUntilNextStage; u8 berryYield; u8 regrowthCount:4; u8 watered1:1; |