fix merge conflicts

1 files changed, 26 insertions, 2 deletions

diff --git a/include/pokeblock.h b/include/pokeblock.h
index b925894db..0d8e965e4 100755
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -1,11 +1,35 @@
 #ifndef GUARD_POKEBLOCK_H
 #define GUARD_POKEBLOCK_H
 
+struct YesNoCBTable {
+    void (*yesFunc)(void);
+    void (*noFunc)(void);
+};
+
+enum {
+    PBLOCK_CLR_BLACK,
+    PBLOCK_CLR_RED,
+    PBLOCK_CLR_BLUE,
+    PBLOCK_CLR_PINK,
+    PBLOCK_CLR_GREEN,
+    PBLOCK_CLR_YELLOW
+};
+
+extern u8 ewram[];
+extern u8 gUnknown_02039244;
+extern u8 gUnknown_02039248[4];
+extern u8 gUnknown_0203924C;
+extern const u8 *gUnknown_03000758;
+
 void sub_810B96C(void);
+u8 sub_810BA50(s16, s16, u8);
+u8 sub_810C9B0(struct Pokeblock *);
+s16 sub_810CA9C(const struct Pokeblock *, u8);
+u8 sub_810C9E8(struct Pokeblock *);
 void sub_810BA7C(u8);
 void ClearPokeblocks(void);
-void sub_810CA6C(s32);
+bool8 sub_810CA6C(u8);
+s16 sub_810CAE4(u8, const struct Pokeblock *);
 u8 sub_810CB68(u8, u8*);
-s16 sub_810CAE4(u8, struct Pokeblock *);
 
 #endif // GUARD_POKEBLOCK_H