sub_810B998 and ALL the data

6 files changed, 30 insertions, 7 deletions

diff --git a/include/battle.h b/include/battle.h
index d93860094..a480ca95e 100644..100755
--- a/include/battle.h
+++ b/include/battle.h
@@ -308,6 +308,7 @@ void c3_0802FDF4(u8);
 void sub_802E3E4(u8, int);
 void nullsub_8(u8);
 void sub_802E414(void);
+void sub_802E424(void);
 
 // asm/battle_7.o
 void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d);
diff --git a/include/decoration.h b/include/decoration.h
index 2595d491a..7a6d8ef5a 100644..100755
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -274,7 +274,7 @@ extern const u8 *const gUnknown_083EC5E4[];
 extern const u8 *const gUnknown_083EC624[];
 extern u8 gUnknown_020388F7[];
 extern const struct MenuAction2 gUnknown_083EC604[];
-extern const struct MenuAction3 gUnknown_083EC634[];
+extern const struct YesNoFuncTable gUnknown_083EC634[];
 extern const u8 gUnknown_083EC65A[];
 extern const u8 gUnknown_083EC97C[];
 extern const u8 gUnknown_083EC984[];
diff --git a/include/graphics.h b/include/graphics.h
index c3fe20996..36b11fd0a 100644..100755
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2435,4 +2435,12 @@ extern const u8 gMonFrontPic_UnownQuestionMark[];
 extern const u8 gMonBackPic_UnownQuestionMark[];
 extern const u8 gMonIcon_UnownQuestionMark[];
 
+// src/pokeblock.c
+extern const u8 gMenuPokeblock_Gfx[];
+extern const u8 gMenuPokeblock_Tilemap[];
+extern const u8 gMenuPokeblock_Pal[];
+
+extern const u8 gMenuPokeblockDevice_Gfx[];
+extern const u8 gMenuPokeblockDevice_Pal[];
+
 #endif  // GUARD_GRAPHICS_H
diff --git a/include/menu.h b/include/menu.h
index 9eeebce60..7d4bc731b 100644..100755
--- a/include/menu.h
+++ b/include/menu.h
@@ -15,12 +15,6 @@ struct MenuAction2
     void (*func)(u8);
 };
 
-struct MenuAction3
-{
-    void (*func1)(u8);
-    void (*func2)(u8);
-};
-
 extern const struct MenuAction gMenuYesNoItems[];
 
 extern struct Window gMenuWindow;
diff --git a/include/pokeblock.h b/include/pokeblock.h
index 353c3d050..958ccec5f 100755
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -1,6 +1,11 @@
 #ifndef GUARD_POKEBLOCK_H
 #define GUARD_POKEBLOCK_H
 
+struct YesNoCBTable {
+    void (*yesFunc)(void);
+    void (*noFunc)(void);
+};
+
 extern u8 ewram[];
 extern u8 gUnknown_02039244;
 extern u8 gUnknown_02039248[2];
diff --git a/include/strings.h b/include/strings.h
index 89a78e478..a1fcc30cb 100644..100755
--- a/include/strings.h
+++ b/include/strings.h
@@ -902,4 +902,19 @@ extern const u8 gSystemText_NoSaveFileNoTime[];
 extern const u8 gSystemText_ClockAdjustmentUsable[];
 extern const u8 gSystemText_Saving[];
 
+extern const u8 ContestStatsText_RedPokeBlock[];
+extern const u8 ContestStatsText_BluePokeBlock[];
+extern const u8 ContestStatsText_PinkPokeBlock[];
+extern const u8 ContestStatsText_GreenPokeBlock[];
+extern const u8 ContestStatsText_YellowPokeBlock[];
+extern const u8 ContestStatsText_PurplePokeBlock[];
+extern const u8 ContestStatsText_IndigoPokeBlock[];
+extern const u8 ContestStatsText_BrownPokeBlock[];
+extern const u8 ContestStatsText_LiteBluePokeBlock[];
+extern const u8 ContestStatsText_OlivePokeBlock[];
+extern const u8 ContestStatsText_GrayPokeBlock[];
+extern const u8 ContestStatsText_BlackPokeBlock[];
+extern const u8 ContestStatsText_WhitePokeBlock[];
+extern const u8 ContestStatsText_GoldPokeBlock[];
+
 #endif