diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-24 13:45:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 13:45:15 -0400 |
| commit | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (patch) | |
| tree | 594590b12dc14049b9c17587d8b602686a4c57fa /src/item_menu.c | |
| parent | ac636ec14e896214b549025e671fc6ae7f6fd045 (diff) | |
| parent | 4313b2f49d22f4e5a6db3c45f9f3a434079a7c1f (diff) | |
Merge pull request #1 from pret/master
upstream merge
Diffstat (limited to 'src/item_menu.c')
| -rw-r--r-- | src/item_menu.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/item_menu.c b/src/item_menu.c index 5fbfb775e..71516c0a4 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -38,14 +38,13 @@ #include "ewram.h" // External stuff -extern void gpu_pal_allocator_reset__manage_upper_four(void); +extern void FreeAndReserveObjectSpritePalettes(void); extern void SetVerticalScrollIndicatorPriority(); extern void sub_809D104(u16 *, u16, u16, const u8 *, u16, u16, u16, u16); extern void PauseVerticalScrollIndicator(); extern u8 sub_80F9284(void); extern void sub_808B5B4(); extern u8 sub_80F92F4(); -extern void sub_80C9C7C(u8); extern void pal_fill_black(void); extern bool8 IsWeatherNotFadingIn(void); extern u8 sub_80F931C(); @@ -140,7 +139,7 @@ EWRAM_DATA static s8 gUnknown_0203855B = 0; EWRAM_DATA static s8 gUnknown_0203855C = 0; EWRAM_DATA u16 gSpecialVar_ItemId = 0; EWRAM_DATA u8 gCurSelectedItemSlotIndex = 0; -EWRAM_DATA u8 gUnknown_02038561 = 0; +EWRAM_DATA u8 gPokemonItemUseType = 0; EWRAM_DATA static u8 gUnknown_02038562 = 0; EWRAM_DATA static u8 gUnknown_02038563 = 0; EWRAM_DATA static u8 gUnknown_02038564 = 0; @@ -392,7 +391,7 @@ static bool8 SetupBagMultistep(void) gMain.state++; break; case 2: - gpu_pal_allocator_reset__manage_upper_four(); + FreeAndReserveObjectSpritePalettes(); gMain.state++; break; case 3: @@ -2666,7 +2665,7 @@ void HandleItemMenuPaletteFade(u8 taskId) MainCallback cb = (MainCallback)((u16)taskData[8] << 16 | (u16)taskData[9]); SetMainCallback2(cb); - gpu_pal_allocator_reset__manage_upper_four(); + FreeAndReserveObjectSpritePalettes(); DestroyTask(taskId); } } @@ -2701,7 +2700,7 @@ static void HandlePopupMenuAction_UseOnField(u8 taskId) if (sCurrentBagPocket != BAG_POCKET_BERRIES) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); else - sub_80C9C7C(taskId); + ItemUseOutOfBattle_Berry(taskId); } } } @@ -2925,7 +2924,7 @@ static void HandlePopupMenuAction_Give(u8 taskId) gTasks[taskId].data[8] = (u32)sub_808B020 >> 16; gTasks[taskId].data[9] = (u32)sub_808B020; gTasks[taskId].func = HandleItemMenuPaletteFade; - gUnknown_02038561 = 1; + gPokemonItemUseType = ITEM_USE_GIVE_ITEM; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } |