From 2d2d8058b109bfcb769e84839598a08e8607f32e Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Tue, 2 Nov 2021 19:12:52 +0000 Subject: [PATCH] Merge pull request #1538 from cbt6/move-speed --- pokeemerald.sym | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index db7399fb22..be92b267df 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -4905,10 +4905,10 @@ 0808b6a0 g 0000001c PlayerGetCopyableMovement 0808b6bc l 00000028 PlayerForceSetHeldMovement 0808b6e4 g 0000003c PlayerSetAnimId -0808b720 g 00000018 PlayerGoSpeed1 -0808b738 g 00000018 PlayerGoSpeed2 +0808b720 g 00000018 PlayerWalkNormal +0808b738 g 00000018 PlayerWalkFast 0808b750 g 00000018 PlayerRideWaterCurrent -0808b768 g 00000018 PlayerGoSpeed4 +0808b768 g 00000018 PlayerWalkFaster 0808b780 l 00000018 PlayerRun 0808b798 g 00000024 PlayerOnBikeCollide 0808b7bc g 00000018 PlayerOnBikeCollideWithFarawayIslandMew @@ -5427,7 +5427,7 @@ 08093388 g 0000002c GetWalkNormalMovementAction 080933b4 g 0000002c GetWalkFastMovementAction 080933e0 g 0000002c GetRideWaterCurrentMovementAction -0809340c g 0000002c GetWalkFastestMovementAction +0809340c g 0000002c GetWalkFasterMovementAction 08093438 g 0000002c GetSlideMovementAction 08093464 g 0000002c GetPlayerRunMovementAction 08093490 g 0000002c GetJump2MovementAction @@ -5558,14 +5558,14 @@ 08094a20 g 0000001e MovementAction_RideWaterCurrentLeft_Step1 08094a40 g 00000020 MovementAction_RideWaterCurrentRight_Step0 08094a60 g 0000001e MovementAction_RideWaterCurrentRight_Step1 -08094a80 g 00000020 MovementAction_WalkFastestDown_Step0 -08094aa0 g 0000001e MovementAction_WalkFastestDown_Step1 -08094ac0 g 00000020 MovementAction_WalkFastestUp_Step0 -08094ae0 g 0000001e MovementAction_WalkFastestUp_Step1 -08094b00 g 00000020 MovementAction_WalkFastestLeft_Step0 -08094b20 g 0000001e MovementAction_WalkFastestLeft_Step1 -08094b40 g 00000020 MovementAction_WalkFastestRight_Step0 -08094b60 g 0000001e MovementAction_WalkFastestRight_Step1 +08094a80 g 00000020 MovementAction_WalkFasterDown_Step0 +08094aa0 g 0000001e MovementAction_WalkFasterDown_Step1 +08094ac0 g 00000020 MovementAction_WalkFasterUp_Step0 +08094ae0 g 0000001e MovementAction_WalkFasterUp_Step1 +08094b00 g 00000020 MovementAction_WalkFasterLeft_Step0 +08094b20 g 0000001e MovementAction_WalkFasterLeft_Step1 +08094b40 g 00000020 MovementAction_WalkFasterRight_Step0 +08094b60 g 0000001e MovementAction_WalkFasterRight_Step1 08094b80 g 00000020 MovementAction_SlideDown_Step0 08094ba0 g 0000001e MovementAction_SlideDown_Step1 08094bc0 g 00000020 MovementAction_SlideUp_Step0 @@ -45203,7 +45203,7 @@ 0850dbaa g 00000005 gWalkNormalMovementActions 0850dbaf g 00000005 gWalkFastMovementActions 0850dbb4 g 00000005 gRideWaterCurrentMovementActions -0850dbb9 g 00000005 gWalkFastestMovementActions +0850dbb9 g 00000005 gWalkFasterMovementActions 0850dbbe g 00000005 gSlideMovementActions 0850dbc3 g 00000005 gPlayerRunMovementActions 0850dbc8 g 00000005 gJump2MovementActions @@ -45285,10 +45285,10 @@ 0850e130 g 0000000c gMovementActionFuncs_RideWaterCurrentUp 0850e13c g 0000000c gMovementActionFuncs_RideWaterCurrentLeft 0850e148 g 0000000c gMovementActionFuncs_RideWaterCurrentRight -0850e154 g 0000000c gMovementActionFuncs_WalkFastestDown -0850e160 g 0000000c gMovementActionFuncs_WalkFastestUp -0850e16c g 0000000c gMovementActionFuncs_WalkFastestLeft -0850e178 g 0000000c gMovementActionFuncs_WalkFastestRight +0850e154 g 0000000c gMovementActionFuncs_WalkFasterDown +0850e160 g 0000000c gMovementActionFuncs_WalkFasterUp +0850e16c g 0000000c gMovementActionFuncs_WalkFasterLeft +0850e178 g 0000000c gMovementActionFuncs_WalkFasterRight 0850e184 g 0000000c gMovementActionFuncs_SlideDown 0850e190 g 0000000c gMovementActionFuncs_SlideUp 0850e19c g 0000000c gMovementActionFuncs_SlideLeft