start working on berry blender

include/berry.h

@@ -11,6 +11,16 @@ enum
     BERRY_FIRMNESS_SUPER_HARD,
 };
 
+enum
+{
+    FLAVOUR_SPICY,
+    FLAVOUR_DRY,
+    FLAVOUR_SWEET,
+    FLAVOUR_BITTER,
+    FLAVOUR_SOUR,
+    FLAVOUR_COUNT
+};
+
 #define NUM_BERRIES 44
 
 extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES];

include/decompress.h

@@ -28,4 +28,6 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32
 void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
 void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
 
+u32 sub_8034974(const u8 *ptr);
+
 #endif // GUARD_DECOMPRESS_H

include/flags.h

@@ -2,6 +2,7 @@
 #define GUARD_FLAGS_H
 
 #define FLAG_PENDING_DAYCARE_EGG    0x86
+#define FLAG_340 0x340
 
 #define FLAG_TRAINER_FLAG_START  0x500
 

include/gba/m4a_internal.h

@@ -406,7 +406,7 @@ void m4aSoundVSyncOff(void);
 
 void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo);
 void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch);
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch);
 void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan);
 void ClearModM(struct MusicPlayerTrack *track);
 void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth);

include/item_menu_icons.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_ITEM_MENU_ICONS
+#define GUARD_ITEM_MENU_ICONS
+
+u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3);
+
+#endif // GUARD_ITEM_MENU_ICONS

include/items.h

@@ -386,6 +386,10 @@ enum
     ITEM_OLD_SEA_MAP,    // 0x178
 };
 
+#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
+#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
+#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
+
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES 8
 

include/new_menu_helpers.h

@@ -13,5 +13,6 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
 void sub_8197434(u8 a0, u8 a1);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);
+u8 GetPlayerTextSpeed(void);
 
 #endif // GUARD_NEW_MENU_HELPERS_H