diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 16:55:39 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 16:55:39 -0500 |
| commit | e16dec874a239c162680b169391d3c0c7ee1fc70 (patch) | |
| tree | 4a18885606996ff59bb714afb5db9a548e2f94a7 /engine/battle/safari_zone.asm | |
| parent | Remove trailing whitespace (diff) | |
| download | pokeyellow-e16dec874a239c162680b169391d3c0c7ee1fc70.tar.gz pokeyellow-e16dec874a239c162680b169391d3c0c7ee1fc70.tar.xz pokeyellow-e16dec874a239c162680b169391d3c0c7ee1fc70.zip | |
Sync more with pokeyellow
Diffstat (limited to 'engine/battle/safari_zone.asm')
| -rwxr-xr-x | engine/battle/safari_zone.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index 4f01c2f4..a61f402f 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -2,18 +2,18 @@ PrintSafariZoneBattleText: ld hl, wSafariBaitFactor ld a, [hl] and a - jr z, .asm_4284 + jr z, .no_bait dec [hl] ld hl, SafariZoneEatingText - jr .asm_429f -.asm_4284 + jr .done +.no_bait dec hl ld a, [hl] and a ret z dec [hl] ld hl, SafariZoneAngryText - jr nz, .asm_429f + jr nz, .done push hl ld a, [wEnemyMonSpecies] ld [wd0b5], a @@ -21,7 +21,7 @@ PrintSafariZoneBattleText: ld a, [wMonHCatchRate] ld [wEnemyMonActualCatchRate], a pop hl -.asm_429f +.done push hl call LoadScreenTilesFromBuffer1 pop hl |