Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-09-29 20:38:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

renamed pockets to align with expansion

Browse Source
This commit is contained in:
cawtds
2024-06-18 20:06:02 +02:00
parent 94cd3866d7
commit f276da42e8
20 changed files with 266 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/event_scripts.s
View File

@@ -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::

4
data/scripts/obtain_item.inc
View File

@@ -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::

7
include/constants/global.h
View File

@@ -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

19
include/constants/item.h
View File

@@ -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

8
src/battle_ai_main.c
View File

@@ -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:

2
src/battle_ai_switch_items.c
View File

@@ -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)
{

2
src/battle_dynamax.c
View File

@@ -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;

2
src/battle_main.c
View File

@@ -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)

12
src/battle_script_commands.c
View File

@@ -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;

18
src/battle_util.c
View File

@@ -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);
}
}

26
src/berry_pouch.c
View File

@@ -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);
}

352
src/data/items.h
View File

File diff suppressed because it is too large Load Diff

12
src/item.c
View File

@@ -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)

2
src/item_pc.c
View File

@@ -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);

8
src/item_use.c
View File

@@ -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);

20
src/party_menu.c
View File

@@ -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;

4
src/quest_log_events.c
View File

@@ -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)

36
src/tm_case.c
View File

@@ -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);
}

4
test/battle/move_effect/belch.c
View File

@@ -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")

2
test/battle/move_effect/stuff_cheeks.c
View File

@@ -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);
}