summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/graphics.h16
-rw-r--r--include/item_menu.h8
-rw-r--r--include/item_menu_icons.h18
3 files changed, 24 insertions, 18 deletions
diff --git a/include/graphics.h b/include/graphics.h
index 4e558b508..43b014a9f 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3301,10 +3301,10 @@ extern const u32 gPokedexSearch1_Tilemap[];
extern const u16 gPokedexSearchMenu_Pal[];
// berry tag screen
-extern const u32 gUnknown_08D9BB44[];
-extern const u32 gUnknown_08D9BF98[];
-extern const u32 gUnknown_08D9C13C[];
-extern const u32 gUnknown_08D9BEF0[];
+extern const u32 gBerryCheck_Gfx[];
+extern const u32 gBerryCheck_Pal[];
+extern const u32 gBerryTag_Gfx[];
+extern const u32 gBerryTag_Pal[];
// rayquaza scene gfx
extern const u32 gRaySceneGroudon_Gfx[];
@@ -3859,6 +3859,7 @@ extern const u8 gFireRedMenuElements_Gfx[];
// item menu graphics
extern const u32 gBagScreen_Gfx[];
+extern const u32 gBagScreen_GfxTileMap[];
extern const u32 gBagScreenFemale_Pal[];
extern const u32 gBagScreenMale_Pal[];
extern const u8 gBagMenuHMIcon_Gfx[];
@@ -4092,11 +4093,11 @@ extern const u16 gBattleInterface_BallDisplayPal[];
extern const u32 gBagSwapLineGfx[];
extern const u32 gBagSwapLinePal[];
-extern const u32 gUnknown_08D9ADD0[];
-extern const u32 gUnknown_08D9AE04[];
+extern const u32 gBattleFrontierGfx_PyramidBag[];
+extern const u32 gBattleFrontierGfx_PyramidBag_Pal[];
+extern const u32 gBattleFrontierGfx_PyramidBagTileMap[];
extern const u32 gUnknown_08D9AF44[];
extern const u16 gUnknown_0860F074[];
-extern const u32 gBattleFrontierGfx_PyramidBag[];
extern const u32 gTitleScreenEmeraldVersionGfx[];
extern const u32 gTitleScreenPressStartGfx[];
@@ -4762,7 +4763,6 @@ extern const u32 gBattleStatMask6_Pal[];
extern const u32 gBattleStatMask7_Pal[];
extern const u32 gBattleStatMask8_Pal[];
-extern const u32 gUnknown_08D9A88C[];
extern const u32 gContestMiscGfx[];
extern const u32 gContestAudienceGfx[];
extern const u8 gContestApplauseMeterGfx[];
diff --git a/include/item_menu.h b/include/item_menu.h
index 70d6b5a94..5580fa4b4 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -29,9 +29,9 @@ struct BagStruct
u16 scrollPosition[POCKETS_COUNT];
};
-extern struct BagStruct gUnknown_0203CE58;
+extern struct BagStruct gBagPositionStruct;
-struct UnkBagStruct
+struct BagMenuStruct
{
void (*mainCallback2)(void);
u8 tilemapBuffer[0x800];
@@ -61,7 +61,7 @@ struct UnkBagStruct
u8 filler2[4];
};
-extern struct UnkBagStruct *gUnknown_0203CE54;
+extern struct BagMenuStruct *gBagMenu;
// Exported RAM declarations
@@ -85,7 +85,7 @@ void ResetBagScrollPositions(void);
void sub_81AABF0(void (*callback)(void));
void CB2_ChooseBerry(void);
void unknown_ItemMenu_Confirm(u8 taskId);
-void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
+void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
void sub_81AB9A8(u8 pocketId);
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h
index aee7599df..50f0d5544 100644
--- a/include/item_menu_icons.h
+++ b/include/item_menu_icons.h
@@ -1,11 +1,11 @@
#ifndef GUARD_ITEM_MENU_ICONS
#define GUARD_ITEM_MENU_ICONS
-extern const struct CompressedSpriteSheet gUnknown_0857FB34;
-extern const struct CompressedSpriteSheet gUnknown_0857FB3C;
-extern const struct CompressedSpritePalette gUnknown_0857FB44;
-extern const struct CompressedSpriteSheet gUnknown_0857FDEC;
-extern const struct CompressedSpritePalette gUnknown_0857FDF4;
+extern const struct CompressedSpriteSheet gBagMaleSpriteSheet;
+extern const struct CompressedSpriteSheet gBagFemaleSpriteSheet;
+extern const struct CompressedSpritePalette gBagPaletteTable;
+extern const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet;
+extern const struct CompressedSpritePalette gBerryCheckCirclePaletteTable;
void RemoveBagSprite(u8 id);
void AddBagVisualSprite(u8 bagPocketId);
@@ -19,7 +19,13 @@ void sub_80D4FC8(u8 arg0);
void sub_80D4FEC(u8 arg0);
u8 CreateBerryTagSprite(u8 id, s16 x, s16 y);
void FreeBerryTagSpritePalette(void);
-u8 sub_80D511C(u8 berryId, u8 x, u8 y, bool8 startAffine);
+u8 LoadSpinningBerryPicGfx(u8 berryId, u8 x, u8 y, bool8 startAffine);
u8 CreateBerryFlavorCircleSprite(s16 x);
+#define TAG_BAG_GFX 100
+#define TAG_ROTATING_BALL_GFX 101
+#define TAG_BERRY_CHECK_CIRCLE_GFX 10000
+#define TAG_BERRY_PIC_TILE 0xFFFF
+#define TAG_BERRY_PIC_PAL 0x7544
+
#endif // GUARD_ITEM_MENU_ICONS