diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 03:03:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 03:03:45 -0500 |
| commit | 39556605cd27a567a45bfc2c46af745ac031ab90 (patch) | |
| tree | c2ff7645625d62e94b369080ba37071eb98426d1 /asm/script_movement.s | |
| parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
| parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'asm/script_movement.s')
| -rw-r--r-- | asm/script_movement.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/script_movement.s b/asm/script_movement.s index 7a7adec6c..7b3a70a25 100644 --- a/asm/script_movement.s +++ b/asm/script_movement.s @@ -482,7 +482,7 @@ _0809777C: lsls r0, 2 ldr r1, _080977A8 @ =gObjectEvents adds r0, r1 - bl npc_sync_anim_pause_bits + bl UnfreezeObjectEvent _08097792: adds r0, r5, 0x1 lsls r0, 24 |