diff options
author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-01 03:51:24 +0100 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-30 18:51:24 -0800 |
commit | 4258e60771aa9fdabd678930eca534423bd371b8 (patch) | |
tree | ecca2ee7641abc0562f39b6c7dd907af2184e102 /include/berry.h | |
parent | 831f8cd4fd94613d6b52d87df1b4903bedfaa717 (diff) |
Declare more non-static functions in header files (#111)
* Declare more non-static functions in header files
* Use `(void)` for functions without arguments.
* Move global-included data to seperate headers
* Don't import types or global in header
* Fix fieldmap imports
* Revert in-code changes
* Add missing newlines
Diffstat (limited to 'include/berry.h')
-rw-r--r-- | include/berry.h | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/include/berry.h b/include/berry.h deleted file mode 100644 index a80e77512..000000000 --- a/include/berry.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef GUARD_BERRY_H -#define GUARD_BERRY_H - -struct Berry -{ - u8 name[7]; - u8 firmness; - u16 size; - u8 maxYield; - u8 minYield; - u8 *description1; - u8 *description2; - u8 stageDuration; - u8 spicy; - u8 dry; - u8 sweet; - u8 bitter; - u8 sour; - u8 smoothness; -}; - -struct EnigmaBerry -{ - struct Berry berry; - u8 pic[(6 * 6) * TILE_SIZE_4BPP]; - u16 palette[16]; - u8 description1[45]; - u8 description2[45]; - u8 itemEffect[18]; - u8 holdEffect; - u8 holdEffectParam; - u32 checksum; -}; - -struct BattleEnigmaBerry -{ - u8 name[7]; - u8 holdEffect; - u8 itemEffect[18]; - u8 holdEffectParam; -}; - -struct BerryTree -{ - u8 berry; - u8 stage:7; - u8 growthSparkle:1; - u16 secondsUntilNextStage; - u8 berryYield; - u8 regrowthCount:4; - u8 watered1:1; - u8 watered2:1; - u8 watered3:1; - u8 watered4:1; -}; - -#endif // GUARD_BERRY_H |