diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
| commit | 3ddda066d91cbbd377584acacaea62a9deba8873 (patch) | |
| tree | 4af711b5daff8a50548f1df28f3981024cb9be8e /asm/map_obj_lock.s | |
| parent | 3ff48ec8c890d95c5fbc467896414a018bf523ad (diff) | |
import names from pokeruby
Diffstat (limited to 'asm/map_obj_lock.s')
| -rw-r--r-- | asm/map_obj_lock.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index b461e6339..cc0b11174 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -112,7 +112,7 @@ _080695F6: cmp r0, 0 blt _0806961E adds r0, r1, 0 - bl sub_80688E4 + bl FreezeMapObject movs r0, 0x1 strh r0, [r5, 0xA] _0806961E: @@ -161,7 +161,7 @@ LockSelectedMapObject: @ 806966C push {r4,r5,lr} ldr r4, _080696B0 @ =gUnknown_3005074 ldrb r0, [r4] - bl sub_80689B0 + bl FreezeMapObjectsExceptOne ldr r0, _080696B4 @ =sub_80695CC movs r1, 0x50 bl CreateTask @@ -178,7 +178,7 @@ LockSelectedMapObject: @ 806966C cmp r0, 0 blt _080696AA adds r0, r1, 0 - bl sub_80688E4 + bl FreezeMapObject ldr r0, _080696BC @ =gUnknown_3005090 lsls r1, r5, 2 adds r1, r5 |