diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-29 16:44:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-29 16:44:37 -0500 |
| commit | 2a263629a40e201b1702e2f4e65f1c61360cc2b2 (patch) | |
| tree | fd05f8f0ad49d88b032dc9e10af85a42dfa0e402 /main.asm | |
| parent | 9bbb65166e4f7674bbdec7b1314b0cf42b43a923 (diff) | |
Item effects, post-battle, and decoration flags
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -6743,7 +6743,7 @@ MoveDescriptions:: ; 2cb52 INCLUDE "battle/moves/move_descriptions.asm" ; 2ed44 -Function2ed44: ; 2ed44 +GivePokerusAndConvertBerries: ; 2ed44 call ConvertBerriesToBerryJuice ld hl, PartyMon1PokerusStatus ld a, [PartyCount] @@ -6784,12 +6784,11 @@ Function2ed44: ; 2ed44 jr z, .randomPokerusLoop ld b, a and $f0 - jr z, .asm_2ed91 + jr z, .load_pkrs ld a, b and $7 inc a - -.asm_2ed91 +.load_pkrs ld b, a swap b and $3 @@ -6800,10 +6799,10 @@ Function2ed44: ; 2ed44 .monHasActivePokerus call Random - cp $55 + cp 1 + 33 percent ret nc ; 1/3 chance ld a, [PartyCount] - cp $1 + cp 1 ret z ; only one mon, nothing to do ld c, [hl] ld a, b |