diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/item_menu.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/item_menu.c')
| -rw-r--r-- | src/item_menu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/item_menu.c b/src/item_menu.c index ff59f0985..5ab87c9a0 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1596,7 +1596,7 @@ static void Task_ItemMenuAction_ToggleSelect(u8 taskId) DestroyListMenuTask(data[0], &gBagMenuState.cursorPos[gBagMenuState.pocket], &gBagMenuState.itemsAbove[gBagMenuState.pocket]); Bag_BuildListMenuTemplate(gBagMenuState.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagMenuState.cursorPos[gBagMenuState.pocket], gBagMenuState.itemsAbove[gBagMenuState.pocket]); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); Task_ItemMenuAction_Cancel(taskId); } @@ -1608,7 +1608,7 @@ static void Task_ItemMenuAction_Give(u8 taskId) HideBagWindow(6); PutWindowTilemap(0); PutWindowTilemap(1); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); if (!CanWriteMailHere(itemId)) DisplayItemMessageInBag(taskId, 2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); else if (!itemid_is_unique(itemId)) @@ -1694,7 +1694,7 @@ static void Task_ItemMenuAction_BattleUse(u8 taskId) HideBagWindow(6); PutWindowTilemap(0); PutWindowTilemap(1); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); ItemId_GetBattleFunc(gSpecialVar_ItemId)(taskId); } } @@ -2131,7 +2131,7 @@ static void Task_Bag_OldManTutorial(u8 taskId) HideBagWindow(6); PutWindowTilemap(0); PutWindowTilemap(1); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); DestroyListMenuTask(data[0], NULL, NULL); RestorePlayerBag(); Bag_BeginCloseWin0Animation(); @@ -2242,7 +2242,7 @@ static void Task_Bag_TeachyTvRegister(u8 taskId) data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagMenuState.cursorPos[gBagMenuState.pocket], gBagMenuState.itemsAbove[gBagMenuState.pocket]); Bag_FillMessageBoxWithPalette(0); bag_menu_print_cursor_(data[0], 1); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); break; case 510: case 612: @@ -2305,7 +2305,7 @@ static void Task_Bag_TeachyTvCatching(u8 taskId) HideBagWindow(6); PutWindowTilemap(0); PutWindowTilemap(1); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); DestroyListMenuTask(data[0], NULL, NULL); RestorePlayerBag(); Bag_BeginCloseWin0Animation(); @@ -2347,7 +2347,7 @@ static void Task_Bag_TeachyTvStatus(u8 taskId) HideBagWindow(6); PutWindowTilemap(0); PutWindowTilemap(1); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); DestroyListMenuTask(data[0], NULL, NULL); RestorePlayerBag(); gItemUseCB = ItemUseCB_MedicineStep; @@ -2388,7 +2388,7 @@ static void Task_Bag_TeachyTvTMs(u8 taskId) HideBagWindow(6); PutWindowTilemap(0); PutWindowTilemap(1); - CopyWindowToVram(0, 1); + CopyWindowToVram(0, COPYWIN_MAP); DestroyListMenuTask(data[0], NULL, NULL); RestorePlayerBag(); sBagMenuDisplay->exitCB = Pokedude_InitTMCase; |