Cannot use Belch after using Stuff Cheeks

[AsparagusEduardo]

Description

EDIT: Also happens in master (5498098).

In-game:

Used the following test as well:

SINGLE_BATTLE_TEST("Belch cannot be used if the user hasn't eaten a berry")
{
    u16 item = 0;
    PARAMETRIZE { item = ITEM_NONE; }
    PARAMETRIZE { item = ITEM_ORAN_BERRY; }
    GIVEN {
        PLAYER(SPECIES_SKWOVET) { Item(item); }
        OPPONENT(SPECIES_WOBBUFFET);
    } WHEN {
        if (item == ITEM_NONE)
            TURN { MOVE(player, MOVE_BELCH, allowed: FALSE); MOVE(player, MOVE_CELEBRATE); }
        else {
            TURN { MOVE(player, MOVE_STUFF_CHEEKS); }
            TURN { MOVE(player, MOVE_BELCH); }
        }
    } SCENE {
        if (item == ITEM_NONE) {
            ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player);
        }
        else {
            ANIMATION(ANIM_TYPE_MOVE, MOVE_STUFF_CHEEKS, player);
            ANIMATION(ANIM_TYPE_MOVE, MOVE_BELCH, player);
        }
    }
}

Version

upcoming (Edge)

Upcoming Version

4a3954f

Discord contact info

AsparagusEduardo

[AlexOn1ine]

Consuming a Berry through other means (such as Natural Gift, using Fling, or its Trainer giving it a Berry from the Bag) will not enable Belch to be used.

Would this apply here?

[AsparagusEduardo]

Would this apply here?

I don't understand the question.

[Bassoonian]

I think Alex means this may very well be intended vanilla behaviour. Someone should probably test in a vanilla game

[AlexOn1ine]

Tested on showdown and it does seem like a bug

Dragonite used Agility!
Dragonite's Speed rose sharply!

The opposing Skwovet used Stuff Cheeks!
The opposing Skwovet's Defense rose sharply!
(The opposing Skwovet ate its Liechi Berry!)
The Liechi Berry raised the opposing Skwovet's Attack!

Turn 2

Dragonite, come back!
Go! Dragapult!

The opposing Skwovet used Belch!
It's not very effective...
(Dragapult lost 6.6% of its health!)

[ZnogyroP]

This should probably be handled in the consumeberry macro and by extension VARIOUS_CONSUME_BERRY (which I assume will also be rewritten as a callnative), because that covers other edge cases that are also presumably not working, such as eating a berry from Fling (someone Flings a berry at you and you eat it, not you Flinging a berry), Bug Bite / Pluck, and Teatime. Just setting the ateBerry bit for the battler

[AlexOn1ine]

I found the problem but I am not sure what the best solution would be.

If you change the test to add an HP amount the test passes.

- PLAYER(SPECIES_SKWOVET) { Item(item); }
+ PLAYER(SPECIES_SKWOVET) { MaxHP(100); HP(90); Item(item); }

Reason is that ItemHealHp returns 0 (any reason this isn't using ITEM_NO_EFFECT?) which then never sets ateBerry

I'm not sure where to best catch it though

/Edit: A different question is, is this even a bug then? That is not clear. Stuff checks let's you consume the berry but technically you haven't eaten eat?

/Edit: It looks like ateBerry is not set anywhere?

[AsparagusEduardo]

/Edit: It looks like ateBerry is not set anywhere?

It's apparently being set at the end ItemBattleEffects

[AlexOn1ine]

/Edit: It looks like ateBerry is not set anywhere?

It's apparently being set at the end ItemBattleEffects

Oh right, I missed that one.

ateBerry could be added to consume berry various (changed to a callnative in the process) but I'm not sure if it is optimal.