From 1e2dc716025614209e58c672afd73d4c86d7c2c7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 14 Aug 2017 22:11:32 +0200
Subject: pokeblock feed is on the way

---
 include/pokeblock.h | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'include/pokeblock.h')

diff --git a/include/pokeblock.h b/include/pokeblock.h
index f78ed40c3..c04278c30 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -1,7 +1,8 @@
 #ifndef GUARD_POKEBLOCK_H
 #define GUARD_POKEBLOCK_H
 
-enum {
+enum
+{
     PBLOCK_CLR_BLACK,
     PBLOCK_CLR_RED,
     PBLOCK_CLR_BLUE,
@@ -10,15 +11,27 @@ enum {
     PBLOCK_CLR_YELLOW
 };
 
+enum
+{
+    PBLOCK_COLOR,
+    PBLOCK_SPICY,
+    PBLOCK_DRY,
+    PBLOCK_SWEET,
+    PBLOCK_BITTER,
+    PBLOCK_SOUR,
+    PBLOCK_FEEL,
+};
+
 void sub_810B96C(void);
 u8 sub_810BA50(s16, s16, u8);
 u8 sub_810C9B0(struct Pokeblock *);
-s16 sub_810CA9C(const struct Pokeblock *, u8);
+s16 GetPokeblockData(const struct Pokeblock *, u8);
 u8 sub_810C9E8(struct Pokeblock *);
 void sub_810BA7C(u8);
 void ClearPokeblocks(void);
-bool8 sub_810CA6C(u8);
-s16 sub_810CAE4(u8, const struct Pokeblock *);
+bool8 PokeblockClearIfExists(u8);
+s16 PokeblockGetGain(u8, const struct Pokeblock *);
 u8 sub_810CB68(u8, u8*);
+void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest);
 
 #endif // GUARD_POKEBLOCK_H
-- 
cgit v1.2.3


From 49aebd08cc11b02c3f6ab5ad48eb9c520528ac8a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 15 Aug 2017 12:17:14 +0200
Subject: cleaning up other pokeblock files

---
 include/pokeblock.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/pokeblock.h')

diff --git a/include/pokeblock.h b/include/pokeblock.h
index c04278c30..0a6057760 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -33,5 +33,7 @@ bool8 PokeblockClearIfExists(u8);
 s16 PokeblockGetGain(u8, const struct Pokeblock *);
 u8 sub_810CB68(u8, u8*);
 void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest);
+void CB2_PreparePokeblockFeedScene(void);
+void sub_8136130(struct Pokeblock *, MainCallback);
 
 #endif // GUARD_POKEBLOCK_H
-- 
cgit v1.2.3


From 296534003f07e6f240b11bb60fec87df42e864f4 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 15 Aug 2017 12:40:10 +0200
Subject: more cleaning, make it compile

---
 include/pokeblock.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/pokeblock.h')

diff --git a/include/pokeblock.h b/include/pokeblock.h
index 0a6057760..6720653a0 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -34,6 +34,9 @@ s16 PokeblockGetGain(u8, const struct Pokeblock *);
 u8 sub_810CB68(u8, u8*);
 void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest);
 void CB2_PreparePokeblockFeedScene(void);
+
+#include "main.h"
+
 void sub_8136130(struct Pokeblock *, MainCallback);
 
 #endif // GUARD_POKEBLOCK_H
-- 
cgit v1.2.3