summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/berry.h30
-rw-r--r--include/pokemon.h2
2 files changed, 31 insertions, 1 deletions
diff --git a/include/berry.h b/include/berry.h
new file mode 100644
index 000000000..9d75eada6
--- /dev/null
+++ b/include/berry.h
@@ -0,0 +1,30 @@
+#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
+{
+ u8 name[7];
+ u8 holdEffect;
+ u8 unknown[18];
+ u8 holdEffectParam;
+};
+
+#endif // GUARD_BERRY_H
diff --git a/include/pokemon.h b/include/pokemon.h
index bed60925b..a49ade10b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -257,7 +257,7 @@ struct BattlePokemon
u32 spDefenseIV:5;
u32 isEgg:1;
u32 altAbility:1;
- u8 statStages[8];
+ s8 statStages[8];
u8 ability;
u8 type1, type2;
u8 unknown;