Sync more with pokeyellow

This commit is contained in:
Rangi 2020-11-05 16:55:39 -05:00
parent 2a4b8b5a24
commit e16dec874a
18 changed files with 102 additions and 79 deletions

View file

@ -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