Berries don't work anymore (but they do work fine with Bug Bite!)

[eatthepear]

I believe with the new fix to Bug Bite, berries in general are broken. I tried a battle with an enemy mon holding a Sitrus Berry, got it to less than half health. The message said "Foe Qwilfish's ???????? restored health!" then didn't restore any health. If someone else can confirm on a clean copy of the battle engine, that'd be great!

[BuffelSaft]

Unable to replicate this in a clean copy of upcoming:

[AsparagusEduardo]

@eatthepear please describe the full situation in case you've encountered an edge case.

[eatthepear]

I'm taking a look right now. So far it seems to be working sometimes and not others (it seems the item ID is copied from a different pokemon's itemID). It might be an issue on my end (like a faulty merge conflict or smthn) but will keep y'all updated.

[eatthepear]

It might be a double battle / multi battle issue. In a standard double battle, I had both opponent's mons copying my left mon's item ID (it held a muscle band so the msg printed muscle band).

[eatthepear]

seems to be an issue on my end (just tested in single battle, works incorrectly). I'll close this issue and open a new one if I'm unable to find a difference between rhh and my code.

[eatthepear]

I tested on a clean copy of upcoming. Set lass Tiana to Roxanne's first gym party and gave her first Geodude a Sitrus Berry. My party was the CHEAT START party (lv 20 treecko leading with no item). When the Geodude fell below half HP, it said "Foe Geodude's ?????? restored health" and then didn't restore any health. The use item animation played. Very similar thing happened for her Nosepass holding an Oran Berry in the back.

[eatthepear]

[eatthepear]

Player berries seem to work fine (need to still test for double battles).

[eatthepear]

FOUND THE ISSUE
Ghoulslash most likely accidentally deleted a line while copy pasting functions. In ItemBattleEffects, in the ITEMEFFECT_MOVE_END case, there should be a gLastUsedItem = gBattleMons[battlerId].item; line that's missing! It shoudl just go right below the for loop, as so:

[eatthepear]

If someone can test to make sure this works (i.e. both regular berry activations and bug bite activations work), that'd be great! (This would explain why the message is both playing the wrong thing, as well as the wrong item is set.)

[BuffelSaft]

Turns out the reason I couldn't replicate this was because I forgot to build the ROM after pulling upstream. Can confirm the bug.

[AsparagusEduardo]

#2451