From 7f4accdae4e50af6b43a8c9be2273a915a130077 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Fri, 3 Sep 2021 11:16:16 -0400 Subject: [PATCH] fix room service switching in effect --- src/battle_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/battle_util.c b/src/battle_util.c index 5f5f2e19bc..04b5abdddc 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5826,6 +5826,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) RecordItemEffectBattle(battlerId, HOLD_EFFECT_AIR_BALLOON); break; case HOLD_EFFECT_ROOM_SERVICE: + if (gFieldStatuses & STATUS_FIELD_TRICK_ROOM && gBattleMons[battlerId].statStages[STAT_SPEED] > MIN_STAT_STAGE) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED); @@ -5838,6 +5839,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); effect = ITEM_STATS_CHANGE; } + break; case HOLD_EFFECT_SEEDS: switch (GetBattlerHoldEffectParam(battlerId)) {