From 3b4cba9b517d60f2a05e28e98930fd84e618e6a7 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 11 Jan 2023 14:11:47 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: LOuroboros --- src/battle_util.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 9e3aa1eacc..11f733e134 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8033,10 +8033,10 @@ u8 IsMonDisobedient(void) return 0; if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) return 0; - #if B_OBEDIENCE_MECHANICS < GEN_8 - if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName)) - return 0; - #endif + #if B_OBEDIENCE_MECHANICS < GEN_8 + if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName)) + return 0; + #endif if (FlagGet(FLAG_BADGE08_GET)) return 0; @@ -8050,11 +8050,13 @@ u8 IsMonDisobedient(void) obedienceLevel = 70; } - #if B_OBEDIENCE_MECHANICS >= GEN_8 +#if B_OBEDIENCE_MECHANICS >= GEN_8 if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName)) levelReferenced = gBattleMons[gBattlerAttacker].metLevel; else - #endif +#else + if (gBattleMons[gBattlerAttacker].level <= obedienceLevel) +#endif levelReferenced = gBattleMons[gBattlerAttacker].level; if (levelReferenced <= obedienceLevel)