diff options
Diffstat (limited to 'engine/wildmons.asm')
| -rwxr-xr-x | engine/wildmons.asm | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 140de9205..6208cfbce 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -62,9 +62,9 @@ FindNest: ; 2a01f ld b, a ld a, [hli] ld c, a -rept 3 inc hl -endr + inc hl + inc hl ld a, NUM_WILDMONS_PER_AREA_TIME_OF_DAY * 3 call .SearchMapForMon jr nc, .next_grass @@ -108,9 +108,8 @@ endr ld a, [wNamedObjectIndexBuffer] cp [hl] jr z, .found -rept 2 inc hl -endr + inc hl pop af dec a jr nz, .ScanMapLoop @@ -268,15 +267,14 @@ ChooseWildEncounter: ; 2a14f call CheckEncounterRoamMon jp c, .startwildbattle -rept 3 inc hl -endr + inc hl + inc hl call CheckOnWater ld de, .WaterMonTable jr z, .watermon -rept 2 inc hl -endr + inc hl ld a, [TimeOfDay] ld bc, $e call AddNTimes @@ -597,9 +595,9 @@ CheckEncounterRoamMon: ; 2a2ce cp [hl] jr nz, .DontEncounterRoamMon ; We've decided to take on a beast, so stage its information for battle. -rept 3 dec hl -endr + dec hl + dec hl ld a, [hli] ld [TempWildMonSpecies], a ld a, [hl] @@ -702,9 +700,8 @@ UpdateRoamMons: ; 2a30d inc hl ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc ld a, [wRoamMons_LastMapGroup] cp [hl] jr nz, .done @@ -866,9 +863,8 @@ RandomPhoneRareWildMon: ; 2a4ab dec a ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc ; We now have the pointer to one of the last (rarest) three wild Pokemon found in that area. inc hl ld c, [hl] ; Contains the species index of this rare Pokemon @@ -942,9 +938,8 @@ RandomPhoneWildMon: ; 2a51f and $3 ld c, a ld b, $0 -rept 2 add hl, bc -endr + add hl, bc inc hl ld a, [hl] ld [wNamedObjectIndexBuffer], a @@ -963,9 +958,8 @@ RandomPhoneMon: ; 2a567 dec a ld c, a ld b, 0 -rept 2 add hl, bc -endr + add hl, bc ld a, BANK(TrainerGroups) call GetFarHalfword |