From 33cb7eb4edade40d29bad4d86d9301dd16034f59 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Mon, 22 Aug 2022 05:35:27 +0000 Subject: [PATCH] Merge pull request #1737 from GriffinRichards/lock-unlock --- pokeemerald.sym | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 7619503d06..52f62471a9 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -5843,8 +5843,8 @@ 08097dd0 g 00000028 StartFieldEffectForObjectEvent 08097df8 l 0000001c DoShadowFieldEffect 08097e14 l 0000003c DoRippleFieldEffect -08097e50 g 000000a0 MovementAction_StoreAndLockAnim_Step0 -08097ef0 g 00000088 MovementAction_FreeAndUnlockAnim_Step0 +08097e50 g 000000a0 MovementAction_LockAnim_Step0 +08097ef0 g 00000088 MovementAction_UnlockAnim_Step0 08097f78 g 0000002c FindLockedObjectEventIndex 08097fa4 l 00000040 CreateLevitateMovementTask 08097fe4 l 00000060 ApplyLevitateMovement @@ -45412,8 +45412,8 @@ 0850e812 l 00000010 sJumpY_Low 0850e822 l 00000010 sJumpY_Normal 0850e834 l 0000000c sJumpYTable -0850e854 g 00000008 gMovementActionFuncs_StoreAndLockAnim -0850e85c g 00000008 gMovementActionFuncs_FreeAndUnlockAnim +0850e854 g 00000008 gMovementActionFuncs_LockAnim +0850e85c g 00000008 gMovementActionFuncs_UnlockAnim 0850e864 g 0000000c gMovementActionFuncs_FlyUp 0850e870 g 0000000c gMovementActionFuncs_FlyDown 0850e87c g 00000120 gTextWindowFrame1_Gfx