diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/pokeblock.c | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/pokeblock.c')
| -rw-r--r-- | src/pokeblock.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index 1418588b8..7c07f9655 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -1,4 +1,5 @@ #include "global.h" +#include "alloc.h" #include "battle.h" #include "battle_controllers.h" #include "battle_message.h" @@ -6,14 +7,15 @@ #include "bg.h" #include "decompress.h" #include "event_data.h" +#include "field_screen_effect.h" #include "gpu_regs.h" #include "graphics.h" #include "international_string_util.h" #include "item.h" +#include "item_menu.h" #include "lilycove_lady.h" #include "list_menu.h" #include "main.h" -#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" @@ -70,14 +72,9 @@ enum PKBL_GIVE_TO_LADY }; -extern u16 gSpecialVar_ItemId; extern const u16 gUnknown_0860F074[]; -extern void CB2_ReturnToField(void); -extern bool8 sub_81221EC(void); -extern void sub_80AF168(void); - // this file's functions static void CB2_InitPokeblockMenu(void); static bool8 InitPokeblockMenu(void); @@ -640,11 +637,11 @@ static bool8 LoadPokeblockMenuGfx(void) sPokeblockMenu->gfxState++; break; case 3: - LoadCompressedObjectPic(&gPokeblockCase_SpriteSheet); + LoadCompressedSpriteSheet(&gPokeblockCase_SpriteSheet); sPokeblockMenu->gfxState++; break; case 4: - LoadCompressedObjectPalette(&gPokeblockCase_SpritePal); + LoadCompressedSpritePalette(&gPokeblockCase_SpritePal); sPokeblockMenu->gfxState++; break; case 5: |