diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-13 13:47:50 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-13 13:47:50 -0400 |
| commit | 7729dcd20420b6ec869bd82c954ced935186bfed (patch) | |
| tree | 3ff69879079dc4adf6462098c86970f2f94dcc2b /engine/overworld | |
| parent | f65448a4c0d6c1b3877ceb8ad138e40669f97c86 (diff) | |
Consistent constants for radio data table sizes (could still be better)
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/wildmons.asm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index 61ef89b18..902226041 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -705,11 +705,14 @@ JumpRoamMons: JumpRoamMon: .loop ld hl, RoamMaps -.innerloop1 ; This loop happens to be unnecessary. - call Random ; Choose a random number. - maskbits NUM_ROAMMON_MAPS ; Mask the number to limit it between 0 and 15. - cp NUM_ROAMMON_MAPS ; If the number is not less than 16, try again. - jr nc, .innerloop1 ; I'm sure you can guess why this check is bogus. +.innerloop1 + ; 0-15 are all valid indexes into RoamMaps, + ; so this retry loop is unnecessary + ; since NUM_ROAMMON_MAPS happens to be 16 + call Random + maskbits NUM_ROAMMON_MAPS + cp NUM_ROAMMON_MAPS + jr nc, .innerloop1 inc a ld b, a .innerloop2 ; Loop to get hl to the address of the chosen roam map. |