diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
| commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /engine/radio.asm | |
| parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/radio.asm')
| -rw-r--r-- | engine/radio.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/radio.asm b/engine/radio.asm index 99408af48..8760956b2 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -234,7 +234,7 @@ OaksPkmnTalk4: jr z, .done .next dec hl - ld de, WILDMON_GRASS_STRUCTURE_LENGTH + ld de, GRASS_WILDDATA_LENGTH add hl, de jr .loop @@ -249,12 +249,12 @@ endr cp 3 jr z, .loop2 - ld bc, 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY + ld bc, 2 * NUM_GRASSMON call AddNTimes .loop3 ; Choose one of the middle three Pokemon. call Random - and NUM_WILDMONS_PER_AREA_TIME_OF_DAY + and NUM_GRASSMON cp 2 jr c, .loop3 cp 5 |