diff --git a/Move-Item.md b/Move-Item.md index bbfef76..b528f8d 100644 --- a/Move-Item.md +++ b/Move-Item.md @@ -8,6 +8,8 @@ Lastly, some changes have been made compared to the code in the pokecommunity po - After moving/swapping items, the selection cursor will now stay on the second Pokémon instead of returning to the first. This matches the behavior seen when switching Pokémon or using Softboiled in the party menu. +- After selecting MOVE ITEM in the menu, the text will now read ''Move {STR_VAR_2} to where?'' instead of ''Move item to where?'', with STR_VAR_2 being the item you're attempting to move. This makes it much easier to identify what item the Pokémon is currently holding. + *** ## 1. In `include/strings.h`, end of the file: ```diff @@ -24,7 +26,7 @@ Lastly, some changes have been made compared to the code in the pokecommunity po const u8 gText_Berry[] = _("BERRY"); const u8 gText_Berries[] = _("BERRIES"); +const u8 gMenuText_Move[] = _("MOVE"); -+const u8 gText_MoveItemWhere[] = _("Move item to where?"); ++const u8 gText_MoveItemWhere[] = _("Move {STR_VAR_2} to where?"); +const u8 gText_XsYAnd[] = _("{STR_VAR_1}'s {STR_VAR_2} and\n"); +const u8 gText_XsYWereSwapped[] = _("{STR_VAR_1}'s {STR_VAR_2} were swapped!{PAUSE_UNTIL_PRESS}"); ``` @@ -144,6 +146,7 @@ void CursorCb_MoveItemCallback(u8 taskId) void CursorCb_MoveItem(u8 taskId) { struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; + u16 item = GetMonData(mon, MON_DATA_HELD_ITEM); PlaySE(SE_SELECT); @@ -156,6 +159,7 @@ void CursorCb_MoveItem(u8 taskId) gPartyMenu.action = PARTY_ACTION_SWITCH; // show "Move item to where" in bottom left + CopyItemName(item, gStringVar2); DisplayPartyMenuStdMessage(PARTY_MSG_MOVE_ITEM_WHERE); // update color of first selected box AnimatePartySlot(gPartyMenu.slotId, 1);