diff options
| author | dannye <33dannye@gmail.com> | 2018-03-24 13:41:54 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2018-03-24 13:41:54 -0500 |
| commit | 98f09b6d26b1f83bdf1779cfe63a73b8a4265aef (patch) | |
| tree | 5a3d90215f63e972766f8c78a24134a293e4a16f /engine/items | |
| parent | 91e55dbe0ba2e22f4cdf0b5c33aba3e0845ddd01 (diff) | |
Use rgblink dmg mode
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/items.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index ada4d7db..3bb2ec9e 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -297,7 +297,7 @@ ItemUseBall: pop bc ; b = Rand1 - Status ; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. - ld a, [wEnemyMonCatchRate] + ld a, [wEnemyMonActualCatchRate] cp b jr c, .failedToCapture @@ -325,7 +325,7 @@ ItemUseBall: xor a ld [H_MULTIPLICAND], a ld [H_MULTIPLICAND + 1], a - ld a, [wEnemyMonCatchRate] + ld a, [wEnemyMonActualCatchRate] ld [H_MULTIPLICAND + 2], a ld a, 100 ld [H_MULTIPLIER], a @@ -1434,7 +1434,7 @@ VitaminText: ItemUseBait: ld hl, ThrewBaitText call PrintText - ld hl, wEnemyMonCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate ; catch rate srl [hl] ; halve catch rate ld a, BAIT_ANIM ld hl, wSafariBaitFactor ; bait factor @@ -1444,7 +1444,7 @@ ItemUseBait: ItemUseRock: ld hl, ThrewRockText call PrintText - ld hl, wEnemyMonCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate ; catch rate ld a, [hl] add a ; double catch rate jr nc, .noCarry |