diff --git a/data/event_scripts.s b/data/event_scripts.s index 4f9821a3f..cb325cc3a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1277,8 +1277,8 @@ EventScript_BufferPutAwayPocketName:: case POCKET_ITEMS, EventScript_BufferPutAwayPocketItems case POCKET_KEY_ITEMS, EventScript_BufferPutAwayPocketKeyItems case POCKET_POKE_BALLS, EventScript_BufferPutAwayPocketPokeBalls - case POCKET_TM_CASE, EventScript_BufferPutAwayPocketTMCase - case POCKET_BERRY_POUCH, EventScript_BufferPutAwayPocketBerryPouch + case POCKET_TM_HM, EventScript_BufferPutAwayPocketTMCase + case POCKET_BERRIES, EventScript_BufferPutAwayPocketBerryPouch end EventScript_BufferPutAwayPocketItems:: diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index c904278ae..a903cb1df 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -29,8 +29,8 @@ EventScript_BufferPocketNameTryFanfare:: case POCKET_ITEMS, EventScript_BufferItemsPocket case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket case POCKET_POKE_BALLS, EventScript_BufferPokeBallsPocket - case POCKET_TM_CASE, EventScript_BufferTMCase - case POCKET_BERRY_POUCH, EventScript_BufferBerryPouch + case POCKET_TM_HM, EventScript_BufferTMCase + case POCKET_BERRIES, EventScript_BufferBerryPouch end EventScript_BufferItemsPocket:: diff --git a/include/constants/global.h b/include/constants/global.h index 2f8891f0b..6d562c479 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -56,13 +56,6 @@ #define UNION_ROOM_KB_ROW_COUNT 10 #define GIFT_RIBBONS_COUNT 11 -// #define POCKET_ITEMS 1 -// #define POCKET_KEY_ITEMS 2 -// #define POCKET_POKE_BALLS 3 -// #define POCKET_TM_CASE 4 -// #define POCKET_BERRY_POUCH 5 -// #define NUM_BAG_POCKETS 5 - // Contests #define CONTEST_CATEGORIES_COUNT 5 diff --git a/include/constants/item.h b/include/constants/item.h index 431ccd719..5e6d46475 100644 --- a/include/constants/item.h +++ b/include/constants/item.h @@ -2,18 +2,13 @@ #define GUARD_ITEM_CONSTANTS_H // These constants are used in gItemsInfo -#define POCKET_ITEMS 1 -#define POCKET_KEY_ITEMS 2 -#define POCKET_POKE_BALLS 3 -#define POCKET_TM_CASE 4 -#define POCKET_BERRY_POUCH 5 -#define NUM_BAG_POCKETS 5 -// #define POCKET_NONE 0 -// #define POCKET_ITEMS 1 -// #define POCKET_POKE_BALLS 2 -// #define POCKET_TM_HM 3 -// #define POCKET_BERRIES 4 -// #define POCKET_KEY_ITEMS 5 +#define POCKET_NONE 0 +#define POCKET_ITEMS 1 +#define POCKET_KEY_ITEMS 2 +#define POCKET_POKE_BALLS 3 +#define POCKET_TM_HM 4 +#define POCKET_BERRIES 5 +#define NUM_BAG_POCKETS 5 // #define ITEMS_POCKET 0 // #define BALLS_POCKET 1 diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 6694991d9..d0d39bfb0 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -1121,7 +1121,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-10); break; case EFFECT_STUFF_CHEEKS: - if (ItemId_GetPocket(gBattleMons[battlerAtk].item) != POCKET_BERRY_POUCH) + if (ItemId_GetPocket(gBattleMons[battlerAtk].item) != POCKET_BERRIES) return 0; // cannot even select //fallthrough case EFFECT_DEFENSE_UP: @@ -2298,7 +2298,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_NATURAL_GIFT: if (aiData->abilities[battlerAtk] == ABILITY_KLUTZ || gFieldStatuses & STATUS_FIELD_MAGIC_ROOM - || GetPocketByItemId(gBattleMons[battlerAtk].item) != POCKET_BERRY_POUCH) + || GetPocketByItemId(gBattleMons[battlerAtk].item) != POCKET_BERRIES) ADJUST_SCORE(-10); break; case EFFECT_GRASSY_TERRAIN: @@ -4600,13 +4600,13 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) case MOVE_EFFECT_BUG_BITE: // And pluck if (gBattleMons[battlerDef].status2 & STATUS2_SUBSTITUTE || aiData->abilities[battlerDef] == ABILITY_STICKY_HOLD) break; - else if (ItemId_GetPocket(aiData->items[battlerDef]) == POCKET_BERRY_POUCH) + else if (ItemId_GetPocket(aiData->items[battlerDef]) == POCKET_BERRIES) ADJUST_SCORE(DECENT_EFFECT); break; case MOVE_EFFECT_INCINERATE: if (gBattleMons[battlerDef].status2 & STATUS2_SUBSTITUTE || aiData->abilities[battlerDef] == ABILITY_STICKY_HOLD) break; - else if (ItemId_GetPocket(aiData->items[battlerDef]) == POCKET_BERRY_POUCH || aiData->holdEffects[battlerDef] == HOLD_EFFECT_GEMS) + else if (ItemId_GetPocket(aiData->items[battlerDef]) == POCKET_BERRIES || aiData->holdEffects[battlerDef] == HOLD_EFFECT_GEMS) ADJUST_SCORE(DECENT_EFFECT); break; case MOVE_EFFECT_SMACK_DOWN: diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 93d237438..dcdd6fb32 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -1609,7 +1609,7 @@ static u32 GetSwitchinHitsToKO(s32 damageTaken, u32 battler) // Check if we're at a single use healing item threshold if (AI_DATA->switchinCandidate.battleMon.ability != ABILITY_KLUTZ && usedSingleUseHealingItem == FALSE - && !(opposingAbility == ABILITY_UNNERVE && GetPocketByItemId(item) == POCKET_BERRY_POUCH)) + && !(opposingAbility == ABILITY_UNNERVE && GetPocketByItemId(item) == POCKET_BERRIES)) { switch (heldItemEffect) { diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 9bf2532c1..5075e18ea 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -1027,7 +1027,7 @@ void BS_TryRecycleBerry(void) u16* usedHeldItem = &gBattleStruct->usedHeldItems[gBattlerPartyIndexes[gBattlerTarget]][GetBattlerSide(gBattlerTarget)]; if (gBattleMons[gBattlerTarget].item == ITEM_NONE && gBattleStruct->changedItems[gBattlerTarget] == ITEM_NONE // Will not inherit an item - && ItemId_GetPocket(*usedHeldItem) == POCKET_BERRY_POUCH) + && ItemId_GetPocket(*usedHeldItem) == POCKET_BERRIES) { gLastUsedItem = *usedHeldItem; *usedHeldItem = ITEM_NONE; diff --git a/src/battle_main.c b/src/battle_main.c index 2596c942c..1a1ad0ad8 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4789,7 +4789,7 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) } else if (gMovesInfo[move].effect == EFFECT_NATURAL_GIFT) { - if (ItemId_GetPocket(gBattleMons[battlerAtk].item) == POCKET_BERRY_POUCH) + if (ItemId_GetPocket(gBattleMons[battlerAtk].item) == POCKET_BERRIES) gBattleStruct->dynamicMoveType = gNaturalGiftTable[ITEM_TO_BERRY(gBattleMons[battlerAtk].item)].type; } else if (gMovesInfo[move].effect == EFFECT_TERRAIN_PULSE) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 41f758e64..1bf139475 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3636,7 +3636,7 @@ void SetMoveEffect(bool32 primary, bool32 certain) } break; case MOVE_EFFECT_BUG_BITE: - if (ItemId_GetPocket(gBattleMons[gEffectBattler].item) == POCKET_BERRY_POUCH + if (ItemId_GetPocket(gBattleMons[gEffectBattler].item) == POCKET_BERRIES && battlerAbility != ABILITY_STICKY_HOLD) { // target loses their berry @@ -7937,7 +7937,7 @@ static void Cmd_setgravity(void) static bool32 TryCheekPouch(u32 battler, u32 itemId) { - if (ItemId_GetPocket(itemId) == POCKET_BERRY_POUCH + if (ItemId_GetPocket(itemId) == POCKET_BERRIES && GetBattlerAbility(battler) == ABILITY_CHEEK_POUCH && !(gStatuses3[battler] & STATUS3_HEAL_BLOCK) && gBattleStruct->ateBerry[GetBattlerSide(battler)] & gBitTable[gBattlerPartyIndexes[battler]] @@ -8707,7 +8707,7 @@ static bool32 IsElectricAbilityAffected(u32 ability) static bool32 IsTeatimeAffected(u32 battler) { - if (ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRY_POUCH) + if (ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) return FALSE; // Only berries if (gStatuses3[battler] & STATUS3_SEMI_INVULNERABLE) return FALSE; // Teatime doesn't affected semi-invulnerable battlers @@ -9076,7 +9076,7 @@ static void Cmd_various(void) case VARIOUS_JUMP_IF_NOT_BERRY: { VARIOUS_ARGS(const u8 *jumpInstr); - if (ItemId_GetPocket(gBattleMons[battler].item) == POCKET_BERRY_POUCH) + if (ItemId_GetPocket(gBattleMons[battler].item) == POCKET_BERRIES) gBattlescriptCurrInstr = cmd->nextInstr; else gBattlescriptCurrInstr = cmd->jumpInstr; @@ -10604,7 +10604,7 @@ static void Cmd_various(void) case VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY: { VARIOUS_ARGS(const u8 *jumpInstr); - if (ItemId_GetPocket(gLastUsedItem) == POCKET_BERRY_POUCH) + if (ItemId_GetPocket(gLastUsedItem) == POCKET_BERRIES) gBattlescriptCurrInstr = cmd->jumpInstr; else gBattlescriptCurrInstr = cmd->nextInstr; @@ -10700,7 +10700,7 @@ static void Cmd_various(void) case VARIOUS_TEATIME_INVUL: { VARIOUS_ARGS(const u8 *jumpInstr); - if (ItemId_GetPocket(gBattleMons[battler].item) == POCKET_BERRY_POUCH && !(gStatuses3[gBattlerTarget] & (STATUS3_SEMI_INVULNERABLE))) + if (ItemId_GetPocket(gBattleMons[battler].item) == POCKET_BERRIES && !(gStatuses3[gBattlerTarget] & (STATUS3_SEMI_INVULNERABLE))) gBattlescriptCurrInstr = cmd->nextInstr; else gBattlescriptCurrInstr = cmd->jumpInstr; diff --git a/src/battle_util.c b/src/battle_util.c index 90040f771..844442f0d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1266,7 +1266,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) limitations++; } - if (DYNAMAX_BYPASS_CHECK && gMovesInfo[move].effect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRY_POUCH) + if (DYNAMAX_BYPASS_CHECK && gMovesInfo[move].effect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) { gCurrentMove = move; gSelectionBattleScripts[battler] = BattleScript_SelectingNotAllowedStuffCheeks; @@ -1379,7 +1379,7 @@ u8 CheckMoveLimitations(u32 battler, u8 unusableMoves, u16 check) else if (check & MOVE_LIMITATION_THROAT_CHOP && gDisableStructs[battler].throatChopTimer && gMovesInfo[move].soundMove) unusableMoves |= gBitTable[i]; // Stuff Cheeks - else if (check & MOVE_LIMITATION_STUFF_CHEEKS && moveEffect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRY_POUCH) + else if (check & MOVE_LIMITATION_STUFF_CHEEKS && moveEffect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) unusableMoves |= gBitTable[i]; // Gorilla Tactics else if (check & MOVE_LIMITATION_CHOICE_ITEM && GetBattlerAbility(battler) == ABILITY_GORILLA_TACTICS && *choicedMove != MOVE_NONE && *choicedMove != MOVE_UNAVAILABLE && *choicedMove != move) @@ -2698,7 +2698,7 @@ u8 DoBattlerEndTurnEffects(void) gBattleStruct->turnEffectsTracker++; break; case ENDTURN_CUD_CHEW: - if (GetBattlerAbility(battler) == ABILITY_CUD_CHEW && !gDisableStructs[battler].cudChew && ItemId_GetPocket(GetUsedHeldItem(battler)) == POCKET_BERRY_POUCH) + if (GetBattlerAbility(battler) == ABILITY_CUD_CHEW && !gDisableStructs[battler].cudChew && ItemId_GetPocket(GetUsedHeldItem(battler)) == POCKET_BERRIES) gDisableStructs[battler].cudChew = TRUE; gBattleStruct->turnEffectsTracker++; break; @@ -4649,7 +4649,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 if ((IsBattlerWeatherAffected(battler, B_WEATHER_SUN) || Random() % 2 == 0) && gBattleMons[battler].item == ITEM_NONE && gBattleStruct->changedItems[battler] == ITEM_NONE // Will not inherit an item - && ItemId_GetPocket(GetUsedHeldItem(battler)) == POCKET_BERRY_POUCH) + && ItemId_GetPocket(GetUsedHeldItem(battler)) == POCKET_BERRIES) { gLastUsedItem = GetUsedHeldItem(battler); BattleScriptPushCursorAndCallback(BattleScript_HarvestActivates); @@ -6305,7 +6305,7 @@ bool32 CanBeConfused(u32 battler) // second argument is 1/X of current hp compared to max hp bool32 HasEnoughHpToEatBerry(u32 battler, u32 hpFraction, u32 itemId) { - bool32 isBerry = (ItemId_GetPocket(itemId) == POCKET_BERRY_POUCH); + bool32 isBerry = (ItemId_GetPocket(itemId) == POCKET_BERRIES); if (!IsBattlerAlive(battler)) return FALSE; @@ -6597,7 +6597,7 @@ static u8 ItemHealHp(u32 battler, u32 itemId, bool32 end2, bool32 percentHeal) gBattleMoveDamage = GetBattlerItemHoldEffectParam(battler, itemId) * -1; // check ripen - if (ItemId_GetPocket(itemId) == POCKET_BERRY_POUCH && GetBattlerAbility(battler) == ABILITY_RIPEN) + if (ItemId_GetPocket(itemId) == POCKET_BERRIES && GetBattlerAbility(battler) == ABILITY_RIPEN) gBattleMoveDamage *= 2; gBattlerAbility = battler; // in SWSH, berry juice shows ability pop up but has no effect. This is mimicked here @@ -6621,7 +6621,7 @@ static u8 ItemHealHp(u32 battler, u32 itemId, bool32 end2, bool32 percentHeal) static bool32 UnnerveOn(u32 battler, u32 itemId) { - if (ItemId_GetPocket(itemId) == POCKET_BERRY_POUCH && IsUnnerveAbilityOnOpposingSide(battler)) + if (ItemId_GetPocket(itemId) == POCKET_BERRIES && IsUnnerveAbilityOnOpposingSide(battler)) return TRUE; return FALSE; } @@ -10867,11 +10867,11 @@ void TryRestoreHeldItems(void) u16 lostItem = gBattleStruct->itemLost[i].originalItem; // Check if the lost item is a berry and the mon is not holding it - if (ItemId_GetPocket(lostItem) == POCKET_BERRY_POUCH && GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) != lostItem) + if (ItemId_GetPocket(lostItem) == POCKET_BERRIES && GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) != lostItem) lostItem = ITEM_NONE; // Check if the lost item should be restored - if ((lostItem != ITEM_NONE || returnNPCItems) && ItemId_GetPocket(lostItem) != POCKET_BERRY_POUCH) + if ((lostItem != ITEM_NONE || returnNPCItems) && ItemId_GetPocket(lostItem) != POCKET_BERRIES) SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &lostItem); } } diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 030f3373d..3de9defc1 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -656,7 +656,7 @@ static bool8 AllocateListMenuBuffers(void) static void SetUpListMenuTemplate(void) { u16 i; - struct BagPocket *pocket = &gBagPockets[POCKET_BERRY_POUCH - 1]; + struct BagPocket *pocket = &gBagPockets[POCKET_BERRIES - 1]; for (i = 0; i < sResources->listMenuNumItems; i++) { GetBerryNameAndIndexForMenu(&sListMenuStrbuf[i * 27], pocket->itemSlots[i].itemId); @@ -715,7 +715,7 @@ static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen } DestroyItemMenuIcon(sResources->itemMenuIconId ^ 1); if (sResources->listMenuNumItems != itemIndex) - CreateBerryPouchItemIcon(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, itemIndex), sResources->itemMenuIconId); + CreateBerryPouchItemIcon(BagGetItemIdByPocketPosition(POCKET_BERRIES, itemIndex), sResources->itemMenuIconId); else CreateBerryPouchItemIcon(ITEMS_COUNT, sResources->itemMenuIconId); sResources->itemMenuIconId ^= 1; @@ -727,7 +727,7 @@ static void BerryPouchItemPrintFunc(u8 windowId, u32 itemId, u8 y) u16 itemQuantity; if (itemId != -2 && sResources->listMenuNumItems != itemId) { - itemQuantity = BagGetQuantityByPocketPosition(POCKET_BERRY_POUCH, itemId); + itemQuantity = BagGetQuantityByPocketPosition(POCKET_BERRIES, itemId); ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); BerryPouchPrint(windowId, FONT_SMALL, gStringVar4, 110, y, 0, 0, 0xFF, 1); @@ -760,7 +760,7 @@ static void PrintSelectedBerryDescription(s32 itemIdx) { const u8 * str; if (itemIdx != sResources->listMenuNumItems) - str = ItemId_GetDescription(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, itemIdx)); + str = ItemId_GetDescription(BagGetItemIdByPocketPosition(POCKET_BERRIES, itemIdx)); else str = gText_TheBerryPouchWillBePutAway; FillWindowPixelBuffer(1, PIXEL_FILL(0)); @@ -887,7 +887,7 @@ static void SortAndCountBerries(void) { u16 i; u32 r2; - struct BagPocket *pocket = &gBagPockets[POCKET_BERRY_POUCH - 1]; + struct BagPocket *pocket = &gBagPockets[POCKET_BERRIES - 1]; SortAndCompactBagPocket(pocket); sResources->listMenuNumItems = 0; for (i = 0; i < pocket->capacity; i++) @@ -966,7 +966,7 @@ static void Task_BerryPouchMain(u8 taskId) PlaySE(SE_SELECT); if (sStaticCnt.type == BERRYPOUCH_FROMBERRYCRUSH) { - gSpecialVar_ItemId = BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, menuInput); + gSpecialVar_ItemId = BagGetItemIdByPocketPosition(POCKET_BERRIES, menuInput); BerryPouch_StartFadeToExitCallback(taskId); } else if (menuInput == sResources->listMenuNumItems) @@ -980,8 +980,8 @@ static void Task_BerryPouchMain(u8 taskId) SetDescriptionWindowBorderPalette(1); BerryPouchSetArrowCursorFromListMenu(data[0], 2); data[1] = menuInput; - data[2] = BagGetQuantityByPocketPosition(POCKET_BERRY_POUCH, menuInput); - gSpecialVar_ItemId = BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, menuInput); + data[2] = BagGetQuantityByPocketPosition(POCKET_BERRIES, menuInput); + gSpecialVar_ItemId = BagGetItemIdByPocketPosition(POCKET_BERRIES, menuInput); gTasks[taskId].func = sBerryPouchContextMenuTasks[sStaticCnt.type]; } break; @@ -1258,7 +1258,7 @@ static void Task_BerryPouch_Exit(u8 taskId) static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId) { s16 * data = gTasks[taskId].data; - u16 itemId = BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1]); + u16 itemId = BagGetItemIdByPocketPosition(POCKET_BERRIES, data[1]); if (!IsHoldingItemAllowed(itemId)) { CopyItemName(itemId, gStringVar1); @@ -1309,7 +1309,7 @@ static void Task_ContextMenu_Sell(u8 taskId) static void Task_AskSellMultiple(u8 taskId) { s16 * data = gTasks[taskId].data; - ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); + ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRIES, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_ICanPayThisMuch_WouldThatBeOkay); DisplayItemMessageInBerryPouch(taskId, GetDialogBoxFontId(), gStringVar4, Task_SellMultiple_CreateYesNoMenu); } @@ -1339,7 +1339,7 @@ static void Task_Sell_PrintSelectMultipleUI(u8 taskId) ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); BerryPouchPrint(windowId, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0xFF, 1); - SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]); + SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRIES, data[1])) / 2 * data[8]); PrintMoneyInWin2(); CreateScrollIndicatorArrows_SellQuantity(); gTasks[taskId].func = Task_Sell_SelectMultiple; @@ -1356,7 +1356,7 @@ static void Task_Sell_SelectMultiple(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE) { PrintxQuantityOnWindow(1, data[8], 2); - SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]); + SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRIES, data[1])) / 2 * data[8]); } else if (JOY_NEW(A_BUTTON)) { @@ -1389,7 +1389,7 @@ static void Task_SellYes(u8 taskId) PutWindowTilemap(0); ScheduleBgCopyTilemapToVram(0); CopyItemName(gSpecialVar_ItemId, gStringVar1); - ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); + ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRIES, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); DisplayItemMessageInBerryPouch(taskId, FONT_NORMAL, gStringVar4, Task_SellBerries_PlaySfxAndRemoveBerries); } diff --git a/src/data/items.h b/src/data/items.h index a420b88ef..09f158207 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -8110,7 +8110,7 @@ const struct Item gItemsInfo[] = "A hold item that " "heals paralysis " "\nin battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, @@ -8128,7 +8128,7 @@ const struct Item gItemsInfo[] = "A hold item that " "awakens Pokémon\n" "in battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, @@ -8146,7 +8146,7 @@ const struct Item gItemsInfo[] = "A hold item that " "heals poisoning " "\nin battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, @@ -8164,7 +8164,7 @@ const struct Item gItemsInfo[] = "A hold item that " "heals a burn in " "\nbattle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, @@ -8182,7 +8182,7 @@ const struct Item gItemsInfo[] = "A hold item that " "defrosts\nPokémon " "in battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, @@ -8201,7 +8201,7 @@ const struct Item gItemsInfo[] = "A hold item that " "restores 10 PP\nin " "battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU_MOVES, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, .battleUsage = EFFECT_ITEM_RESTORE_PP, @@ -8220,7 +8220,7 @@ const struct Item gItemsInfo[] = "A hold item that " "restores 10 HP\nin " "battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_RESTORE_HP, @@ -8238,7 +8238,7 @@ const struct Item gItemsInfo[] = "A hold item that " "heals confusion " "\nin battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_CURE_STATUS, @@ -8256,7 +8256,7 @@ const struct Item gItemsInfo[] = "A hold item that " "heals any status\n" "problem in battle."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, @@ -8284,7 +8284,7 @@ const struct Item gItemsInfo[] = "restores 30 HP\nin " "battle."), #endif - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_RESTORE_HP, @@ -8300,7 +8300,7 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_CONFUSE_SPICY, .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION, .description = sFigyBerryDesc, - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8314,7 +8314,7 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_CONFUSE_DRY, .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION, .description = sFigyBerryDesc, - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8328,7 +8328,7 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_CONFUSE_SWEET, .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION, .description = sFigyBerryDesc, - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8342,7 +8342,7 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_CONFUSE_BITTER, .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION, .description = sFigyBerryDesc, - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8356,7 +8356,7 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_CONFUSE_SOUR, .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION, .description = sFigyBerryDesc, - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8371,7 +8371,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Razz."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8386,7 +8386,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Bluk."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8401,7 +8401,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Nanab."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8416,7 +8416,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Wepear."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8431,7 +8431,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Pinap."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8446,7 +8446,7 @@ const struct Item gItemsInfo[] = "Makes a Pokémon " "friendly but\nlowers " "base HP."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_PomegBerry, @@ -8462,7 +8462,7 @@ const struct Item gItemsInfo[] = "Makes a Pokémon " "friendly but\nlowers " "base Attack."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_KelpsyBerry, @@ -8478,7 +8478,7 @@ const struct Item gItemsInfo[] = "Makes a Pokémon " "friendly but\nlowers " "base Defense."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_QualotBerry, @@ -8494,7 +8494,7 @@ const struct Item gItemsInfo[] = "Makes a Pokémon " "friendly but\nlowers " "base Sp. Atk."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_HondewBerry, @@ -8510,7 +8510,7 @@ const struct Item gItemsInfo[] = "Makes a Pokémon " "friendly but\nlowers " "base Sp. Def."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_GrepaBerry, @@ -8526,7 +8526,7 @@ const struct Item gItemsInfo[] = "Makes a Pokémon " "friendly but\nlowers " "base Speed."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_TamatoBerry, @@ -8542,7 +8542,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Cornn."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8557,7 +8557,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Magost."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8572,7 +8572,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Rabuta."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8587,7 +8587,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Nomel."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8602,7 +8602,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Spelon."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8617,7 +8617,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Pamtre."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8632,7 +8632,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Watmel."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8647,7 +8647,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Durin."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8662,7 +8662,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow Belue."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8679,7 +8679,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Normal\n" "move."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8696,7 +8696,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Fire " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8713,7 +8713,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Water " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8730,7 +8730,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a\nElectric " "move if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8747,7 +8747,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Grass " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8764,7 +8764,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Ice " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8781,7 +8781,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a\nFighting " "move if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8798,7 +8798,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Poison\n" "move if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8815,7 +8815,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Ground\n" "move if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8832,7 +8832,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Flying\n" "move if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8849,7 +8849,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a\nPsychic " "move if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8866,7 +8866,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Bug " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8883,7 +8883,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Rock " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8900,7 +8900,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Ghost " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8917,7 +8917,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Dragon\n" "move if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8934,7 +8934,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Dark " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8951,7 +8951,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Steel " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8968,7 +8968,7 @@ const struct Item gItemsInfo[] = "A hold item that " "weakens a Fairy " "\nmove if weak to it."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -8985,7 +8985,7 @@ const struct Item gItemsInfo[] = "A hold item that " "raises Attack in\n" "a pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9002,7 +9002,7 @@ const struct Item gItemsInfo[] = "A hold item that " "raises Defense\nin " "a pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9019,7 +9019,7 @@ const struct Item gItemsInfo[] = "A hold item that " "raises Speed in " "\na pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9036,7 +9036,7 @@ const struct Item gItemsInfo[] = "A hold item that " "raises Sp. Atk\nin " "a pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9053,7 +9053,7 @@ const struct Item gItemsInfo[] = "A hold item that " "raises Sp. Def\nin " "a pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9070,7 +9070,7 @@ const struct Item gItemsInfo[] = "A hold item that " "ups the\ncritical" "hit rate in a pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9087,7 +9087,7 @@ const struct Item gItemsInfo[] = "A hold item that " "sharply boosts a\n" "stat in a pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9103,7 +9103,7 @@ const struct Item gItemsInfo[] = "A hold item that " "heals from super\n" "effective moves."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9120,7 +9120,7 @@ const struct Item gItemsInfo[] = "When held, it ups " "the Accuracy of\na " "move in a pinch."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9137,7 +9137,7 @@ const struct Item gItemsInfo[] = "It allows a Pokémon " "in a pinch\nto move " "first just once."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9153,7 +9153,7 @@ const struct Item gItemsInfo[] = "If hit by a physical " "move, it\nwill hurt " "the attacker a bit."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9169,7 +9169,7 @@ const struct Item gItemsInfo[] = "If hit by a special " "move, it will\nhurt " "the attacker a bit."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9185,7 +9185,7 @@ const struct Item gItemsInfo[] = "If hit by a physical " "move, it\nraises the " "Defense a bit."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9201,7 +9201,7 @@ const struct Item gItemsInfo[] = "If hit by a special " "move, it\nraises the " "Sp. Def. a bit."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, @@ -9216,7 +9216,7 @@ const struct Item gItemsInfo[] = "{POKEBLOCK} ingredient. " "Plant in\nloamy soil " "to grow a mystery."), - .pocket = POCKET_BERRY_POUCH, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, // Type handled by ItemUseOutOfBattle_EnigmaBerry .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry, .battleUsage = EFFECT_ITEM_ENIGMA_BERRY_EREADER, @@ -9234,7 +9234,7 @@ const struct Item gItemsInfo[] = "the user\nflinch if " "hit by the foe."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_FOCUS_PUNCH, @@ -9249,7 +9249,7 @@ const struct Item gItemsInfo[] = "the foe with\nlong, " "sharp claws."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_DRAGON_CLAW, @@ -9264,7 +9264,7 @@ const struct Item gItemsInfo[] = "ultrasonic wave " "that\nmay confuse."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_WATER_PULSE, @@ -9279,7 +9279,7 @@ const struct Item gItemsInfo[] = "Sp. Def by\nfocusing " "the mind."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_CALM_MIND, @@ -9294,7 +9294,7 @@ const struct Item gItemsInfo[] = "makes the foe\nflee " "to end the battle."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_ROAR, @@ -9309,7 +9309,7 @@ const struct Item gItemsInfo[] = "with a toxin that\n" "gradually worsens."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_TOXIC, @@ -9324,7 +9324,7 @@ const struct Item gItemsInfo[] = "that damages\nall " "types except Ice."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_HAIL, @@ -9339,7 +9339,7 @@ const struct Item gItemsInfo[] = "to boost both " "\nAttack & Defense."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_BULK_UP, @@ -9354,7 +9354,7 @@ const struct Item gItemsInfo[] = "in a row to\nstrike " "the foe."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_BULLET_SEED, @@ -9369,7 +9369,7 @@ const struct Item gItemsInfo[] = "varies among " "\ndifferent Pokémon."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_HIDDEN_POWER, @@ -9384,7 +9384,7 @@ const struct Item gItemsInfo[] = "Fire-type\nmoves " "for 5 turns."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SUNNY_DAY, @@ -9399,7 +9399,7 @@ const struct Item gItemsInfo[] = "it can only\nuse " "attack moves."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_TAUNT, @@ -9418,7 +9418,7 @@ const struct Item gItemsInfo[] = "\nfreeze the foe."), #endif .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_ICE_BEAM, @@ -9437,7 +9437,7 @@ const struct Item gItemsInfo[] = "may freeze the foe."), #endif .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_BLIZZARD, @@ -9452,7 +9452,7 @@ const struct Item gItemsInfo[] = "recharging\nthe " "next turn."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_HYPER_BEAM, @@ -9467,7 +9467,7 @@ const struct Item gItemsInfo[] = "light that\nlowers " "Sp. Atk damage."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_LIGHT_SCREEN, @@ -9482,7 +9482,7 @@ const struct Item gItemsInfo[] = "but may fail\nif used " "in succession."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_PROTECT, @@ -9497,7 +9497,7 @@ const struct Item gItemsInfo[] = "Water-type\nmoves " "for 5 turns."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_RAIN_DANCE, @@ -9512,7 +9512,7 @@ const struct Item gItemsInfo[] = "HP of the\ndamage " "this move inflicts."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_GIGA_DRAIN, @@ -9527,7 +9527,7 @@ const struct Item gItemsInfo[] = "abnormality with\na " "mystical power."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SAFEGUARD, @@ -9542,7 +9542,7 @@ const struct Item gItemsInfo[] = "likes you, the\nmore " "powerful this move."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_FRUSTRATION, @@ -9557,7 +9557,7 @@ const struct Item gItemsInfo[] = "the 1st turn,\nthen " "attacks next turn."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SOLAR_BEAM, @@ -9572,7 +9572,7 @@ const struct Item gItemsInfo[] = "a hard tail.\nIt may " "lower Defense."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_IRON_TAIL, @@ -9587,7 +9587,7 @@ const struct Item gItemsInfo[] = "attack that\nmay " "cause paralysis."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_THUNDERBOLT, @@ -9602,7 +9602,7 @@ const struct Item gItemsInfo[] = "with a\nthunderbolt. " "It may paralyze."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_THUNDER, @@ -9617,7 +9617,7 @@ const struct Item gItemsInfo[] = "that has no effect\n" "on flying foes."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_EARTHQUAKE, @@ -9632,7 +9632,7 @@ const struct Item gItemsInfo[] = "likes you, the\nmore " "powerful this move."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_RETURN, @@ -9647,7 +9647,7 @@ const struct Item gItemsInfo[] = "the 1st turn,\nthen " "strikes next turn."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_DIG, @@ -9662,7 +9662,7 @@ const struct Item gItemsInfo[] = "attack that\nmay " "lower Sp. Def."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_PSYCHIC, @@ -9677,7 +9677,7 @@ const struct Item gItemsInfo[] = "at the foe. It\nmay " "lower Sp. Def."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SHADOW_BALL, @@ -9692,7 +9692,7 @@ const struct Item gItemsInfo[] = "like Light\nScreen " "and causes damage."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_BRICK_BREAK, @@ -9707,7 +9707,7 @@ const struct Item gItemsInfo[] = "copies to\nenhance " "elusiveness."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_DOUBLE_TEAM, @@ -9722,7 +9722,7 @@ const struct Item gItemsInfo[] = "light that\nweakens " "physical attacks."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_REFLECT, @@ -9737,7 +9737,7 @@ const struct Item gItemsInfo[] = "jolt of\nelectricity " "that never misses."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SHOCK_WAVE, @@ -9752,7 +9752,7 @@ const struct Item gItemsInfo[] = "fire that may\nburn " "the foe."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_FLAMETHROWER, @@ -9767,7 +9767,7 @@ const struct Item gItemsInfo[] = "foe. It may\npoison " "the foe."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SLUDGE_BOMB, @@ -9782,7 +9782,7 @@ const struct Item gItemsInfo[] = "that hits the\nfoe " "over several turns."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SANDSTORM, @@ -9797,7 +9797,7 @@ const struct Item gItemsInfo[] = "attack that may " "\nburn the foe."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_FIRE_BLAST, @@ -9812,7 +9812,7 @@ const struct Item gItemsInfo[] = "moving with\nrocks. " "May lower Speed."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_ROCK_TOMB, @@ -9827,7 +9827,7 @@ const struct Item gItemsInfo[] = "attack that\ncan't " "be avoided."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_AERIAL_ACE, @@ -9842,7 +9842,7 @@ const struct Item gItemsInfo[] = "from using the\nsame " "move in a row."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_TORMENT, @@ -9857,7 +9857,7 @@ const struct Item gItemsInfo[] = "poisoned,\nburned, " "or paralyzed."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_FACADE, @@ -9872,7 +9872,7 @@ const struct Item gItemsInfo[] = "attack\ndepending " "on the location."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SECRET_POWER, @@ -9887,7 +9887,7 @@ const struct Item gItemsInfo[] = "2 turns to\nrestore " "health and status."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_REST, @@ -9902,7 +9902,7 @@ const struct Item gItemsInfo[] = "attack a foe of\nthe " "opposite gender."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_ATTRACT, @@ -9917,7 +9917,7 @@ const struct Item gItemsInfo[] = "it may steal the\n" "foe's held item."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_THIEF, @@ -9932,7 +9932,7 @@ const struct Item gItemsInfo[] = "edged wings and " "\nslams into the foe."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_STEEL_WING, @@ -9947,7 +9947,7 @@ const struct Item gItemsInfo[] = "with the foe\non the " "turn this is used."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SKILL_SWAP, @@ -9962,7 +9962,7 @@ const struct Item gItemsInfo[] = "of the move\nthe foe " "is trying to use."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SNATCH, @@ -9977,7 +9977,7 @@ const struct Item gItemsInfo[] = "attack, but\nsharply " "lowers Sp. Atk."), .importance = I_REUSABLE_TMS, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_OVERHEAT, @@ -9989,7 +9989,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10001,7 +10001,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10013,7 +10013,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10025,7 +10025,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10037,7 +10037,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10049,7 +10049,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10061,7 +10061,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10073,7 +10073,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10085,7 +10085,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10097,7 +10097,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10109,7 +10109,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10121,7 +10121,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10133,7 +10133,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10145,7 +10145,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10157,7 +10157,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10169,7 +10169,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10181,7 +10181,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10193,7 +10193,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10205,7 +10205,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10217,7 +10217,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10229,7 +10229,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10241,7 +10241,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10253,7 +10253,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10265,7 +10265,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10277,7 +10277,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10289,7 +10289,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10301,7 +10301,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10313,7 +10313,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10325,7 +10325,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10337,7 +10337,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10349,7 +10349,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10361,7 +10361,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10373,7 +10373,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10385,7 +10385,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10397,7 +10397,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10409,7 +10409,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10421,7 +10421,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10433,7 +10433,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10445,7 +10445,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10457,7 +10457,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10469,7 +10469,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10481,7 +10481,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10493,7 +10493,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10505,7 +10505,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10517,7 +10517,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10529,7 +10529,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10541,7 +10541,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10553,7 +10553,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10565,7 +10565,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10577,7 +10577,7 @@ const struct Item gItemsInfo[] = // .price = 3000, // .description = sQuestionMarksDesc, // Todo // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_CASE, + // .pocket = POCKET_TM_HM, // .type = ITEM_USE_PARTY_MENU, // .fieldUseFunc = NULL, // .secondaryId = MOVE_NONE, // Todo @@ -10592,7 +10592,7 @@ const struct Item gItemsInfo[] = "with sharp blades\n" "or claws."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_CUT, @@ -10607,7 +10607,7 @@ const struct Item gItemsInfo[] = "first turn, then " "\nattacks next turn."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_FLY, @@ -10622,7 +10622,7 @@ const struct Item gItemsInfo[] = "wave, then crashes\n" "it down on the foe."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_SURF, @@ -10637,7 +10637,7 @@ const struct Item gItemsInfo[] = "power, then slams\n" "the foe."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_STRENGTH, @@ -10652,7 +10652,7 @@ const struct Item gItemsInfo[] = "blast of light\nthat " "reduces accuracy."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_FLASH, @@ -10667,7 +10667,7 @@ const struct Item gItemsInfo[] = "tough attack\nthat " "may lower Defense."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_ROCK_SMASH, @@ -10682,7 +10682,7 @@ const struct Item gItemsInfo[] = "with enough power\n" "to climb waterfalls."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_WATERFALL, @@ -10697,7 +10697,7 @@ const struct Item gItemsInfo[] = "the 1st turn,\nthen " "attacks next turn."), .importance = 1, - .pocket = POCKET_TM_CASE, + .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = NULL, .secondaryId = MOVE_DIVE, diff --git a/src/item.c b/src/item.c index 0073ac6c2..204dfa0f4 100644 --- a/src/item.c +++ b/src/item.c @@ -70,10 +70,10 @@ void SetBagPocketsPointers(void) gBagPockets[POCKET_KEY_ITEMS - 1].capacity = BAG_KEYITEMS_COUNT; gBagPockets[POCKET_POKE_BALLS - 1].itemSlots = gSaveBlock1Ptr->bagPocket_PokeBalls; gBagPockets[POCKET_POKE_BALLS - 1].capacity = BAG_POKEBALLS_COUNT; - gBagPockets[POCKET_TM_CASE - 1].itemSlots = gSaveBlock1Ptr->bagPocket_TMHM; - gBagPockets[POCKET_TM_CASE - 1].capacity = BAG_TMHM_COUNT; - gBagPockets[POCKET_BERRY_POUCH - 1].itemSlots = gSaveBlock1Ptr->bagPocket_Berries; - gBagPockets[POCKET_BERRY_POUCH - 1].capacity = BAG_BERRIES_COUNT; + gBagPockets[POCKET_TM_HM - 1].itemSlots = gSaveBlock1Ptr->bagPocket_TMHM; + gBagPockets[POCKET_TM_HM - 1].capacity = BAG_TMHM_COUNT; + gBagPockets[POCKET_BERRIES - 1].itemSlots = gSaveBlock1Ptr->bagPocket_Berries; + gBagPockets[POCKET_BERRIES - 1].capacity = BAG_BERRIES_COUNT; } void CopyItemName(u16 itemId, u8 * dest) @@ -228,7 +228,7 @@ bool8 AddBagItem(u16 itemId, u16 count) } } - if (pocket == POCKET_TM_CASE - 1 && !CheckBagHasItem(ITEM_TM_CASE, 1)) + if (pocket == POCKET_TM_HM - 1 && !CheckBagHasItem(ITEM_TM_CASE, 1)) { idx = BagPocketGetFirstEmptySlot(POCKET_KEY_ITEMS - 1); if (idx == -1) @@ -237,7 +237,7 @@ bool8 AddBagItem(u16 itemId, u16 count) SetBagItemQuantity(&gBagPockets[POCKET_KEY_ITEMS - 1].itemSlots[idx].quantity, 1); } - if (pocket == POCKET_BERRY_POUCH - 1 && !CheckBagHasItem(ITEM_BERRY_POUCH, 1)) + if (pocket == POCKET_BERRIES - 1 && !CheckBagHasItem(ITEM_BERRY_POUCH, 1)) { idx = BagPocketGetFirstEmptySlot(POCKET_KEY_ITEMS - 1); if (idx == -1) diff --git a/src/item_pc.c b/src/item_pc.c index b52db2077..d7af2107e 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -522,7 +522,7 @@ static void ItemPc_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * { itemId = ItemPc_GetItemIdBySlotId(itemIndex); CreateItemMenuIcon(itemId, sStateDataPtr->itemMenuIconSlot); - if (ItemId_GetPocket(itemId) == POCKET_TM_CASE) + if (ItemId_GetPocket(itemId) == POCKET_TM_HM) desc = gMovesInfo[ItemIdToBattleMoveId(itemId)].name; else desc = ItemId_GetDescription(itemId); diff --git a/src/item_use.c b/src/item_use.c index 60f1ff3c7..12d2af8df 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -93,7 +93,7 @@ static void SetUpItemUseCallback(u8 taskId) itemType = gTasks[taskId].data[4] - 1; else itemType = ItemId_GetType(gSpecialVar_ItemId) - 1; - if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) + if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRIES) { BerryPouch_SetExitCallback(sExitCallbackByItemType[itemType]); BerryPouch_StartFadeToExitCallback(taskId); @@ -154,7 +154,7 @@ static void Task_ItemUse_CloseMessageBoxAndReturnToField(u8 taskId) u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId) { - if (ItemId_GetPocket(itemId) == POCKET_TM_CASE) + if (ItemId_GetPocket(itemId) == POCKET_TM_HM) return 1; else if (ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_EvolutionStone) return 2; @@ -875,7 +875,7 @@ void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId) static void ItemUse_SwitchToPartyMenuInBattle(u8 taskId) { - if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) + if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRIES) { BerryPouch_SetExitCallback(EnterPartyFromItemMenuInBattle); BerryPouch_StartFadeToExitCallback(taskId); @@ -1117,7 +1117,7 @@ void ItemUseOutOfBattle_Honey(u8 taskId) void ItemUseOutOfBattle_CannotUse(u8 taskId) { - if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) + if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRIES) { StringExpandPlaceholders(gStringVar4, gText_OakForbidsUseOfItemHere); DisplayItemMessageInBerryPouch(taskId, FONT_MALE, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu); diff --git a/src/party_menu.c b/src/party_menu.c index fd5460eff..5b199a6d7 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1829,10 +1829,10 @@ static void BufferBagFullCantTakeItemMessage(u16 itemId) default: string = gText_MenuBag; break; - case POCKET_TM_CASE: + case POCKET_TM_HM: string = ItemId_GetName(ITEM_TM_CASE); break; - case POCKET_BERRY_POUCH: + case POCKET_BERRIES: string = ItemId_GetName(ITEM_BERRY_POUCH); break; } @@ -4362,7 +4362,7 @@ void CB2_ShowPartyMenuForItemUse(void) break; } } - if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) + if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRIES) callback = CB2_ReturnToBerryPouchMenu; task = Task_SetSacredAshCB; msgId = PARTY_MSG_NONE; @@ -4374,11 +4374,11 @@ void CB2_ShowPartyMenuForItemUse(void) default: msgId = PARTY_MSG_USE_ON_WHICH_MON; break; - case POCKET_TM_CASE: + case POCKET_TM_HM: msgId = PARTY_MSG_TEACH_WHICH_MON; callback = CB2_ReturnToTMCaseMenu; break; - case POCKET_BERRY_POUCH: + case POCKET_BERRIES: msgId = PARTY_MSG_USE_ON_WHICH_MON; callback = CB2_ReturnToBerryPouchMenu; break; @@ -4424,7 +4424,7 @@ static void CB2_DoUseItemAnim(void) static void CB2_UseItem(void) { - if (ItemId_GetPocket(gSpecialVar_ItemId) == POCKET_TM_CASE && PSA_IsCancelDisabled() == TRUE) + if (ItemId_GetPocket(gSpecialVar_ItemId) == POCKET_TM_HM && PSA_IsCancelDisabled() == TRUE) { GiveMoveToMon(&gPlayerParty[gPartyMenu.slotId], ItemIdToBattleMoveId(gSpecialVar_ItemId)); AdjustFriendship(&gPlayerParty[gPartyMenu.slotId], FRIENDSHIP_EVENT_LEARN_TMHM); @@ -5306,7 +5306,7 @@ void ItemUseCB_PPUp(u8 taskId, TaskFunc func) u16 ItemIdToBattleMoveId(u16 item) { - return (ItemId_GetPocket(item) == POCKET_TM_CASE) ? gItemsInfo[item].secondaryId : MOVE_NONE; + return (ItemId_GetPocket(item) == POCKET_TM_HM) ? gItemsInfo[item].secondaryId : MOVE_NONE; } bool8 MonKnowsMove(struct Pokemon *mon, u16 move) @@ -6167,10 +6167,10 @@ void CB2_ChooseMonToGiveItem(void) default: callback = CB2_ReturnToBagMenu; break; - case POCKET_TM_CASE: + case POCKET_TM_HM: callback = CB2_ReturnToTMCaseMenu; break; - case POCKET_BERRY_POUCH: + case POCKET_BERRIES: callback = CB2_ReturnToBerryPouchMenu; break; } @@ -6615,7 +6615,7 @@ void EnterPartyFromItemMenuInBattle(void) { MainCallback callback; - if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) + if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRIES) callback = CB2_ReturnToBerryPouchMenu; else callback = CB2_BagMenuFromBattle; diff --git a/src/quest_log_events.c b/src/quest_log_events.c index 6310a405d..33a129103 100644 --- a/src/quest_log_events.c +++ b/src/quest_log_events.c @@ -1081,7 +1081,7 @@ static const u16 *LoadEvent_UsedItem(const u16 *eventData) { case POCKET_ITEMS: case POCKET_POKE_BALLS: - case POCKET_BERRY_POUCH: + case POCKET_BERRIES: StringCopy(gStringVar1, ItemId_GetName(rItemId)); if (rItemId == ITEM_ESCAPE_ROPE) { @@ -1102,7 +1102,7 @@ static const u16 *LoadEvent_UsedItem(const u16 *eventData) StringCopy(gStringVar1, ItemId_GetName(rItemId)); StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedTheKeyItem); break; - case POCKET_TM_CASE: + case POCKET_TM_HM: QuestLog_GetSpeciesName(rSpecies, gStringVar1, 0); StringCopy(gStringVar2, gMovesInfo[ItemIdToBattleMoveId(rItemId)].name); if (rItemParam != 0xFFFF) diff --git a/src/tm_case.c b/src/tm_case.c index 5372769b8..818d957b3 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -510,7 +510,7 @@ static bool8 DoSetUpTMCaseUI(void) gMain.state++; break; case 9: - SortPocketAndPlaceHMsFirst(&gBagPockets[POCKET_TM_CASE - 1]); + SortPocketAndPlaceHMsFirst(&gBagPockets[POCKET_TM_HM - 1]); gMain.state++; break; case 10: @@ -545,7 +545,7 @@ static bool8 DoSetUpTMCaseUI(void) gMain.state++; break; case 16: - sTMCaseDynamicResources->discSpriteId = CreateDiscSprite(BagGetItemIdByPocketPosition(POCKET_TM_CASE, sTMCaseStaticResources.scrollOffset + sTMCaseStaticResources.selectedRow)); + sTMCaseDynamicResources->discSpriteId = CreateDiscSprite(BagGetItemIdByPocketPosition(POCKET_TM_HM, sTMCaseStaticResources.scrollOffset + sTMCaseStaticResources.selectedRow)); gMain.state++; break; case 17: @@ -634,14 +634,14 @@ static bool8 HandleLoadTMCaseGraphicsAndPalettes(void) static void CreateTMCaseListMenuBuffers(void) { - struct BagPocket * pocket = &gBagPockets[POCKET_TM_CASE - 1]; + struct BagPocket * pocket = &gBagPockets[POCKET_TM_HM - 1]; sListMenuItemsBuffer = Alloc((pocket->capacity + 1) * sizeof(struct ListMenuItem)); sListMenuStringsBuffer = Alloc(sTMCaseDynamicResources->numTMs * 29); } static void InitTMCaseListMenuItems(void) { - struct BagPocket * pocket = &gBagPockets[POCKET_TM_CASE - 1]; + struct BagPocket * pocket = &gBagPockets[POCKET_TM_HM - 1]; u16 i; for (i = 0; i < sTMCaseDynamicResources->numTMs; i++) @@ -702,7 +702,7 @@ static void List_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *li if (itemIndex == LIST_CANCEL) itemId = ITEM_NONE; else - itemId = BagGetItemIdByPocketPosition(POCKET_TM_CASE, itemIndex); + itemId = BagGetItemIdByPocketPosition(POCKET_TM_HM, itemIndex); if (onInit != TRUE) { @@ -717,12 +717,12 @@ static void List_ItemPrintFunc(u8 windowId, u32 itemIndex, u8 y) { if (itemIndex != LIST_CANCEL) { - u16 itemId = BagGetItemIdByPocketPosition(POCKET_TM_CASE, itemIndex); + u16 itemId = BagGetItemIdByPocketPosition(POCKET_TM_HM, itemIndex); if (!IsItemHM(itemId)) { if (!ItemId_GetImportance(itemId)) { - ConvertIntToDecimalStringN(gStringVar1, BagGetQuantityByPocketPosition(POCKET_TM_CASE, itemIndex), STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, BagGetQuantityByPocketPosition(POCKET_TM_HM, itemIndex), STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); } else @@ -742,7 +742,7 @@ static void PrintDescription(s32 itemIndex) { const u8 * str; if (itemIndex != LIST_CANCEL) - str = ItemId_GetDescription(BagGetItemIdByPocketPosition(POCKET_TM_CASE, itemIndex)); + str = ItemId_GetDescription(BagGetItemIdByPocketPosition(POCKET_TM_HM, itemIndex)); else str = gText_TMCaseWillBePutAway; FillWindowPixelBuffer(WIN_DESCRIPTION, 0); @@ -812,7 +812,7 @@ void ResetTMCaseCursorPos(void) static void TMCaseSetup_GetTMCount(void) { - struct BagPocket * pocket = &gBagPockets[POCKET_TM_CASE - 1]; + struct BagPocket * pocket = &gBagPockets[POCKET_TM_HM - 1]; u16 i; BagPocketCompaction(pocket->itemSlots, pocket->capacity); @@ -928,8 +928,8 @@ static void Task_HandleListInput(u8 taskId) RemoveScrollArrows(); PrintListCursor(tListTaskId, COLOR_CURSOR_SELECTED); tSelection = input; - tQuantityOwned = BagGetQuantityByPocketPosition(POCKET_TM_CASE, input); - gSpecialVar_ItemId = BagGetItemIdByPocketPosition(POCKET_TM_CASE, input); + tQuantityOwned = BagGetQuantityByPocketPosition(POCKET_TM_HM, input); + gSpecialVar_ItemId = BagGetItemIdByPocketPosition(POCKET_TM_HM, input); gTasks[taskId].func = sSelectTMActionTasks[sTMCaseStaticResources.menuType]; break; } @@ -1046,7 +1046,7 @@ static void Action_Use(u8 taskId) static void Action_Give(u8 taskId) { s16 * data = gTasks[taskId].data; - u16 itemId = BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection); + u16 itemId = BagGetItemIdByPocketPosition(POCKET_TM_HM, tSelection); RemoveContextMenu(&sTMCaseDynamicResources->contextMenuWindowId); ClearStdWindowAndFrameToTransparent(WIN_SELECTED_MSG, FALSE); ClearWindowTilemap(WIN_SELECTED_MSG); @@ -1132,7 +1132,7 @@ static void Task_SelectedTMHM_GiveParty(u8 taskId) { s16 * data = gTasks[taskId].data; - if (!ItemId_GetImportance(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection))) + if (!ItemId_GetImportance(BagGetItemIdByPocketPosition(POCKET_TM_HM, tSelection))) { sTMCaseDynamicResources->nextScreenCallback = CB2_GiveHoldItem; Task_BeginFadeOutFromTMCase(taskId); @@ -1148,7 +1148,7 @@ static void Task_SelectedTMHM_GivePC(u8 taskId) { s16 * data = gTasks[taskId].data; - if (!ItemId_GetImportance(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection))) + if (!ItemId_GetImportance(BagGetItemIdByPocketPosition(POCKET_TM_HM, tSelection))) { sTMCaseDynamicResources->nextScreenCallback = CB2_ReturnToPokeStorage; Task_BeginFadeOutFromTMCase(taskId); @@ -1194,7 +1194,7 @@ static void Task_AskConfirmSaleWithAmount(u8 taskId) { s16 * data = gTasks[taskId].data; - ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected, STR_CONV_MODE_LEFT_ALIGN, 6); + ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_HM, tSelection)) / 2 * tQuantitySelected, STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_ICanPayThisMuch_WouldThatBeOkay); PrintMessageWithFollowupTask(taskId, GetDialogBoxFontId(), gStringVar4, Task_PlaceYesNoBox); } @@ -1229,7 +1229,7 @@ static void Task_InitQuantitySelectUI(u8 taskId) ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); TMCase_Print(WIN_SELL_QUANTITY, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, COLOR_DARK); - SellTM_PrintQuantityAndSalePrice(1, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected); + SellTM_PrintQuantityAndSalePrice(1, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_HM, tSelection)) / 2 * tQuantitySelected); PrintPlayersMoney(); CreateQuantityScrollArrows(); ScheduleBgCopyTilemapToVram(0); @@ -1252,7 +1252,7 @@ static void Task_QuantitySelect_HandleInput(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&tQuantitySelected, tQuantityOwned) == 1) { - SellTM_PrintQuantityAndSalePrice(tQuantitySelected, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected); + SellTM_PrintQuantityAndSalePrice(tQuantitySelected, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_HM, tSelection)) / 2 * tQuantitySelected); } else if (JOY_NEW(A_BUTTON)) { @@ -1287,7 +1287,7 @@ static void Task_PrintSaleConfirmedText(u8 taskId) PutWindowTilemap(WIN_LIST); ScheduleBgCopyTilemapToVram(0); CopyItemName(gSpecialVar_ItemId, gStringVar1); - ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected, STR_CONV_MODE_LEFT_ALIGN, 6); + ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_HM, tSelection)) / 2 * tQuantitySelected, STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); PrintMessageWithFollowupTask(taskId, FONT_NORMAL, gStringVar4, Task_DoSaleOfTMs); } diff --git a/test/battle/move_effect/belch.c b/test/battle/move_effect/belch.c index 32b3767bc..2a732e0e4 100644 --- a/test/battle/move_effect/belch.c +++ b/test/battle/move_effect/belch.c @@ -7,8 +7,8 @@ ASSUMPTIONS ASSUME(gMovesInfo[MOVE_MUD_SHOT].type == TYPE_GROUND); ASSUME(gItemsInfo[ITEM_SHUCA_BERRY].holdEffect == HOLD_EFFECT_RESIST_BERRY); ASSUME(gItemsInfo[ITEM_SHUCA_BERRY].holdEffectParam == TYPE_GROUND); - ASSUME(gItemsInfo[ITEM_SHUCA_BERRY].pocket == POCKET_BERRY_POUCH); - ASSUME(gItemsInfo[ITEM_ORAN_BERRY].pocket == POCKET_BERRY_POUCH); + ASSUME(gItemsInfo[ITEM_SHUCA_BERRY].pocket == POCKET_BERRIES); + ASSUME(gItemsInfo[ITEM_ORAN_BERRY].pocket == POCKET_BERRIES); } AI_SINGLE_BATTLE_TEST("AI: Belch has nonzero score after eating a berry") diff --git a/test/battle/move_effect/stuff_cheeks.c b/test/battle/move_effect/stuff_cheeks.c index 033c68ef8..3bb3f2292 100644 --- a/test/battle/move_effect/stuff_cheeks.c +++ b/test/battle/move_effect/stuff_cheeks.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gMovesInfo[MOVE_STUFF_CHEEKS].effect == EFFECT_STUFF_CHEEKS); - ASSUME(gItemsInfo[ITEM_LIECHI_BERRY].pocket == POCKET_BERRY_POUCH); + ASSUME(gItemsInfo[ITEM_LIECHI_BERRY].pocket == POCKET_BERRIES); ASSUME(gItemsInfo[ITEM_LIECHI_BERRY].holdEffect == HOLD_EFFECT_ATTACK_UP); }