diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 10:24:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 10:24:11 -0500 |
| commit | a01d83a4341cd0cdad01fe2d0b96920301257f2a (patch) | |
| tree | ac4f4ce6086d4664ea49d515759a8044ecd1d973 /asm/script_movement.s | |
| parent | e7cd8c59f4ca0f6c56a3b3782c21e896c203694e (diff) | |
| parent | 91099dbd0c451188742bf045a26a036e0e8d9f89 (diff) | |
Merge branch 'master' into sync-ai
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 |