diff options
| author | JaceCearK1 <JaceCearK1@users.noreply.github.com> | 2017-07-01 21:04:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 21:04:18 +0200 |
| commit | 0dd804a99e5455a0eac8ff6ed87d9de16c7380b7 (patch) | |
| tree | 7b3567978b63ee6548a7b945e075ea8ba37bef51 /asm/field_effect_helpers.s | |
| parent | f1344efd2aff92292f58f7323bd9297a38fe9b02 (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge pull request #1 from pret/master
Update fork to match main fork.
Diffstat (limited to 'asm/field_effect_helpers.s')
| -rw-r--r-- | asm/field_effect_helpers.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 68a1b02c9..9df9dfd8d 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -715,7 +715,7 @@ _08126D3E: cmp r0, r1 bne _08126DBC ldrb r0, [r4, 0x1E] - bl sub_8056E14 + bl MetatileBehavior_IsPokeGrass lsls r0, 24 cmp r0, 0 bne _08126DBC |