Merge pull request #29 from DizzyEggg/decomp_berry

decompile berry

4 files changed, 18 insertions, 11 deletions

diff --git a/include/berry.h b/include/berry.h
index f0acbe0ad..7c2636411 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -37,12 +37,14 @@ u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water);
 u8 CalcBerryYield(struct BerryTree *tree);
 u8 GetBerryCountByBerryTreeId(u8 id);
 u16 GetStageDurationByBerryType(u8);
+void Bag_ChooseBerry(void);
 void FieldObjectInteractionGetBerryTreeData(void);
-void sub_80B4EE4(void);
 void FieldObjectInteractionPlantBerryTree(void);
 void FieldObjectInteractionPickBerryTree(void);
 void FieldObjectInteractionRemoveBerryTree(void);
 u8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 
+extern const struct Berry gBerries[];
+
 #endif // GUARD_BERRY_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
new file mode 100644
index 000000000..f3b5a7668
--- /dev/null
+++ b/include/fieldmap.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_FIELDMAP_H
+#define GUARD_FIELDMAP_H
+
+void GetCameraCoords(u16*, u16*);
+
+#endif // GUARD_FIELDMAP_H
diff --git a/include/global.berry.h b/include/global.berry.h
index 6695a9f4b..a77da20ba 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -42,10 +42,6 @@ struct Berry2
 struct EnigmaBerry
 {
     struct Berry2 berry;
-    u8 pic[(6 * 6) * TILE_SIZE_4BPP];
-    u16 palette[16];
-    u8 description1[45];
-    u8 description2[45];
     u8 itemEffect[18];
     u8 holdEffect;
     u8 holdEffectParam;
diff --git a/include/global.h b/include/global.h
index 32c13d86c..5b4bdc2a1 100644
--- a/include/global.h
+++ b/include/global.h
@@ -649,8 +649,10 @@ struct DaycareData
     u8 stepCounter;
 };
 
-#define FLAGS_NUMBER    300
-#define VARS_NUMBER     256
+#define MAP_OBJECTS_COUNT  16
+#define BERRY_TREES_COUNT  128
+#define FLAGS_COUNT        300
+#define VARS_COUNT         256
 
 struct SaveBlock1
 {
@@ -683,12 +685,12 @@ struct SaveBlock1
     /*0x9C2*/ u8 field_9C2[6];
     /*0x9C8*/ u16 trainerRematchStepCounter;
     /*0x9CA*/ u8 trainerRematches[100];
-    /*0xA30*/ struct MapObject mapObjects[16];
+    /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
     /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64];
-    /*0x1270*/ u8 flags[FLAGS_NUMBER];
-    /*0x139C*/ u16 vars[VARS_NUMBER];
+    /*0x1270*/ u8 flags[FLAGS_COUNT];
+    /*0x139C*/ u16 vars[VARS_COUNT];
     /*0x159C*/ u32 gameStats[NUM_GAME_STATS];
-    /*0x169C*/ struct BerryTree berryTrees[128];
+    /*0x169C*/ struct BerryTree berryTrees[BERRY_TREES_COUNT];
     /*0x1A9C*/ struct SecretBaseRecord secretBases[20];
     /*0x271C*/ u8 playerRoomDecor[12];
     /*0x2728*/ u8 playerRoomDecorPos[12];
@@ -731,6 +733,7 @@ struct SaveBlock1
     /*0x31A8*/ u8 giftRibbons[52];
     /*0x31DC*/ struct Roamer roamer;
     /*0x31F8*/ struct EnigmaBerry enigmaBerry;
+    /*0x322C*/ u8 field_322C[1276];
     /*0x3728*/ struct RamScript ramScript;
     /*0x3B14*/ struct RecordMixingGift recordMixingGift;
     /*0x3B24*/ u8 seen2[52];