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

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