ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-19 09:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Included PR that was accidentally merged into BE

Browse Source
This commit is contained in:
Eduardo Quezada 2022-08-24 18:37:25 -04:00
commit 30594a9773
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/battle_script_commands.c
View File

@ -10571,19 +10571,20 @@ static void Cmd_setmultihitcounter(void)
} }
else if (B_MULTI_HIT_CHANCE >= GEN_5) else if (B_MULTI_HIT_CHANCE >= GEN_5)
{ {
// 2 and 3 hits: 33.3% // Based on Gen 5's odds
// 4 and 5 hits: 16.7% // 35% for 2 hits
gMultiHitCounter = Random() % 4; // 35% for 3 hits
if (gMultiHitCounter > 2) // 15% for 4 hits
{ // 15% for 5 hits
gMultiHitCounter = (Random() % 3); gMultiHitCounter = Random() % 100;
if (gMultiHitCounter < 2) if (gMultiHitCounter < 35)
gMultiHitCounter = 2; gMultiHitCounter = 2;
else else if (gMultiHitCounter < 35 + 35)
gMultiHitCounter = 3; gMultiHitCounter = 3;
} else if (gMultiHitCounter < 35 + 35 + 15)
gMultiHitCounter = 4;
else else
gMultiHitCounter += 3; gMultiHitCounter = 5;
} }
else else
{ {