diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 15:40:43 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 15:40:43 -0500 |
| commit | 3a7f518de4bbced15cbf5bb877a988055de7d063 (patch) | |
| tree | af3a8725138870cd9c3db4eaa29c56fb1422754c /engine/events/pokerus | |
| parent | 4d8528f90329e2ddfac16046ad8bf309ec1887f2 (diff) | |
wStatusFlags/2 bit constants
Diffstat (limited to 'engine/events/pokerus')
| -rw-r--r-- | engine/events/pokerus/pokerus.asm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engine/events/pokerus/pokerus.asm b/engine/events/pokerus/pokerus.asm index d47bcb6c1..ab717407a 100644 --- a/engine/events/pokerus/pokerus.asm +++ b/engine/events/pokerus/pokerus.asm @@ -19,7 +19,7 @@ GivePokerusAndConvertBerries: ; 2ed44 ; If we haven't been to Goldenrod City at least once, ; prevent the contraction of Pokerus. ld hl, wStatusFlags2 - bit 6, [hl] + bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl] ret z call Random ld a, [hRandomAdd] @@ -61,7 +61,7 @@ GivePokerusAndConvertBerries: ; 2ed44 .TrySpreadPokerus: call Random - cp 1 + 33 percent + cp 33 percent + 1 ret nc ; 1/3 chance ld a, [PartyCount] @@ -74,7 +74,7 @@ GivePokerusAndConvertBerries: ; 2ed44 jr c, .checkPreviousMonsLoop ; no more mons after this one, go backwards call Random - cp 1 + 50 percent + cp 50 percent + 1 jr c, .checkPreviousMonsLoop ; 1/2 chance, go backwards .checkFollowingMonsLoop add hl, de @@ -121,14 +121,15 @@ GivePokerusAndConvertBerries: ; 2ed44 ld [hl], a ret -; any berry held by a Shuckle may be converted to berry juice ConvertBerriesToBerryJuice: ; 2ede6 +; If we haven't been to Goldenrod City at least once, +; prevent Shuckle from turning held Berry into Berry Juice. ld hl, wStatusFlags2 - bit 6, [hl] + bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl] ret z call Random - cp $10 - ret nc ; 1/16 chance + cp 6 percent + 1 ; 1/16 chance + ret nc ld hl, PartyMons ld a, [PartyCount] .partyMonLoop |