diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /asm/field_tasks.s | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'asm/field_tasks.s')
| -rw-r--r-- | asm/field_tasks.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index c879ebf63..5f3e3a03f 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -1523,7 +1523,7 @@ _08069F9E: bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl MetatileBehavior_IsAsh + bl MetatileBehavior_IsAshGrass lsls r0, 24 cmp r0, 0 beq _0806A02A @@ -1708,7 +1708,7 @@ _0806A122: lsls r0, 24 cmp r0, 0 beq _0806A182 - bl sub_80E6034 + bl GetPlayerSpeed lsls r0, 16 asrs r0, 16 cmp r0, 0x4 |