Fix Rivalry boost (#440)

* Fix Rivalry boost https://www.smogon.com/forums/threads/pok%C3%A9mon-showdown-damage-calculator.3593546/page-8#post-8199267 Rivalry and gender is not the same - 0xC00 Rivalry and gender is the same - 0x1400 * Fix Rivalry boost https://www.smogon.com/bw/articles/bw_complete_damage_formula
smogon · Apr 27, 2021 · 0cc3c16 · 0cc3c16
1 parent e06fc9a
commit 0cc3c16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/calc/src/mechanics/gen56.ts b/calc/src/mechanics/gen56.ts
@@ -399,7 +399,7 @@ export function calculateBWXY(
       bpMods.push(0x1400);
       desc.rivalry = 'buffed';
     } else {
-      bpMods.push(0xccd);
+      bpMods.push(0xc00);
       desc.rivalry = 'nerfed';
     }
     desc.attackerAbility = attacker.ability;

diff --git a/calc/src/mechanics/gen78.ts b/calc/src/mechanics/gen78.ts
@@ -786,10 +786,10 @@ export function calculateBPModsSMSS(
 
   if (attacker.hasAbility('Rivalry') && ![attacker.gender, defender.gender].includes('N')) {
     if (attacker.gender === defender.gender) {
-      bpMods.push(0xC00);
+      bpMods.push(0x1400);
       desc.rivalry = 'buffed';
     } else {
-      bpMods.push(0xCCD);
+      bpMods.push(0xC00);
       desc.rivalry = 'nerfed';
     }
     desc.attackerAbility = attacker.ability;