dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ItemId_GetX to GetItemX (#2116)

Browse Source
This commit is contained in:
Alex
2025-05-22 14:27:52 +02:00
committed by GitHub
parent bd0a02c456
commit b31a73f990
22 changed files with 154 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apprentice.c
View File

@@ -1068,7 +1068,7 @@ static void ApprenticeBufferString(void)
StringCopy(stringDst, gMoveNames[gApprenticeQuestionData->move2]);
break;
case APPRENTICE_BUFF_ITEM:
StringCopy(stringDst, ItemId_GetName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data));
StringCopy(stringDst, GetItemName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data));
break;
case APPRENTICE_BUFF_NAME:
TVShowConvertInternationalString(text, GetApprenticeNameInLanguage(PLAYER_APPRENTICE.id, GAME_LANGUAGE), GAME_LANGUAGE);

4
src/battle_ai_script_commands.c
View File

@@ -2030,9 +2030,9 @@ static void Cmd_get_hold_effect(void)
battler = gBattlerTarget;
if (gActiveBattler != battler)
AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(BATTLE_HISTORY->itemEffects[battler]);
AI_THINKING_STRUCT->funcResult = GetItemHoldEffect(BATTLE_HISTORY->itemEffects[battler]);
else
AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(gBattleMons[battler].item);
AI_THINKING_STRUCT->funcResult = GetItemHoldEffect(gBattleMons[battler].item);
gAIScriptPtr += 2;
}

10
src/battle_main.c
View File

@@ -4027,7 +4027,7 @@ u8 IsRunningFromBattleImpossible(void)
if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[gActiveBattler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
holdEffect = GetItemHoldEffect(gBattleMons[gActiveBattler].item);
gPotentialItemEffectBattler = gActiveBattler;
@@ -4632,8 +4632,8 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
}
else
{
holdEffect = ItemId_GetHoldEffect(gBattleMons[battler1].item);
holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[battler1].item);
holdEffect = GetItemHoldEffect(gBattleMons[battler1].item);
holdEffectParam = GetItemHoldEffectParam(gBattleMons[battler1].item);
}
// badge boost
@@ -4666,8 +4666,8 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
}
else
{
holdEffect = ItemId_GetHoldEffect(gBattleMons[battler2].item);
holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[battler2].item);
holdEffect = GetItemHoldEffect(gBattleMons[battler2].item);
holdEffectParam = GetItemHoldEffectParam(gBattleMons[battler2].item);
}
// badge boost

20
src/battle_pyramid_bag.c
View File

@@ -620,7 +620,7 @@ static void SetBagItemsListTemplate(void)
static void CopyBagItemName(u8 *dst, u16 itemId)
{
if (ItemId_GetPocket(itemId) == POCKET_BERRIES)
if (GetItemPocket(itemId) == POCKET_BERRIES)
{
ConvertIntToDecimalStringN(gStringVar1, ITEM_TO_BERRY(itemId), STR_CONV_MODE_LEADING_ZEROS, 2);
CopyItemName(itemId, gStringVar2);
@@ -681,7 +681,7 @@ static void PrintItemDescription(s32 listMenuId)
const u8 *desc;
if (listMenuId != LIST_CANCEL)
{
desc = ItemId_GetDescription(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][listMenuId]);
desc = GetItemDescription(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][listMenuId]);
}
else
{
@@ -942,7 +942,7 @@ static void OpenContextMenu(u8 taskId)
gPyramidBagMenu->menuActionsCount = ARRAY_COUNT(sMenuActionIds_Field);
break;
case PYRAMIDBAG_LOC_BATTLE:
if (ItemId_GetBattleUsage(gSpecialVar_ItemId))
if (GetItemBattleUsage(gSpecialVar_ItemId))
{
gPyramidBagMenu->menuActionIds = sMenuActionIds_Battle;
gPyramidBagMenu->menuActionsCount = ARRAY_COUNT(sMenuActionIds_Battle);
@@ -1085,7 +1085,7 @@ static void CloseMenuActionWindow(void)
static void BagAction_UseOnField(u8 taskId)
{
u8 pocketId = ItemId_GetPocket(gSpecialVar_ItemId);
u8 pocketId = GetItemPocket(gSpecialVar_ItemId);
if (pocketId == POCKET_KEY_ITEMS
|| pocketId == POCKET_POKE_BALLS
@@ -1095,12 +1095,12 @@ static void BagAction_UseOnField(u8 taskId)
CloseMenuActionWindow();
DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, Task_CloseBattlePyramidBagMessage);
}
else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL)
else if (GetItemFieldFunc(gSpecialVar_ItemId) != NULL)
{
CloseMenuActionWindow();
FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
ScheduleBgCopyTilemapToVram(0);
ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
GetItemFieldFunc(gSpecialVar_ItemId)(taskId);
}
}
@@ -1250,7 +1250,7 @@ static void BagAction_Give(u8 taskId)
{
DisplayItemMessageInBattlePyramid(taskId, gText_CantWriteMail, Task_WaitCloseErrorMessage);
}
else if (!ItemId_GetImportance(gSpecialVar_ItemId))
else if (!GetItemImportance(gSpecialVar_ItemId))
{
gPyramidBagMenu->newScreenCallback = CB2_ChooseMonToGiveItem;
CloseBattlePyramidBag(taskId);
@@ -1291,7 +1291,7 @@ static void TryCloseBagToGiveItem(u8 taskId)
{
if (!IsWritingMailAllowed(gSpecialVar_ItemId))
DisplayItemMessageInBattlePyramid(taskId, gText_CantWriteMail, Task_WaitCloseErrorMessage);
else if (!ItemId_GetImportance(gSpecialVar_ItemId))
else if (!GetItemImportance(gSpecialVar_ItemId))
CloseBattlePyramidBag(taskId);
else
ShowCantHoldMessage(taskId);
@@ -1299,10 +1299,10 @@ static void TryCloseBagToGiveItem(u8 taskId)
static void BagAction_UseInBattle(u8 taskId)
{
if (ItemId_GetBattleFunc(gSpecialVar_ItemId) != NULL)
if (GetItemBattleFunc(gSpecialVar_ItemId) != NULL)
{
CloseMenuActionWindow();
ItemId_GetBattleFunc(gSpecialVar_ItemId)(taskId);
GetItemBattleFunc(gSpecialVar_ItemId)(taskId);
}
}

28
src/battle_script_commands.c
View File

@@ -1163,8 +1163,8 @@ static void Cmd_accuracycheck(void)
}
else
{
holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
holdEffect = GetItemHoldEffect(gBattleMons[gBattlerTarget].item);
param = GetItemHoldEffectParam(gBattleMons[gBattlerTarget].item);
}
gPotentialItemEffectBattler = gBattlerTarget;
@@ -1260,7 +1260,7 @@ static void Cmd_critcalc(void)
if (item == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[gBattlerAttacker].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(item);
holdEffect = GetItemHoldEffect(item);
gPotentialItemEffectBattler = gBattlerAttacker;
@@ -1668,8 +1668,8 @@ static void Cmd_adjustnormaldamage(void)
}
else
{
holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
holdEffect = GetItemHoldEffect(gBattleMons[gBattlerTarget].item);
param = GetItemHoldEffectParam(gBattleMons[gBattlerTarget].item);
}
gPotentialItemEffectBattler = gBattlerTarget;
@@ -1711,8 +1711,8 @@ static void Cmd_adjustnormaldamage2(void)
}
else
{
holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
holdEffect = GetItemHoldEffect(gBattleMons[gBattlerTarget].item);
param = GetItemHoldEffectParam(gBattleMons[gBattlerTarget].item);
}
gPotentialItemEffectBattler = gBattlerTarget;
@@ -3301,7 +3301,7 @@ static void Cmd_getexp(void)
if (item == ITEM_ENIGMA_BERRY)
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
else
holdEffect = ItemId_GetHoldEffect(item);
holdEffect = GetItemHoldEffect(item);
if (holdEffect == HOLD_EFFECT_EXP_SHARE)
viaExpShare++;
@@ -3340,7 +3340,7 @@ static void Cmd_getexp(void)
if (item == ITEM_ENIGMA_BERRY)
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
else
holdEffect = ItemId_GetHoldEffect(item);
holdEffect = GetItemHoldEffect(item);
if (holdEffect != HOLD_EFFECT_EXP_SHARE && !(gBattleStruct->sentInPokes & 1))
{
@@ -4228,7 +4228,7 @@ static void Cmd_moveend(void)
if (gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY)
holdEffectAtk = gEnigmaBerries[gBattlerAttacker].holdEffect;
else
holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattlerAttacker].item);
holdEffectAtk = GetItemHoldEffect(gBattleMons[gBattlerAttacker].item);
choicedMoveAtk = &gBattleStruct->choicedMove[gBattlerAttacker];
GET_MOVE_TYPE(gCurrentMove, moveType);
@@ -5869,8 +5869,8 @@ static void Cmd_adjustsetdamage(void)
}
else
{
holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
holdEffect = GetItemHoldEffect(gBattleMons[gBattlerTarget].item);
param = GetItemHoldEffectParam(gBattleMons[gBattlerTarget].item);
}
gPotentialItemEffectBattler = gBattlerTarget;
@@ -7521,8 +7521,8 @@ static void Cmd_tryKO(void)
}
else
{
holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
holdEffect = GetItemHoldEffect(gBattleMons[gBattlerTarget].item);
param = GetItemHoldEffectParam(gBattleMons[gBattlerTarget].item);
}
gPotentialItemEffectBattler = gBattlerTarget;

22
src/battle_util.c
View File

@@ -414,7 +414,7 @@ bool8 TryRunFromBattle(u8 battler)
if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[battler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[battler].item);
holdEffect = GetItemHoldEffect(gBattleMons[battler].item);
gPotentialItemEffectBattler = battler;
@@ -1044,7 +1044,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[gActiveBattler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
holdEffect = GetItemHoldEffect(gBattleMons[gActiveBattler].item);
gPotentialItemEffectBattler = gActiveBattler;
@@ -1088,7 +1088,7 @@ u8 CheckMoveLimitations(u8 battler, u8 unusableMoves, u8 check)
if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY)
holdEffect = gEnigmaBerries[battler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[battler].item);
holdEffect = GetItemHoldEffect(gBattleMons[battler].item);
gPotentialItemEffectBattler = battler;
@@ -3271,8 +3271,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battler, bool8 moveTurn)
}
else
{
battlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem);
battlerHoldEffectParam = ItemId_GetHoldEffectParam(gLastUsedItem);
battlerHoldEffect = GetItemHoldEffect(gLastUsedItem);
battlerHoldEffectParam = GetItemHoldEffectParam(gLastUsedItem);
}
atkItem = gBattleMons[gBattlerAttacker].item;
@@ -3283,8 +3283,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battler, bool8 moveTurn)
}
else
{
atkHoldEffect = ItemId_GetHoldEffect(atkItem);
atkHoldEffectParam = ItemId_GetHoldEffectParam(atkItem);
atkHoldEffect = GetItemHoldEffect(atkItem);
atkHoldEffectParam = GetItemHoldEffectParam(atkItem);
}
// def variables are unused
@@ -3296,8 +3296,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battler, bool8 moveTurn)
}
else
{
defHoldEffect = ItemId_GetHoldEffect(defItem);
defHoldEffectParam = ItemId_GetHoldEffectParam(defItem);
defHoldEffect = GetItemHoldEffect(defItem);
defHoldEffectParam = GetItemHoldEffectParam(defItem);
}
switch (caseID)
@@ -3633,8 +3633,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battler, bool8 moveTurn)
}
else
{
battlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem);
battlerHoldEffectParam = ItemId_GetHoldEffectParam(gLastUsedItem);
battlerHoldEffect = GetItemHoldEffect(gLastUsedItem);
battlerHoldEffectParam = GetItemHoldEffectParam(gLastUsedItem);
}
switch (battlerHoldEffect)
{

1
src/data/map_group_count.h Normal file
View File

@@ -0,0 +1 @@
static const u8 MAP_GROUP_COUNT[] = {57, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};

54
src/item.c
View File

@@ -78,7 +78,7 @@ void SetBagItemsPointers(void)
void CopyItemName(u16 itemId, u8 *dst)
{
StringCopy(dst, ItemId_GetName(itemId));
StringCopy(dst, GetItemName(itemId));
}
void CopyItemNameHandlePlural(u16 itemId, u8 *dst, u32 quantity)
@@ -86,7 +86,7 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *dst, u32 quantity)
if (itemId == ITEM_POKE_BALL)
{
if (quantity < 2)
StringCopy(dst, ItemId_GetName(ITEM_POKE_BALL));
StringCopy(dst, GetItemName(ITEM_POKE_BALL));
else
StringCopy(dst, gText_PokeBalls);
}
@@ -95,7 +95,7 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *dst, u32 quantity)
if (itemId >= FIRST_BERRY_INDEX && itemId <= LAST_BERRY_INDEX)
GetBerryCountString(dst, gBerries[itemId - FIRST_BERRY_INDEX].name, quantity);
else
StringCopy(dst, ItemId_GetName(itemId));
StringCopy(dst, GetItemName(itemId));
}
}
@@ -131,11 +131,11 @@ bool8 CheckBagHasItem(u16 itemId, u16 count)
u8 i;
u8 pocket;
if (ItemId_GetPocket(itemId) == 0)
if (GetItemPocket(itemId) == 0)
return FALSE;
if (InBattlePyramid() || FlagGet(FLAG_STORING_ITEMS_IN_PYRAMID_BAG) == TRUE)
return CheckPyramidBagHasItem(itemId, count);
pocket = ItemId_GetPocket(itemId) - 1;
pocket = GetItemPocket(itemId) - 1;
// Check for item slots that contain the item
for (i = 0; i < gBagPockets[pocket].capacity; i++)
{
@@ -178,7 +178,7 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count)
u16 slotCapacity;
u16 ownedCount;
if (ItemId_GetPocket(itemId) == POCKET_NONE)
if (GetItemPocket(itemId) == POCKET_NONE)
return FALSE;
if (InBattlePyramid() || FlagGet(FLAG_STORING_ITEMS_IN_PYRAMID_BAG) == TRUE)
@@ -186,7 +186,7 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count)
return CheckPyramidBagHasSpace(itemId, count);
}
pocket = ItemId_GetPocket(itemId) - 1;
pocket = GetItemPocket(itemId) - 1;
if (pocket != BERRIES_POCKET)
slotCapacity = MAX_BAG_ITEM_CAPACITY;
else
@@ -239,7 +239,7 @@ bool8 AddBagItem(u16 itemId, u16 count)
{
u8 i;
if (ItemId_GetPocket(itemId) == POCKET_NONE)
if (GetItemPocket(itemId) == POCKET_NONE)
return FALSE;
// check Battle Pyramid Bag
@@ -253,7 +253,7 @@ bool8 AddBagItem(u16 itemId, u16 count)
struct ItemSlot *newItems;
u16 slotCapacity;
u16 ownedCount;
u8 pocket = ItemId_GetPocket(itemId) - 1;
u8 pocket = GetItemPocket(itemId) - 1;
itemPocket = &gBagPockets[pocket];
newItems = AllocZeroed(itemPocket->capacity * sizeof(struct ItemSlot));
@@ -347,7 +347,7 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
u8 i;
u16 totalQuantity = 0;
if (ItemId_GetPocket(itemId) == POCKET_NONE || itemId == ITEM_NONE)
if (GetItemPocket(itemId) == POCKET_NONE || itemId == ITEM_NONE)
return FALSE;
// check Battle Pyramid Bag
@@ -362,7 +362,7 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
u16 ownedCount;
struct BagPocket *itemPocket;
pocket = ItemId_GetPocket(itemId) - 1;
pocket = GetItemPocket(itemId) - 1;
itemPocket = &gBagPockets[pocket];
for (i = 0; i < itemPocket->capacity; i++)
@@ -432,7 +432,7 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
u8 GetPocketByItemId(u16 itemId)
{
return ItemId_GetPocket(itemId);
return GetItemPocket(itemId);
}
void ClearItemSlots(struct ItemSlot *itemSlots, u8 itemCount)
@@ -672,7 +672,7 @@ u16 CountTotalItemQuantityInBag(u16 itemId)
{
u16 i;
u16 ownedCount = 0;
struct BagPocket *bagPocket = &gBagPockets[ItemId_GetPocket(itemId) - 1];
struct BagPocket *bagPocket = &gBagPockets[GetItemPocket(itemId) - 1];
for (i = 0; i < bagPocket->capacity; i++)
{
@@ -871,74 +871,74 @@ static u16 SanitizeItemId(u16 itemId)
return itemId;
}
const u8 *ItemId_GetName(u16 itemId)
const u8 *GetItemName(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].name;
}
// Unused
u16 ItemId_GetId(u16 itemId)
u16 GetItemId(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].itemId;
}
u16 ItemId_GetPrice(u16 itemId)
u16 GetItemPrice(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].price;
}
u8 ItemId_GetHoldEffect(u16 itemId)
u8 GetItemHoldEffect(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].holdEffect;
}
u8 ItemId_GetHoldEffectParam(u16 itemId)
u8 GetItemHoldEffectParam(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].holdEffectParam;
}
const u8 *ItemId_GetDescription(u16 itemId)
const u8 *GetItemDescription(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].description;
}
u8 ItemId_GetImportance(u16 itemId)
u8 GetItemImportance(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].importance;
}
// Unused
u8 ItemId_GetRegistrability(u16 itemId)
u8 GetItemRegistrability(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].registrability;
}
u8 ItemId_GetPocket(u16 itemId)
u8 GetItemPocket(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].pocket;
}
u8 ItemId_GetType(u16 itemId)
u8 GetItemType(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].type;
}
ItemUseFunc ItemId_GetFieldFunc(u16 itemId)
ItemUseFunc GetItemFieldFunc(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].fieldUseFunc;
}
u8 ItemId_GetBattleUsage(u16 itemId)
u8 GetItemBattleUsage(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].battleUsage;
}
ItemUseFunc ItemId_GetBattleFunc(u16 itemId)
ItemUseFunc GetItemBattleFunc(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].battleUseFunc;
}
u8 ItemId_GetSecondaryId(u16 itemId)
u8 GetItemSecondaryId(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].secondaryId;
}

52
src/item_menu.c
View File

@@ -138,7 +138,7 @@ static void PrepareTMHMMoveWindow(void);
static bool8 IsWallysBag(void);
static void Task_WallyTutorialBagMenu(u8);
static void Task_BagMenu_HandleInput(u8);
static void GetItemName(u8 *, u16);
static void GetItemNameFromPocket(u8 *, u16);
static void PrintItemDescription(int);
static void BagMenu_PrintCursorAtPos(u8, u8);
static void BagMenu_Print(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8);
@@ -868,7 +868,7 @@ static void LoadBagItemListBuffers(u8 pocketId)
{
for (i = 0; i < gBagMenu->numItemStacks[pocketId] - 1; i++)
{
GetItemName(sListBuffer2->name[i], pocket->itemSlots[i].itemId);
GetItemNameFromPocket(sListBuffer2->name[i], pocket->itemSlots[i].itemId);
subBuffer = sListBuffer1->subBuffers;
subBuffer[i].name = sListBuffer2->name[i];
subBuffer[i].id = i;
@@ -882,7 +882,7 @@ static void LoadBagItemListBuffers(u8 pocketId)
{
for (i = 0; i < gBagMenu->numItemStacks[pocketId]; i++)
{
GetItemName(sListBuffer2->name[i], pocket->itemSlots[i].itemId);
GetItemNameFromPocket(sListBuffer2->name[i], pocket->itemSlots[i].itemId);
subBuffer = sListBuffer1->subBuffers;
subBuffer[i].name = sListBuffer2->name[i];
subBuffer[i].id = i;
@@ -894,7 +894,7 @@ static void LoadBagItemListBuffers(u8 pocketId)
gMultiuseListMenuTemplate.maxShowed = gBagMenu->numShownItems[pocketId];
}
static void GetItemName(u8 *dest, u16 itemId)
static void GetItemNameFromPocket(u8 *dest, u16 itemId)
{
switch (gBagPosition.pocket)
{
@@ -976,7 +976,7 @@ static void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y)
offset = GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 119);
BagMenu_Print(windowId, FONT_NARROW, gStringVar4, offset, y, 0, 0, TEXT_SKIP_DRAW, COLORID_NORMAL);
}
else if (gBagPosition.pocket != KEYITEMS_POCKET && ItemId_GetImportance(itemId) == FALSE)
else if (gBagPosition.pocket != KEYITEMS_POCKET && GetItemImportance(itemId) == FALSE)
{
// Print item quantity
ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, BAG_ITEM_CAPACITY_DIGITS);
@@ -998,7 +998,7 @@ static void PrintItemDescription(int itemIndex)
const u8 *str;
if (itemIndex != LIST_CANCEL)
{
str = ItemId_GetDescription(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, itemIndex));
str = GetItemDescription(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, itemIndex));
}
else
{
@@ -1533,7 +1533,7 @@ static void OpenContextMenu(u8 taskId)
{
case ITEMMENULOCATION_BATTLE:
case ITEMMENULOCATION_WALLY:
if (ItemId_GetBattleUsage(gSpecialVar_ItemId))
if (GetItemBattleUsage(gSpecialVar_ItemId))
{
gBagMenu->contextMenuItemsPtr = sContextMenuItems_BattleUse;
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BattleUse);
@@ -1549,7 +1549,7 @@ static void OpenContextMenu(u8 taskId)
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BerryBlenderCrush);
break;
case ITEMMENULOCATION_APPRENTICE:
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
if (!GetItemImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
{
gBagMenu->contextMenuItemsPtr = sContextMenuItems_Apprentice;
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Apprentice);
@@ -1561,7 +1561,7 @@ static void OpenContextMenu(u8 taskId)
}
break;
case ITEMMENULOCATION_FAVOR_LADY:
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
if (!GetItemImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
{
gBagMenu->contextMenuItemsPtr = sContextMenuItems_FavorLady;
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_FavorLady);
@@ -1573,7 +1573,7 @@ static void OpenContextMenu(u8 taskId)
}
break;
case ITEMMENULOCATION_QUIZ_LADY:
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
if (!GetItemImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
{
gBagMenu->contextMenuItemsPtr = sContextMenuItems_QuizLady;
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_QuizLady);
@@ -1785,10 +1785,10 @@ static void RemoveContextWindow(void)
static void ItemMenu_UseOutOfBattle(u8 taskId)
{
if (ItemId_GetFieldFunc(gSpecialVar_ItemId))
if (GetItemFieldFunc(gSpecialVar_ItemId))
{
RemoveContextWindow();
if (CalculatePlayerPartyCount() == 0 && ItemId_GetType(gSpecialVar_ItemId) == ITEM_USE_PARTY_MENU)
if (CalculatePlayerPartyCount() == 0 && GetItemType(gSpecialVar_ItemId) == ITEM_USE_PARTY_MENU)
{
PrintThereIsNoPokemon(taskId);
}
@@ -1797,7 +1797,7 @@ static void ItemMenu_UseOutOfBattle(u8 taskId)
FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
ScheduleBgCopyTilemapToVram(0);
if (gBagPosition.pocket != BERRIES_POCKET)
ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
GetItemFieldFunc(gSpecialVar_ItemId)(taskId);
else
ItemUseOutOfBattle_Berry(taskId);
}
@@ -1926,7 +1926,7 @@ static void ItemMenu_Give(u8 taskId)
{
DisplayItemMessage(taskId, FONT_NORMAL, gText_CantWriteMail, HandleErrorMessage);
}
else if (!ItemId_GetImportance(gSpecialVar_ItemId))
else if (!GetItemImportance(gSpecialVar_ItemId))
{
if (CalculatePlayerPartyCount() == 0)
{
@@ -1985,10 +1985,10 @@ static void ItemMenu_Cancel(u8 taskId)
static void ItemMenu_UseInBattle(u8 taskId)
{
if (ItemId_GetBattleFunc(gSpecialVar_ItemId))
if (GetItemBattleFunc(gSpecialVar_ItemId))
{
RemoveContextWindow();
ItemId_GetBattleFunc(gSpecialVar_ItemId)(taskId);
GetItemBattleFunc(gSpecialVar_ItemId)(taskId);
}
}
@@ -2009,7 +2009,7 @@ static void Task_ItemContext_GiveToParty(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeldHere);
DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, HandleErrorMessage);
}
else if (gBagPosition.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
else if (gBagPosition.pocket != KEYITEMS_POCKET && !GetItemImportance(gSpecialVar_ItemId))
{
Task_FadeAndCloseBagMenu(taskId);
}
@@ -2024,7 +2024,7 @@ static void Task_ItemContext_GiveToPC(u8 taskId)
{
if (ItemIsMail(gSpecialVar_ItemId) == TRUE)
DisplayItemMessage(taskId, FONT_NORMAL, gText_CantWriteMail, HandleErrorMessage);
else if (gBagPosition.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
else if (gBagPosition.pocket != KEYITEMS_POCKET && !GetItemImportance(gSpecialVar_ItemId))
gTasks[taskId].func = Task_FadeAndCloseBagMenu;
else
PrintItemCantBeHeld(taskId);
@@ -2049,7 +2049,7 @@ bool8 UseRegisteredKeyItemOnField(void)
PlayerFreeze();
StopPlayerAvatar();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8);
taskId = CreateTask(GetItemFieldFunc(gSaveBlock1Ptr->registeredItem), 8);
gTasks[taskId].tUsingRegisteredKeyItem = TRUE;
return TRUE;
}
@@ -2068,7 +2068,7 @@ static void Task_ItemContext_Sell(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (ItemId_GetPrice(gSpecialVar_ItemId) == 0)
if (GetItemPrice(gSpecialVar_ItemId) == 0)
{
CopyItemName(gSpecialVar_ItemId, gStringVar2);
StringExpandPlaceholders(gStringVar4, gText_CantBuyKeyItem);
@@ -2095,7 +2095,7 @@ static void DisplaySellItemPriceAndConfirm(u8 taskId)
{
s16 *data = gTasks[taskId].data;
ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar1, (GetItemPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_ICanPayVar1);
DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, AskSellItems);
}
@@ -2120,7 +2120,7 @@ static void InitSellHowManyInput(u8 taskId)
s16 *data = gTasks[taskId].data;
u8 windowId = BagMenu_AddWindow(ITEMWIN_QUANTITY_WIDE);
PrintItemSoldAmount(windowId, 1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
PrintItemSoldAmount(windowId, 1, (GetItemPrice(gSpecialVar_ItemId) / 2) * tItemCount);
DisplayCurrentMoneyWindow();
gTasks[taskId].func = Task_ChooseHowManyToSell;
}
@@ -2131,7 +2131,7 @@ static void Task_ChooseHowManyToSell(u8 taskId)
if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
{
PrintItemSoldAmount(gBagMenu->windowIds[ITEMWIN_QUANTITY_WIDE], tItemCount, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
PrintItemSoldAmount(gBagMenu->windowIds[ITEMWIN_QUANTITY_WIDE], tItemCount, (GetItemPrice(gSpecialVar_ItemId) / 2) * tItemCount);
}
else if (JOY_NEW(A_BUTTON))
{
@@ -2155,7 +2155,7 @@ static void ConfirmSell(u8 taskId)
s16 *data = gTasks[taskId].data;
CopyItemName(gSpecialVar_ItemId, gStringVar2);
ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar1, (GetItemPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverVar1ForVar2);
DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, SellItem);
}
@@ -2168,7 +2168,7 @@ static void SellItem(u8 taskId)
PlaySE(SE_SHOP);
RemoveBagItem(gSpecialVar_ItemId, tItemCount);
AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
AddMoney(&gSaveBlock1Ptr->money, (GetItemPrice(gSpecialVar_ItemId) / 2) * tItemCount);
DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
UpdatePocketItemList(gBagPosition.pocket);
UpdatePocketListPosition(gBagPosition.pocket);
@@ -2238,7 +2238,7 @@ static void TryDepositItem(u8 taskId)
s16 *data = gTasks[taskId].data;
FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
if (ItemId_GetImportance(gSpecialVar_ItemId))
if (GetItemImportance(gSpecialVar_ItemId))
{
// Can't deposit important items
BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, COLORID_NORMAL);

18
src/item_use.c
View File

@@ -101,7 +101,7 @@ static void SetUpItemUseCallback(u8 taskId)
if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY)
type = gTasks[taskId].tEnigmaBerryType - 1;
else
type = ItemId_GetType(gSpecialVar_ItemId) - 1;
type = GetItemType(gSpecialVar_ItemId) - 1;
if (!InBattlePyramid())
{
gBagMenu->newScreenCallback = sItemUseCallbacks[type];
@@ -175,9 +175,9 @@ static void Task_CloseCantUseKeyItemMessage(u8 taskId)
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
{
if (ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_TMHM)
if (GetItemFieldFunc(itemId) == ItemUseOutOfBattle_TMHM)
return 1;
else if (ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_EvolutionStone)
else if (GetItemFieldFunc(itemId) == ItemUseOutOfBattle_EvolutionStone)
return 2;
else
return 0;
@@ -225,7 +225,7 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
static void ItemUseOnFieldCB_Bike(u8 taskId)
{
if (ItemId_GetSecondaryId(gSpecialVar_ItemId) == MACH_BIKE)
if (GetItemSecondaryId(gSpecialVar_ItemId) == MACH_BIKE)
GetOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE);
else // ACRO_BIKE
GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE);
@@ -279,7 +279,7 @@ void ItemUseOutOfBattle_Rod(u8 taskId)
static void ItemUseOnFieldCB_Rod(u8 taskId)
{
StartFishing(ItemId_GetSecondaryId(gSpecialVar_ItemId));
StartFishing(GetItemSecondaryId(gSpecialVar_ItemId));
DestroyTask(taskId);
}
@@ -692,7 +692,7 @@ void ItemUseOutOfBattle_Berry(u8 taskId)
}
else
{
ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
GetItemFieldFunc(gSpecialVar_ItemId)(taskId);
}
}
@@ -828,8 +828,8 @@ static void RemoveUsedItem(void)
StringExpandPlaceholders(gStringVar4, gText_PlayerUsedVar2);
if (!InBattlePyramid())
{
UpdatePocketItemList(ItemId_GetPocket(gSpecialVar_ItemId));
UpdatePocketListPosition(ItemId_GetPocket(gSpecialVar_ItemId));
UpdatePocketItemList(GetItemPocket(gSpecialVar_ItemId));
UpdatePocketListPosition(GetItemPocket(gSpecialVar_ItemId));
}
else
{
@@ -864,7 +864,7 @@ static void Task_UseRepel(u8 taskId)
{
if (!IsSEPlaying())
{
VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId));
VarSet(VAR_REPEL_STEP_COUNT, GetItemHoldEffectParam(gSpecialVar_ItemId));
RemoveUsedItem();
if (!InBattlePyramid())
DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, CloseItemMessage);

4
src/lilycove_lady.c
View File

@@ -192,7 +192,7 @@ bool8 HasAnotherPlayerGivenFavorLadyItem(void)
static void BufferItemName(u8 *dest, u16 itemId)
{
StringCopy(dest, ItemId_GetName(itemId));
StringCopy(dest, GetItemName(itemId));
}
void BufferFavorLadyItemName(void)
@@ -451,7 +451,7 @@ static u8 GetPlayerNameLength(const u8 *playerName)
void BufferQuizPrizeName(void)
{
StringCopy(gStringVar1, ItemId_GetName(sQuizLadyPtr->prize));
StringCopy(gStringVar1, GetItemName(sQuizLadyPtr->prize));
}
bool8 BufferQuizAuthorNameAndCheckIfLady(void)

6
src/player_pc.c
View File

@@ -1051,7 +1051,7 @@ static void ItemStorage_PrintDescription(s32 id)
// Get item description (or Cancel text)
if (id != LIST_CANCEL)
description = (u8 *)ItemId_GetDescription(gSaveBlock1Ptr->pcItems[id].itemId);
description = (u8 *)GetItemDescription(gSaveBlock1Ptr->pcItems[id].itemId);
else
description = ItemStorage_GetMessage(MSG_GO_BACK_TO_PREV);
@@ -1195,7 +1195,7 @@ static const u8 *ItemStorage_GetMessage(u16 itemId)
string = gText_MoveVar1Where;
break;
default:
string = ItemId_GetDescription(itemId);
string = GetItemDescription(itemId);
break;
}
return string;
@@ -1447,7 +1447,7 @@ static void ItemStorage_DoItemToss(u8 taskId)
s16 *data = gTasks[taskId].data;
u16 pos = gPlayerPCItemPageInfo.cursorPos + gPlayerPCItemPageInfo.itemsAbove;
if (!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[pos].itemId))
if (!GetItemImportance(gSaveBlock1Ptr->pcItems[pos].itemId))
{
// Show toss confirmation prompt
CopyItemName(gSaveBlock1Ptr->pcItems[pos].itemId, gStringVar1);

2
src/pokeblock.c
View File

@@ -699,7 +699,7 @@ static void DrawPokeblockMenuTitleText(void)
{
u8 i;
const u8 *itemName = ItemId_GetName(ITEM_POKEBLOCK_CASE);
const u8 *itemName = GetItemName(ITEM_POKEBLOCK_CASE);
PrintOnPokeblockWindow(WIN_TITLE, itemName, GetStringCenterAlignXOffset(FONT_NORMAL, itemName, 0x48));
PrintOnPokeblockWindow(WIN_SPICY, gText_Spicy, 0);

16
src/pokemon.c
View File

@@ -3139,8 +3139,8 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
}
else
{
attackerHoldEffect = ItemId_GetHoldEffect(attacker->item);
attackerHoldEffectParam = ItemId_GetHoldEffectParam(attacker->item);
attackerHoldEffect = GetItemHoldEffect(attacker->item);
attackerHoldEffectParam = GetItemHoldEffectParam(attacker->item);
}
// Get defender hold item info
@@ -3151,8 +3151,8 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
}
else
{
defenderHoldEffect = ItemId_GetHoldEffect(defender->item);
defenderHoldEffectParam = ItemId_GetHoldEffectParam(defender->item);
defenderHoldEffect = GetItemHoldEffect(defender->item);
defenderHoldEffectParam = GetItemHoldEffectParam(defender->item);
}
if (attacker->ability == ABILITY_HUGE_POWER || attacker->ability == ABILITY_PURE_POWER)
@@ -4755,7 +4755,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
}
else
{
holdEffect = ItemId_GetHoldEffect(heldItem);
holdEffect = GetItemHoldEffect(heldItem);
}
// Get battler id (if relevant)
@@ -5489,7 +5489,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem)
if (heldItem == ITEM_ENIGMA_BERRY)
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
else
holdEffect = ItemId_GetHoldEffect(heldItem);
holdEffect = GetItemHoldEffect(heldItem);
// Prevent evolution with Everstone, unless we're just viewing the party menu with an evolution item
if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && mode != EVO_MODE_ITEM_CHECK)
@@ -5905,7 +5905,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event)
}
else
{
holdEffect = ItemId_GetHoldEffect(heldItem);
holdEffect = GetItemHoldEffect(heldItem);
}
if (species && species != SPECIES_EGG)
@@ -6015,7 +6015,7 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
}
else
{
holdEffect = ItemId_GetHoldEffect(heldItem);
holdEffect = GetItemHoldEffect(heldItem);
}
if (holdEffect == HOLD_EFFECT_MACHO_BRACE)

8
src/pokemon_storage_system.c
View File

@@ -6983,7 +6983,7 @@ static void SetDisplayMonData(void *pokemon, u8 mode)
txtPtr[1] = EOS;
if (sStorage->displayMonItemId != ITEM_NONE)
StringCopyPadded(sStorage->displayMonItemName, ItemId_GetName(sStorage->displayMonItemId), CHAR_SPACE, 8);
StringCopyPadded(sStorage->displayMonItemName, GetItemName(sStorage->displayMonItemId), CHAR_SPACE, 8);
else
StringFill(sStorage->displayMonItemName, CHAR_SPACE, 8);
}
@@ -8986,7 +8986,7 @@ static bool8 IsMovingItem(void)
static const u8 *GetMovingItemName(void)
{
return ItemId_GetName(sStorage->movingItemId);
return GetItemName(sStorage->movingItemId);
}
static u16 GetMovingItemId(void)
@@ -9181,9 +9181,9 @@ static void PrintItemDescription(void)
const u8 *description;
if (IsMovingItem())
description = ItemId_GetDescription(sStorage->movingItemId);
description = GetItemDescription(sStorage->movingItemId);
else
description = ItemId_GetDescription(sStorage->displayMonItemId);
description = GetItemDescription(sStorage->displayMonItemId);
FillWindowPixelBuffer(WIN_ITEM_DESC, PIXEL_FILL(1));
AddTextPrinterParameterized5(WIN_ITEM_DESC, FONT_NORMAL, description, 4, 0, 0, NULL, 0, 1);

2
src/pokemon_summary_screen.c
View File

@@ -3324,7 +3324,7 @@ static void PrintHeldItemName(void)
&& IsMultiBattle() == TRUE
&& (sMonSummaryScreen->curMonIndex == 1 || sMonSummaryScreen->curMonIndex == 4 || sMonSummaryScreen->curMonIndex == 5))
{
text = ItemId_GetName(ITEM_ENIGMA_BERRY);
text = GetItemName(ITEM_ENIGMA_BERRY);
}
else if (sMonSummaryScreen->summary.item == ITEM_NONE)
{

10
src/shop.c
View File

@@ -603,7 +603,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, s
if (item != LIST_CANCEL)
{
if (sMartInfo.martType == MART_TYPE_NORMAL)
description = ItemId_GetDescription(item);
description = GetItemDescription(item);
else
description = gDecorations[item].description;
}
@@ -626,7 +626,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, u32 itemId, u8 y)
{
ConvertIntToDecimalStringN(
gStringVar1,
ItemId_GetPrice(itemId) >> IsPokeNewsActive(POKENEWS_SLATEPORT),
GetItemPrice(itemId) >> IsPokeNewsActive(POKENEWS_SLATEPORT),
STR_CONV_MODE_LEFT_ALIGN,
5);
}
@@ -985,7 +985,7 @@ static void Task_BuyMenu(u8 taskId)
BuyMenuPrintCursor(tListTaskId, COLORID_GRAY_CURSOR);
if (sMartInfo.martType == MART_TYPE_NORMAL)
sShopData->totalCost = (ItemId_GetPrice(itemId) >> IsPokeNewsActive(POKENEWS_SLATEPORT));
sShopData->totalCost = (GetItemPrice(itemId) >> IsPokeNewsActive(POKENEWS_SLATEPORT));
else
sShopData->totalCost = gDecorations[itemId].price;
@@ -998,7 +998,7 @@ static void Task_BuyMenu(u8 taskId)
if (sMartInfo.martType == MART_TYPE_NORMAL)
{
CopyItemName(itemId, gStringVar1);
if (ItemId_GetPocket(itemId) == POCKET_TM_HM)
if (GetItemPocket(itemId) == POCKET_TM_HM)
{
StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]);
BuyMenuDisplayMessage(taskId, gText_Var1CertainlyHowMany2, Task_BuyHowManyDialogueInit);
@@ -1058,7 +1058,7 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId)
if (AdjustQuantityAccordingToDPadInput(&tItemCount, sShopData->maxQuantity) == TRUE)
{
sShopData->totalCost = (ItemId_GetPrice(tItemId) >> IsPokeNewsActive(POKENEWS_SLATEPORT)) * tItemCount;
sShopData->totalCost = (GetItemPrice(tItemId) >> IsPokeNewsActive(POKENEWS_SLATEPORT)) * tItemCount;
BuyMenuPrintItemQuantityAndPrice(taskId);
}
else

24
src/tv.c
View File

@@ -2807,7 +2807,7 @@ static void SmartShopper_BufferPurchaseTotal(u8 varIdx, TVShow *show)
for (i = 0; i < SMARTSHOPPER_NUM_ITEMS; i++)
{
if (show->smartshopperShow.itemIds[i] != ITEM_NONE)
price += ItemId_GetPrice(show->smartshopperShow.itemIds[i]) * show->smartshopperShow.itemAmounts[i];
price += GetItemPrice(show->smartshopperShow.itemIds[i]) * show->smartshopperShow.itemAmounts[i];
}
if (show->smartshopperShow.priceReduced == TRUE)
@@ -4489,7 +4489,7 @@ static void DoTVShowTodaysSmartShopper(void)
break;
case SMARTSHOPPER_STATE_CLERK_NORMAL:
TVShowConvertInternationalString(gStringVar1, show->smartshopperShow.playerName, show->smartshopperShow.language);
StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[0]));
StringCopy(gStringVar2, GetItemName(show->smartshopperShow.itemIds[0]));
ConvertIntToDecimalString(2, show->smartshopperShow.itemAmounts[0]);
// Pick a random comment (SMARTSHOPPER_STATE_RAND_COMMENT_#)
sTVShowState += SMARTSHOPPER_STATE_CLERK_NORMAL + (Random() % (SMARTSHOPPER_STATE_RAND_COMMENT_4 - SMARTSHOPPER_STATE_RAND_COMMENT_1 + 1));
@@ -4511,7 +4511,7 @@ static void DoTVShowTodaysSmartShopper(void)
break;
case SMARTSHOPPER_STATE_SECOND_ITEM:
// Clerk describes 2nd type of item player purchased
StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[1]));
StringCopy(gStringVar2, GetItemName(show->smartshopperShow.itemIds[1]));
ConvertIntToDecimalString(2, show->smartshopperShow.itemAmounts[1]);
if (show->smartshopperShow.itemIds[2] != ITEM_NONE)
sTVShowState = SMARTSHOPPER_STATE_THIRD_ITEM;
@@ -4522,7 +4522,7 @@ static void DoTVShowTodaysSmartShopper(void)
break;
case SMARTSHOPPER_STATE_THIRD_ITEM:
// Clerk describes 3rd type of item player purchased
StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[2]));
StringCopy(gStringVar2, GetItemName(show->smartshopperShow.itemIds[2]));
ConvertIntToDecimalString(2, show->smartshopperShow.itemAmounts[2]);
if (show->smartshopperShow.priceReduced == TRUE)
sTVShowState = SMARTSHOPPER_STATE_DURING_SALE;
@@ -4550,7 +4550,7 @@ static void DoTVShowTodaysSmartShopper(void)
case SMARTSHOPPER_STATE_CLERK_MAX:
// Clerk's comments if player purchased maximum number of 1st item
TVShowConvertInternationalString(gStringVar1, show->smartshopperShow.playerName, show->smartshopperShow.language);
StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[0]));
StringCopy(gStringVar2, GetItemName(show->smartshopperShow.itemIds[0]));
if (show->smartshopperShow.priceReduced == TRUE)
sTVShowState = SMARTSHOPPER_STATE_DURING_SALE;
else
@@ -4674,7 +4674,7 @@ static void DoTVShowPokemonTodaySuccessfulCapture(void)
sTVShowState = 2;
break;
case 2:
StringCopy(gStringVar2, ItemId_GetName(show->pokemonToday.ball));
StringCopy(gStringVar2, GetItemName(show->pokemonToday.ball));
ConvertIntToDecimalString(2, show->pokemonToday.nBallsUsed);
if (show->pokemonToday.nBallsUsed < 4)
sTVShowState = 3;
@@ -5714,7 +5714,7 @@ static void DoTVShowHoennTreasureInvestigators(void)
switch (state)
{
case 0:
StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item));
StringCopy(gStringVar1, GetItemName(show->treasureInvestigators.item));
if (show->treasureInvestigators.location == MAPSEC_DYNAMIC)
{
switch (show->treasureInvestigators.mapLayoutId)
@@ -5735,13 +5735,13 @@ static void DoTVShowHoennTreasureInvestigators(void)
}
break;
case 1:
StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item));
StringCopy(gStringVar1, GetItemName(show->treasureInvestigators.item));
TVShowConvertInternationalString(gStringVar2, show->treasureInvestigators.playerName, show->treasureInvestigators.language);
GetMapName(gStringVar3, show->treasureInvestigators.location, 0);
TVShowDone();
break;
case 2:
StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item));
StringCopy(gStringVar1, GetItemName(show->treasureInvestigators.item));
TVShowConvertInternationalString(gStringVar2, show->treasureInvestigators.playerName, show->treasureInvestigators.language);
TVShowDone();
break;
@@ -5849,7 +5849,7 @@ static void DoTVShowBreakingNewsTV(void)
break;
case 3:
ConvertIntToDecimalString(0, show->breakingNews.balls);
StringCopy(gStringVar2, ItemId_GetName(show->breakingNews.caughtMonBall));
StringCopy(gStringVar2, GetItemName(show->breakingNews.caughtMonBall));
sTVShowState = 4;
break;
case 4:
@@ -6011,7 +6011,7 @@ static void DoTVShowPokemonLotteryWinnerFlashReport(void)
StringCopy(gStringVar2, gText_Second);
else
StringCopy(gStringVar2, gText_Third);
StringCopy(gStringVar3, ItemId_GetName(show->lottoWinner.item));
StringCopy(gStringVar3, GetItemName(show->lottoWinner.item));
TVShowDone();
ShowFieldMessage(sTVPokemonLotteryWinnerFlashReportTextGroup[state]);
}
@@ -6695,7 +6695,7 @@ static void DoTVShowSecretBaseSecrets(void)
sTVShowState = show->secretBaseSecrets.savedState;
break;
case SBSECRETS_STATE_USED_BAG:
StringCopy(gStringVar2, ItemId_GetName(show->secretBaseSecrets.item));
StringCopy(gStringVar2, GetItemName(show->secretBaseSecrets.item));
sTVShowState = show->secretBaseSecrets.savedState;
break;
case SBSECRETS_STATE_USED_CUSHION: