pokeblock.s is decompiled

5 files changed, 18 insertions, 7 deletions

diff --git a/include/lilycove_lady.h b/include/lilycove_lady.h
index c7776131b..084e5722e 100644
--- a/include/lilycove_lady.h
+++ b/include/lilycove_lady.h
@@ -7,7 +7,7 @@ void sub_818DA78(void);
 void sub_818DEF4(void);
 void sub_818E564(void);
 void sub_818E570(const struct LilycoveLadyQuiz *quiz);
-bool8 sub_818E704(struct Pokeblock *pokeblock);
+bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock);
 void sub_818E7E0(u8 *dest1, u8 *dest2);
 void sub_818E81C(u8 *dest);
 void sub_818E848(u8 *dest);
diff --git a/include/menu.h b/include/menu.h
index b57cfd455..e5e69160a 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -4,6 +4,9 @@
 #include "text.h"
 #include "window.h"
 
+#define MENU_NOTHING_CHOSEN -2
+#define MENU_B_PRESSED -1
+
 struct MenuAction
 {
     const u8 *text;
@@ -34,5 +37,7 @@ void do_scheduled_bg_tilemap_copies_to_vram(void);
 void clear_scheduled_bg_copies_to_vram(void);
 void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
 void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
+void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
+void sub_8197DF8(u8 windowId, bool8 copyToVram);
 
 #endif // GUARD_MENU_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 4d76104b7..14b6d32ca 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -25,5 +25,7 @@ void sub_8122344(void *arg0, u8 arg1);
 void LoadListMenuArrowsGfx(void);
 void sub_81223FC(u8 *a0, u8 count, u8 a2);
 void sub_8122448(u8 *a0, u8 count, u16 x, u16 y);
+void DisplayMessageAndContinueTask(u8 taskId, u8 arg1, u16 arg2, u8 arg3, u8 arg4, u8 textSpeed, const u8 *string, void *taskFunc);
+void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 
 #endif //GUARD_MENU_HELPERS_H
diff --git a/include/pokeblock.h b/include/pokeblock.h
index c69aa07dc..6dd07b689 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -52,16 +52,17 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void));
 void OpenPokeblockCaseInBattle(void);
 void OpenPokeblockCaseOnFeeder(void);
 void ResetPokeblockScrollPositions(void);
-
 u8 CreatePokeblockCaseSprite(s16 x, s16 y, u8 subpriority);
-s16 GetPokeblockData(const struct Pokeblock *pokeblock, u8 dataId);
 void ClearPokeblocks(void);
-s8 GetFirstFreePokeblockSlot(void);
-bool32 AddPokeblock(struct Pokeblock *pokeblock);
 u8 GetHighestPokeblocksFlavorLevel(const struct Pokeblock *pokeblock);
 u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock);
+s8 GetFirstFreePokeblockSlot(void);
+bool32 AddPokeblock(const struct Pokeblock *pokeblock);
+bool32 TryClearPokeblock(u8 pkblId);
+s16 GetPokeblockData(const struct Pokeblock *pokeblock, u8 field);
+s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock);
+void PokeblockCopyName(const struct Pokeblock *pokeblock, u8 *dest);
+bool8 CopyMonFavoritePokeblockName(u8 nature, u8 *dest);
 u8 GetPokeblocksFlavor(const struct Pokeblock *pokeblock);
-s16 PokeblockGetGain(u8, const struct Pokeblock *pokeblock);
-void PokeblockCopyName(const struct Pokeblock *pokeblock, u8 *dst);
 
 #endif // GUARD_POKEBLOCK_H
diff --git a/include/strings.h b/include/strings.h
index 51027adff..15a6374a3 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -54,6 +54,9 @@ extern const u8 gText_NoDecorationsInUse[];
 extern const u8 gText_Exit[];
 extern const u8 gText_Cancel[];
 
+extern const u8 gText_ThrowAwayVar1[];
+extern const u8 gText_Var1ThrownAway[];
+
 extern const u8 gText_Color161Shadow161[];
 extern const u8 gText_GoBackPrevMenu[];
 extern const u8 gText_CantPlaceInRoom[];