atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
This commit is contained in:
Bassoonian 2023-01-11 14:11:47 +01:00 committed by GitHub
parent 333917941b
commit 3b4cba9b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/battle_util.c
View file

@ -8033,10 +8033,10 @@ u8 IsMonDisobedient(void)
return 0; return 0;
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
return 0; return 0;
#if B_OBEDIENCE_MECHANICS < GEN_8 #if B_OBEDIENCE_MECHANICS < GEN_8
if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName)) if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName))
return 0; return 0;
#endif #endif
if (FlagGet(FLAG_BADGE08_GET)) if (FlagGet(FLAG_BADGE08_GET))
return 0; return 0;
@ -8050,11 +8050,13 @@ u8 IsMonDisobedient(void)
obedienceLevel = 70; obedienceLevel = 70;
} }
#if B_OBEDIENCE_MECHANICS >= GEN_8 #if B_OBEDIENCE_MECHANICS >= GEN_8
if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName)) if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName))
levelReferenced = gBattleMons[gBattlerAttacker].metLevel; levelReferenced = gBattleMons[gBattlerAttacker].metLevel;
else else
#endif #else
if (gBattleMons[gBattlerAttacker].level <= obedienceLevel)
#endif
levelReferenced = gBattleMons[gBattlerAttacker].level; levelReferenced = gBattleMons[gBattlerAttacker].level;
if (levelReferenced <= obedienceLevel) if (levelReferenced <= obedienceLevel)