diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /engine/radio.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'engine/radio.asm')
| -rw-r--r-- | engine/radio.asm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engine/radio.asm b/engine/radio.asm index 678fc05d5..ce3bc7942 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -139,7 +139,7 @@ PrintRadioLine: cp 2 jr nz, .print bccoord 1, 16 - call PlaceWholeStringInBoxAtOnce + call PlaceHLTextAtBC jr .skip .print call PrintTextBoxText @@ -201,10 +201,11 @@ OaksPkmnTalk3: OaksPkmnTalk4: ; Choose a random route, and a random Pokemon from that route. +.sample call Random and $1f - cp $f - jr nc, OaksPkmnTalk4 + cp $f ; so wasteful + jr nc, .sample ; We now have a number between 0 and 14. ld hl, .routes ld c, a @@ -1576,7 +1577,8 @@ BuenasPassword4: ; There are only 11 groups to choose from. .greater_than_11 call Random - and $f + maskbits NUM_PASSWORD_CATEGORIES + and x cp NUM_PASSWORD_CATEGORIES jr nc, .greater_than_11 ; Store it in the high nybble of e. |