Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion

This commit is contained in:
Evan 2020-12-19 22:13:37 -07:00
commit f05249c8da

View File

@ -9786,7 +9786,7 @@ static void Cmd_handleballthrow(void)
#ifdef POKEMON_EXPANSION #ifdef POKEMON_EXPANSION
if (IS_ULTRA_BEAST(gBattleMons[gBattlerTarget].species)) if (gBaseStats[gBattleMons[gBattlerTarget].species].flags & F_ULTRA_BEAST)
{ {
if (gLastUsedItem == ITEM_BEAST_BALL) if (gLastUsedItem == ITEM_BEAST_BALL)
ballMultiplier = 50; ballMultiplier = 50;