Merge branch 'master' into secret_base

1 files changed, 133 insertions, 3 deletions

diff --git a/include/graphics.h b/include/graphics.h
index 36b11fd0a..f3a722b40 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2435,12 +2435,142 @@ extern const u8 gMonFrontPic_UnownQuestionMark[];
 extern const u8 gMonBackPic_UnownQuestionMark[];
 extern const u8 gMonIcon_UnownQuestionMark[];
 
-// src/pokeblock.c
+extern const u8 gMonIcon_QuestionMark[];
+extern const u8 gMonIcon_Egg[];
+extern const u16 gMonIconPalettes[][16];
+
+// data/graphics.s
+extern const u8 gBagMaleTiles[];
+extern const u8 gBagFemaleTiles[];
+extern const u8 gBagPalette[];
+extern const u8 gBagScreen_Gfx[];
+extern const u8 gBagScreenMale_Pal[];
+extern const u8 gBagScreenFemale_Pal[];
+extern const u16 gUnknown_08E77004[];
+extern const u8 gBuyMenuFrame_Gfx[];
+extern const u8 gMenuMoneyPal[];
+extern const u8 gBuyMenuFrame_Tilemap[];
+extern const u8 gMenuMoneyGfx[];
 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[];
+extern const u8 gMenuPokeblock_Tilemap[];
+
+extern const u8 gBerryCheck_Gfx[];
+extern const u8 gBerryCheck_Pal[];
+extern const u8 gUnknown_08E788E4[];
+extern const u8 gUnknown_08E78A84[];
+extern const u8 gBerryCheckCircle_Gfx[];
+
+// data/graphics/berries/graphics.inc
+extern const u8 gBerryPic_Cheri[];
+extern const u8 gBerryPic_Oran[];
+extern const u8 gBerryPic_Pecha[];
+extern const u8 gBerryPic_Rawst[];
+extern const u8 gBerryPic_Aspear[];
+extern const u8 gBerryPic_Leppa[];
+extern const u8 gBerryPic_Chesto[];
+extern const u8 gBerryPic_Persim[];
+extern const u8 gBerryPic_Lum[];
+extern const u8 gBerryPic_Sitrus[];
+extern const u8 gBerryPic_Figy[];
+extern const u8 gBerryPic_Wiki[];
+extern const u8 gBerryPic_Mago[];
+extern const u8 gBerryPic_Aguav[];
+extern const u8 gBerryPic_Iapapa[];
+extern const u8 gBerryPic_Razz[];
+extern const u8 gBerryPic_Bluk[];
+extern const u8 gBerryPic_Nanab[];
+extern const u8 gBerryPic_Wepear[];
+extern const u8 gBerryPic_Pinap[];
+extern const u8 gBerryPic_Pomeg[];
+extern const u8 gBerryPic_Kelpsy[];
+extern const u8 gBerryPic_Qualot[];
+extern const u8 gBerryPic_Hondew[];
+extern const u8 gBerryPic_Grepa[];
+extern const u8 gBerryPic_Tamato[];
+extern const u8 gBerryPic_Cornn[];
+extern const u8 gBerryPic_Magost[];
+extern const u8 gBerryPic_Rabuta[];
+extern const u8 gBerryPic_Nomel[];
+extern const u8 gBerryPic_Spelon[];
+extern const u8 gBerryPic_Pamtre[];
+extern const u8 gBerryPic_Watmel[];
+extern const u8 gBerryPic_Durin[];
+extern const u8 gBerryPic_Belue[];
+extern const u8 gBerryPic_Liechi[];
+extern const u8 gBerryPic_Ganlon[];
+extern const u8 gBerryPic_Salac[];
+extern const u8 gBerryPic_Petaya[];
+extern const u8 gBerryPic_Apicot[];
+extern const u8 gBerryPic_Lansat[];
+extern const u8 gBerryPic_Starf[];
+extern const u8 gBerryPic_Enigma[];
+extern const u8 gBerryPalette_Cheri[];
+extern const u8 gBerryPalette_Oran[];
+extern const u8 gBerryPalette_Pecha[];
+extern const u8 gBerryPalette_Rawst[];
+extern const u8 gBerryPalette_Aspear[];
+extern const u8 gBerryPalette_Leppa[];
+extern const u8 gBerryPalette_Chesto[];
+extern const u8 gBerryPalette_Persim[];
+extern const u8 gBerryPalette_Lum[];
+extern const u8 gBerryPalette_Sitrus[];
+extern const u8 gBerryPalette_Figy[];
+extern const u8 gBerryPalette_Wiki[];
+extern const u8 gBerryPalette_Mago[];
+extern const u8 gBerryPalette_Aguav[];
+extern const u8 gBerryPalette_Iapapa[];
+extern const u8 gBerryPalette_Razz[];
+extern const u8 gBerryPalette_Bluk[];
+extern const u8 gBerryPalette_Nanab[];
+extern const u8 gBerryPalette_Wepear[];
+extern const u8 gBerryPalette_Pinap[];
+extern const u8 gBerryPalette_Pomeg[];
+extern const u8 gBerryPalette_Kelpsy[];
+extern const u8 gBerryPalette_Qualot[];
+extern const u8 gBerryPalette_Hondew[];
+extern const u8 gBerryPalette_Grepa[];
+extern const u8 gBerryPalette_Tamato[];
+extern const u8 gBerryPalette_Cornn[];
+extern const u8 gBerryPalette_Magost[];
+extern const u8 gBerryPalette_Rabuta[];
+extern const u8 gBerryPalette_Nomel[];
+extern const u8 gBerryPalette_Spelon[];
+extern const u8 gBerryPalette_Pamtre[];
+extern const u8 gBerryPalette_Watmel[];
+extern const u8 gBerryPalette_Durin[];
+extern const u8 gBerryPalette_Belue[];
+extern const u8 gBerryPalette_Liechi[];
+extern const u8 gBerryPalette_Ganlon[];
+extern const u8 gBerryPalette_Salac[];
+extern const u8 gBerryPalette_Petaya[];
+extern const u8 gBerryPalette_Apicot[];
+extern const u8 gBerryPalette_Lansat[];
+extern const u8 gBerryPalette_Starf[];
+extern const u8 gBerryPalette_Enigma[];
+
+extern const u8 gUnknown_08E96EC8[];
+
+extern const u8 gMenuTrainerCard_Gfx[];
+extern const u16 gMenuTrainerCard0Star_Pal[];
+extern const u16 gMenuTrainerCard1Star_Pal[];
+extern const u16 gMenuTrainerCard2Star_Pal[];
+extern const u16 gMenuTrainerCard3Star_Pal[];
+extern const u16 gMenuTrainerCard4Star_Pal[];
+extern const u8 gUnknown_08E8CAC0[];
+extern const u8 gUnknown_08E8CFC0[];
+extern const u8 gUnknown_08E8D4C0[];
+extern const u8 gUnknown_08E8D9C0[];
 
+extern const u8 gUnknown_08EA1DEC[];
+extern const u16 gUnknown_08EA0328[];
+extern const u16 gUnknown_08EA02C8[];
+extern const u16 gUnknown_08EA0348[];
+extern const u16 gUnknown_08EA15C8[];
+extern const u16 gTradeMonBoxTilemap[];
+extern const u8 gUnknown_08D00000[];
+extern const u16 gUnknown_08D00524[];
+extern const u8 gUnknown_08D004E0[];
 #endif  // GUARD_GRAPHICS_H