diff options
Diffstat (limited to 'asm/field_map_obj.s')
| -rw-r--r-- | asm/field_map_obj.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index b884252be..348e1d0f3 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -10911,7 +10911,7 @@ _0805F950: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r3, _0805F984 @ =sub_8056E14 + ldr r3, _0805F984 @ =MetatileBehavior_IsPokeGrass ldr r4, [r4] adds r0, r6, 0 adds r1, r7, 0 @@ -10924,7 +10924,7 @@ _0805F978: bx r1 .align 2, 0 _0805F980: .4byte gUnknown_08375594 -_0805F984: .4byte sub_8056E14 +_0805F984: .4byte MetatileBehavior_IsPokeGrass thumb_func_end mss_08062EA4 thumb_func_start FieldObjectCB_TreeDisguise @@ -12654,7 +12654,7 @@ FieldObjectSetSpecialAnim: @ 8060550 cmp r6, 0 bne _08060590 adds r0, r4, 0 - bl npc_sync_anim_pause_bits + bl UnfreezeMapObject strb r5, [r4, 0x1C] ldrb r0, [r4] movs r1, 0x40 |