mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-14 23:53:41 +01:00
Merge pull request #2187 from LOuroboros/patch-4
Updated Cmd_handleballthrow
This commit is contained in:
commit
61f2011b36
@ -13586,7 +13586,7 @@ static void Cmd_handleballthrow(void)
|
|||||||
else
|
else
|
||||||
catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate;
|
catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate;
|
||||||
|
|
||||||
#ifdef POKEMON_EXPANSION
|
#if defined POKEMON_EXPANSION && defined ITEM_EXPANSION
|
||||||
if (gBaseStats[gBattleMons[gBattlerTarget].species].flags & FLAG_ULTRA_BEAST)
|
if (gBaseStats[gBattleMons[gBattlerTarget].species].flags & FLAG_ULTRA_BEAST)
|
||||||
{
|
{
|
||||||
if (gLastUsedItem == ITEM_BEAST_BALL)
|
if (gLastUsedItem == ITEM_BEAST_BALL)
|
||||||
@ -13764,7 +13764,7 @@ static void Cmd_handleballthrow(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef POKEMON_EXPANSION
|
#if defined POKEMON_EXPANSION && defined ITEM_EXPANSION
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user