From 47dbbd4f4db8fba6316a971e2bd3de8a9f59d445 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Mon, 9 Jun 2025 16:33:31 +0200 Subject: [PATCH] name missing windows --- include/item_menu.h | 4 ++-- src/item_menu.c | 30 +++++++++++++++--------------- src/money.c | 13 ------------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/include/item_menu.h b/include/item_menu.h index 888f65590..f8dd2e105 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -29,8 +29,8 @@ enum { ITEMWIN_MESSAGE, ITEMWIN_SELECTIONTEXT, ITEMWIN_ASKTOSS, - ITEMWIN_8, - ITEMWIN_9, + ITEMWIN_ASKTOSS_QUANTITY, + ITEMWIN_TOSSED, ITEMWIN_1x1, ITEMWIN_1x2, ITEMWIN_1x3, diff --git a/src/item_menu.c b/src/item_menu.c index 39150ade6..6bd6fbacd 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -528,7 +528,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .paletteNum = 12, .baseBlock = 0x2da }, - [ITEMWIN_8] = + [ITEMWIN_ASKTOSS_QUANTITY] = { .bg = 0, .tilemapLeft = 6, @@ -538,7 +538,7 @@ static const struct WindowTemplate sWindowTemplates[] = { .paletteNum = 12, .baseBlock = 0x316 }, - [ITEMWIN_9] = + [ITEMWIN_TOSSED] = { .bg = 0, .tilemapLeft = 6, @@ -1738,7 +1738,7 @@ static void ItemMenu_Toss(u8 taskId) } else { - u8 windowId = BagMenu_AddWindow(ITEMWIN_8); + u8 windowId = BagMenu_AddWindow(ITEMWIN_ASKTOSS_QUANTITY); CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); BagMenu_Print(windowId, FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1); @@ -1779,8 +1779,8 @@ static void Task_ChooseHowManyToToss(u8 taskId) else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - ClearWindowTilemap(GetBagWindow(ITEMWIN_8)); - BagMenu_RemoveWindow(ITEMWIN_8); + ClearWindowTilemap(GetBagWindow(ITEMWIN_ASKTOSS_QUANTITY)); + BagMenu_RemoveWindow(ITEMWIN_ASKTOSS_QUANTITY); BagMenu_RemoveWindow(ITEMWIN_QUANTITY); ScheduleBgCopyTilemapToVram(0); BagDestroyPocketScrollArrowPair(); @@ -1789,7 +1789,7 @@ static void Task_ChooseHowManyToToss(u8 taskId) else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - BagMenu_RemoveWindow(ITEMWIN_8); + BagMenu_RemoveWindow(ITEMWIN_ASKTOSS_QUANTITY); BagMenu_RemoveWindow(ITEMWIN_QUANTITY); PutWindowTilemap(0); PutWindowTilemap(1); @@ -1807,7 +1807,7 @@ static void ConfirmToss(u8 taskId) CopyItemName(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, data[1]), gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayStrVar2StrVar1s); - BagMenu_Print(BagMenu_AddWindow(ITEMWIN_9), FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1); + BagMenu_Print(BagMenu_AddWindow(ITEMWIN_TOSSED), FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1); gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag; } @@ -1818,7 +1818,7 @@ static void Task_WaitAB_RedrawAndReturnToBag(u8 taskId) { PlaySE(SE_SELECT); RemoveBagItem(gSpecialVar_ItemId, data[8]); - BagMenu_RemoveWindow(ITEMWIN_9); + BagMenu_RemoveWindow(ITEMWIN_TOSSED); DestroyListMenuTask(data[0], &gBagPosition.scrollPosition[gBagPosition.pocket], &gBagPosition.cursorPosition[gBagPosition.pocket]); UpdatePocketItemList(gBagPosition.pocket); UpdatePocketListPosition(gBagPosition.pocket); @@ -2230,7 +2230,7 @@ static void Task_ItemContext_Deposit(u8 taskId) } else { - u8 windowId = BagMenu_AddWindow(ITEMWIN_8); + u8 windowId = BagMenu_AddWindow(ITEMWIN_ASKTOSS_QUANTITY); CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, sText_DepositHowManyVar1); BagMenu_Print(windowId, FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1); @@ -2250,8 +2250,8 @@ static void Task_ChooseHowManyToDeposit(u8 taskId) else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - ClearWindowTilemap(GetBagWindow(ITEMWIN_8)); - BagMenu_RemoveWindow(ITEMWIN_8); + ClearWindowTilemap(GetBagWindow(ITEMWIN_ASKTOSS_QUANTITY)); + BagMenu_RemoveWindow(ITEMWIN_ASKTOSS_QUANTITY); BagMenu_RemoveWindow(ITEMWIN_QUANTITY); ScheduleBgCopyTilemapToVram(0); BagDestroyPocketScrollArrowPair(); @@ -2260,7 +2260,7 @@ static void Task_ChooseHowManyToDeposit(u8 taskId) else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - BagMenu_RemoveWindow(ITEMWIN_8); + BagMenu_RemoveWindow(ITEMWIN_ASKTOSS_QUANTITY); BagMenu_RemoveWindow(ITEMWIN_QUANTITY); PutWindowTilemap(1); ScheduleBgCopyTilemapToVram(0); @@ -2279,7 +2279,7 @@ static void TryDepositItem(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_DepositedStrVar2StrVar1s); - BagMenu_Print(BagMenu_AddWindow(ITEMWIN_9), FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1); + BagMenu_Print(BagMenu_AddWindow(ITEMWIN_TOSSED), FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1); gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag; } else @@ -2734,8 +2734,8 @@ u32 BagMenu_AddWindow(u32 whichWindow) { case ITEMWIN_SELECTIONTEXT: case ITEMWIN_ASKTOSS: - case ITEMWIN_8: - case ITEMWIN_9: + case ITEMWIN_ASKTOSS_QUANTITY: + case ITEMWIN_TOSSED: DrawStdFrameWithCustomTileAndPalette(gBagMenu->windowIds[whichWindow], FALSE, 0x081, 12); break; default: diff --git a/src/money.c b/src/money.c index fe01eeba3..c8611e911 100644 --- a/src/money.c +++ b/src/money.c @@ -73,19 +73,6 @@ void SubtractMoneyFromVar0x8005(void) void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed) { PrintMoneyAmount(windowId, 16, 12, amount, speed); - // u8 *txtPtr; - // s32 strLength; - - // ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_LEFT_ALIGN, 6); - - // strLength = 6 - StringLength(gStringVar1); - // txtPtr = gStringVar4; - - // while (strLength-- != 0) - // *(txtPtr++) = 0; - - // StringExpandPlaceholders(txtPtr, gText_PokedollarVar1); - // AddTextPrinterParameterized(windowId, FONT_SMALL, gStringVar4, 64 - GetStringWidth(FONT_SMALL, gStringVar4, 0), 0xC, speed, NULL); } static u32 CalculateLeadingSpacesForMoney(u32 numDigits)