summaryrefslogtreecommitdiff
path: root/engine/battle/core.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-04 21:21:34 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-04 21:21:34 -0500
commitbc3cc697494d1212b8fed9273d72f0448f24b1d5 (patch)
tree45554b5e0393e06f8618e2584de5122a4aca2ea1 /engine/battle/core.asm
parentd6b00d0cc177b3a94b477735fd165232614a6cee (diff)
Consistent "X percent [+/- Y]" order
Diffstat (limited to 'engine/battle/core.asm')
-rw-r--r--engine/battle/core.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 419129e10..a1ccc0340 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -463,13 +463,13 @@ DetermineMoveOrder: ; 3c314
jr z, .player_2
call BattleRandom
- cp 1 + (50 percent)
+ cp 50 percent + 1
jp c, .player_first
jp .enemy_first
.player_2
call BattleRandom
- cp 1 + (50 percent)
+ cp 50 percent + 1
jp c, .enemy_first
jp .player_first
@@ -549,13 +549,13 @@ DetermineMoveOrder: ; 3c314
cp USING_INTERNAL_CLOCK
jr z, .player_2c
call BattleRandom
- cp 1 + (50 percent)
+ cp 50 percent + 1
jp c, .player_first
jp .enemy_first
.player_2c
call BattleRandom
- cp 1 + (50 percent)
+ cp 50 percent + 1
jp c, .enemy_first
.player_first
scf
@@ -791,7 +791,7 @@ TryEnemyFlee: ; 3c543
call BattleRandom
ld b, a
- cp 1 + (50 percent)
+ cp 50 percent + 1
jr nc, .Stay
push bc
@@ -803,7 +803,7 @@ TryEnemyFlee: ; 3c543
jr c, .Flee
ld a, b
- cp 1 + (10 percent)
+ cp 10 percent + 1
jr nc, .Stay
ld a, [wTempEnemyMonSpecies]
@@ -6177,7 +6177,7 @@ LoadEnemyMon: ; 3e8eb
; 25% chance of getting an item
call BattleRandom
- cp 1 + (75 percent)
+ cp 75 percent + 1
ld a, NO_ITEM
jr c, .UpdateItem