From 3f1ee4f945ddb9109ed3da0fc852316c0f8a4727 Mon Sep 17 00:00:00 2001
From: Mike-Goutokuji <83477269+mike-goutokuji@users.noreply.github.com>
Date: Fri, 12 Jun 2026 15:04:58 -0400
Subject: [PATCH] BUGFIX: Zigagoon can hold an oran berry even when zeroed out

ORAS does not have this. It seems to be unintentional. BATTLE_TYPE_FIRST_BATTLE was never set.
---
 src/pokemon.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pokemon.c b/src/pokemon.c
index 9245fc012c68..34946aeafa51 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -6663,7 +6663,12 @@ static s32 GetWildMonTableIdInAlteringCave(u16 species)
 
 void SetWildMonHeldItem(void)
 {
+    // BUG: Zigzagoon can hold an oran berry because this function is called.
+    #if !BUGFIX
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_PIKE)))
+    #else
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_PIKE | BATTLE_TYPE_FIRST_BATTLE)))
+    #endif
     {
         u16 rnd = Random() % 100;
         u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0);