Merge pull request #1403 from GriffinRichards/doc-pokeblock

Document Pokéblock menu and feeding scene

4 files changed, 11 insertions, 12 deletions

diff --git a/include/graphics.h b/include/graphics.h
index 7c36b9cf5..cea8bbab1 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4076,7 +4076,7 @@ extern const u8 gNamingScreenCursor_Gfx[];
 extern const u8 gNamingScreenInputArrow_Gfx[];
 extern const u8 gNamingScreenUnderscore_Gfx[];
 
-extern const u32 gUnknown_08D9BA44[];
+extern const u32 gPokeblockFeedBg_Tilemap[];
 
 extern const u32 gConfetti_Gfx[];
 extern const u32 gConfetti_Pal[];
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h
index 7ff6ace94..50e11dfd9 100644
--- a/include/item_menu_icons.h
+++ b/include/item_menu_icons.h
@@ -14,9 +14,9 @@ void ShakeBagSprite(void);
 void AddSwitchPocketRotatingBallSprite(s16 rotationDirection);
 void AddBagItemIconSprite(u16 itemId, u8 id);
 void RemoveBagItemIconSprite(u8 id);
-void sub_80D4FAC(void);
-void sub_80D4FC8(u8 arg0);
-void sub_80D4FEC(u8 arg0);
+void CreateItemMenuSwapLine(void);
+void SetItemMenuSwapLineInvisibility(bool8 invisible);
+void UpdateItemMenuSwapLinePos(u8 y);
 u8 CreateBerryTagSprite(u8 id, s16 x, s16 y);
 void FreeBerryTagSpritePalette(void);
 u8 CreateSpinningBerrySprite(u8 berryId, u8 x, u8 y, bool8 startAffine);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 4557ebbb1..c4401354b 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -35,10 +35,10 @@ bool8 MenuHelpers_CallLinkSomething(void);
 void sub_812220C(struct ItemSlot *slots, u8 count, u8 *arg2, u8 *usedSlotsCount, u8 maxUsedSlotsCount);
 void sub_812225C(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 numItems);
 void sub_8122298(u16 *arg0, u16 *arg1, u8 arg2, u8 arg3, u8 arg4);
-void LoadListMenuArrowsGfx(void);
-void sub_8122344(u8 *spriteIds, u8 count);
-void sub_81223B0(u8 *spriteIds, u8 count);
-void sub_81223FC(u8 *spriteIds, u8 count, bool8 invisible);
-void sub_8122448(u8 *spriteIds, u8 count, s16 x, u16 y);
+void LoadListMenuSwapLineGfx(void);
+void CreateSwapLineSprites(u8 *spriteIds, u8 count);
+void DestroySwapLineSprites(u8 *spriteIds, u8 count);
+void SetSwapLineSpritesInvisibility(u8 *spriteIds, u8 count, bool8 invisible);
+void UpdateSwapLineSpritesPos(u8 *spriteIds, u8 count, s16 x, u16 y);
 
 #endif //GUARD_MENU_HELPERS_H
diff --git a/include/pokeblock.h b/include/pokeblock.h
index c82e99d8f..9e0161495 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -4,8 +4,7 @@
 #include "constants/berry.h"
 #include "constants/pokemon.h"
 
-#define GFX_TAG_POKEBLOCK       14818
-#define GFX_TAG_POKEBLOCK_CASE  14800
+#define TAG_POKEBLOCK       14818
 
 enum
 {
@@ -52,7 +51,7 @@ extern s16 gPokeblockGain;
 void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void));
 
 // pokeblock feed
-void CB2_PreparePokeblockFeedScene(void);
+void PreparePokeblockFeedScene(void);
 
 // pokeblock
 extern const s8 gPokeblockFlavorCompatibilityTable[NUM_NATURES * FLAVOR_COUNT];