diff --git a/pokefirered.sym b/pokefirered.sym index 136e88013..0e34eb513 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -4010,33 +4010,33 @@ 08064894 g 00000070 InitNpcForWalkSlowest 08064904 g 0000002c InitWalkSlowest 08064930 g 00000038 UpdateWalkSlowest -08064968 l 0000001e MovementActionFunc_x9B_0 -08064988 l 0000001e MovementActionFunc_x9B_1 -080649a8 l 0000001e MovementActionFunc_x9C_0 -080649c8 l 0000001e MovementActionFunc_x9C_1 -080649e8 l 0000001e MovementActionFunc_x9D_0 -08064a08 l 0000001e MovementActionFunc_x9D_1 -08064a28 l 0000001e MovementActionFunc_x9E_0 -08064a48 l 0000001e MovementActionFunc_x9E_1 -08064a68 l 0000001e MovementActionFunc_x08_0 -08064a88 l 0000001e MovementActionFunc_x08_1 -08064aa8 l 0000001e MovementActionFunc_x09_0 -08064ac8 l 0000001e MovementActionFunc_x09_1 -08064ae8 l 0000001e MovementActionFunc_x0A_0 -08064b08 l 0000001e MovementActionFunc_x0A_1 -08064b28 l 0000001e MovementActionFunc_x0B_0 -08064b48 l 0000001e MovementActionFunc_x0B_1 +08064968 l 0000001e MovementAction_WalkSlowestDown_Step0 +08064988 l 0000001e MovementAction_WalkSlowestDown_Step1 +080649a8 l 0000001e MovementAction_WalkSlowestUp_Step0 +080649c8 l 0000001e MovementAction_WalkSlowestUp_Step1 +080649e8 l 0000001e MovementAction_WalkSlowestLeft_Step0 +08064a08 l 0000001e MovementAction_WalkSlowestLeft_Step1 +08064a28 l 0000001e MovementAction_WalkSlowestRight_Step0 +08064a48 l 0000001e MovementAction_WalkSlowestRight_Step1 +08064a68 l 0000001e MovementAction_WalkSlowerDown_Step0 +08064a88 l 0000001e MovementAction_WalkSlowerDown_Step1 +08064aa8 l 0000001e MovementAction_WalkSlowerUp_Step0 +08064ac8 l 0000001e MovementAction_WalkSlowerUp_Step1 +08064ae8 l 0000001e MovementAction_WalkSlowerLeft_Step0 +08064b08 l 0000001e MovementAction_WalkSlowerLeft_Step1 +08064b28 l 0000001e MovementAction_WalkSlowerRight_Step0 +08064b48 l 0000001e MovementAction_WalkSlowerRight_Step1 08064b68 g 00000070 InitNpcForWalkSlow 08064bd8 g 0000002c InitWalkSlow 08064c04 g 00000038 UpdateWalkSlow -08064c3c l 0000001e MovementActionFunc_x0D_0 -08064c5c l 0000001e MovementActionFunc_x0D_1 -08064c7c l 0000001e MovementActionFunc_x0C_0 -08064c9c l 0000001e MovementActionFunc_x0C_1 -08064cbc l 0000001e MovementActionFunc_x0E_0 -08064cdc l 0000001e MovementActionFunc_x0E_1 -08064cfc l 0000001e MovementActionFunc_x0F_0 -08064d1c l 0000001e MovementActionFunc_x0F_1 +08064c3c l 0000001e MovementAction_WalkSlowUp_Step0 +08064c5c l 0000001e MovementAction_WalkSlowUp_Step1 +08064c7c l 0000001e MovementAction_WalkSlowDown_Step0 +08064c9c l 0000001e MovementAction_WalkSlowDown_Step1 +08064cbc l 0000001e MovementAction_WalkSlowLeft_Step0 +08064cdc l 0000001e MovementAction_WalkSlowLeft_Step1 +08064cfc l 0000001e MovementAction_WalkSlowRight_Step0 +08064d1c l 0000001e MovementAction_WalkSlowRight_Step1 08064d3c l 00000020 MovementAction_WalkNormalDown_Step0 08064d5c l 0000001e MovementAction_WalkNormalDown_Step1 08064d7c l 00000020 MovementAction_WalkNormalUp_Step0 @@ -4077,19 +4077,19 @@ 0806538c l 00000020 MovementAction_WalkFastRight_Step0 080653ac l 0000001e MovementAction_WalkFastRight_Step1 080653cc g 0000002a sub_80653CC -080653f8 l 00000040 MovementActionFunc_xA0_0 -08065438 l 0000002a MovementActionFunc_xA0_1 -08065464 l 00000040 MovementActionFunc_xA1_0 -080654a4 l 0000002a MovementActionFunc_xA1_1 -080654d0 l 00000040 MovementActionFunc_xA2_0 -08065510 l 0000002a MovementActionFunc_xA2_1 -0806553c l 00000040 MovementActionFunc_xA3_0 -0806557c l 0000002a MovementActionFunc_xA3_1 +080653f8 l 00000040 MovementAction_xA0_Step0 +08065438 l 0000002a MovementAction_xA0_Step1 +08065464 l 00000040 MovementAction_xA1_Step0 +080654a4 l 0000002a MovementAction_xA1_Step1 +080654d0 l 00000040 MovementAction_xA2_Step0 +08065510 l 0000002a MovementAction_xA2_Step1 +0806553c l 00000040 MovementAction_xA3_Step0 +0806557c l 0000002a MovementAction_xA3_Step1 080655a8 g 0000002c sub_80655A8 -080655d4 l 0000003a MovementActionFunc_x04_0 -08065610 l 0000003a MovementActionFunc_x05_0 -0806564c l 0000003a MovementActionFunc_x06_0 -08065688 l 0000003a MovementActionFunc_x07_0 +080655d4 l 0000003a MovementAction_FaceDownFast_Step0 +08065610 l 0000003a MovementAction_FaceUpFast_Step0 +0806564c l 0000003a MovementAction_FaceLeftFast_Step0 +08065688 l 0000003a MovementAction_FaceRightFast_Step0 080656c4 g 00000048 InitMoveInPlace 0806570c l 00000028 MovementAction_WalkInPlace_Step1 08065734 l 0000003c MovementAction_WalkInPlaceSlow_Step1 @@ -4105,10 +4105,10 @@ 08065968 l 00000036 MovementAction_WalkInPlaceFastUp_Step0 080659a0 l 00000036 MovementAction_WalkInPlaceFastLeft_Step0 080659d8 l 00000036 MovementAction_WalkInPlaceFastRight_Step0 -08065a10 l 00000036 MovementAction_WalkInPlaceFastestDown_Step0 -08065a48 l 00000036 MovementAction_WalkInPlaceFastestUp_Step0 -08065a80 l 00000036 MovementAction_WalkInPlaceFastestLeft_Step0 -08065ab8 l 00000036 MovementAction_WalkInPlaceFastestRight_Step0 +08065a10 l 00000036 MovementAction_WalkInPlaceFasterDown_Step0 +08065a48 l 00000036 MovementAction_WalkInPlaceFasterUp_Step0 +08065a80 l 00000036 MovementAction_WalkInPlaceFasterLeft_Step0 +08065ab8 l 00000036 MovementAction_WalkInPlaceFasterRight_Step0 08065af0 l 00000020 MovementAction_RideWaterCurrentDown_Step0 08065b10 l 0000001e MovementAction_RideWaterCurrentDown_Step1 08065b30 l 00000020 MovementAction_RideWaterCurrentUp_Step0 @@ -4117,14 +4117,14 @@ 08065b90 l 0000001e MovementAction_RideWaterCurrentLeft_Step1 08065bb0 l 00000020 MovementAction_RideWaterCurrentRight_Step0 08065bd0 l 0000001e MovementAction_RideWaterCurrentRight_Step1 -08065bf0 l 00000020 MovementAction_WalkFastestDown_Step0 -08065c10 l 0000001e MovementAction_WalkFastestDown_Step1 -08065c30 l 00000020 MovementAction_WalkFastestUp_Step0 -08065c50 l 0000001e MovementAction_WalkFastestUp_Step1 -08065c70 l 00000020 MovementAction_WalkFastestLeft_Step0 -08065c90 l 0000001e MovementAction_WalkFastestLeft_Step1 -08065cb0 l 00000020 MovementAction_WalkFastestRight_Step0 -08065cd0 l 0000001e MovementAction_WalkFastestRight_Step1 +08065bf0 l 00000020 MovementAction_WalkFasterDown_Step0 +08065c10 l 0000001e MovementAction_WalkFasterDown_Step1 +08065c30 l 00000020 MovementAction_WalkFasterUp_Step0 +08065c50 l 0000001e MovementAction_WalkFasterUp_Step1 +08065c70 l 00000020 MovementAction_WalkFasterLeft_Step0 +08065c90 l 0000001e MovementAction_WalkFasterLeft_Step1 +08065cb0 l 00000020 MovementAction_WalkFasterRight_Step0 +08065cd0 l 0000001e MovementAction_WalkFasterRight_Step1 08065cf0 l 00000020 MovementAction_SlideDown_Step0 08065d10 l 0000001e MovementAction_SlideDown_Step1 08065d30 l 00000020 MovementAction_SlideUp_Step0 @@ -4144,14 +4144,14 @@ 08065ef0 g 00000070 InitNpcForRunSlow 08065f60 g 0000002c InitRunSlow 08065f8c g 00000038 UpdateRunSlow -08065fc4 l 0000001e MovementActionFunc_x41_0 -08065fe4 l 0000001e MovementActionFunc_x41_1 -08066004 l 0000001e MovementActionFunc_x42_0 -08066024 l 0000001e MovementActionFunc_x42_1 -08066044 l 0000001e MovementActionFunc_x43_0 -08066064 l 0000001e MovementActionFunc_x43_1 -08066084 l 0000001e MovementActionFunc_x44_0 -080660a4 l 0000001e MovementActionFunc_x44_1 +08065fc4 l 0000001e MovementAction_RunDownSlow_Step0 +08065fe4 l 0000001e MovementAction_RunDownSlow_Step1 +08066004 l 0000001e MovementAction_RunUpSlow_Step0 +08066024 l 0000001e MovementAction_RunUpSlow_Step1 +08066044 l 0000001e MovementAction_RunLeftSlow_Step0 +08066064 l 0000001e MovementAction_RunLeftSlow_Step1 +08066084 l 0000001e MovementAction_RunRightSlow_Step0 +080660a4 l 0000001e MovementAction_RunRightSlow_Step1 080660c4 g 0000002c StartSpriteAnimInDirection 080660f0 l 00000016 MovementAction_StartAnimInDirection_Step0 08066108 l 00000020 MovementAction_WaitSpriteAnim @@ -4164,14 +4164,14 @@ 0806620c l 00000028 MovementAction_JumpSpecialLeft_Step1 08066234 l 0000001e MovementAction_JumpSpecialRight_Step0 08066254 l 00000028 MovementAction_JumpSpecialRight_Step1 -0806627c l 0000001e MovementActionFunc_xA6_0 -0806629c l 0000001e MovementActionFunc_xA6_1 -080662bc l 0000001e MovementActionFunc_xA7_0 -080662dc l 0000001e MovementActionFunc_xA7_1 -080662fc l 0000001e MovementActionFunc_xA8_0 -0806631c l 0000001e MovementActionFunc_xA8_1 -0806633c l 0000001e MovementActionFunc_xA9_0 -0806635c l 0000001e MovementActionFunc_xA9_1 +0806627c l 0000001e MovementAction_JumpSpecialWithEffectDown_Step0 +0806629c l 0000001e MovementAction_JumpSpecialWithEffectDown_Step1 +080662bc l 0000001e MovementAction_JumpSpecialWithEffectUp_Step0 +080662dc l 0000001e MovementAction_JumpSpecialWithEffectUp_Step1 +080662fc l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step0 +0806631c l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step1 +0806633c l 0000001e MovementAction_JumpSpecialWithEffectRight_Step0 +0806635c l 0000001e MovementAction_JumpSpecialWithEffectRight_Step1 0806637c l 0000005c MovementAction_FacePlayer_Step0 080663d8 l 00000064 MovementAction_FaceAwayPlayer_Step0 0806643c l 0000000e MovementAction_LockFacingDirection_Step0 @@ -4210,9 +4210,9 @@ 08066910 l 00000010 MovementAction_SetVisible_Step0 08066920 l 00000024 MovementAction_EmoteExclamationMark_Step0 08066944 l 00000024 MovementAction_EmoteQuestionMark_Step0 -08066968 l 00000024 MovementAction_EmoteHeart_Step0 -0806698c l 00000024 do_double_excl_bubble -080669b0 l 00000024 do_smile_bubble +08066968 l 00000024 MovementAction_EmoteX_Step0 +0806698c l 00000024 MovementAction_EmoteDoubleExclamationMark_Step0 +080669b0 l 00000024 MovementAction_EmoteSmile_Step0 080669d4 l 00000044 MovementAction_RevealTrainer_Step0 08066a18 l 0000001e MovementAction_RevealTrainer_Step1 08066a38 l 0000001a MovementAction_RockSmashBreak_Step0 @@ -4230,10 +4230,10 @@ 08066c10 l 00000032 MovementAction_WalkDownAffine_Step0 08066c44 l 0000002a MovementAction_WalkDownAffine_Step1 08066c70 g 00000040 AcroWheelieFaceDirection -08066cb0 l 0000000e MovementActionFunc_x70_0 -08066cc0 l 0000000e MovementActionFunc_x71_0 -08066cd0 l 0000000e MovementActionFunc_x72_0 -08066ce0 l 0000000e MovementActionFunc_x73_0 +08066cb0 l 0000000e MovementAction_AcroWheelieFaceDown_Step0 +08066cc0 l 0000000e MovementAction_AcroWheelieFaceUp_Step0 +08066cd0 l 0000000e MovementAction_AcroWheelieFaceLeft_Step0 +08066ce0 l 0000000e MovementAction_AcroWheelieFaceRight_Step0 08066cf0 l 00000024 MovementAction_AcroPopWheelieDown_Step0 08066d14 l 00000024 MovementAction_AcroPopWheelieUp_Step0 08066d38 l 00000024 MovementAction_AcroPopWheelieLeft_Step0 @@ -4271,10 +4271,10 @@ 08067280 l 0000002a MovementAction_AcroWheelieJumpLeft_Step1 080672ac l 0000002a MovementAction_AcroWheelieJumpRight_Step0 080672d8 l 0000002a MovementAction_AcroWheelieJumpRight_Step1 -08067304 l 00000036 MovementActionFunc_x88_0 -0806733c l 00000036 MovementActionFunc_x89_0 -08067374 l 00000036 MovementActionFunc_x8A_0 -080673ac l 00000036 MovementActionFunc_x8B_0 +08067304 l 00000036 MovementAction_AcroWheelieInPlaceDown_Step0 +0806733c l 00000036 MovementAction_AcroWheelieInPlaceUp_Step0 +08067374 l 00000036 MovementAction_AcroWheelieInPlaceLeft_Step0 +080673ac l 00000036 MovementAction_AcroWheelieInPlaceRight_Step0 080673e4 g 00000036 InitAcroPopWheelie 0806741c l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 0806743c l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 @@ -4294,27 +4294,27 @@ 0806760c l 00000020 MovementAction_AcroWheelieMoveRight_Step0 0806762c l 0000001e MovementAction_AcroWheelieMoveRight_Step1 0806764c g 00000038 InitSpin -08067684 l 00000020 MovementActionFunc_x94_0 -080676a4 l 0000001e MovementActionFunc_x94_1 -080676c4 l 00000020 MovementActionFunc_x95_0 -080676e4 l 0000001e MovementActionFunc_x95_1 -08067704 l 00000020 MovementActionFunc_x96_0 -08067724 l 0000001e MovementActionFunc_x96_1 -08067744 l 00000020 MovementActionFunc_x97_0 -08067764 l 0000001e MovementActionFunc_x97_1 -08067784 l 0000003c MovementActionFunc_x98_0 -080677c0 l 0000000a MovementActionFunc_x98_1 -080677cc l 000000f2 MovementActionFunc_x99_1 -080678c0 l 00000030 MovementActionFunc_x9A_1 -080678f0 l 00000032 MovementActionFunc_x9F_0 -08067924 l 0000000a MovementActionFunc_x9F_1 +08067684 l 00000020 MovementAction_SpinDown_Step0 +080676a4 l 0000001e MovementAction_SpinDown_Step1 +080676c4 l 00000020 MovementAction_SpinUp_Step0 +080676e4 l 0000001e MovementAction_SpinUp_Step1 +08067704 l 00000020 MovementAction_SpinLeft_Step0 +08067724 l 0000001e MovementAction_SpinLeft_Step1 +08067744 l 00000020 MovementAction_SpinRight_Step0 +08067764 l 0000001e MovementAction_SpinRight_Step1 +08067784 l 0000003c MovementAction_x98_Step0 +080677c0 l 0000000a MovementAction_x98_Step1 +080677cc l 000000f2 MovementAction_x99_Step1 +080678c0 l 00000030 MovementAction_x9A_Step1 +080678f0 l 00000032 MovementAction_ShakeHeadOrWalkInPlace_Step0 +08067924 l 0000000a MovementAction_ShakeHeadOrWalkInPlace_Step1 08067930 l 00000004 MovementAction_Finish 08067934 l 0000000e MovementAction_PauseSpriteAnim -08067944 l 0000000e MovementActionFunc_xA4_0 -08067954 l 00000022 MovementActionFunc_xA4_1 -08067978 l 00000014 MovementActionFunc_xA5_0 -0806798c l 0000001a MovementActionFunc_xA5_1 -080679a8 l 00000004 MovementActionFunc_xA4_2 +08067944 l 0000000e MovementAction_FlyUp_Step0 +08067954 l 00000022 MovementAction_FlyUp_Step1 +08067978 l 00000014 MovementAction_FlyDown_Step0 +0806798c l 0000001a MovementAction_FlyDown_Step1 +080679a8 l 00000004 MovementAction_FlyUp_Step2 080679ac l 0000001a UpdateObjectEventSpriteAnimPause 080679c8 l 0000002e TryEnableObjectEventAnim 080679f8 l 00000018 UpdateObjectEventVisibility @@ -4384,11 +4384,11 @@ 080689b0 g 00000044 FreezeObjectEventsExceptOne 080689f4 g 00000068 UnfreezeObjectEvent 08068a5c g 00000030 UnfreezeObjectEvents -08068a8c l 00000020 little_step -08068aac l 00000024 double_little_steps -08068ad0 l 00000028 triple_little_steps -08068af8 l 00000024 quad_little_steps -08068b1c l 00000024 oct_little_steps +08068a8c l 00000020 Step1 +08068aac l 00000024 Step2 +08068ad0 l 00000028 Step3 +08068af8 l 00000024 Step4 +08068b1c l 00000024 Step8 08068b40 g 00000012 SetSpriteDataForNormalStep 08068b54 g 00000068 NpcTakeStep 08068bbc g 0000000e SetWalkSlowerSpriteData @@ -4399,7 +4399,7 @@ 08068c68 g 0000003c UpdateWalkSlowestAnim 08068ca4 g 0000000e SetRunSlowSpriteData 08068cb4 g 0000004a UpdateRunSlowAnim -08068d00 l 0000001c GetJumpYDisplacement +08068d00 l 0000001c GetJumpY 08068d1c g 0000001e SetJumpSpriteData 08068d3c g 00000088 DoJumpSpriteMovement 08068dc4 g 00000094 DoJumpSpecialSpriteMovement @@ -20261,10 +20261,10 @@ 081a75e1 g 00000000 Movement_FacePlayer 081a75e3 g 00000000 Movement_FaceAwayPlayer 081a75e5 g 00000000 Movement_FaceOriginalDirection -081a75e7 g 00000000 Movement_WalkInPlaceFastestLeft -081a75e9 g 00000000 Movement_WalkInPlaceFastestUp -081a75eb g 00000000 Movement_WalkInPlaceFastestRight -081a75ed g 00000000 Movement_WalkInPlaceFastestDown +081a75e7 g 00000000 Movement_WalkInPlaceFasterLeft +081a75e9 g 00000000 Movement_WalkInPlaceFasterUp +081a75eb g 00000000 Movement_WalkInPlaceFasterRight +081a75ed g 00000000 Movement_WalkInPlaceFasterDown 081a75ef g 00000000 Movement_FaceRight 081a75f1 g 00000000 Movement_FaceDown 081a75f3 g 00000000 Movement_WalkUp5 @@ -30928,180 +30928,184 @@ 083a6591 l 00000008 gOppositeDirections 083a6599 l 00000010 sPlayerDirectionsForCopy 083a65a9 l 00000010 sPlayerDirectionToCopyDirection -083a65bc g 000002a8 gMovementActionFuncs -083a6864 l 00000008 sMovementActionFuncs_x00 -083a686c l 00000008 sMovementActionFuncs_x01 -083a6874 l 00000008 sMovementActionFuncs_x02 -083a687c l 00000008 sMovementActionFuncs_x03 -083a6884 l 00000014 gUnknown_83A6884 -083a6898 l 0000000c sMovementActionFuncs_x9B -083a68a4 l 0000000c sMovementActionFuncs_x9C -083a68b0 l 0000000c sMovementActionFuncs_x9D -083a68bc l 0000000c sMovementActionFuncs_x9E -083a68c8 l 0000000c sMovementActionFuncs_x08 -083a68d4 l 0000000c sMovementActionFuncs_x09 -083a68e0 l 0000000c sMovementActionFuncs_x0A -083a68ec l 0000000c sMovementActionFuncs_x0B -083a68f8 l 0000000c sMovementActionFuncs_x0D -083a6904 l 0000000c sMovementActionFuncs_x0C -083a6910 l 0000000c sMovementActionFuncs_x0E -083a691c l 0000000c sMovementActionFuncs_x0F -083a6928 l 0000000c sMovementActionFuncs_x10 -083a6934 l 0000000c sMovementActionFuncs_x11 -083a6940 l 0000000c sMovementActionFuncs_x12 -083a694c l 0000000c sMovementActionFuncs_x13 -083a6958 g 00000006 gUnknown_83A6958 -083a695e g 00000006 gUnknown_83A695E -083a6964 l 0000000c sMovementActionFuncs_x14 -083a6970 l 0000000c sMovementActionFuncs_x15 -083a697c l 0000000c sMovementActionFuncs_x16 -083a6988 l 0000000c sMovementActionFuncs_x17 -083a6994 l 0000000c sMovementActionFuncs_x18 -083a69a0 l 0000000c sMovementActionFuncs_x19 -083a69ac l 0000000c sMovementActionFuncs_x1A -083a69b8 l 0000000c sMovementActionFuncs_x1B -083a69c4 l 0000000c sMovementActionFuncs_x1C -083a69d0 l 0000000c sMovementActionFuncs_x1D -083a69dc l 0000000c sMovementActionFuncs_x1E -083a69e8 l 0000000c sMovementActionFuncs_x1F -083a69f4 l 0000000c sMovementActionFuncs_x20 +083a65bc l 000002a8 sMovementActionFuncs +083a6864 l 00000008 sMovementActionFuncs_FaceDown +083a686c l 00000008 sMovementActionFuncs_FaceUp +083a6874 l 00000008 sMovementActionFuncs_FaceLeft +083a687c l 00000008 sMovementActionFuncs_FaceRight +083a6884 l 00000014 sDirectionAnimFuncsBySpeed +083a6898 l 0000000c sMovementActionFuncs_WalkSlowestDown +083a68a4 l 0000000c sMovementActionFuncs_WalkSlowestUp +083a68b0 l 0000000c sMovementActionFuncs_WalkSlowestLeft +083a68bc l 0000000c sMovementActionFuncs_WalkSlowestRight +083a68c8 l 0000000c sMovementActionFuncs_WalkSlowerDown +083a68d4 l 0000000c sMovementActionFuncs_WalkSlowerUp +083a68e0 l 0000000c sMovementActionFuncs_WalkSlowerLeft +083a68ec l 0000000c sMovementActionFuncs_WalkSlowerRight +083a68f8 l 0000000c sMovementActionFuncs_WalkSlowUp +083a6904 l 0000000c sMovementActionFuncs_WalkSlowDown +083a6910 l 0000000c sMovementActionFuncs_WalkSlowLeft +083a691c l 0000000c sMovementActionFuncs_WalkSlowRight +083a6928 l 0000000c sMovementActionFuncs_WalkNormalDown +083a6934 l 0000000c sMovementActionFuncs_WalkNormalUp +083a6940 l 0000000c sMovementActionFuncs_WalkNormalLeft +083a694c l 0000000c sMovementActionFuncs_WalkNormalRight +083a6958 l 00000006 sJumpInitDisplacements +083a695e l 00000006 sJumpDisplacements +083a6964 l 0000000c sMovementActionFuncs_Jump2Down +083a6970 l 0000000c sMovementActionFuncs_Jump2Up +083a697c l 0000000c sMovementActionFuncs_Jump2Left +083a6988 l 0000000c sMovementActionFuncs_Jump2Right +083a6994 l 0000000c sMovementActionFuncs_Delay1 +083a69a0 l 0000000c sMovementActionFuncs_Delay2 +083a69ac l 0000000c sMovementActionFuncs_Delay4 +083a69b8 l 0000000c sMovementActionFuncs_Delay8 +083a69c4 l 0000000c sMovementActionFuncs_Delay16 +083a69d0 l 0000000c sMovementActionFuncs_WalkFastDown +083a69dc l 0000000c sMovementActionFuncs_WalkFastUp +083a69e8 l 0000000c sMovementActionFuncs_WalkFastLeft +083a69f4 l 0000000c sMovementActionFuncs_WalkFastRight 083a6a00 l 0000000c sMovementActionFuncs_xA0 083a6a0c l 0000000c sMovementActionFuncs_xA1 083a6a18 l 0000000c sMovementActionFuncs_xA2 083a6a24 l 0000000c sMovementActionFuncs_xA3 -083a6a30 l 00000008 sMovementActionFuncs_x04 -083a6a38 l 00000008 sMovementActionFuncs_x05 -083a6a40 l 00000008 sMovementActionFuncs_x06 -083a6a48 l 00000008 sMovementActionFuncs_x07 -083a6a50 l 0000000c sMovementActionFuncs_x21 -083a6a5c l 0000000c sMovementActionFuncs_x22 -083a6a68 l 0000000c sMovementActionFuncs_x23 -083a6a74 l 0000000c sMovementActionFuncs_x24 -083a6a80 l 0000000c sMovementActionFuncs_x25 -083a6a8c l 0000000c sMovementActionFuncs_x26 -083a6a98 l 0000000c sMovementActionFuncs_x27 -083a6aa4 l 0000000c sMovementActionFuncs_x28 -083a6ab0 l 0000000c sMovementActionFuncs_x29 -083a6abc l 0000000c sMovementActionFuncs_x2A -083a6ac8 l 0000000c sMovementActionFuncs_x2B -083a6ad4 l 0000000c sMovementActionFuncs_x2C -083a6ae0 l 0000000c sMovementActionFuncs_x2D -083a6aec l 0000000c sMovementActionFuncs_x2E -083a6af8 l 0000000c sMovementActionFuncs_x2F -083a6b04 l 0000000c sMovementActionFuncs_x30 -083a6b10 l 0000000c sMovementActionFuncs_x31 -083a6b1c l 0000000c sMovementActionFuncs_x32 -083a6b28 l 0000000c sMovementActionFuncs_x33 -083a6b34 l 0000000c sMovementActionFuncs_x34 -083a6b40 l 0000000c sMovementActionFuncs_x35 -083a6b4c l 0000000c sMovementActionFuncs_x36 -083a6b58 l 0000000c sMovementActionFuncs_x37 -083a6b64 l 0000000c sMovementActionFuncs_x38 -083a6b70 l 0000000c sMovementActionFuncs_x39 -083a6b7c l 0000000c sMovementActionFuncs_x3A -083a6b88 l 0000000c sMovementActionFuncs_x3B -083a6b94 l 0000000c sMovementActionFuncs_x3C -083a6ba0 l 0000000c sMovementActionFuncs_x3D -083a6bac l 0000000c sMovementActionFuncs_x3E -083a6bb8 l 0000000c sMovementActionFuncs_x3F -083a6bc4 l 0000000c sMovementActionFuncs_x40 -083a6bd0 l 0000000c sMovementActionFuncs_x41 -083a6bdc l 0000000c sMovementActionFuncs_x42 -083a6be8 l 0000000c sMovementActionFuncs_x43 -083a6bf4 l 0000000c sMovementActionFuncs_x44 -083a6c00 l 0000000c sMovementActionFuncs_x45 -083a6c0c l 0000000c sMovementActionFuncs_x46 -083a6c18 l 0000000c sMovementActionFuncs_x47 -083a6c24 l 0000000c sMovementActionFuncs_x48 -083a6c30 l 0000000c sMovementActionFuncs_x49 -083a6c3c l 0000000c sMovementActionFuncs_xA6 -083a6c48 l 0000000c sMovementActionFuncs_xA7 -083a6c54 l 0000000c sMovementActionFuncs_xA8 -083a6c60 l 0000000c sMovementActionFuncs_xA9 -083a6c6c l 00000008 sMovementActionFuncs_x4A -083a6c74 l 00000008 sMovementActionFuncs_x4B -083a6c7c l 00000008 sMovementActionFuncs_x4C -083a6c84 l 00000008 sMovementActionFuncs_x4D -083a6c8c l 0000000c sMovementActionFuncs_x4E -083a6c98 l 0000000c sMovementActionFuncs_x4F -083a6ca4 l 0000000c sMovementActionFuncs_x50 -083a6cb0 l 0000000c sMovementActionFuncs_x51 -083a6cbc l 0000000c sMovementActionFuncs_x52 -083a6cc8 l 0000000c sMovementActionFuncs_x53 -083a6cd4 l 0000000c sMovementActionFuncs_x54 -083a6ce0 l 0000000c sMovementActionFuncs_x55 -083a6cec l 0000000c sMovementActionFuncs_x56 -083a6cf8 l 0000000c sMovementActionFuncs_x57 -083a6d04 l 0000000c sMovementActionFuncs_x58 -083a6d10 l 0000000c sMovementActionFuncs_x59 -083a6d1c l 00000008 sMovementActionFuncs_x5A -083a6d24 l 0000000c sMovementActionFuncs_x5B -083a6d30 l 00000008 sMovementActionFuncs_x5C -083a6d38 l 00000008 sMovementActionFuncs_x5D -083a6d40 l 00000008 sMovementActionFuncs_x5E -083a6d48 l 00000008 sMovementActionFuncs_x5F -083a6d50 l 00000008 sMovementActionFuncs_x60 -083a6d58 l 00000008 sMovementActionFuncs_x61 -083a6d60 l 00000008 sMovementActionFuncs_x62 -083a6d68 l 00000008 sMovementActionFuncs_x63 -083a6d70 l 00000008 sMovementActionFuncs_x64 -083a6d78 l 00000008 sMovementActionFuncs_x65 -083a6d80 l 00000008 sMovementActionFuncs_x66 -083a6d88 l 0000000c sMovementActionFuncs_x67 -083a6d94 l 00000010 sMovementActionFuncs_x68 -083a6da4 l 00000010 sMovementActionFuncs_x69 -083a6db4 l 00000008 sMovementActionFuncs_x6A -083a6dbc l 00000008 sMovementActionFuncs_x6B -083a6dc4 l 00000008 sMovementActionFuncs_x6C -083a6dcc l 00000008 sMovementActionFuncs_x6D -083a6dd4 l 0000000c sMovementActionFuncs_x6E -083a6de0 l 0000000c sMovementActionFuncs_x6F -083a6dec l 00000008 sMovementActionFuncs_x70 -083a6df4 l 00000008 sMovementActionFuncs_x71 -083a6dfc l 00000008 sMovementActionFuncs_x72 -083a6e04 l 00000008 sMovementActionFuncs_x73 -083a6e0c l 0000000c sMovementActionFuncs_x74 -083a6e18 l 0000000c sMovementActionFuncs_x75 -083a6e24 l 0000000c sMovementActionFuncs_x76 -083a6e30 l 0000000c sMovementActionFuncs_x77 -083a6e3c l 0000000c sMovementActionFuncs_x78 -083a6e48 l 0000000c sMovementActionFuncs_x79 -083a6e54 l 0000000c sMovementActionFuncs_x7A -083a6e60 l 0000003c sMovementActionFuncs_x7B -083a6e9c l 0000000c sMovementActionFuncs_x7C -083a6ea8 l 0000000c sMovementActionFuncs_x7D -083a6eb4 l 0000000c sMovementActionFuncs_x7E -083a6ec0 l 0000000c sMovementActionFuncs_x7F -083a6ecc l 0000000c sMovementActionFuncs_x80 -083a6ed8 l 0000000c sMovementActionFuncs_x81 -083a6ee4 l 0000000c sMovementActionFuncs_x82 -083a6ef0 l 0000000c sMovementActionFuncs_x83 -083a6efc l 0000000c sMovementActionFuncs_x84 -083a6f08 l 0000000c sMovementActionFuncs_x85 -083a6f14 l 0000000c sMovementActionFuncs_x86 -083a6f20 l 0000000c sMovementActionFuncs_x87 -083a6f2c l 0000000c sMovementActionFuncs_x88 -083a6f38 l 0000000c sMovementActionFuncs_x89 -083a6f44 l 0000000c sMovementActionFuncs_x8A -083a6f50 l 0000000c sMovementActionFuncs_x8B -083a6f5c l 0000000c sMovementActionFuncs_x8C -083a6f68 l 0000000c sMovementActionFuncs_x8D -083a6f74 l 0000000c sMovementActionFuncs_x8E -083a6f80 l 0000000c sMovementActionFuncs_x8F -083a6f8c l 0000000c sMovementActionFuncs_x90 -083a6f98 l 0000000c sMovementActionFuncs_x91 -083a6fa4 l 0000000c sMovementActionFuncs_x92 -083a6fb0 l 0000000c sMovementActionFuncs_x93 -083a6fbc l 0000000c sMovementActionFuncs_x94 -083a6fc8 l 0000000c sMovementActionFuncs_x95 -083a6fd4 l 0000000c sMovementActionFuncs_x96 -083a6fe0 l 0000000c sMovementActionFuncs_x97 +083a6a30 l 00000008 sMovementActionFuncs_FaceDownFast +083a6a38 l 00000008 sMovementActionFuncs_FaceUpFast +083a6a40 l 00000008 sMovementActionFuncs_FaceLeftFast +083a6a48 l 00000008 sMovementActionFuncs_FaceRightFast +083a6a50 l 0000000c sMovementActionFuncs_WalkInPlaceSlowDown +083a6a5c l 0000000c sMovementActionFuncs_WalkInPlaceSlowUp +083a6a68 l 0000000c sMovementActionFuncs_WalkInPlaceSlowLeft +083a6a74 l 0000000c sMovementActionFuncs_WalkInPlaceSlowRight +083a6a80 l 0000000c sMovementActionFuncs_WalkInPlaceNormalDown +083a6a8c l 0000000c sMovementActionFuncs_WalkInPlaceNormalUp +083a6a98 l 0000000c sMovementActionFuncs_WalkInPlaceNormalLeft +083a6aa4 l 0000000c sMovementActionFuncs_WalkInPlaceNormalRight +083a6ab0 l 0000000c sMovementActionFuncs_WalkInPlaceFastDown +083a6abc l 0000000c sMovementActionFuncs_WalkInPlaceFastUp +083a6ac8 l 0000000c sMovementActionFuncs_WalkInPlaceFastLeft +083a6ad4 l 0000000c sMovementActionFuncs_WalkInPlaceFastRight +083a6ae0 l 0000000c sMovementActionFuncs_WalkInPlaceFasterDown +083a6aec l 0000000c sMovementActionFuncs_WalkInPlaceFasterUp +083a6af8 l 0000000c sMovementActionFuncs_WalkInPlaceFasterLeft +083a6b04 l 0000000c sMovementActionFuncs_WalkInPlaceFasterRight +083a6b10 l 0000000c sMovementActionFuncs_RideWaterCurrentDown +083a6b1c l 0000000c sMovementActionFuncs_RideWaterCurrentUp +083a6b28 l 0000000c sMovementActionFuncs_RideWaterCurrentLeft +083a6b34 l 0000000c sMovementActionFuncs_RideWaterCurrentRight +083a6b40 l 0000000c sMovementActionFuncs_WalkFasterDown +083a6b4c l 0000000c sMovementActionFuncs_WalkFasterUp +083a6b58 l 0000000c sMovementActionFuncs_WalkFasterLeft +083a6b64 l 0000000c sMovementActionFuncs_WalkFasterRight +083a6b70 l 0000000c sMovementActionFuncs_SlideDown +083a6b7c l 0000000c sMovementActionFuncs_SlideUp +083a6b88 l 0000000c sMovementActionFuncs_SlideLeft +083a6b94 l 0000000c sMovementActionFuncs_SlideRight +083a6ba0 l 0000000c sMovementActionFuncs_PlayerRunDown +083a6bac l 0000000c sMovementActionFuncs_PlayerRunUp +083a6bb8 l 0000000c sMovementActionFuncs_PlayerRunLeft +083a6bc4 l 0000000c sMovementActionFuncs_PlayerRunRight +083a6bd0 l 0000000c sMovementActionFuncs_PlayerRunDownSlow +083a6bdc l 0000000c sMovementActionFuncs_PlayerRunUpSlow +083a6be8 l 0000000c sMovementActionFuncs_PlayerRunLeftSlow +083a6bf4 l 0000000c sMovementActionFuncs_PlayerRunRightSlow +083a6c00 l 0000000c sMovementActionFuncs_StartAnimInDirection +083a6c0c l 0000000c sMovementActionFuncs_JumpSpecialDown +083a6c18 l 0000000c sMovementActionFuncs_JumpSpecialUp +083a6c24 l 0000000c sMovementActionFuncs_JumpSpecialLeft +083a6c30 l 0000000c sMovementActionFuncs_JumpSpecialRight +083a6c3c l 0000000c sMovementActionFuncs_JumpSpecialWithEffectDown +083a6c48 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectUp +083a6c54 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectLeft +083a6c60 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectRight +083a6c6c l 00000008 sMovementActionFuncs_FacePlayer +083a6c74 l 00000008 sMovementActionFuncs_FaceAwayPlayer +083a6c7c l 00000008 sMovementActionFuncs_LockFacingDirection +083a6c84 l 00000008 sMovementActionFuncs_UnlockFacingDirection +083a6c8c l 0000000c sMovementActionFuncs_JumpDown +083a6c98 l 0000000c sMovementActionFuncs_JumpUp +083a6ca4 l 0000000c sMovementActionFuncs_JumpLeft +083a6cb0 l 0000000c sMovementActionFuncs_JumpRight +083a6cbc l 0000000c sMovementActionFuncs_JumpInPlaceDown +083a6cc8 l 0000000c sMovementActionFuncs_JumpInPlaceUp +083a6cd4 l 0000000c sMovementActionFuncs_JumpInPlaceLeft +083a6ce0 l 0000000c sMovementActionFuncs_JumpInPlaceRight +083a6cec l 0000000c sMovementActionFuncs_JumpInPlaceDownUp +083a6cf8 l 0000000c sMovementActionFuncs_JumpInPlaceUpDown +083a6d04 l 0000000c sMovementActionFuncs_JumpInPlaceLeftRight +083a6d10 l 0000000c sMovementActionFuncs_JumpInPlaceRightLeft +083a6d1c l 00000008 sMovementActionFuncs_FaceOriginalDirection +083a6d24 l 0000000c sMovementActionFuncs_NurseJoyBowDown +083a6d30 l 00000008 sMovementActionFuncs_EnableJumpLandingGroundEffect +083a6d38 l 00000008 sMovementActionFuncs_DisableJumpLandingGroundEffect +083a6d40 l 00000008 sMovementActionFuncs_DisableAnimation +083a6d48 l 00000008 sMovementActionFuncs_RestoreAnimation +083a6d50 l 00000008 sMovementActionFuncs_SetInvisible +083a6d58 l 00000008 sMovementActionFuncs_SetVisible +083a6d60 l 00000008 sMovementActionFuncs_EmoteExclamationMark +083a6d68 l 00000008 sMovementActionFuncs_EmoteQuestionMark +083a6d70 l 00000008 sMovementActionFuncs_EmoteX +083a6d78 l 00000008 sMovementActionFuncs_EmoteDoubleExclMark +083a6d80 l 00000008 sMovementActionFuncs_EmoteSmile +083a6d88 l 0000000c sMovementActionFuncs_RevealTrainer +083a6d94 l 00000010 sMovementActionFuncs_RockSmashBreak +083a6da4 l 00000010 sMovementActionFuncs_CutTree +083a6db4 l 00000008 sMovementActionFuncs_SetFixedPriority +083a6dbc l 00000008 sMovementActionFuncs_ClearFixedPriority +083a6dc4 l 00000008 sMovementActionFuncs_InitAffineAnim +083a6dcc l 00000008 sMovementActionFuncs_ClearAffineAnim +083a6dd4 l 0000000c sMovementActionFuncs_WalkDownStartAffine +083a6de0 l 0000000c sMovementActionFuncs_WalkDownAffine +083a6dec l 00000008 sMovementActionFuncs_AcroWheelieFaceDown +083a6df4 l 00000008 sMovementActionFuncs_AcroWheelieFaceUp +083a6dfc l 00000008 sMovementActionFuncs_AcroWheelieFaceLeft +083a6e04 l 00000008 sMovementActionFuncs_AcroWheelieFaceRight +083a6e0c l 0000000c sMovementActionFuncs_AcroPopWheelieDown +083a6e18 l 0000000c sMovementActionFuncs_AcroPopWheelieUp +083a6e24 l 0000000c sMovementActionFuncs_AcroPopWheelieLeft +083a6e30 l 0000000c sMovementActionFuncs_AcroPopWheelieRight +083a6e3c l 0000000c sMovementActionFuncs_AcroEndWheelieFaceDown +083a6e48 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceUp +083a6e54 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceLeft +083a6e60 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceRight +083a6e6c l 0000000c MovementActionFuncs_UnusedAcroActionDown +083a6e78 l 0000000c MovementActionFuncs_UnusedAcroActionUp +083a6e84 l 0000000c MovementActionFuncs_UnusedAcroActionLeft +083a6e90 l 0000000c MovementActionFuncs_UnusedAcroActionRight +083a6e9c l 0000000c sMovementActionFuncs_AcroWheelieHopFaceDown +083a6ea8 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceUp +083a6eb4 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceLeft +083a6ec0 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceRight +083a6ecc l 0000000c sMovementActionFuncs_AcroWheelieHopDown +083a6ed8 l 0000000c sMovementActionFuncs_AcroWheelieHopUp +083a6ee4 l 0000000c sMovementActionFuncs_AcroWheelieHopLeft +083a6ef0 l 0000000c sMovementActionFuncs_AcroWheelieHopRight +083a6efc l 0000000c sMovementActionFuncs_AcroWheelieJumpDown +083a6f08 l 0000000c sMovementActionFuncs_AcroWheelieJumpUp +083a6f14 l 0000000c sMovementActionFuncs_AcroWheelieJumpLeft +083a6f20 l 0000000c sMovementActionFuncs_AcroWheelieJumpRight +083a6f2c l 0000000c sMovementActionFuncs_AcroWheelieInPlaceDown +083a6f38 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceUp +083a6f44 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceLeft +083a6f50 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceRight +083a6f5c l 0000000c sMovementActionFuncs_AcroPopWheelieMoveDown +083a6f68 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveUp +083a6f74 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveLeft +083a6f80 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveRight +083a6f8c l 0000000c sMovementActionFuncs_AcroWheelieMoveDown +083a6f98 l 0000000c sMovementActionFuncs_AcroWheelieMoveUp +083a6fa4 l 0000000c sMovementActionFuncs_AcroWheelieMoveLeft +083a6fb0 l 0000000c sMovementActionFuncs_AcroWheelieMoveRight +083a6fbc l 0000000c sMovementActionFuncs_SpinDown +083a6fc8 l 0000000c sMovementActionFuncs_SpinUp +083a6fd4 l 0000000c sMovementActionFuncs_SpinLeft +083a6fe0 l 0000000c sMovementActionFuncs_SpinRight 083a6fec l 00000008 sMovementActionFuncs_x98 083a6ff4 l 00000008 sMovementActionFuncs_x99 083a6ffc l 00000008 sMovementActionFuncs_x9A -083a7004 l 00000008 sMovementActionFuncs_x9F -083a700c l 0000000c sMovementActionFuncs_xA4 -083a7018 l 0000000c sMovementActionFuncs_xA5 +083a7004 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace +083a700c l 0000000c sMovementActionFuncs_FlyUp +083a7018 l 0000000c sMovementActionFuncs_FlyDown 083a702c l 00000000 metatileFuncs.2418 083a7044 l 00000000 jumpLandingFlags.2419 083a705c l 00000010 gUnknown_83A705C.2429 @@ -31111,17 +31115,17 @@ 083a709c l 0000000c sGroundEffectTracksFuncs 083a70ac l 00000010 bikeTireTracks_Transitions.2493 083a70bc l 00000050 sGroundEffectFuncs -083a710c l 00000040 sSpeed0 -083a714c l 00000020 sSpeed1 -083a716c l 00000018 sSpeed2 -083a7184 l 00000010 sSpeed3 -083a7194 l 00000008 sSpeed4 -083a719c l 00000014 sSpriteStepFuncsBySpeed -083a71b0 l 0000000a sSpriteStepCountsBySpeed -083a71ba l 00000010 sJumpHeight12 -083a71ca l 00000010 sJumpHeight6 -083a71da l 00000010 sJumpHeight10 -083a71ec l 0000000c sYDisplacementPtrs +083a710c l 00000040 sSpeedNormalStepFuncs +083a714c l 00000020 sSpeedFast1StepFuncs +083a716c l 00000018 sSpeedFast2StepFuncs +083a7184 l 00000010 sSpeedFasterStepFuncs +083a7194 l 00000008 sSpeedFastestStepFuncs +083a719c l 00000014 sNpcStepFuncTables +083a71b0 l 0000000a sStepTimes +083a71ba l 00000010 sJumpY_High +083a71ca l 00000010 sJumpY_Low +083a71da l 00000010 sJumpY_Normal +083a71ec l 0000000c sJumpYTable 083a7244 g 00000004 gNullScriptPtr 083a7248 l 00000012 sScriptConditionTable 083a7294 g 0000000c sScriptStringVars diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index cfae980c8..7005a520b 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -4010,33 +4010,33 @@ 080648a8 g 00000070 InitNpcForWalkSlowest 08064918 g 0000002c InitWalkSlowest 08064944 g 00000038 UpdateWalkSlowest -0806497c l 0000001e MovementActionFunc_x9B_0 -0806499c l 0000001e MovementActionFunc_x9B_1 -080649bc l 0000001e MovementActionFunc_x9C_0 -080649dc l 0000001e MovementActionFunc_x9C_1 -080649fc l 0000001e MovementActionFunc_x9D_0 -08064a1c l 0000001e MovementActionFunc_x9D_1 -08064a3c l 0000001e MovementActionFunc_x9E_0 -08064a5c l 0000001e MovementActionFunc_x9E_1 -08064a7c l 0000001e MovementActionFunc_x08_0 -08064a9c l 0000001e MovementActionFunc_x08_1 -08064abc l 0000001e MovementActionFunc_x09_0 -08064adc l 0000001e MovementActionFunc_x09_1 -08064afc l 0000001e MovementActionFunc_x0A_0 -08064b1c l 0000001e MovementActionFunc_x0A_1 -08064b3c l 0000001e MovementActionFunc_x0B_0 -08064b5c l 0000001e MovementActionFunc_x0B_1 +0806497c l 0000001e MovementAction_WalkSlowestDown_Step0 +0806499c l 0000001e MovementAction_WalkSlowestDown_Step1 +080649bc l 0000001e MovementAction_WalkSlowestUp_Step0 +080649dc l 0000001e MovementAction_WalkSlowestUp_Step1 +080649fc l 0000001e MovementAction_WalkSlowestLeft_Step0 +08064a1c l 0000001e MovementAction_WalkSlowestLeft_Step1 +08064a3c l 0000001e MovementAction_WalkSlowestRight_Step0 +08064a5c l 0000001e MovementAction_WalkSlowestRight_Step1 +08064a7c l 0000001e MovementAction_WalkSlowerDown_Step0 +08064a9c l 0000001e MovementAction_WalkSlowerDown_Step1 +08064abc l 0000001e MovementAction_WalkSlowerUp_Step0 +08064adc l 0000001e MovementAction_WalkSlowerUp_Step1 +08064afc l 0000001e MovementAction_WalkSlowerLeft_Step0 +08064b1c l 0000001e MovementAction_WalkSlowerLeft_Step1 +08064b3c l 0000001e MovementAction_WalkSlowerRight_Step0 +08064b5c l 0000001e MovementAction_WalkSlowerRight_Step1 08064b7c g 00000070 InitNpcForWalkSlow 08064bec g 0000002c InitWalkSlow 08064c18 g 00000038 UpdateWalkSlow -08064c50 l 0000001e MovementActionFunc_x0D_0 -08064c70 l 0000001e MovementActionFunc_x0D_1 -08064c90 l 0000001e MovementActionFunc_x0C_0 -08064cb0 l 0000001e MovementActionFunc_x0C_1 -08064cd0 l 0000001e MovementActionFunc_x0E_0 -08064cf0 l 0000001e MovementActionFunc_x0E_1 -08064d10 l 0000001e MovementActionFunc_x0F_0 -08064d30 l 0000001e MovementActionFunc_x0F_1 +08064c50 l 0000001e MovementAction_WalkSlowUp_Step0 +08064c70 l 0000001e MovementAction_WalkSlowUp_Step1 +08064c90 l 0000001e MovementAction_WalkSlowDown_Step0 +08064cb0 l 0000001e MovementAction_WalkSlowDown_Step1 +08064cd0 l 0000001e MovementAction_WalkSlowLeft_Step0 +08064cf0 l 0000001e MovementAction_WalkSlowLeft_Step1 +08064d10 l 0000001e MovementAction_WalkSlowRight_Step0 +08064d30 l 0000001e MovementAction_WalkSlowRight_Step1 08064d50 l 00000020 MovementAction_WalkNormalDown_Step0 08064d70 l 0000001e MovementAction_WalkNormalDown_Step1 08064d90 l 00000020 MovementAction_WalkNormalUp_Step0 @@ -4077,19 +4077,19 @@ 080653a0 l 00000020 MovementAction_WalkFastRight_Step0 080653c0 l 0000001e MovementAction_WalkFastRight_Step1 080653e0 g 0000002a sub_80653CC -0806540c l 00000040 MovementActionFunc_xA0_0 -0806544c l 0000002a MovementActionFunc_xA0_1 -08065478 l 00000040 MovementActionFunc_xA1_0 -080654b8 l 0000002a MovementActionFunc_xA1_1 -080654e4 l 00000040 MovementActionFunc_xA2_0 -08065524 l 0000002a MovementActionFunc_xA2_1 -08065550 l 00000040 MovementActionFunc_xA3_0 -08065590 l 0000002a MovementActionFunc_xA3_1 +0806540c l 00000040 MovementAction_xA0_Step0 +0806544c l 0000002a MovementAction_xA0_Step1 +08065478 l 00000040 MovementAction_xA1_Step0 +080654b8 l 0000002a MovementAction_xA1_Step1 +080654e4 l 00000040 MovementAction_xA2_Step0 +08065524 l 0000002a MovementAction_xA2_Step1 +08065550 l 00000040 MovementAction_xA3_Step0 +08065590 l 0000002a MovementAction_xA3_Step1 080655bc g 0000002c sub_80655A8 -080655e8 l 0000003a MovementActionFunc_x04_0 -08065624 l 0000003a MovementActionFunc_x05_0 -08065660 l 0000003a MovementActionFunc_x06_0 -0806569c l 0000003a MovementActionFunc_x07_0 +080655e8 l 0000003a MovementAction_FaceDownFast_Step0 +08065624 l 0000003a MovementAction_FaceUpFast_Step0 +08065660 l 0000003a MovementAction_FaceLeftFast_Step0 +0806569c l 0000003a MovementAction_FaceRightFast_Step0 080656d8 g 00000048 InitMoveInPlace 08065720 l 00000028 MovementAction_WalkInPlace_Step1 08065748 l 0000003c MovementAction_WalkInPlaceSlow_Step1 @@ -4105,10 +4105,10 @@ 0806597c l 00000036 MovementAction_WalkInPlaceFastUp_Step0 080659b4 l 00000036 MovementAction_WalkInPlaceFastLeft_Step0 080659ec l 00000036 MovementAction_WalkInPlaceFastRight_Step0 -08065a24 l 00000036 MovementAction_WalkInPlaceFastestDown_Step0 -08065a5c l 00000036 MovementAction_WalkInPlaceFastestUp_Step0 -08065a94 l 00000036 MovementAction_WalkInPlaceFastestLeft_Step0 -08065acc l 00000036 MovementAction_WalkInPlaceFastestRight_Step0 +08065a24 l 00000036 MovementAction_WalkInPlaceFasterDown_Step0 +08065a5c l 00000036 MovementAction_WalkInPlaceFasterUp_Step0 +08065a94 l 00000036 MovementAction_WalkInPlaceFasterLeft_Step0 +08065acc l 00000036 MovementAction_WalkInPlaceFasterRight_Step0 08065b04 l 00000020 MovementAction_RideWaterCurrentDown_Step0 08065b24 l 0000001e MovementAction_RideWaterCurrentDown_Step1 08065b44 l 00000020 MovementAction_RideWaterCurrentUp_Step0 @@ -4117,14 +4117,14 @@ 08065ba4 l 0000001e MovementAction_RideWaterCurrentLeft_Step1 08065bc4 l 00000020 MovementAction_RideWaterCurrentRight_Step0 08065be4 l 0000001e MovementAction_RideWaterCurrentRight_Step1 -08065c04 l 00000020 MovementAction_WalkFastestDown_Step0 -08065c24 l 0000001e MovementAction_WalkFastestDown_Step1 -08065c44 l 00000020 MovementAction_WalkFastestUp_Step0 -08065c64 l 0000001e MovementAction_WalkFastestUp_Step1 -08065c84 l 00000020 MovementAction_WalkFastestLeft_Step0 -08065ca4 l 0000001e MovementAction_WalkFastestLeft_Step1 -08065cc4 l 00000020 MovementAction_WalkFastestRight_Step0 -08065ce4 l 0000001e MovementAction_WalkFastestRight_Step1 +08065c04 l 00000020 MovementAction_WalkFasterDown_Step0 +08065c24 l 0000001e MovementAction_WalkFasterDown_Step1 +08065c44 l 00000020 MovementAction_WalkFasterUp_Step0 +08065c64 l 0000001e MovementAction_WalkFasterUp_Step1 +08065c84 l 00000020 MovementAction_WalkFasterLeft_Step0 +08065ca4 l 0000001e MovementAction_WalkFasterLeft_Step1 +08065cc4 l 00000020 MovementAction_WalkFasterRight_Step0 +08065ce4 l 0000001e MovementAction_WalkFasterRight_Step1 08065d04 l 00000020 MovementAction_SlideDown_Step0 08065d24 l 0000001e MovementAction_SlideDown_Step1 08065d44 l 00000020 MovementAction_SlideUp_Step0 @@ -4144,14 +4144,14 @@ 08065f04 g 00000070 InitNpcForRunSlow 08065f74 g 0000002c InitRunSlow 08065fa0 g 00000038 UpdateRunSlow -08065fd8 l 0000001e MovementActionFunc_x41_0 -08065ff8 l 0000001e MovementActionFunc_x41_1 -08066018 l 0000001e MovementActionFunc_x42_0 -08066038 l 0000001e MovementActionFunc_x42_1 -08066058 l 0000001e MovementActionFunc_x43_0 -08066078 l 0000001e MovementActionFunc_x43_1 -08066098 l 0000001e MovementActionFunc_x44_0 -080660b8 l 0000001e MovementActionFunc_x44_1 +08065fd8 l 0000001e MovementAction_RunDownSlow_Step0 +08065ff8 l 0000001e MovementAction_RunDownSlow_Step1 +08066018 l 0000001e MovementAction_RunUpSlow_Step0 +08066038 l 0000001e MovementAction_RunUpSlow_Step1 +08066058 l 0000001e MovementAction_RunLeftSlow_Step0 +08066078 l 0000001e MovementAction_RunLeftSlow_Step1 +08066098 l 0000001e MovementAction_RunRightSlow_Step0 +080660b8 l 0000001e MovementAction_RunRightSlow_Step1 080660d8 g 0000002c StartSpriteAnimInDirection 08066104 l 00000016 MovementAction_StartAnimInDirection_Step0 0806611c l 00000020 MovementAction_WaitSpriteAnim @@ -4164,14 +4164,14 @@ 08066220 l 00000028 MovementAction_JumpSpecialLeft_Step1 08066248 l 0000001e MovementAction_JumpSpecialRight_Step0 08066268 l 00000028 MovementAction_JumpSpecialRight_Step1 -08066290 l 0000001e MovementActionFunc_xA6_0 -080662b0 l 0000001e MovementActionFunc_xA6_1 -080662d0 l 0000001e MovementActionFunc_xA7_0 -080662f0 l 0000001e MovementActionFunc_xA7_1 -08066310 l 0000001e MovementActionFunc_xA8_0 -08066330 l 0000001e MovementActionFunc_xA8_1 -08066350 l 0000001e MovementActionFunc_xA9_0 -08066370 l 0000001e MovementActionFunc_xA9_1 +08066290 l 0000001e MovementAction_JumpSpecialWithEffectDown_Step0 +080662b0 l 0000001e MovementAction_JumpSpecialWithEffectDown_Step1 +080662d0 l 0000001e MovementAction_JumpSpecialWithEffectUp_Step0 +080662f0 l 0000001e MovementAction_JumpSpecialWithEffectUp_Step1 +08066310 l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step0 +08066330 l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step1 +08066350 l 0000001e MovementAction_JumpSpecialWithEffectRight_Step0 +08066370 l 0000001e MovementAction_JumpSpecialWithEffectRight_Step1 08066390 l 0000005c MovementAction_FacePlayer_Step0 080663ec l 00000064 MovementAction_FaceAwayPlayer_Step0 08066450 l 0000000e MovementAction_LockFacingDirection_Step0 @@ -4210,9 +4210,9 @@ 08066924 l 00000010 MovementAction_SetVisible_Step0 08066934 l 00000024 MovementAction_EmoteExclamationMark_Step0 08066958 l 00000024 MovementAction_EmoteQuestionMark_Step0 -0806697c l 00000024 MovementAction_EmoteHeart_Step0 -080669a0 l 00000024 do_double_excl_bubble -080669c4 l 00000024 do_smile_bubble +0806697c l 00000024 MovementAction_EmoteX_Step0 +080669a0 l 00000024 MovementAction_EmoteDoubleExclamationMark_Step0 +080669c4 l 00000024 MovementAction_EmoteSmile_Step0 080669e8 l 00000044 MovementAction_RevealTrainer_Step0 08066a2c l 0000001e MovementAction_RevealTrainer_Step1 08066a4c l 0000001a MovementAction_RockSmashBreak_Step0 @@ -4230,10 +4230,10 @@ 08066c24 l 00000032 MovementAction_WalkDownAffine_Step0 08066c58 l 0000002a MovementAction_WalkDownAffine_Step1 08066c84 g 00000040 AcroWheelieFaceDirection -08066cc4 l 0000000e MovementActionFunc_x70_0 -08066cd4 l 0000000e MovementActionFunc_x71_0 -08066ce4 l 0000000e MovementActionFunc_x72_0 -08066cf4 l 0000000e MovementActionFunc_x73_0 +08066cc4 l 0000000e MovementAction_AcroWheelieFaceDown_Step0 +08066cd4 l 0000000e MovementAction_AcroWheelieFaceUp_Step0 +08066ce4 l 0000000e MovementAction_AcroWheelieFaceLeft_Step0 +08066cf4 l 0000000e MovementAction_AcroWheelieFaceRight_Step0 08066d04 l 00000024 MovementAction_AcroPopWheelieDown_Step0 08066d28 l 00000024 MovementAction_AcroPopWheelieUp_Step0 08066d4c l 00000024 MovementAction_AcroPopWheelieLeft_Step0 @@ -4271,10 +4271,10 @@ 08067294 l 0000002a MovementAction_AcroWheelieJumpLeft_Step1 080672c0 l 0000002a MovementAction_AcroWheelieJumpRight_Step0 080672ec l 0000002a MovementAction_AcroWheelieJumpRight_Step1 -08067318 l 00000036 MovementActionFunc_x88_0 -08067350 l 00000036 MovementActionFunc_x89_0 -08067388 l 00000036 MovementActionFunc_x8A_0 -080673c0 l 00000036 MovementActionFunc_x8B_0 +08067318 l 00000036 MovementAction_AcroWheelieInPlaceDown_Step0 +08067350 l 00000036 MovementAction_AcroWheelieInPlaceUp_Step0 +08067388 l 00000036 MovementAction_AcroWheelieInPlaceLeft_Step0 +080673c0 l 00000036 MovementAction_AcroWheelieInPlaceRight_Step0 080673f8 g 00000036 InitAcroPopWheelie 08067430 l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 08067450 l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 @@ -4294,27 +4294,27 @@ 08067620 l 00000020 MovementAction_AcroWheelieMoveRight_Step0 08067640 l 0000001e MovementAction_AcroWheelieMoveRight_Step1 08067660 g 00000038 InitSpin -08067698 l 00000020 MovementActionFunc_x94_0 -080676b8 l 0000001e MovementActionFunc_x94_1 -080676d8 l 00000020 MovementActionFunc_x95_0 -080676f8 l 0000001e MovementActionFunc_x95_1 -08067718 l 00000020 MovementActionFunc_x96_0 -08067738 l 0000001e MovementActionFunc_x96_1 -08067758 l 00000020 MovementActionFunc_x97_0 -08067778 l 0000001e MovementActionFunc_x97_1 -08067798 l 0000003c MovementActionFunc_x98_0 -080677d4 l 0000000a MovementActionFunc_x98_1 -080677e0 l 000000f2 MovementActionFunc_x99_1 -080678d4 l 00000030 MovementActionFunc_x9A_1 -08067904 l 00000032 MovementActionFunc_x9F_0 -08067938 l 0000000a MovementActionFunc_x9F_1 +08067698 l 00000020 MovementAction_SpinDown_Step0 +080676b8 l 0000001e MovementAction_SpinDown_Step1 +080676d8 l 00000020 MovementAction_SpinUp_Step0 +080676f8 l 0000001e MovementAction_SpinUp_Step1 +08067718 l 00000020 MovementAction_SpinLeft_Step0 +08067738 l 0000001e MovementAction_SpinLeft_Step1 +08067758 l 00000020 MovementAction_SpinRight_Step0 +08067778 l 0000001e MovementAction_SpinRight_Step1 +08067798 l 0000003c MovementAction_x98_Step0 +080677d4 l 0000000a MovementAction_x98_Step1 +080677e0 l 000000f2 MovementAction_x99_Step1 +080678d4 l 00000030 MovementAction_x9A_Step1 +08067904 l 00000032 MovementAction_ShakeHeadOrWalkInPlace_Step0 +08067938 l 0000000a MovementAction_ShakeHeadOrWalkInPlace_Step1 08067944 l 00000004 MovementAction_Finish 08067948 l 0000000e MovementAction_PauseSpriteAnim -08067958 l 0000000e MovementActionFunc_xA4_0 -08067968 l 00000022 MovementActionFunc_xA4_1 -0806798c l 00000014 MovementActionFunc_xA5_0 -080679a0 l 0000001a MovementActionFunc_xA5_1 -080679bc l 00000004 MovementActionFunc_xA4_2 +08067958 l 0000000e MovementAction_FlyUp_Step0 +08067968 l 00000022 MovementAction_FlyUp_Step1 +0806798c l 00000014 MovementAction_FlyDown_Step0 +080679a0 l 0000001a MovementAction_FlyDown_Step1 +080679bc l 00000004 MovementAction_FlyUp_Step2 080679c0 l 0000001a UpdateObjectEventSpriteAnimPause 080679dc l 0000002e TryEnableObjectEventAnim 08067a0c l 00000018 UpdateObjectEventVisibility @@ -4384,11 +4384,11 @@ 080689c4 g 00000044 FreezeObjectEventsExceptOne 08068a08 g 00000068 UnfreezeObjectEvent 08068a70 g 00000030 UnfreezeObjectEvents -08068aa0 l 00000020 little_step -08068ac0 l 00000024 double_little_steps -08068ae4 l 00000028 triple_little_steps -08068b0c l 00000024 quad_little_steps -08068b30 l 00000024 oct_little_steps +08068aa0 l 00000020 Step1 +08068ac0 l 00000024 Step2 +08068ae4 l 00000028 Step3 +08068b0c l 00000024 Step4 +08068b30 l 00000024 Step8 08068b54 g 00000012 SetSpriteDataForNormalStep 08068b68 g 00000068 NpcTakeStep 08068bd0 g 0000000e SetWalkSlowerSpriteData @@ -4399,7 +4399,7 @@ 08068c7c g 0000003c UpdateWalkSlowestAnim 08068cb8 g 0000000e SetRunSlowSpriteData 08068cc8 g 0000004a UpdateRunSlowAnim -08068d14 l 0000001c GetJumpYDisplacement +08068d14 l 0000001c GetJumpY 08068d30 g 0000001e SetJumpSpriteData 08068d50 g 00000088 DoJumpSpriteMovement 08068dd8 g 00000094 DoJumpSpecialSpriteMovement @@ -20262,10 +20262,10 @@ 081a7659 g 00000000 Movement_FacePlayer 081a765b g 00000000 Movement_FaceAwayPlayer 081a765d g 00000000 Movement_FaceOriginalDirection -081a765f g 00000000 Movement_WalkInPlaceFastestLeft -081a7661 g 00000000 Movement_WalkInPlaceFastestUp -081a7663 g 00000000 Movement_WalkInPlaceFastestRight -081a7665 g 00000000 Movement_WalkInPlaceFastestDown +081a765f g 00000000 Movement_WalkInPlaceFasterLeft +081a7661 g 00000000 Movement_WalkInPlaceFasterUp +081a7663 g 00000000 Movement_WalkInPlaceFasterRight +081a7665 g 00000000 Movement_WalkInPlaceFasterDown 081a7667 g 00000000 Movement_FaceRight 081a7669 g 00000000 Movement_FaceDown 081a766b g 00000000 Movement_WalkUp5 @@ -30929,180 +30929,184 @@ 083a6601 l 00000008 gOppositeDirections 083a6609 l 00000010 sPlayerDirectionsForCopy 083a6619 l 00000010 sPlayerDirectionToCopyDirection -083a662c g 000002a8 gMovementActionFuncs -083a68d4 l 00000008 sMovementActionFuncs_x00 -083a68dc l 00000008 sMovementActionFuncs_x01 -083a68e4 l 00000008 sMovementActionFuncs_x02 -083a68ec l 00000008 sMovementActionFuncs_x03 -083a68f4 l 00000014 gUnknown_83A6884 -083a6908 l 0000000c sMovementActionFuncs_x9B -083a6914 l 0000000c sMovementActionFuncs_x9C -083a6920 l 0000000c sMovementActionFuncs_x9D -083a692c l 0000000c sMovementActionFuncs_x9E -083a6938 l 0000000c sMovementActionFuncs_x08 -083a6944 l 0000000c sMovementActionFuncs_x09 -083a6950 l 0000000c sMovementActionFuncs_x0A -083a695c l 0000000c sMovementActionFuncs_x0B -083a6968 l 0000000c sMovementActionFuncs_x0D -083a6974 l 0000000c sMovementActionFuncs_x0C -083a6980 l 0000000c sMovementActionFuncs_x0E -083a698c l 0000000c sMovementActionFuncs_x0F -083a6998 l 0000000c sMovementActionFuncs_x10 -083a69a4 l 0000000c sMovementActionFuncs_x11 -083a69b0 l 0000000c sMovementActionFuncs_x12 -083a69bc l 0000000c sMovementActionFuncs_x13 -083a69c8 g 00000006 gUnknown_83A6958 -083a69ce g 00000006 gUnknown_83A695E -083a69d4 l 0000000c sMovementActionFuncs_x14 -083a69e0 l 0000000c sMovementActionFuncs_x15 -083a69ec l 0000000c sMovementActionFuncs_x16 -083a69f8 l 0000000c sMovementActionFuncs_x17 -083a6a04 l 0000000c sMovementActionFuncs_x18 -083a6a10 l 0000000c sMovementActionFuncs_x19 -083a6a1c l 0000000c sMovementActionFuncs_x1A -083a6a28 l 0000000c sMovementActionFuncs_x1B -083a6a34 l 0000000c sMovementActionFuncs_x1C -083a6a40 l 0000000c sMovementActionFuncs_x1D -083a6a4c l 0000000c sMovementActionFuncs_x1E -083a6a58 l 0000000c sMovementActionFuncs_x1F -083a6a64 l 0000000c sMovementActionFuncs_x20 +083a662c l 000002a8 sMovementActionFuncs +083a68d4 l 00000008 sMovementActionFuncs_FaceDown +083a68dc l 00000008 sMovementActionFuncs_FaceUp +083a68e4 l 00000008 sMovementActionFuncs_FaceLeft +083a68ec l 00000008 sMovementActionFuncs_FaceRight +083a68f4 l 00000014 sDirectionAnimFuncsBySpeed +083a6908 l 0000000c sMovementActionFuncs_WalkSlowestDown +083a6914 l 0000000c sMovementActionFuncs_WalkSlowestUp +083a6920 l 0000000c sMovementActionFuncs_WalkSlowestLeft +083a692c l 0000000c sMovementActionFuncs_WalkSlowestRight +083a6938 l 0000000c sMovementActionFuncs_WalkSlowerDown +083a6944 l 0000000c sMovementActionFuncs_WalkSlowerUp +083a6950 l 0000000c sMovementActionFuncs_WalkSlowerLeft +083a695c l 0000000c sMovementActionFuncs_WalkSlowerRight +083a6968 l 0000000c sMovementActionFuncs_WalkSlowUp +083a6974 l 0000000c sMovementActionFuncs_WalkSlowDown +083a6980 l 0000000c sMovementActionFuncs_WalkSlowLeft +083a698c l 0000000c sMovementActionFuncs_WalkSlowRight +083a6998 l 0000000c sMovementActionFuncs_WalkNormalDown +083a69a4 l 0000000c sMovementActionFuncs_WalkNormalUp +083a69b0 l 0000000c sMovementActionFuncs_WalkNormalLeft +083a69bc l 0000000c sMovementActionFuncs_WalkNormalRight +083a69c8 l 00000006 sJumpInitDisplacements +083a69ce l 00000006 sJumpDisplacements +083a69d4 l 0000000c sMovementActionFuncs_Jump2Down +083a69e0 l 0000000c sMovementActionFuncs_Jump2Up +083a69ec l 0000000c sMovementActionFuncs_Jump2Left +083a69f8 l 0000000c sMovementActionFuncs_Jump2Right +083a6a04 l 0000000c sMovementActionFuncs_Delay1 +083a6a10 l 0000000c sMovementActionFuncs_Delay2 +083a6a1c l 0000000c sMovementActionFuncs_Delay4 +083a6a28 l 0000000c sMovementActionFuncs_Delay8 +083a6a34 l 0000000c sMovementActionFuncs_Delay16 +083a6a40 l 0000000c sMovementActionFuncs_WalkFastDown +083a6a4c l 0000000c sMovementActionFuncs_WalkFastUp +083a6a58 l 0000000c sMovementActionFuncs_WalkFastLeft +083a6a64 l 0000000c sMovementActionFuncs_WalkFastRight 083a6a70 l 0000000c sMovementActionFuncs_xA0 083a6a7c l 0000000c sMovementActionFuncs_xA1 083a6a88 l 0000000c sMovementActionFuncs_xA2 083a6a94 l 0000000c sMovementActionFuncs_xA3 -083a6aa0 l 00000008 sMovementActionFuncs_x04 -083a6aa8 l 00000008 sMovementActionFuncs_x05 -083a6ab0 l 00000008 sMovementActionFuncs_x06 -083a6ab8 l 00000008 sMovementActionFuncs_x07 -083a6ac0 l 0000000c sMovementActionFuncs_x21 -083a6acc l 0000000c sMovementActionFuncs_x22 -083a6ad8 l 0000000c sMovementActionFuncs_x23 -083a6ae4 l 0000000c sMovementActionFuncs_x24 -083a6af0 l 0000000c sMovementActionFuncs_x25 -083a6afc l 0000000c sMovementActionFuncs_x26 -083a6b08 l 0000000c sMovementActionFuncs_x27 -083a6b14 l 0000000c sMovementActionFuncs_x28 -083a6b20 l 0000000c sMovementActionFuncs_x29 -083a6b2c l 0000000c sMovementActionFuncs_x2A -083a6b38 l 0000000c sMovementActionFuncs_x2B -083a6b44 l 0000000c sMovementActionFuncs_x2C -083a6b50 l 0000000c sMovementActionFuncs_x2D -083a6b5c l 0000000c sMovementActionFuncs_x2E -083a6b68 l 0000000c sMovementActionFuncs_x2F -083a6b74 l 0000000c sMovementActionFuncs_x30 -083a6b80 l 0000000c sMovementActionFuncs_x31 -083a6b8c l 0000000c sMovementActionFuncs_x32 -083a6b98 l 0000000c sMovementActionFuncs_x33 -083a6ba4 l 0000000c sMovementActionFuncs_x34 -083a6bb0 l 0000000c sMovementActionFuncs_x35 -083a6bbc l 0000000c sMovementActionFuncs_x36 -083a6bc8 l 0000000c sMovementActionFuncs_x37 -083a6bd4 l 0000000c sMovementActionFuncs_x38 -083a6be0 l 0000000c sMovementActionFuncs_x39 -083a6bec l 0000000c sMovementActionFuncs_x3A -083a6bf8 l 0000000c sMovementActionFuncs_x3B -083a6c04 l 0000000c sMovementActionFuncs_x3C -083a6c10 l 0000000c sMovementActionFuncs_x3D -083a6c1c l 0000000c sMovementActionFuncs_x3E -083a6c28 l 0000000c sMovementActionFuncs_x3F -083a6c34 l 0000000c sMovementActionFuncs_x40 -083a6c40 l 0000000c sMovementActionFuncs_x41 -083a6c4c l 0000000c sMovementActionFuncs_x42 -083a6c58 l 0000000c sMovementActionFuncs_x43 -083a6c64 l 0000000c sMovementActionFuncs_x44 -083a6c70 l 0000000c sMovementActionFuncs_x45 -083a6c7c l 0000000c sMovementActionFuncs_x46 -083a6c88 l 0000000c sMovementActionFuncs_x47 -083a6c94 l 0000000c sMovementActionFuncs_x48 -083a6ca0 l 0000000c sMovementActionFuncs_x49 -083a6cac l 0000000c sMovementActionFuncs_xA6 -083a6cb8 l 0000000c sMovementActionFuncs_xA7 -083a6cc4 l 0000000c sMovementActionFuncs_xA8 -083a6cd0 l 0000000c sMovementActionFuncs_xA9 -083a6cdc l 00000008 sMovementActionFuncs_x4A -083a6ce4 l 00000008 sMovementActionFuncs_x4B -083a6cec l 00000008 sMovementActionFuncs_x4C -083a6cf4 l 00000008 sMovementActionFuncs_x4D -083a6cfc l 0000000c sMovementActionFuncs_x4E -083a6d08 l 0000000c sMovementActionFuncs_x4F -083a6d14 l 0000000c sMovementActionFuncs_x50 -083a6d20 l 0000000c sMovementActionFuncs_x51 -083a6d2c l 0000000c sMovementActionFuncs_x52 -083a6d38 l 0000000c sMovementActionFuncs_x53 -083a6d44 l 0000000c sMovementActionFuncs_x54 -083a6d50 l 0000000c sMovementActionFuncs_x55 -083a6d5c l 0000000c sMovementActionFuncs_x56 -083a6d68 l 0000000c sMovementActionFuncs_x57 -083a6d74 l 0000000c sMovementActionFuncs_x58 -083a6d80 l 0000000c sMovementActionFuncs_x59 -083a6d8c l 00000008 sMovementActionFuncs_x5A -083a6d94 l 0000000c sMovementActionFuncs_x5B -083a6da0 l 00000008 sMovementActionFuncs_x5C -083a6da8 l 00000008 sMovementActionFuncs_x5D -083a6db0 l 00000008 sMovementActionFuncs_x5E -083a6db8 l 00000008 sMovementActionFuncs_x5F -083a6dc0 l 00000008 sMovementActionFuncs_x60 -083a6dc8 l 00000008 sMovementActionFuncs_x61 -083a6dd0 l 00000008 sMovementActionFuncs_x62 -083a6dd8 l 00000008 sMovementActionFuncs_x63 -083a6de0 l 00000008 sMovementActionFuncs_x64 -083a6de8 l 00000008 sMovementActionFuncs_x65 -083a6df0 l 00000008 sMovementActionFuncs_x66 -083a6df8 l 0000000c sMovementActionFuncs_x67 -083a6e04 l 00000010 sMovementActionFuncs_x68 -083a6e14 l 00000010 sMovementActionFuncs_x69 -083a6e24 l 00000008 sMovementActionFuncs_x6A -083a6e2c l 00000008 sMovementActionFuncs_x6B -083a6e34 l 00000008 sMovementActionFuncs_x6C -083a6e3c l 00000008 sMovementActionFuncs_x6D -083a6e44 l 0000000c sMovementActionFuncs_x6E -083a6e50 l 0000000c sMovementActionFuncs_x6F -083a6e5c l 00000008 sMovementActionFuncs_x70 -083a6e64 l 00000008 sMovementActionFuncs_x71 -083a6e6c l 00000008 sMovementActionFuncs_x72 -083a6e74 l 00000008 sMovementActionFuncs_x73 -083a6e7c l 0000000c sMovementActionFuncs_x74 -083a6e88 l 0000000c sMovementActionFuncs_x75 -083a6e94 l 0000000c sMovementActionFuncs_x76 -083a6ea0 l 0000000c sMovementActionFuncs_x77 -083a6eac l 0000000c sMovementActionFuncs_x78 -083a6eb8 l 0000000c sMovementActionFuncs_x79 -083a6ec4 l 0000000c sMovementActionFuncs_x7A -083a6ed0 l 0000003c sMovementActionFuncs_x7B -083a6f0c l 0000000c sMovementActionFuncs_x7C -083a6f18 l 0000000c sMovementActionFuncs_x7D -083a6f24 l 0000000c sMovementActionFuncs_x7E -083a6f30 l 0000000c sMovementActionFuncs_x7F -083a6f3c l 0000000c sMovementActionFuncs_x80 -083a6f48 l 0000000c sMovementActionFuncs_x81 -083a6f54 l 0000000c sMovementActionFuncs_x82 -083a6f60 l 0000000c sMovementActionFuncs_x83 -083a6f6c l 0000000c sMovementActionFuncs_x84 -083a6f78 l 0000000c sMovementActionFuncs_x85 -083a6f84 l 0000000c sMovementActionFuncs_x86 -083a6f90 l 0000000c sMovementActionFuncs_x87 -083a6f9c l 0000000c sMovementActionFuncs_x88 -083a6fa8 l 0000000c sMovementActionFuncs_x89 -083a6fb4 l 0000000c sMovementActionFuncs_x8A -083a6fc0 l 0000000c sMovementActionFuncs_x8B -083a6fcc l 0000000c sMovementActionFuncs_x8C -083a6fd8 l 0000000c sMovementActionFuncs_x8D -083a6fe4 l 0000000c sMovementActionFuncs_x8E -083a6ff0 l 0000000c sMovementActionFuncs_x8F -083a6ffc l 0000000c sMovementActionFuncs_x90 -083a7008 l 0000000c sMovementActionFuncs_x91 -083a7014 l 0000000c sMovementActionFuncs_x92 -083a7020 l 0000000c sMovementActionFuncs_x93 -083a702c l 0000000c sMovementActionFuncs_x94 -083a7038 l 0000000c sMovementActionFuncs_x95 -083a7044 l 0000000c sMovementActionFuncs_x96 -083a7050 l 0000000c sMovementActionFuncs_x97 +083a6aa0 l 00000008 sMovementActionFuncs_FaceDownFast +083a6aa8 l 00000008 sMovementActionFuncs_FaceUpFast +083a6ab0 l 00000008 sMovementActionFuncs_FaceLeftFast +083a6ab8 l 00000008 sMovementActionFuncs_FaceRightFast +083a6ac0 l 0000000c sMovementActionFuncs_WalkInPlaceSlowDown +083a6acc l 0000000c sMovementActionFuncs_WalkInPlaceSlowUp +083a6ad8 l 0000000c sMovementActionFuncs_WalkInPlaceSlowLeft +083a6ae4 l 0000000c sMovementActionFuncs_WalkInPlaceSlowRight +083a6af0 l 0000000c sMovementActionFuncs_WalkInPlaceNormalDown +083a6afc l 0000000c sMovementActionFuncs_WalkInPlaceNormalUp +083a6b08 l 0000000c sMovementActionFuncs_WalkInPlaceNormalLeft +083a6b14 l 0000000c sMovementActionFuncs_WalkInPlaceNormalRight +083a6b20 l 0000000c sMovementActionFuncs_WalkInPlaceFastDown +083a6b2c l 0000000c sMovementActionFuncs_WalkInPlaceFastUp +083a6b38 l 0000000c sMovementActionFuncs_WalkInPlaceFastLeft +083a6b44 l 0000000c sMovementActionFuncs_WalkInPlaceFastRight +083a6b50 l 0000000c sMovementActionFuncs_WalkInPlaceFasterDown +083a6b5c l 0000000c sMovementActionFuncs_WalkInPlaceFasterUp +083a6b68 l 0000000c sMovementActionFuncs_WalkInPlaceFasterLeft +083a6b74 l 0000000c sMovementActionFuncs_WalkInPlaceFasterRight +083a6b80 l 0000000c sMovementActionFuncs_RideWaterCurrentDown +083a6b8c l 0000000c sMovementActionFuncs_RideWaterCurrentUp +083a6b98 l 0000000c sMovementActionFuncs_RideWaterCurrentLeft +083a6ba4 l 0000000c sMovementActionFuncs_RideWaterCurrentRight +083a6bb0 l 0000000c sMovementActionFuncs_WalkFasterDown +083a6bbc l 0000000c sMovementActionFuncs_WalkFasterUp +083a6bc8 l 0000000c sMovementActionFuncs_WalkFasterLeft +083a6bd4 l 0000000c sMovementActionFuncs_WalkFasterRight +083a6be0 l 0000000c sMovementActionFuncs_SlideDown +083a6bec l 0000000c sMovementActionFuncs_SlideUp +083a6bf8 l 0000000c sMovementActionFuncs_SlideLeft +083a6c04 l 0000000c sMovementActionFuncs_SlideRight +083a6c10 l 0000000c sMovementActionFuncs_PlayerRunDown +083a6c1c l 0000000c sMovementActionFuncs_PlayerRunUp +083a6c28 l 0000000c sMovementActionFuncs_PlayerRunLeft +083a6c34 l 0000000c sMovementActionFuncs_PlayerRunRight +083a6c40 l 0000000c sMovementActionFuncs_PlayerRunDownSlow +083a6c4c l 0000000c sMovementActionFuncs_PlayerRunUpSlow +083a6c58 l 0000000c sMovementActionFuncs_PlayerRunLeftSlow +083a6c64 l 0000000c sMovementActionFuncs_PlayerRunRightSlow +083a6c70 l 0000000c sMovementActionFuncs_StartAnimInDirection +083a6c7c l 0000000c sMovementActionFuncs_JumpSpecialDown +083a6c88 l 0000000c sMovementActionFuncs_JumpSpecialUp +083a6c94 l 0000000c sMovementActionFuncs_JumpSpecialLeft +083a6ca0 l 0000000c sMovementActionFuncs_JumpSpecialRight +083a6cac l 0000000c sMovementActionFuncs_JumpSpecialWithEffectDown +083a6cb8 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectUp +083a6cc4 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectLeft +083a6cd0 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectRight +083a6cdc l 00000008 sMovementActionFuncs_FacePlayer +083a6ce4 l 00000008 sMovementActionFuncs_FaceAwayPlayer +083a6cec l 00000008 sMovementActionFuncs_LockFacingDirection +083a6cf4 l 00000008 sMovementActionFuncs_UnlockFacingDirection +083a6cfc l 0000000c sMovementActionFuncs_JumpDown +083a6d08 l 0000000c sMovementActionFuncs_JumpUp +083a6d14 l 0000000c sMovementActionFuncs_JumpLeft +083a6d20 l 0000000c sMovementActionFuncs_JumpRight +083a6d2c l 0000000c sMovementActionFuncs_JumpInPlaceDown +083a6d38 l 0000000c sMovementActionFuncs_JumpInPlaceUp +083a6d44 l 0000000c sMovementActionFuncs_JumpInPlaceLeft +083a6d50 l 0000000c sMovementActionFuncs_JumpInPlaceRight +083a6d5c l 0000000c sMovementActionFuncs_JumpInPlaceDownUp +083a6d68 l 0000000c sMovementActionFuncs_JumpInPlaceUpDown +083a6d74 l 0000000c sMovementActionFuncs_JumpInPlaceLeftRight +083a6d80 l 0000000c sMovementActionFuncs_JumpInPlaceRightLeft +083a6d8c l 00000008 sMovementActionFuncs_FaceOriginalDirection +083a6d94 l 0000000c sMovementActionFuncs_NurseJoyBowDown +083a6da0 l 00000008 sMovementActionFuncs_EnableJumpLandingGroundEffect +083a6da8 l 00000008 sMovementActionFuncs_DisableJumpLandingGroundEffect +083a6db0 l 00000008 sMovementActionFuncs_DisableAnimation +083a6db8 l 00000008 sMovementActionFuncs_RestoreAnimation +083a6dc0 l 00000008 sMovementActionFuncs_SetInvisible +083a6dc8 l 00000008 sMovementActionFuncs_SetVisible +083a6dd0 l 00000008 sMovementActionFuncs_EmoteExclamationMark +083a6dd8 l 00000008 sMovementActionFuncs_EmoteQuestionMark +083a6de0 l 00000008 sMovementActionFuncs_EmoteX +083a6de8 l 00000008 sMovementActionFuncs_EmoteDoubleExclMark +083a6df0 l 00000008 sMovementActionFuncs_EmoteSmile +083a6df8 l 0000000c sMovementActionFuncs_RevealTrainer +083a6e04 l 00000010 sMovementActionFuncs_RockSmashBreak +083a6e14 l 00000010 sMovementActionFuncs_CutTree +083a6e24 l 00000008 sMovementActionFuncs_SetFixedPriority +083a6e2c l 00000008 sMovementActionFuncs_ClearFixedPriority +083a6e34 l 00000008 sMovementActionFuncs_InitAffineAnim +083a6e3c l 00000008 sMovementActionFuncs_ClearAffineAnim +083a6e44 l 0000000c sMovementActionFuncs_WalkDownStartAffine +083a6e50 l 0000000c sMovementActionFuncs_WalkDownAffine +083a6e5c l 00000008 sMovementActionFuncs_AcroWheelieFaceDown +083a6e64 l 00000008 sMovementActionFuncs_AcroWheelieFaceUp +083a6e6c l 00000008 sMovementActionFuncs_AcroWheelieFaceLeft +083a6e74 l 00000008 sMovementActionFuncs_AcroWheelieFaceRight +083a6e7c l 0000000c sMovementActionFuncs_AcroPopWheelieDown +083a6e88 l 0000000c sMovementActionFuncs_AcroPopWheelieUp +083a6e94 l 0000000c sMovementActionFuncs_AcroPopWheelieLeft +083a6ea0 l 0000000c sMovementActionFuncs_AcroPopWheelieRight +083a6eac l 0000000c sMovementActionFuncs_AcroEndWheelieFaceDown +083a6eb8 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceUp +083a6ec4 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceLeft +083a6ed0 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceRight +083a6edc l 0000000c MovementActionFuncs_UnusedAcroActionDown +083a6ee8 l 0000000c MovementActionFuncs_UnusedAcroActionUp +083a6ef4 l 0000000c MovementActionFuncs_UnusedAcroActionLeft +083a6f00 l 0000000c MovementActionFuncs_UnusedAcroActionRight +083a6f0c l 0000000c sMovementActionFuncs_AcroWheelieHopFaceDown +083a6f18 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceUp +083a6f24 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceLeft +083a6f30 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceRight +083a6f3c l 0000000c sMovementActionFuncs_AcroWheelieHopDown +083a6f48 l 0000000c sMovementActionFuncs_AcroWheelieHopUp +083a6f54 l 0000000c sMovementActionFuncs_AcroWheelieHopLeft +083a6f60 l 0000000c sMovementActionFuncs_AcroWheelieHopRight +083a6f6c l 0000000c sMovementActionFuncs_AcroWheelieJumpDown +083a6f78 l 0000000c sMovementActionFuncs_AcroWheelieJumpUp +083a6f84 l 0000000c sMovementActionFuncs_AcroWheelieJumpLeft +083a6f90 l 0000000c sMovementActionFuncs_AcroWheelieJumpRight +083a6f9c l 0000000c sMovementActionFuncs_AcroWheelieInPlaceDown +083a6fa8 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceUp +083a6fb4 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceLeft +083a6fc0 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceRight +083a6fcc l 0000000c sMovementActionFuncs_AcroPopWheelieMoveDown +083a6fd8 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveUp +083a6fe4 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveLeft +083a6ff0 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveRight +083a6ffc l 0000000c sMovementActionFuncs_AcroWheelieMoveDown +083a7008 l 0000000c sMovementActionFuncs_AcroWheelieMoveUp +083a7014 l 0000000c sMovementActionFuncs_AcroWheelieMoveLeft +083a7020 l 0000000c sMovementActionFuncs_AcroWheelieMoveRight +083a702c l 0000000c sMovementActionFuncs_SpinDown +083a7038 l 0000000c sMovementActionFuncs_SpinUp +083a7044 l 0000000c sMovementActionFuncs_SpinLeft +083a7050 l 0000000c sMovementActionFuncs_SpinRight 083a705c l 00000008 sMovementActionFuncs_x98 083a7064 l 00000008 sMovementActionFuncs_x99 083a706c l 00000008 sMovementActionFuncs_x9A -083a7074 l 00000008 sMovementActionFuncs_x9F -083a707c l 0000000c sMovementActionFuncs_xA4 -083a7088 l 0000000c sMovementActionFuncs_xA5 +083a7074 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace +083a707c l 0000000c sMovementActionFuncs_FlyUp +083a7088 l 0000000c sMovementActionFuncs_FlyDown 083a709c l 00000000 metatileFuncs.2418 083a70b4 l 00000000 jumpLandingFlags.2419 083a70cc l 00000010 gUnknown_83A705C.2429 @@ -31112,17 +31116,17 @@ 083a710c l 0000000c sGroundEffectTracksFuncs 083a711c l 00000010 bikeTireTracks_Transitions.2493 083a712c l 00000050 sGroundEffectFuncs -083a717c l 00000040 sSpeed0 -083a71bc l 00000020 sSpeed1 -083a71dc l 00000018 sSpeed2 -083a71f4 l 00000010 sSpeed3 -083a7204 l 00000008 sSpeed4 -083a720c l 00000014 sSpriteStepFuncsBySpeed -083a7220 l 0000000a sSpriteStepCountsBySpeed -083a722a l 00000010 sJumpHeight12 -083a723a l 00000010 sJumpHeight6 -083a724a l 00000010 sJumpHeight10 -083a725c l 0000000c sYDisplacementPtrs +083a717c l 00000040 sSpeedNormalStepFuncs +083a71bc l 00000020 sSpeedFast1StepFuncs +083a71dc l 00000018 sSpeedFast2StepFuncs +083a71f4 l 00000010 sSpeedFasterStepFuncs +083a7204 l 00000008 sSpeedFastestStepFuncs +083a720c l 00000014 sNpcStepFuncTables +083a7220 l 0000000a sStepTimes +083a722a l 00000010 sJumpY_High +083a723a l 00000010 sJumpY_Low +083a724a l 00000010 sJumpY_Normal +083a725c l 0000000c sJumpYTable 083a72b4 g 00000004 gNullScriptPtr 083a72b8 l 00000012 sScriptConditionTable 083a7304 g 0000000c sScriptStringVars diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 242314577..2611e872c 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -4010,33 +4010,33 @@ 08064894 g 00000070 InitNpcForWalkSlowest 08064904 g 0000002c InitWalkSlowest 08064930 g 00000038 UpdateWalkSlowest -08064968 l 0000001e MovementActionFunc_x9B_0 -08064988 l 0000001e MovementActionFunc_x9B_1 -080649a8 l 0000001e MovementActionFunc_x9C_0 -080649c8 l 0000001e MovementActionFunc_x9C_1 -080649e8 l 0000001e MovementActionFunc_x9D_0 -08064a08 l 0000001e MovementActionFunc_x9D_1 -08064a28 l 0000001e MovementActionFunc_x9E_0 -08064a48 l 0000001e MovementActionFunc_x9E_1 -08064a68 l 0000001e MovementActionFunc_x08_0 -08064a88 l 0000001e MovementActionFunc_x08_1 -08064aa8 l 0000001e MovementActionFunc_x09_0 -08064ac8 l 0000001e MovementActionFunc_x09_1 -08064ae8 l 0000001e MovementActionFunc_x0A_0 -08064b08 l 0000001e MovementActionFunc_x0A_1 -08064b28 l 0000001e MovementActionFunc_x0B_0 -08064b48 l 0000001e MovementActionFunc_x0B_1 +08064968 l 0000001e MovementAction_WalkSlowestDown_Step0 +08064988 l 0000001e MovementAction_WalkSlowestDown_Step1 +080649a8 l 0000001e MovementAction_WalkSlowestUp_Step0 +080649c8 l 0000001e MovementAction_WalkSlowestUp_Step1 +080649e8 l 0000001e MovementAction_WalkSlowestLeft_Step0 +08064a08 l 0000001e MovementAction_WalkSlowestLeft_Step1 +08064a28 l 0000001e MovementAction_WalkSlowestRight_Step0 +08064a48 l 0000001e MovementAction_WalkSlowestRight_Step1 +08064a68 l 0000001e MovementAction_WalkSlowerDown_Step0 +08064a88 l 0000001e MovementAction_WalkSlowerDown_Step1 +08064aa8 l 0000001e MovementAction_WalkSlowerUp_Step0 +08064ac8 l 0000001e MovementAction_WalkSlowerUp_Step1 +08064ae8 l 0000001e MovementAction_WalkSlowerLeft_Step0 +08064b08 l 0000001e MovementAction_WalkSlowerLeft_Step1 +08064b28 l 0000001e MovementAction_WalkSlowerRight_Step0 +08064b48 l 0000001e MovementAction_WalkSlowerRight_Step1 08064b68 g 00000070 InitNpcForWalkSlow 08064bd8 g 0000002c InitWalkSlow 08064c04 g 00000038 UpdateWalkSlow -08064c3c l 0000001e MovementActionFunc_x0D_0 -08064c5c l 0000001e MovementActionFunc_x0D_1 -08064c7c l 0000001e MovementActionFunc_x0C_0 -08064c9c l 0000001e MovementActionFunc_x0C_1 -08064cbc l 0000001e MovementActionFunc_x0E_0 -08064cdc l 0000001e MovementActionFunc_x0E_1 -08064cfc l 0000001e MovementActionFunc_x0F_0 -08064d1c l 0000001e MovementActionFunc_x0F_1 +08064c3c l 0000001e MovementAction_WalkSlowUp_Step0 +08064c5c l 0000001e MovementAction_WalkSlowUp_Step1 +08064c7c l 0000001e MovementAction_WalkSlowDown_Step0 +08064c9c l 0000001e MovementAction_WalkSlowDown_Step1 +08064cbc l 0000001e MovementAction_WalkSlowLeft_Step0 +08064cdc l 0000001e MovementAction_WalkSlowLeft_Step1 +08064cfc l 0000001e MovementAction_WalkSlowRight_Step0 +08064d1c l 0000001e MovementAction_WalkSlowRight_Step1 08064d3c l 00000020 MovementAction_WalkNormalDown_Step0 08064d5c l 0000001e MovementAction_WalkNormalDown_Step1 08064d7c l 00000020 MovementAction_WalkNormalUp_Step0 @@ -4077,19 +4077,19 @@ 0806538c l 00000020 MovementAction_WalkFastRight_Step0 080653ac l 0000001e MovementAction_WalkFastRight_Step1 080653cc g 0000002a sub_80653CC -080653f8 l 00000040 MovementActionFunc_xA0_0 -08065438 l 0000002a MovementActionFunc_xA0_1 -08065464 l 00000040 MovementActionFunc_xA1_0 -080654a4 l 0000002a MovementActionFunc_xA1_1 -080654d0 l 00000040 MovementActionFunc_xA2_0 -08065510 l 0000002a MovementActionFunc_xA2_1 -0806553c l 00000040 MovementActionFunc_xA3_0 -0806557c l 0000002a MovementActionFunc_xA3_1 +080653f8 l 00000040 MovementAction_xA0_Step0 +08065438 l 0000002a MovementAction_xA0_Step1 +08065464 l 00000040 MovementAction_xA1_Step0 +080654a4 l 0000002a MovementAction_xA1_Step1 +080654d0 l 00000040 MovementAction_xA2_Step0 +08065510 l 0000002a MovementAction_xA2_Step1 +0806553c l 00000040 MovementAction_xA3_Step0 +0806557c l 0000002a MovementAction_xA3_Step1 080655a8 g 0000002c sub_80655A8 -080655d4 l 0000003a MovementActionFunc_x04_0 -08065610 l 0000003a MovementActionFunc_x05_0 -0806564c l 0000003a MovementActionFunc_x06_0 -08065688 l 0000003a MovementActionFunc_x07_0 +080655d4 l 0000003a MovementAction_FaceDownFast_Step0 +08065610 l 0000003a MovementAction_FaceUpFast_Step0 +0806564c l 0000003a MovementAction_FaceLeftFast_Step0 +08065688 l 0000003a MovementAction_FaceRightFast_Step0 080656c4 g 00000048 InitMoveInPlace 0806570c l 00000028 MovementAction_WalkInPlace_Step1 08065734 l 0000003c MovementAction_WalkInPlaceSlow_Step1 @@ -4105,10 +4105,10 @@ 08065968 l 00000036 MovementAction_WalkInPlaceFastUp_Step0 080659a0 l 00000036 MovementAction_WalkInPlaceFastLeft_Step0 080659d8 l 00000036 MovementAction_WalkInPlaceFastRight_Step0 -08065a10 l 00000036 MovementAction_WalkInPlaceFastestDown_Step0 -08065a48 l 00000036 MovementAction_WalkInPlaceFastestUp_Step0 -08065a80 l 00000036 MovementAction_WalkInPlaceFastestLeft_Step0 -08065ab8 l 00000036 MovementAction_WalkInPlaceFastestRight_Step0 +08065a10 l 00000036 MovementAction_WalkInPlaceFasterDown_Step0 +08065a48 l 00000036 MovementAction_WalkInPlaceFasterUp_Step0 +08065a80 l 00000036 MovementAction_WalkInPlaceFasterLeft_Step0 +08065ab8 l 00000036 MovementAction_WalkInPlaceFasterRight_Step0 08065af0 l 00000020 MovementAction_RideWaterCurrentDown_Step0 08065b10 l 0000001e MovementAction_RideWaterCurrentDown_Step1 08065b30 l 00000020 MovementAction_RideWaterCurrentUp_Step0 @@ -4117,14 +4117,14 @@ 08065b90 l 0000001e MovementAction_RideWaterCurrentLeft_Step1 08065bb0 l 00000020 MovementAction_RideWaterCurrentRight_Step0 08065bd0 l 0000001e MovementAction_RideWaterCurrentRight_Step1 -08065bf0 l 00000020 MovementAction_WalkFastestDown_Step0 -08065c10 l 0000001e MovementAction_WalkFastestDown_Step1 -08065c30 l 00000020 MovementAction_WalkFastestUp_Step0 -08065c50 l 0000001e MovementAction_WalkFastestUp_Step1 -08065c70 l 00000020 MovementAction_WalkFastestLeft_Step0 -08065c90 l 0000001e MovementAction_WalkFastestLeft_Step1 -08065cb0 l 00000020 MovementAction_WalkFastestRight_Step0 -08065cd0 l 0000001e MovementAction_WalkFastestRight_Step1 +08065bf0 l 00000020 MovementAction_WalkFasterDown_Step0 +08065c10 l 0000001e MovementAction_WalkFasterDown_Step1 +08065c30 l 00000020 MovementAction_WalkFasterUp_Step0 +08065c50 l 0000001e MovementAction_WalkFasterUp_Step1 +08065c70 l 00000020 MovementAction_WalkFasterLeft_Step0 +08065c90 l 0000001e MovementAction_WalkFasterLeft_Step1 +08065cb0 l 00000020 MovementAction_WalkFasterRight_Step0 +08065cd0 l 0000001e MovementAction_WalkFasterRight_Step1 08065cf0 l 00000020 MovementAction_SlideDown_Step0 08065d10 l 0000001e MovementAction_SlideDown_Step1 08065d30 l 00000020 MovementAction_SlideUp_Step0 @@ -4144,14 +4144,14 @@ 08065ef0 g 00000070 InitNpcForRunSlow 08065f60 g 0000002c InitRunSlow 08065f8c g 00000038 UpdateRunSlow -08065fc4 l 0000001e MovementActionFunc_x41_0 -08065fe4 l 0000001e MovementActionFunc_x41_1 -08066004 l 0000001e MovementActionFunc_x42_0 -08066024 l 0000001e MovementActionFunc_x42_1 -08066044 l 0000001e MovementActionFunc_x43_0 -08066064 l 0000001e MovementActionFunc_x43_1 -08066084 l 0000001e MovementActionFunc_x44_0 -080660a4 l 0000001e MovementActionFunc_x44_1 +08065fc4 l 0000001e MovementAction_RunDownSlow_Step0 +08065fe4 l 0000001e MovementAction_RunDownSlow_Step1 +08066004 l 0000001e MovementAction_RunUpSlow_Step0 +08066024 l 0000001e MovementAction_RunUpSlow_Step1 +08066044 l 0000001e MovementAction_RunLeftSlow_Step0 +08066064 l 0000001e MovementAction_RunLeftSlow_Step1 +08066084 l 0000001e MovementAction_RunRightSlow_Step0 +080660a4 l 0000001e MovementAction_RunRightSlow_Step1 080660c4 g 0000002c StartSpriteAnimInDirection 080660f0 l 00000016 MovementAction_StartAnimInDirection_Step0 08066108 l 00000020 MovementAction_WaitSpriteAnim @@ -4164,14 +4164,14 @@ 0806620c l 00000028 MovementAction_JumpSpecialLeft_Step1 08066234 l 0000001e MovementAction_JumpSpecialRight_Step0 08066254 l 00000028 MovementAction_JumpSpecialRight_Step1 -0806627c l 0000001e MovementActionFunc_xA6_0 -0806629c l 0000001e MovementActionFunc_xA6_1 -080662bc l 0000001e MovementActionFunc_xA7_0 -080662dc l 0000001e MovementActionFunc_xA7_1 -080662fc l 0000001e MovementActionFunc_xA8_0 -0806631c l 0000001e MovementActionFunc_xA8_1 -0806633c l 0000001e MovementActionFunc_xA9_0 -0806635c l 0000001e MovementActionFunc_xA9_1 +0806627c l 0000001e MovementAction_JumpSpecialWithEffectDown_Step0 +0806629c l 0000001e MovementAction_JumpSpecialWithEffectDown_Step1 +080662bc l 0000001e MovementAction_JumpSpecialWithEffectUp_Step0 +080662dc l 0000001e MovementAction_JumpSpecialWithEffectUp_Step1 +080662fc l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step0 +0806631c l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step1 +0806633c l 0000001e MovementAction_JumpSpecialWithEffectRight_Step0 +0806635c l 0000001e MovementAction_JumpSpecialWithEffectRight_Step1 0806637c l 0000005c MovementAction_FacePlayer_Step0 080663d8 l 00000064 MovementAction_FaceAwayPlayer_Step0 0806643c l 0000000e MovementAction_LockFacingDirection_Step0 @@ -4210,9 +4210,9 @@ 08066910 l 00000010 MovementAction_SetVisible_Step0 08066920 l 00000024 MovementAction_EmoteExclamationMark_Step0 08066944 l 00000024 MovementAction_EmoteQuestionMark_Step0 -08066968 l 00000024 MovementAction_EmoteHeart_Step0 -0806698c l 00000024 do_double_excl_bubble -080669b0 l 00000024 do_smile_bubble +08066968 l 00000024 MovementAction_EmoteX_Step0 +0806698c l 00000024 MovementAction_EmoteDoubleExclamationMark_Step0 +080669b0 l 00000024 MovementAction_EmoteSmile_Step0 080669d4 l 00000044 MovementAction_RevealTrainer_Step0 08066a18 l 0000001e MovementAction_RevealTrainer_Step1 08066a38 l 0000001a MovementAction_RockSmashBreak_Step0 @@ -4230,10 +4230,10 @@ 08066c10 l 00000032 MovementAction_WalkDownAffine_Step0 08066c44 l 0000002a MovementAction_WalkDownAffine_Step1 08066c70 g 00000040 AcroWheelieFaceDirection -08066cb0 l 0000000e MovementActionFunc_x70_0 -08066cc0 l 0000000e MovementActionFunc_x71_0 -08066cd0 l 0000000e MovementActionFunc_x72_0 -08066ce0 l 0000000e MovementActionFunc_x73_0 +08066cb0 l 0000000e MovementAction_AcroWheelieFaceDown_Step0 +08066cc0 l 0000000e MovementAction_AcroWheelieFaceUp_Step0 +08066cd0 l 0000000e MovementAction_AcroWheelieFaceLeft_Step0 +08066ce0 l 0000000e MovementAction_AcroWheelieFaceRight_Step0 08066cf0 l 00000024 MovementAction_AcroPopWheelieDown_Step0 08066d14 l 00000024 MovementAction_AcroPopWheelieUp_Step0 08066d38 l 00000024 MovementAction_AcroPopWheelieLeft_Step0 @@ -4271,10 +4271,10 @@ 08067280 l 0000002a MovementAction_AcroWheelieJumpLeft_Step1 080672ac l 0000002a MovementAction_AcroWheelieJumpRight_Step0 080672d8 l 0000002a MovementAction_AcroWheelieJumpRight_Step1 -08067304 l 00000036 MovementActionFunc_x88_0 -0806733c l 00000036 MovementActionFunc_x89_0 -08067374 l 00000036 MovementActionFunc_x8A_0 -080673ac l 00000036 MovementActionFunc_x8B_0 +08067304 l 00000036 MovementAction_AcroWheelieInPlaceDown_Step0 +0806733c l 00000036 MovementAction_AcroWheelieInPlaceUp_Step0 +08067374 l 00000036 MovementAction_AcroWheelieInPlaceLeft_Step0 +080673ac l 00000036 MovementAction_AcroWheelieInPlaceRight_Step0 080673e4 g 00000036 InitAcroPopWheelie 0806741c l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 0806743c l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 @@ -4294,27 +4294,27 @@ 0806760c l 00000020 MovementAction_AcroWheelieMoveRight_Step0 0806762c l 0000001e MovementAction_AcroWheelieMoveRight_Step1 0806764c g 00000038 InitSpin -08067684 l 00000020 MovementActionFunc_x94_0 -080676a4 l 0000001e MovementActionFunc_x94_1 -080676c4 l 00000020 MovementActionFunc_x95_0 -080676e4 l 0000001e MovementActionFunc_x95_1 -08067704 l 00000020 MovementActionFunc_x96_0 -08067724 l 0000001e MovementActionFunc_x96_1 -08067744 l 00000020 MovementActionFunc_x97_0 -08067764 l 0000001e MovementActionFunc_x97_1 -08067784 l 0000003c MovementActionFunc_x98_0 -080677c0 l 0000000a MovementActionFunc_x98_1 -080677cc l 000000f2 MovementActionFunc_x99_1 -080678c0 l 00000030 MovementActionFunc_x9A_1 -080678f0 l 00000032 MovementActionFunc_x9F_0 -08067924 l 0000000a MovementActionFunc_x9F_1 +08067684 l 00000020 MovementAction_SpinDown_Step0 +080676a4 l 0000001e MovementAction_SpinDown_Step1 +080676c4 l 00000020 MovementAction_SpinUp_Step0 +080676e4 l 0000001e MovementAction_SpinUp_Step1 +08067704 l 00000020 MovementAction_SpinLeft_Step0 +08067724 l 0000001e MovementAction_SpinLeft_Step1 +08067744 l 00000020 MovementAction_SpinRight_Step0 +08067764 l 0000001e MovementAction_SpinRight_Step1 +08067784 l 0000003c MovementAction_x98_Step0 +080677c0 l 0000000a MovementAction_x98_Step1 +080677cc l 000000f2 MovementAction_x99_Step1 +080678c0 l 00000030 MovementAction_x9A_Step1 +080678f0 l 00000032 MovementAction_ShakeHeadOrWalkInPlace_Step0 +08067924 l 0000000a MovementAction_ShakeHeadOrWalkInPlace_Step1 08067930 l 00000004 MovementAction_Finish 08067934 l 0000000e MovementAction_PauseSpriteAnim -08067944 l 0000000e MovementActionFunc_xA4_0 -08067954 l 00000022 MovementActionFunc_xA4_1 -08067978 l 00000014 MovementActionFunc_xA5_0 -0806798c l 0000001a MovementActionFunc_xA5_1 -080679a8 l 00000004 MovementActionFunc_xA4_2 +08067944 l 0000000e MovementAction_FlyUp_Step0 +08067954 l 00000022 MovementAction_FlyUp_Step1 +08067978 l 00000014 MovementAction_FlyDown_Step0 +0806798c l 0000001a MovementAction_FlyDown_Step1 +080679a8 l 00000004 MovementAction_FlyUp_Step2 080679ac l 0000001a UpdateObjectEventSpriteAnimPause 080679c8 l 0000002e TryEnableObjectEventAnim 080679f8 l 00000018 UpdateObjectEventVisibility @@ -4384,11 +4384,11 @@ 080689b0 g 00000044 FreezeObjectEventsExceptOne 080689f4 g 00000068 UnfreezeObjectEvent 08068a5c g 00000030 UnfreezeObjectEvents -08068a8c l 00000020 little_step -08068aac l 00000024 double_little_steps -08068ad0 l 00000028 triple_little_steps -08068af8 l 00000024 quad_little_steps -08068b1c l 00000024 oct_little_steps +08068a8c l 00000020 Step1 +08068aac l 00000024 Step2 +08068ad0 l 00000028 Step3 +08068af8 l 00000024 Step4 +08068b1c l 00000024 Step8 08068b40 g 00000012 SetSpriteDataForNormalStep 08068b54 g 00000068 NpcTakeStep 08068bbc g 0000000e SetWalkSlowerSpriteData @@ -4399,7 +4399,7 @@ 08068c68 g 0000003c UpdateWalkSlowestAnim 08068ca4 g 0000000e SetRunSlowSpriteData 08068cb4 g 0000004a UpdateRunSlowAnim -08068d00 l 0000001c GetJumpYDisplacement +08068d00 l 0000001c GetJumpY 08068d1c g 0000001e SetJumpSpriteData 08068d3c g 00000088 DoJumpSpriteMovement 08068dc4 g 00000094 DoJumpSpecialSpriteMovement @@ -20263,10 +20263,10 @@ 081a75bd g 00000000 Movement_FacePlayer 081a75bf g 00000000 Movement_FaceAwayPlayer 081a75c1 g 00000000 Movement_FaceOriginalDirection -081a75c3 g 00000000 Movement_WalkInPlaceFastestLeft -081a75c5 g 00000000 Movement_WalkInPlaceFastestUp -081a75c7 g 00000000 Movement_WalkInPlaceFastestRight -081a75c9 g 00000000 Movement_WalkInPlaceFastestDown +081a75c3 g 00000000 Movement_WalkInPlaceFasterLeft +081a75c5 g 00000000 Movement_WalkInPlaceFasterUp +081a75c7 g 00000000 Movement_WalkInPlaceFasterRight +081a75c9 g 00000000 Movement_WalkInPlaceFasterDown 081a75cb g 00000000 Movement_FaceRight 081a75cd g 00000000 Movement_FaceDown 081a75cf g 00000000 Movement_WalkUp5 @@ -30930,180 +30930,184 @@ 083a6571 l 00000008 gOppositeDirections 083a6579 l 00000010 sPlayerDirectionsForCopy 083a6589 l 00000010 sPlayerDirectionToCopyDirection -083a659c g 000002a8 gMovementActionFuncs -083a6844 l 00000008 sMovementActionFuncs_x00 -083a684c l 00000008 sMovementActionFuncs_x01 -083a6854 l 00000008 sMovementActionFuncs_x02 -083a685c l 00000008 sMovementActionFuncs_x03 -083a6864 l 00000014 gUnknown_83A6884 -083a6878 l 0000000c sMovementActionFuncs_x9B -083a6884 l 0000000c sMovementActionFuncs_x9C -083a6890 l 0000000c sMovementActionFuncs_x9D -083a689c l 0000000c sMovementActionFuncs_x9E -083a68a8 l 0000000c sMovementActionFuncs_x08 -083a68b4 l 0000000c sMovementActionFuncs_x09 -083a68c0 l 0000000c sMovementActionFuncs_x0A -083a68cc l 0000000c sMovementActionFuncs_x0B -083a68d8 l 0000000c sMovementActionFuncs_x0D -083a68e4 l 0000000c sMovementActionFuncs_x0C -083a68f0 l 0000000c sMovementActionFuncs_x0E -083a68fc l 0000000c sMovementActionFuncs_x0F -083a6908 l 0000000c sMovementActionFuncs_x10 -083a6914 l 0000000c sMovementActionFuncs_x11 -083a6920 l 0000000c sMovementActionFuncs_x12 -083a692c l 0000000c sMovementActionFuncs_x13 -083a6938 g 00000006 gUnknown_83A6958 -083a693e g 00000006 gUnknown_83A695E -083a6944 l 0000000c sMovementActionFuncs_x14 -083a6950 l 0000000c sMovementActionFuncs_x15 -083a695c l 0000000c sMovementActionFuncs_x16 -083a6968 l 0000000c sMovementActionFuncs_x17 -083a6974 l 0000000c sMovementActionFuncs_x18 -083a6980 l 0000000c sMovementActionFuncs_x19 -083a698c l 0000000c sMovementActionFuncs_x1A -083a6998 l 0000000c sMovementActionFuncs_x1B -083a69a4 l 0000000c sMovementActionFuncs_x1C -083a69b0 l 0000000c sMovementActionFuncs_x1D -083a69bc l 0000000c sMovementActionFuncs_x1E -083a69c8 l 0000000c sMovementActionFuncs_x1F -083a69d4 l 0000000c sMovementActionFuncs_x20 +083a659c l 000002a8 sMovementActionFuncs +083a6844 l 00000008 sMovementActionFuncs_FaceDown +083a684c l 00000008 sMovementActionFuncs_FaceUp +083a6854 l 00000008 sMovementActionFuncs_FaceLeft +083a685c l 00000008 sMovementActionFuncs_FaceRight +083a6864 l 00000014 sDirectionAnimFuncsBySpeed +083a6878 l 0000000c sMovementActionFuncs_WalkSlowestDown +083a6884 l 0000000c sMovementActionFuncs_WalkSlowestUp +083a6890 l 0000000c sMovementActionFuncs_WalkSlowestLeft +083a689c l 0000000c sMovementActionFuncs_WalkSlowestRight +083a68a8 l 0000000c sMovementActionFuncs_WalkSlowerDown +083a68b4 l 0000000c sMovementActionFuncs_WalkSlowerUp +083a68c0 l 0000000c sMovementActionFuncs_WalkSlowerLeft +083a68cc l 0000000c sMovementActionFuncs_WalkSlowerRight +083a68d8 l 0000000c sMovementActionFuncs_WalkSlowUp +083a68e4 l 0000000c sMovementActionFuncs_WalkSlowDown +083a68f0 l 0000000c sMovementActionFuncs_WalkSlowLeft +083a68fc l 0000000c sMovementActionFuncs_WalkSlowRight +083a6908 l 0000000c sMovementActionFuncs_WalkNormalDown +083a6914 l 0000000c sMovementActionFuncs_WalkNormalUp +083a6920 l 0000000c sMovementActionFuncs_WalkNormalLeft +083a692c l 0000000c sMovementActionFuncs_WalkNormalRight +083a6938 l 00000006 sJumpInitDisplacements +083a693e l 00000006 sJumpDisplacements +083a6944 l 0000000c sMovementActionFuncs_Jump2Down +083a6950 l 0000000c sMovementActionFuncs_Jump2Up +083a695c l 0000000c sMovementActionFuncs_Jump2Left +083a6968 l 0000000c sMovementActionFuncs_Jump2Right +083a6974 l 0000000c sMovementActionFuncs_Delay1 +083a6980 l 0000000c sMovementActionFuncs_Delay2 +083a698c l 0000000c sMovementActionFuncs_Delay4 +083a6998 l 0000000c sMovementActionFuncs_Delay8 +083a69a4 l 0000000c sMovementActionFuncs_Delay16 +083a69b0 l 0000000c sMovementActionFuncs_WalkFastDown +083a69bc l 0000000c sMovementActionFuncs_WalkFastUp +083a69c8 l 0000000c sMovementActionFuncs_WalkFastLeft +083a69d4 l 0000000c sMovementActionFuncs_WalkFastRight 083a69e0 l 0000000c sMovementActionFuncs_xA0 083a69ec l 0000000c sMovementActionFuncs_xA1 083a69f8 l 0000000c sMovementActionFuncs_xA2 083a6a04 l 0000000c sMovementActionFuncs_xA3 -083a6a10 l 00000008 sMovementActionFuncs_x04 -083a6a18 l 00000008 sMovementActionFuncs_x05 -083a6a20 l 00000008 sMovementActionFuncs_x06 -083a6a28 l 00000008 sMovementActionFuncs_x07 -083a6a30 l 0000000c sMovementActionFuncs_x21 -083a6a3c l 0000000c sMovementActionFuncs_x22 -083a6a48 l 0000000c sMovementActionFuncs_x23 -083a6a54 l 0000000c sMovementActionFuncs_x24 -083a6a60 l 0000000c sMovementActionFuncs_x25 -083a6a6c l 0000000c sMovementActionFuncs_x26 -083a6a78 l 0000000c sMovementActionFuncs_x27 -083a6a84 l 0000000c sMovementActionFuncs_x28 -083a6a90 l 0000000c sMovementActionFuncs_x29 -083a6a9c l 0000000c sMovementActionFuncs_x2A -083a6aa8 l 0000000c sMovementActionFuncs_x2B -083a6ab4 l 0000000c sMovementActionFuncs_x2C -083a6ac0 l 0000000c sMovementActionFuncs_x2D -083a6acc l 0000000c sMovementActionFuncs_x2E -083a6ad8 l 0000000c sMovementActionFuncs_x2F -083a6ae4 l 0000000c sMovementActionFuncs_x30 -083a6af0 l 0000000c sMovementActionFuncs_x31 -083a6afc l 0000000c sMovementActionFuncs_x32 -083a6b08 l 0000000c sMovementActionFuncs_x33 -083a6b14 l 0000000c sMovementActionFuncs_x34 -083a6b20 l 0000000c sMovementActionFuncs_x35 -083a6b2c l 0000000c sMovementActionFuncs_x36 -083a6b38 l 0000000c sMovementActionFuncs_x37 -083a6b44 l 0000000c sMovementActionFuncs_x38 -083a6b50 l 0000000c sMovementActionFuncs_x39 -083a6b5c l 0000000c sMovementActionFuncs_x3A -083a6b68 l 0000000c sMovementActionFuncs_x3B -083a6b74 l 0000000c sMovementActionFuncs_x3C -083a6b80 l 0000000c sMovementActionFuncs_x3D -083a6b8c l 0000000c sMovementActionFuncs_x3E -083a6b98 l 0000000c sMovementActionFuncs_x3F -083a6ba4 l 0000000c sMovementActionFuncs_x40 -083a6bb0 l 0000000c sMovementActionFuncs_x41 -083a6bbc l 0000000c sMovementActionFuncs_x42 -083a6bc8 l 0000000c sMovementActionFuncs_x43 -083a6bd4 l 0000000c sMovementActionFuncs_x44 -083a6be0 l 0000000c sMovementActionFuncs_x45 -083a6bec l 0000000c sMovementActionFuncs_x46 -083a6bf8 l 0000000c sMovementActionFuncs_x47 -083a6c04 l 0000000c sMovementActionFuncs_x48 -083a6c10 l 0000000c sMovementActionFuncs_x49 -083a6c1c l 0000000c sMovementActionFuncs_xA6 -083a6c28 l 0000000c sMovementActionFuncs_xA7 -083a6c34 l 0000000c sMovementActionFuncs_xA8 -083a6c40 l 0000000c sMovementActionFuncs_xA9 -083a6c4c l 00000008 sMovementActionFuncs_x4A -083a6c54 l 00000008 sMovementActionFuncs_x4B -083a6c5c l 00000008 sMovementActionFuncs_x4C -083a6c64 l 00000008 sMovementActionFuncs_x4D -083a6c6c l 0000000c sMovementActionFuncs_x4E -083a6c78 l 0000000c sMovementActionFuncs_x4F -083a6c84 l 0000000c sMovementActionFuncs_x50 -083a6c90 l 0000000c sMovementActionFuncs_x51 -083a6c9c l 0000000c sMovementActionFuncs_x52 -083a6ca8 l 0000000c sMovementActionFuncs_x53 -083a6cb4 l 0000000c sMovementActionFuncs_x54 -083a6cc0 l 0000000c sMovementActionFuncs_x55 -083a6ccc l 0000000c sMovementActionFuncs_x56 -083a6cd8 l 0000000c sMovementActionFuncs_x57 -083a6ce4 l 0000000c sMovementActionFuncs_x58 -083a6cf0 l 0000000c sMovementActionFuncs_x59 -083a6cfc l 00000008 sMovementActionFuncs_x5A -083a6d04 l 0000000c sMovementActionFuncs_x5B -083a6d10 l 00000008 sMovementActionFuncs_x5C -083a6d18 l 00000008 sMovementActionFuncs_x5D -083a6d20 l 00000008 sMovementActionFuncs_x5E -083a6d28 l 00000008 sMovementActionFuncs_x5F -083a6d30 l 00000008 sMovementActionFuncs_x60 -083a6d38 l 00000008 sMovementActionFuncs_x61 -083a6d40 l 00000008 sMovementActionFuncs_x62 -083a6d48 l 00000008 sMovementActionFuncs_x63 -083a6d50 l 00000008 sMovementActionFuncs_x64 -083a6d58 l 00000008 sMovementActionFuncs_x65 -083a6d60 l 00000008 sMovementActionFuncs_x66 -083a6d68 l 0000000c sMovementActionFuncs_x67 -083a6d74 l 00000010 sMovementActionFuncs_x68 -083a6d84 l 00000010 sMovementActionFuncs_x69 -083a6d94 l 00000008 sMovementActionFuncs_x6A -083a6d9c l 00000008 sMovementActionFuncs_x6B -083a6da4 l 00000008 sMovementActionFuncs_x6C -083a6dac l 00000008 sMovementActionFuncs_x6D -083a6db4 l 0000000c sMovementActionFuncs_x6E -083a6dc0 l 0000000c sMovementActionFuncs_x6F -083a6dcc l 00000008 sMovementActionFuncs_x70 -083a6dd4 l 00000008 sMovementActionFuncs_x71 -083a6ddc l 00000008 sMovementActionFuncs_x72 -083a6de4 l 00000008 sMovementActionFuncs_x73 -083a6dec l 0000000c sMovementActionFuncs_x74 -083a6df8 l 0000000c sMovementActionFuncs_x75 -083a6e04 l 0000000c sMovementActionFuncs_x76 -083a6e10 l 0000000c sMovementActionFuncs_x77 -083a6e1c l 0000000c sMovementActionFuncs_x78 -083a6e28 l 0000000c sMovementActionFuncs_x79 -083a6e34 l 0000000c sMovementActionFuncs_x7A -083a6e40 l 0000003c sMovementActionFuncs_x7B -083a6e7c l 0000000c sMovementActionFuncs_x7C -083a6e88 l 0000000c sMovementActionFuncs_x7D -083a6e94 l 0000000c sMovementActionFuncs_x7E -083a6ea0 l 0000000c sMovementActionFuncs_x7F -083a6eac l 0000000c sMovementActionFuncs_x80 -083a6eb8 l 0000000c sMovementActionFuncs_x81 -083a6ec4 l 0000000c sMovementActionFuncs_x82 -083a6ed0 l 0000000c sMovementActionFuncs_x83 -083a6edc l 0000000c sMovementActionFuncs_x84 -083a6ee8 l 0000000c sMovementActionFuncs_x85 -083a6ef4 l 0000000c sMovementActionFuncs_x86 -083a6f00 l 0000000c sMovementActionFuncs_x87 -083a6f0c l 0000000c sMovementActionFuncs_x88 -083a6f18 l 0000000c sMovementActionFuncs_x89 -083a6f24 l 0000000c sMovementActionFuncs_x8A -083a6f30 l 0000000c sMovementActionFuncs_x8B -083a6f3c l 0000000c sMovementActionFuncs_x8C -083a6f48 l 0000000c sMovementActionFuncs_x8D -083a6f54 l 0000000c sMovementActionFuncs_x8E -083a6f60 l 0000000c sMovementActionFuncs_x8F -083a6f6c l 0000000c sMovementActionFuncs_x90 -083a6f78 l 0000000c sMovementActionFuncs_x91 -083a6f84 l 0000000c sMovementActionFuncs_x92 -083a6f90 l 0000000c sMovementActionFuncs_x93 -083a6f9c l 0000000c sMovementActionFuncs_x94 -083a6fa8 l 0000000c sMovementActionFuncs_x95 -083a6fb4 l 0000000c sMovementActionFuncs_x96 -083a6fc0 l 0000000c sMovementActionFuncs_x97 +083a6a10 l 00000008 sMovementActionFuncs_FaceDownFast +083a6a18 l 00000008 sMovementActionFuncs_FaceUpFast +083a6a20 l 00000008 sMovementActionFuncs_FaceLeftFast +083a6a28 l 00000008 sMovementActionFuncs_FaceRightFast +083a6a30 l 0000000c sMovementActionFuncs_WalkInPlaceSlowDown +083a6a3c l 0000000c sMovementActionFuncs_WalkInPlaceSlowUp +083a6a48 l 0000000c sMovementActionFuncs_WalkInPlaceSlowLeft +083a6a54 l 0000000c sMovementActionFuncs_WalkInPlaceSlowRight +083a6a60 l 0000000c sMovementActionFuncs_WalkInPlaceNormalDown +083a6a6c l 0000000c sMovementActionFuncs_WalkInPlaceNormalUp +083a6a78 l 0000000c sMovementActionFuncs_WalkInPlaceNormalLeft +083a6a84 l 0000000c sMovementActionFuncs_WalkInPlaceNormalRight +083a6a90 l 0000000c sMovementActionFuncs_WalkInPlaceFastDown +083a6a9c l 0000000c sMovementActionFuncs_WalkInPlaceFastUp +083a6aa8 l 0000000c sMovementActionFuncs_WalkInPlaceFastLeft +083a6ab4 l 0000000c sMovementActionFuncs_WalkInPlaceFastRight +083a6ac0 l 0000000c sMovementActionFuncs_WalkInPlaceFasterDown +083a6acc l 0000000c sMovementActionFuncs_WalkInPlaceFasterUp +083a6ad8 l 0000000c sMovementActionFuncs_WalkInPlaceFasterLeft +083a6ae4 l 0000000c sMovementActionFuncs_WalkInPlaceFasterRight +083a6af0 l 0000000c sMovementActionFuncs_RideWaterCurrentDown +083a6afc l 0000000c sMovementActionFuncs_RideWaterCurrentUp +083a6b08 l 0000000c sMovementActionFuncs_RideWaterCurrentLeft +083a6b14 l 0000000c sMovementActionFuncs_RideWaterCurrentRight +083a6b20 l 0000000c sMovementActionFuncs_WalkFasterDown +083a6b2c l 0000000c sMovementActionFuncs_WalkFasterUp +083a6b38 l 0000000c sMovementActionFuncs_WalkFasterLeft +083a6b44 l 0000000c sMovementActionFuncs_WalkFasterRight +083a6b50 l 0000000c sMovementActionFuncs_SlideDown +083a6b5c l 0000000c sMovementActionFuncs_SlideUp +083a6b68 l 0000000c sMovementActionFuncs_SlideLeft +083a6b74 l 0000000c sMovementActionFuncs_SlideRight +083a6b80 l 0000000c sMovementActionFuncs_PlayerRunDown +083a6b8c l 0000000c sMovementActionFuncs_PlayerRunUp +083a6b98 l 0000000c sMovementActionFuncs_PlayerRunLeft +083a6ba4 l 0000000c sMovementActionFuncs_PlayerRunRight +083a6bb0 l 0000000c sMovementActionFuncs_PlayerRunDownSlow +083a6bbc l 0000000c sMovementActionFuncs_PlayerRunUpSlow +083a6bc8 l 0000000c sMovementActionFuncs_PlayerRunLeftSlow +083a6bd4 l 0000000c sMovementActionFuncs_PlayerRunRightSlow +083a6be0 l 0000000c sMovementActionFuncs_StartAnimInDirection +083a6bec l 0000000c sMovementActionFuncs_JumpSpecialDown +083a6bf8 l 0000000c sMovementActionFuncs_JumpSpecialUp +083a6c04 l 0000000c sMovementActionFuncs_JumpSpecialLeft +083a6c10 l 0000000c sMovementActionFuncs_JumpSpecialRight +083a6c1c l 0000000c sMovementActionFuncs_JumpSpecialWithEffectDown +083a6c28 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectUp +083a6c34 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectLeft +083a6c40 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectRight +083a6c4c l 00000008 sMovementActionFuncs_FacePlayer +083a6c54 l 00000008 sMovementActionFuncs_FaceAwayPlayer +083a6c5c l 00000008 sMovementActionFuncs_LockFacingDirection +083a6c64 l 00000008 sMovementActionFuncs_UnlockFacingDirection +083a6c6c l 0000000c sMovementActionFuncs_JumpDown +083a6c78 l 0000000c sMovementActionFuncs_JumpUp +083a6c84 l 0000000c sMovementActionFuncs_JumpLeft +083a6c90 l 0000000c sMovementActionFuncs_JumpRight +083a6c9c l 0000000c sMovementActionFuncs_JumpInPlaceDown +083a6ca8 l 0000000c sMovementActionFuncs_JumpInPlaceUp +083a6cb4 l 0000000c sMovementActionFuncs_JumpInPlaceLeft +083a6cc0 l 0000000c sMovementActionFuncs_JumpInPlaceRight +083a6ccc l 0000000c sMovementActionFuncs_JumpInPlaceDownUp +083a6cd8 l 0000000c sMovementActionFuncs_JumpInPlaceUpDown +083a6ce4 l 0000000c sMovementActionFuncs_JumpInPlaceLeftRight +083a6cf0 l 0000000c sMovementActionFuncs_JumpInPlaceRightLeft +083a6cfc l 00000008 sMovementActionFuncs_FaceOriginalDirection +083a6d04 l 0000000c sMovementActionFuncs_NurseJoyBowDown +083a6d10 l 00000008 sMovementActionFuncs_EnableJumpLandingGroundEffect +083a6d18 l 00000008 sMovementActionFuncs_DisableJumpLandingGroundEffect +083a6d20 l 00000008 sMovementActionFuncs_DisableAnimation +083a6d28 l 00000008 sMovementActionFuncs_RestoreAnimation +083a6d30 l 00000008 sMovementActionFuncs_SetInvisible +083a6d38 l 00000008 sMovementActionFuncs_SetVisible +083a6d40 l 00000008 sMovementActionFuncs_EmoteExclamationMark +083a6d48 l 00000008 sMovementActionFuncs_EmoteQuestionMark +083a6d50 l 00000008 sMovementActionFuncs_EmoteX +083a6d58 l 00000008 sMovementActionFuncs_EmoteDoubleExclMark +083a6d60 l 00000008 sMovementActionFuncs_EmoteSmile +083a6d68 l 0000000c sMovementActionFuncs_RevealTrainer +083a6d74 l 00000010 sMovementActionFuncs_RockSmashBreak +083a6d84 l 00000010 sMovementActionFuncs_CutTree +083a6d94 l 00000008 sMovementActionFuncs_SetFixedPriority +083a6d9c l 00000008 sMovementActionFuncs_ClearFixedPriority +083a6da4 l 00000008 sMovementActionFuncs_InitAffineAnim +083a6dac l 00000008 sMovementActionFuncs_ClearAffineAnim +083a6db4 l 0000000c sMovementActionFuncs_WalkDownStartAffine +083a6dc0 l 0000000c sMovementActionFuncs_WalkDownAffine +083a6dcc l 00000008 sMovementActionFuncs_AcroWheelieFaceDown +083a6dd4 l 00000008 sMovementActionFuncs_AcroWheelieFaceUp +083a6ddc l 00000008 sMovementActionFuncs_AcroWheelieFaceLeft +083a6de4 l 00000008 sMovementActionFuncs_AcroWheelieFaceRight +083a6dec l 0000000c sMovementActionFuncs_AcroPopWheelieDown +083a6df8 l 0000000c sMovementActionFuncs_AcroPopWheelieUp +083a6e04 l 0000000c sMovementActionFuncs_AcroPopWheelieLeft +083a6e10 l 0000000c sMovementActionFuncs_AcroPopWheelieRight +083a6e1c l 0000000c sMovementActionFuncs_AcroEndWheelieFaceDown +083a6e28 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceUp +083a6e34 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceLeft +083a6e40 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceRight +083a6e4c l 0000000c MovementActionFuncs_UnusedAcroActionDown +083a6e58 l 0000000c MovementActionFuncs_UnusedAcroActionUp +083a6e64 l 0000000c MovementActionFuncs_UnusedAcroActionLeft +083a6e70 l 0000000c MovementActionFuncs_UnusedAcroActionRight +083a6e7c l 0000000c sMovementActionFuncs_AcroWheelieHopFaceDown +083a6e88 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceUp +083a6e94 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceLeft +083a6ea0 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceRight +083a6eac l 0000000c sMovementActionFuncs_AcroWheelieHopDown +083a6eb8 l 0000000c sMovementActionFuncs_AcroWheelieHopUp +083a6ec4 l 0000000c sMovementActionFuncs_AcroWheelieHopLeft +083a6ed0 l 0000000c sMovementActionFuncs_AcroWheelieHopRight +083a6edc l 0000000c sMovementActionFuncs_AcroWheelieJumpDown +083a6ee8 l 0000000c sMovementActionFuncs_AcroWheelieJumpUp +083a6ef4 l 0000000c sMovementActionFuncs_AcroWheelieJumpLeft +083a6f00 l 0000000c sMovementActionFuncs_AcroWheelieJumpRight +083a6f0c l 0000000c sMovementActionFuncs_AcroWheelieInPlaceDown +083a6f18 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceUp +083a6f24 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceLeft +083a6f30 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceRight +083a6f3c l 0000000c sMovementActionFuncs_AcroPopWheelieMoveDown +083a6f48 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveUp +083a6f54 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveLeft +083a6f60 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveRight +083a6f6c l 0000000c sMovementActionFuncs_AcroWheelieMoveDown +083a6f78 l 0000000c sMovementActionFuncs_AcroWheelieMoveUp +083a6f84 l 0000000c sMovementActionFuncs_AcroWheelieMoveLeft +083a6f90 l 0000000c sMovementActionFuncs_AcroWheelieMoveRight +083a6f9c l 0000000c sMovementActionFuncs_SpinDown +083a6fa8 l 0000000c sMovementActionFuncs_SpinUp +083a6fb4 l 0000000c sMovementActionFuncs_SpinLeft +083a6fc0 l 0000000c sMovementActionFuncs_SpinRight 083a6fcc l 00000008 sMovementActionFuncs_x98 083a6fd4 l 00000008 sMovementActionFuncs_x99 083a6fdc l 00000008 sMovementActionFuncs_x9A -083a6fe4 l 00000008 sMovementActionFuncs_x9F -083a6fec l 0000000c sMovementActionFuncs_xA4 -083a6ff8 l 0000000c sMovementActionFuncs_xA5 +083a6fe4 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace +083a6fec l 0000000c sMovementActionFuncs_FlyUp +083a6ff8 l 0000000c sMovementActionFuncs_FlyDown 083a700c l 00000000 metatileFuncs.2418 083a7024 l 00000000 jumpLandingFlags.2419 083a703c l 00000010 gUnknown_83A705C.2429 @@ -31113,17 +31117,17 @@ 083a707c l 0000000c sGroundEffectTracksFuncs 083a708c l 00000010 bikeTireTracks_Transitions.2493 083a709c l 00000050 sGroundEffectFuncs -083a70ec l 00000040 sSpeed0 -083a712c l 00000020 sSpeed1 -083a714c l 00000018 sSpeed2 -083a7164 l 00000010 sSpeed3 -083a7174 l 00000008 sSpeed4 -083a717c l 00000014 sSpriteStepFuncsBySpeed -083a7190 l 0000000a sSpriteStepCountsBySpeed -083a719a l 00000010 sJumpHeight12 -083a71aa l 00000010 sJumpHeight6 -083a71ba l 00000010 sJumpHeight10 -083a71cc l 0000000c sYDisplacementPtrs +083a70ec l 00000040 sSpeedNormalStepFuncs +083a712c l 00000020 sSpeedFast1StepFuncs +083a714c l 00000018 sSpeedFast2StepFuncs +083a7164 l 00000010 sSpeedFasterStepFuncs +083a7174 l 00000008 sSpeedFastestStepFuncs +083a717c l 00000014 sNpcStepFuncTables +083a7190 l 0000000a sStepTimes +083a719a l 00000010 sJumpY_High +083a71aa l 00000010 sJumpY_Low +083a71ba l 00000010 sJumpY_Normal +083a71cc l 0000000c sJumpYTable 083a7224 g 00000004 gNullScriptPtr 083a7228 l 00000012 sScriptConditionTable 083a7274 g 0000000c sScriptStringVars diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index e9820ec5a..ab264ac7c 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -4010,33 +4010,33 @@ 080648a8 g 00000070 InitNpcForWalkSlowest 08064918 g 0000002c InitWalkSlowest 08064944 g 00000038 UpdateWalkSlowest -0806497c l 0000001e MovementActionFunc_x9B_0 -0806499c l 0000001e MovementActionFunc_x9B_1 -080649bc l 0000001e MovementActionFunc_x9C_0 -080649dc l 0000001e MovementActionFunc_x9C_1 -080649fc l 0000001e MovementActionFunc_x9D_0 -08064a1c l 0000001e MovementActionFunc_x9D_1 -08064a3c l 0000001e MovementActionFunc_x9E_0 -08064a5c l 0000001e MovementActionFunc_x9E_1 -08064a7c l 0000001e MovementActionFunc_x08_0 -08064a9c l 0000001e MovementActionFunc_x08_1 -08064abc l 0000001e MovementActionFunc_x09_0 -08064adc l 0000001e MovementActionFunc_x09_1 -08064afc l 0000001e MovementActionFunc_x0A_0 -08064b1c l 0000001e MovementActionFunc_x0A_1 -08064b3c l 0000001e MovementActionFunc_x0B_0 -08064b5c l 0000001e MovementActionFunc_x0B_1 +0806497c l 0000001e MovementAction_WalkSlowestDown_Step0 +0806499c l 0000001e MovementAction_WalkSlowestDown_Step1 +080649bc l 0000001e MovementAction_WalkSlowestUp_Step0 +080649dc l 0000001e MovementAction_WalkSlowestUp_Step1 +080649fc l 0000001e MovementAction_WalkSlowestLeft_Step0 +08064a1c l 0000001e MovementAction_WalkSlowestLeft_Step1 +08064a3c l 0000001e MovementAction_WalkSlowestRight_Step0 +08064a5c l 0000001e MovementAction_WalkSlowestRight_Step1 +08064a7c l 0000001e MovementAction_WalkSlowerDown_Step0 +08064a9c l 0000001e MovementAction_WalkSlowerDown_Step1 +08064abc l 0000001e MovementAction_WalkSlowerUp_Step0 +08064adc l 0000001e MovementAction_WalkSlowerUp_Step1 +08064afc l 0000001e MovementAction_WalkSlowerLeft_Step0 +08064b1c l 0000001e MovementAction_WalkSlowerLeft_Step1 +08064b3c l 0000001e MovementAction_WalkSlowerRight_Step0 +08064b5c l 0000001e MovementAction_WalkSlowerRight_Step1 08064b7c g 00000070 InitNpcForWalkSlow 08064bec g 0000002c InitWalkSlow 08064c18 g 00000038 UpdateWalkSlow -08064c50 l 0000001e MovementActionFunc_x0D_0 -08064c70 l 0000001e MovementActionFunc_x0D_1 -08064c90 l 0000001e MovementActionFunc_x0C_0 -08064cb0 l 0000001e MovementActionFunc_x0C_1 -08064cd0 l 0000001e MovementActionFunc_x0E_0 -08064cf0 l 0000001e MovementActionFunc_x0E_1 -08064d10 l 0000001e MovementActionFunc_x0F_0 -08064d30 l 0000001e MovementActionFunc_x0F_1 +08064c50 l 0000001e MovementAction_WalkSlowUp_Step0 +08064c70 l 0000001e MovementAction_WalkSlowUp_Step1 +08064c90 l 0000001e MovementAction_WalkSlowDown_Step0 +08064cb0 l 0000001e MovementAction_WalkSlowDown_Step1 +08064cd0 l 0000001e MovementAction_WalkSlowLeft_Step0 +08064cf0 l 0000001e MovementAction_WalkSlowLeft_Step1 +08064d10 l 0000001e MovementAction_WalkSlowRight_Step0 +08064d30 l 0000001e MovementAction_WalkSlowRight_Step1 08064d50 l 00000020 MovementAction_WalkNormalDown_Step0 08064d70 l 0000001e MovementAction_WalkNormalDown_Step1 08064d90 l 00000020 MovementAction_WalkNormalUp_Step0 @@ -4077,19 +4077,19 @@ 080653a0 l 00000020 MovementAction_WalkFastRight_Step0 080653c0 l 0000001e MovementAction_WalkFastRight_Step1 080653e0 g 0000002a sub_80653CC -0806540c l 00000040 MovementActionFunc_xA0_0 -0806544c l 0000002a MovementActionFunc_xA0_1 -08065478 l 00000040 MovementActionFunc_xA1_0 -080654b8 l 0000002a MovementActionFunc_xA1_1 -080654e4 l 00000040 MovementActionFunc_xA2_0 -08065524 l 0000002a MovementActionFunc_xA2_1 -08065550 l 00000040 MovementActionFunc_xA3_0 -08065590 l 0000002a MovementActionFunc_xA3_1 +0806540c l 00000040 MovementAction_xA0_Step0 +0806544c l 0000002a MovementAction_xA0_Step1 +08065478 l 00000040 MovementAction_xA1_Step0 +080654b8 l 0000002a MovementAction_xA1_Step1 +080654e4 l 00000040 MovementAction_xA2_Step0 +08065524 l 0000002a MovementAction_xA2_Step1 +08065550 l 00000040 MovementAction_xA3_Step0 +08065590 l 0000002a MovementAction_xA3_Step1 080655bc g 0000002c sub_80655A8 -080655e8 l 0000003a MovementActionFunc_x04_0 -08065624 l 0000003a MovementActionFunc_x05_0 -08065660 l 0000003a MovementActionFunc_x06_0 -0806569c l 0000003a MovementActionFunc_x07_0 +080655e8 l 0000003a MovementAction_FaceDownFast_Step0 +08065624 l 0000003a MovementAction_FaceUpFast_Step0 +08065660 l 0000003a MovementAction_FaceLeftFast_Step0 +0806569c l 0000003a MovementAction_FaceRightFast_Step0 080656d8 g 00000048 InitMoveInPlace 08065720 l 00000028 MovementAction_WalkInPlace_Step1 08065748 l 0000003c MovementAction_WalkInPlaceSlow_Step1 @@ -4105,10 +4105,10 @@ 0806597c l 00000036 MovementAction_WalkInPlaceFastUp_Step0 080659b4 l 00000036 MovementAction_WalkInPlaceFastLeft_Step0 080659ec l 00000036 MovementAction_WalkInPlaceFastRight_Step0 -08065a24 l 00000036 MovementAction_WalkInPlaceFastestDown_Step0 -08065a5c l 00000036 MovementAction_WalkInPlaceFastestUp_Step0 -08065a94 l 00000036 MovementAction_WalkInPlaceFastestLeft_Step0 -08065acc l 00000036 MovementAction_WalkInPlaceFastestRight_Step0 +08065a24 l 00000036 MovementAction_WalkInPlaceFasterDown_Step0 +08065a5c l 00000036 MovementAction_WalkInPlaceFasterUp_Step0 +08065a94 l 00000036 MovementAction_WalkInPlaceFasterLeft_Step0 +08065acc l 00000036 MovementAction_WalkInPlaceFasterRight_Step0 08065b04 l 00000020 MovementAction_RideWaterCurrentDown_Step0 08065b24 l 0000001e MovementAction_RideWaterCurrentDown_Step1 08065b44 l 00000020 MovementAction_RideWaterCurrentUp_Step0 @@ -4117,14 +4117,14 @@ 08065ba4 l 0000001e MovementAction_RideWaterCurrentLeft_Step1 08065bc4 l 00000020 MovementAction_RideWaterCurrentRight_Step0 08065be4 l 0000001e MovementAction_RideWaterCurrentRight_Step1 -08065c04 l 00000020 MovementAction_WalkFastestDown_Step0 -08065c24 l 0000001e MovementAction_WalkFastestDown_Step1 -08065c44 l 00000020 MovementAction_WalkFastestUp_Step0 -08065c64 l 0000001e MovementAction_WalkFastestUp_Step1 -08065c84 l 00000020 MovementAction_WalkFastestLeft_Step0 -08065ca4 l 0000001e MovementAction_WalkFastestLeft_Step1 -08065cc4 l 00000020 MovementAction_WalkFastestRight_Step0 -08065ce4 l 0000001e MovementAction_WalkFastestRight_Step1 +08065c04 l 00000020 MovementAction_WalkFasterDown_Step0 +08065c24 l 0000001e MovementAction_WalkFasterDown_Step1 +08065c44 l 00000020 MovementAction_WalkFasterUp_Step0 +08065c64 l 0000001e MovementAction_WalkFasterUp_Step1 +08065c84 l 00000020 MovementAction_WalkFasterLeft_Step0 +08065ca4 l 0000001e MovementAction_WalkFasterLeft_Step1 +08065cc4 l 00000020 MovementAction_WalkFasterRight_Step0 +08065ce4 l 0000001e MovementAction_WalkFasterRight_Step1 08065d04 l 00000020 MovementAction_SlideDown_Step0 08065d24 l 0000001e MovementAction_SlideDown_Step1 08065d44 l 00000020 MovementAction_SlideUp_Step0 @@ -4144,14 +4144,14 @@ 08065f04 g 00000070 InitNpcForRunSlow 08065f74 g 0000002c InitRunSlow 08065fa0 g 00000038 UpdateRunSlow -08065fd8 l 0000001e MovementActionFunc_x41_0 -08065ff8 l 0000001e MovementActionFunc_x41_1 -08066018 l 0000001e MovementActionFunc_x42_0 -08066038 l 0000001e MovementActionFunc_x42_1 -08066058 l 0000001e MovementActionFunc_x43_0 -08066078 l 0000001e MovementActionFunc_x43_1 -08066098 l 0000001e MovementActionFunc_x44_0 -080660b8 l 0000001e MovementActionFunc_x44_1 +08065fd8 l 0000001e MovementAction_RunDownSlow_Step0 +08065ff8 l 0000001e MovementAction_RunDownSlow_Step1 +08066018 l 0000001e MovementAction_RunUpSlow_Step0 +08066038 l 0000001e MovementAction_RunUpSlow_Step1 +08066058 l 0000001e MovementAction_RunLeftSlow_Step0 +08066078 l 0000001e MovementAction_RunLeftSlow_Step1 +08066098 l 0000001e MovementAction_RunRightSlow_Step0 +080660b8 l 0000001e MovementAction_RunRightSlow_Step1 080660d8 g 0000002c StartSpriteAnimInDirection 08066104 l 00000016 MovementAction_StartAnimInDirection_Step0 0806611c l 00000020 MovementAction_WaitSpriteAnim @@ -4164,14 +4164,14 @@ 08066220 l 00000028 MovementAction_JumpSpecialLeft_Step1 08066248 l 0000001e MovementAction_JumpSpecialRight_Step0 08066268 l 00000028 MovementAction_JumpSpecialRight_Step1 -08066290 l 0000001e MovementActionFunc_xA6_0 -080662b0 l 0000001e MovementActionFunc_xA6_1 -080662d0 l 0000001e MovementActionFunc_xA7_0 -080662f0 l 0000001e MovementActionFunc_xA7_1 -08066310 l 0000001e MovementActionFunc_xA8_0 -08066330 l 0000001e MovementActionFunc_xA8_1 -08066350 l 0000001e MovementActionFunc_xA9_0 -08066370 l 0000001e MovementActionFunc_xA9_1 +08066290 l 0000001e MovementAction_JumpSpecialWithEffectDown_Step0 +080662b0 l 0000001e MovementAction_JumpSpecialWithEffectDown_Step1 +080662d0 l 0000001e MovementAction_JumpSpecialWithEffectUp_Step0 +080662f0 l 0000001e MovementAction_JumpSpecialWithEffectUp_Step1 +08066310 l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step0 +08066330 l 0000001e MovementAction_JumpSpecialWithEffectLeft_Step1 +08066350 l 0000001e MovementAction_JumpSpecialWithEffectRight_Step0 +08066370 l 0000001e MovementAction_JumpSpecialWithEffectRight_Step1 08066390 l 0000005c MovementAction_FacePlayer_Step0 080663ec l 00000064 MovementAction_FaceAwayPlayer_Step0 08066450 l 0000000e MovementAction_LockFacingDirection_Step0 @@ -4210,9 +4210,9 @@ 08066924 l 00000010 MovementAction_SetVisible_Step0 08066934 l 00000024 MovementAction_EmoteExclamationMark_Step0 08066958 l 00000024 MovementAction_EmoteQuestionMark_Step0 -0806697c l 00000024 MovementAction_EmoteHeart_Step0 -080669a0 l 00000024 do_double_excl_bubble -080669c4 l 00000024 do_smile_bubble +0806697c l 00000024 MovementAction_EmoteX_Step0 +080669a0 l 00000024 MovementAction_EmoteDoubleExclamationMark_Step0 +080669c4 l 00000024 MovementAction_EmoteSmile_Step0 080669e8 l 00000044 MovementAction_RevealTrainer_Step0 08066a2c l 0000001e MovementAction_RevealTrainer_Step1 08066a4c l 0000001a MovementAction_RockSmashBreak_Step0 @@ -4230,10 +4230,10 @@ 08066c24 l 00000032 MovementAction_WalkDownAffine_Step0 08066c58 l 0000002a MovementAction_WalkDownAffine_Step1 08066c84 g 00000040 AcroWheelieFaceDirection -08066cc4 l 0000000e MovementActionFunc_x70_0 -08066cd4 l 0000000e MovementActionFunc_x71_0 -08066ce4 l 0000000e MovementActionFunc_x72_0 -08066cf4 l 0000000e MovementActionFunc_x73_0 +08066cc4 l 0000000e MovementAction_AcroWheelieFaceDown_Step0 +08066cd4 l 0000000e MovementAction_AcroWheelieFaceUp_Step0 +08066ce4 l 0000000e MovementAction_AcroWheelieFaceLeft_Step0 +08066cf4 l 0000000e MovementAction_AcroWheelieFaceRight_Step0 08066d04 l 00000024 MovementAction_AcroPopWheelieDown_Step0 08066d28 l 00000024 MovementAction_AcroPopWheelieUp_Step0 08066d4c l 00000024 MovementAction_AcroPopWheelieLeft_Step0 @@ -4271,10 +4271,10 @@ 08067294 l 0000002a MovementAction_AcroWheelieJumpLeft_Step1 080672c0 l 0000002a MovementAction_AcroWheelieJumpRight_Step0 080672ec l 0000002a MovementAction_AcroWheelieJumpRight_Step1 -08067318 l 00000036 MovementActionFunc_x88_0 -08067350 l 00000036 MovementActionFunc_x89_0 -08067388 l 00000036 MovementActionFunc_x8A_0 -080673c0 l 00000036 MovementActionFunc_x8B_0 +08067318 l 00000036 MovementAction_AcroWheelieInPlaceDown_Step0 +08067350 l 00000036 MovementAction_AcroWheelieInPlaceUp_Step0 +08067388 l 00000036 MovementAction_AcroWheelieInPlaceLeft_Step0 +080673c0 l 00000036 MovementAction_AcroWheelieInPlaceRight_Step0 080673f8 g 00000036 InitAcroPopWheelie 08067430 l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 08067450 l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 @@ -4294,27 +4294,27 @@ 08067620 l 00000020 MovementAction_AcroWheelieMoveRight_Step0 08067640 l 0000001e MovementAction_AcroWheelieMoveRight_Step1 08067660 g 00000038 InitSpin -08067698 l 00000020 MovementActionFunc_x94_0 -080676b8 l 0000001e MovementActionFunc_x94_1 -080676d8 l 00000020 MovementActionFunc_x95_0 -080676f8 l 0000001e MovementActionFunc_x95_1 -08067718 l 00000020 MovementActionFunc_x96_0 -08067738 l 0000001e MovementActionFunc_x96_1 -08067758 l 00000020 MovementActionFunc_x97_0 -08067778 l 0000001e MovementActionFunc_x97_1 -08067798 l 0000003c MovementActionFunc_x98_0 -080677d4 l 0000000a MovementActionFunc_x98_1 -080677e0 l 000000f2 MovementActionFunc_x99_1 -080678d4 l 00000030 MovementActionFunc_x9A_1 -08067904 l 00000032 MovementActionFunc_x9F_0 -08067938 l 0000000a MovementActionFunc_x9F_1 +08067698 l 00000020 MovementAction_SpinDown_Step0 +080676b8 l 0000001e MovementAction_SpinDown_Step1 +080676d8 l 00000020 MovementAction_SpinUp_Step0 +080676f8 l 0000001e MovementAction_SpinUp_Step1 +08067718 l 00000020 MovementAction_SpinLeft_Step0 +08067738 l 0000001e MovementAction_SpinLeft_Step1 +08067758 l 00000020 MovementAction_SpinRight_Step0 +08067778 l 0000001e MovementAction_SpinRight_Step1 +08067798 l 0000003c MovementAction_x98_Step0 +080677d4 l 0000000a MovementAction_x98_Step1 +080677e0 l 000000f2 MovementAction_x99_Step1 +080678d4 l 00000030 MovementAction_x9A_Step1 +08067904 l 00000032 MovementAction_ShakeHeadOrWalkInPlace_Step0 +08067938 l 0000000a MovementAction_ShakeHeadOrWalkInPlace_Step1 08067944 l 00000004 MovementAction_Finish 08067948 l 0000000e MovementAction_PauseSpriteAnim -08067958 l 0000000e MovementActionFunc_xA4_0 -08067968 l 00000022 MovementActionFunc_xA4_1 -0806798c l 00000014 MovementActionFunc_xA5_0 -080679a0 l 0000001a MovementActionFunc_xA5_1 -080679bc l 00000004 MovementActionFunc_xA4_2 +08067958 l 0000000e MovementAction_FlyUp_Step0 +08067968 l 00000022 MovementAction_FlyUp_Step1 +0806798c l 00000014 MovementAction_FlyDown_Step0 +080679a0 l 0000001a MovementAction_FlyDown_Step1 +080679bc l 00000004 MovementAction_FlyUp_Step2 080679c0 l 0000001a UpdateObjectEventSpriteAnimPause 080679dc l 0000002e TryEnableObjectEventAnim 08067a0c l 00000018 UpdateObjectEventVisibility @@ -4384,11 +4384,11 @@ 080689c4 g 00000044 FreezeObjectEventsExceptOne 08068a08 g 00000068 UnfreezeObjectEvent 08068a70 g 00000030 UnfreezeObjectEvents -08068aa0 l 00000020 little_step -08068ac0 l 00000024 double_little_steps -08068ae4 l 00000028 triple_little_steps -08068b0c l 00000024 quad_little_steps -08068b30 l 00000024 oct_little_steps +08068aa0 l 00000020 Step1 +08068ac0 l 00000024 Step2 +08068ae4 l 00000028 Step3 +08068b0c l 00000024 Step4 +08068b30 l 00000024 Step8 08068b54 g 00000012 SetSpriteDataForNormalStep 08068b68 g 00000068 NpcTakeStep 08068bd0 g 0000000e SetWalkSlowerSpriteData @@ -4399,7 +4399,7 @@ 08068c7c g 0000003c UpdateWalkSlowestAnim 08068cb8 g 0000000e SetRunSlowSpriteData 08068cc8 g 0000004a UpdateRunSlowAnim -08068d14 l 0000001c GetJumpYDisplacement +08068d14 l 0000001c GetJumpY 08068d30 g 0000001e SetJumpSpriteData 08068d50 g 00000088 DoJumpSpriteMovement 08068dd8 g 00000094 DoJumpSpecialSpriteMovement @@ -20264,10 +20264,10 @@ 081a7635 g 00000000 Movement_FacePlayer 081a7637 g 00000000 Movement_FaceAwayPlayer 081a7639 g 00000000 Movement_FaceOriginalDirection -081a763b g 00000000 Movement_WalkInPlaceFastestLeft -081a763d g 00000000 Movement_WalkInPlaceFastestUp -081a763f g 00000000 Movement_WalkInPlaceFastestRight -081a7641 g 00000000 Movement_WalkInPlaceFastestDown +081a763b g 00000000 Movement_WalkInPlaceFasterLeft +081a763d g 00000000 Movement_WalkInPlaceFasterUp +081a763f g 00000000 Movement_WalkInPlaceFasterRight +081a7641 g 00000000 Movement_WalkInPlaceFasterDown 081a7643 g 00000000 Movement_FaceRight 081a7645 g 00000000 Movement_FaceDown 081a7647 g 00000000 Movement_WalkUp5 @@ -30931,180 +30931,184 @@ 083a65e1 l 00000008 gOppositeDirections 083a65e9 l 00000010 sPlayerDirectionsForCopy 083a65f9 l 00000010 sPlayerDirectionToCopyDirection -083a660c g 000002a8 gMovementActionFuncs -083a68b4 l 00000008 sMovementActionFuncs_x00 -083a68bc l 00000008 sMovementActionFuncs_x01 -083a68c4 l 00000008 sMovementActionFuncs_x02 -083a68cc l 00000008 sMovementActionFuncs_x03 -083a68d4 l 00000014 gUnknown_83A6884 -083a68e8 l 0000000c sMovementActionFuncs_x9B -083a68f4 l 0000000c sMovementActionFuncs_x9C -083a6900 l 0000000c sMovementActionFuncs_x9D -083a690c l 0000000c sMovementActionFuncs_x9E -083a6918 l 0000000c sMovementActionFuncs_x08 -083a6924 l 0000000c sMovementActionFuncs_x09 -083a6930 l 0000000c sMovementActionFuncs_x0A -083a693c l 0000000c sMovementActionFuncs_x0B -083a6948 l 0000000c sMovementActionFuncs_x0D -083a6954 l 0000000c sMovementActionFuncs_x0C -083a6960 l 0000000c sMovementActionFuncs_x0E -083a696c l 0000000c sMovementActionFuncs_x0F -083a6978 l 0000000c sMovementActionFuncs_x10 -083a6984 l 0000000c sMovementActionFuncs_x11 -083a6990 l 0000000c sMovementActionFuncs_x12 -083a699c l 0000000c sMovementActionFuncs_x13 -083a69a8 g 00000006 gUnknown_83A6958 -083a69ae g 00000006 gUnknown_83A695E -083a69b4 l 0000000c sMovementActionFuncs_x14 -083a69c0 l 0000000c sMovementActionFuncs_x15 -083a69cc l 0000000c sMovementActionFuncs_x16 -083a69d8 l 0000000c sMovementActionFuncs_x17 -083a69e4 l 0000000c sMovementActionFuncs_x18 -083a69f0 l 0000000c sMovementActionFuncs_x19 -083a69fc l 0000000c sMovementActionFuncs_x1A -083a6a08 l 0000000c sMovementActionFuncs_x1B -083a6a14 l 0000000c sMovementActionFuncs_x1C -083a6a20 l 0000000c sMovementActionFuncs_x1D -083a6a2c l 0000000c sMovementActionFuncs_x1E -083a6a38 l 0000000c sMovementActionFuncs_x1F -083a6a44 l 0000000c sMovementActionFuncs_x20 +083a660c l 000002a8 sMovementActionFuncs +083a68b4 l 00000008 sMovementActionFuncs_FaceDown +083a68bc l 00000008 sMovementActionFuncs_FaceUp +083a68c4 l 00000008 sMovementActionFuncs_FaceLeft +083a68cc l 00000008 sMovementActionFuncs_FaceRight +083a68d4 l 00000014 sDirectionAnimFuncsBySpeed +083a68e8 l 0000000c sMovementActionFuncs_WalkSlowestDown +083a68f4 l 0000000c sMovementActionFuncs_WalkSlowestUp +083a6900 l 0000000c sMovementActionFuncs_WalkSlowestLeft +083a690c l 0000000c sMovementActionFuncs_WalkSlowestRight +083a6918 l 0000000c sMovementActionFuncs_WalkSlowerDown +083a6924 l 0000000c sMovementActionFuncs_WalkSlowerUp +083a6930 l 0000000c sMovementActionFuncs_WalkSlowerLeft +083a693c l 0000000c sMovementActionFuncs_WalkSlowerRight +083a6948 l 0000000c sMovementActionFuncs_WalkSlowUp +083a6954 l 0000000c sMovementActionFuncs_WalkSlowDown +083a6960 l 0000000c sMovementActionFuncs_WalkSlowLeft +083a696c l 0000000c sMovementActionFuncs_WalkSlowRight +083a6978 l 0000000c sMovementActionFuncs_WalkNormalDown +083a6984 l 0000000c sMovementActionFuncs_WalkNormalUp +083a6990 l 0000000c sMovementActionFuncs_WalkNormalLeft +083a699c l 0000000c sMovementActionFuncs_WalkNormalRight +083a69a8 l 00000006 sJumpInitDisplacements +083a69ae l 00000006 sJumpDisplacements +083a69b4 l 0000000c sMovementActionFuncs_Jump2Down +083a69c0 l 0000000c sMovementActionFuncs_Jump2Up +083a69cc l 0000000c sMovementActionFuncs_Jump2Left +083a69d8 l 0000000c sMovementActionFuncs_Jump2Right +083a69e4 l 0000000c sMovementActionFuncs_Delay1 +083a69f0 l 0000000c sMovementActionFuncs_Delay2 +083a69fc l 0000000c sMovementActionFuncs_Delay4 +083a6a08 l 0000000c sMovementActionFuncs_Delay8 +083a6a14 l 0000000c sMovementActionFuncs_Delay16 +083a6a20 l 0000000c sMovementActionFuncs_WalkFastDown +083a6a2c l 0000000c sMovementActionFuncs_WalkFastUp +083a6a38 l 0000000c sMovementActionFuncs_WalkFastLeft +083a6a44 l 0000000c sMovementActionFuncs_WalkFastRight 083a6a50 l 0000000c sMovementActionFuncs_xA0 083a6a5c l 0000000c sMovementActionFuncs_xA1 083a6a68 l 0000000c sMovementActionFuncs_xA2 083a6a74 l 0000000c sMovementActionFuncs_xA3 -083a6a80 l 00000008 sMovementActionFuncs_x04 -083a6a88 l 00000008 sMovementActionFuncs_x05 -083a6a90 l 00000008 sMovementActionFuncs_x06 -083a6a98 l 00000008 sMovementActionFuncs_x07 -083a6aa0 l 0000000c sMovementActionFuncs_x21 -083a6aac l 0000000c sMovementActionFuncs_x22 -083a6ab8 l 0000000c sMovementActionFuncs_x23 -083a6ac4 l 0000000c sMovementActionFuncs_x24 -083a6ad0 l 0000000c sMovementActionFuncs_x25 -083a6adc l 0000000c sMovementActionFuncs_x26 -083a6ae8 l 0000000c sMovementActionFuncs_x27 -083a6af4 l 0000000c sMovementActionFuncs_x28 -083a6b00 l 0000000c sMovementActionFuncs_x29 -083a6b0c l 0000000c sMovementActionFuncs_x2A -083a6b18 l 0000000c sMovementActionFuncs_x2B -083a6b24 l 0000000c sMovementActionFuncs_x2C -083a6b30 l 0000000c sMovementActionFuncs_x2D -083a6b3c l 0000000c sMovementActionFuncs_x2E -083a6b48 l 0000000c sMovementActionFuncs_x2F -083a6b54 l 0000000c sMovementActionFuncs_x30 -083a6b60 l 0000000c sMovementActionFuncs_x31 -083a6b6c l 0000000c sMovementActionFuncs_x32 -083a6b78 l 0000000c sMovementActionFuncs_x33 -083a6b84 l 0000000c sMovementActionFuncs_x34 -083a6b90 l 0000000c sMovementActionFuncs_x35 -083a6b9c l 0000000c sMovementActionFuncs_x36 -083a6ba8 l 0000000c sMovementActionFuncs_x37 -083a6bb4 l 0000000c sMovementActionFuncs_x38 -083a6bc0 l 0000000c sMovementActionFuncs_x39 -083a6bcc l 0000000c sMovementActionFuncs_x3A -083a6bd8 l 0000000c sMovementActionFuncs_x3B -083a6be4 l 0000000c sMovementActionFuncs_x3C -083a6bf0 l 0000000c sMovementActionFuncs_x3D -083a6bfc l 0000000c sMovementActionFuncs_x3E -083a6c08 l 0000000c sMovementActionFuncs_x3F -083a6c14 l 0000000c sMovementActionFuncs_x40 -083a6c20 l 0000000c sMovementActionFuncs_x41 -083a6c2c l 0000000c sMovementActionFuncs_x42 -083a6c38 l 0000000c sMovementActionFuncs_x43 -083a6c44 l 0000000c sMovementActionFuncs_x44 -083a6c50 l 0000000c sMovementActionFuncs_x45 -083a6c5c l 0000000c sMovementActionFuncs_x46 -083a6c68 l 0000000c sMovementActionFuncs_x47 -083a6c74 l 0000000c sMovementActionFuncs_x48 -083a6c80 l 0000000c sMovementActionFuncs_x49 -083a6c8c l 0000000c sMovementActionFuncs_xA6 -083a6c98 l 0000000c sMovementActionFuncs_xA7 -083a6ca4 l 0000000c sMovementActionFuncs_xA8 -083a6cb0 l 0000000c sMovementActionFuncs_xA9 -083a6cbc l 00000008 sMovementActionFuncs_x4A -083a6cc4 l 00000008 sMovementActionFuncs_x4B -083a6ccc l 00000008 sMovementActionFuncs_x4C -083a6cd4 l 00000008 sMovementActionFuncs_x4D -083a6cdc l 0000000c sMovementActionFuncs_x4E -083a6ce8 l 0000000c sMovementActionFuncs_x4F -083a6cf4 l 0000000c sMovementActionFuncs_x50 -083a6d00 l 0000000c sMovementActionFuncs_x51 -083a6d0c l 0000000c sMovementActionFuncs_x52 -083a6d18 l 0000000c sMovementActionFuncs_x53 -083a6d24 l 0000000c sMovementActionFuncs_x54 -083a6d30 l 0000000c sMovementActionFuncs_x55 -083a6d3c l 0000000c sMovementActionFuncs_x56 -083a6d48 l 0000000c sMovementActionFuncs_x57 -083a6d54 l 0000000c sMovementActionFuncs_x58 -083a6d60 l 0000000c sMovementActionFuncs_x59 -083a6d6c l 00000008 sMovementActionFuncs_x5A -083a6d74 l 0000000c sMovementActionFuncs_x5B -083a6d80 l 00000008 sMovementActionFuncs_x5C -083a6d88 l 00000008 sMovementActionFuncs_x5D -083a6d90 l 00000008 sMovementActionFuncs_x5E -083a6d98 l 00000008 sMovementActionFuncs_x5F -083a6da0 l 00000008 sMovementActionFuncs_x60 -083a6da8 l 00000008 sMovementActionFuncs_x61 -083a6db0 l 00000008 sMovementActionFuncs_x62 -083a6db8 l 00000008 sMovementActionFuncs_x63 -083a6dc0 l 00000008 sMovementActionFuncs_x64 -083a6dc8 l 00000008 sMovementActionFuncs_x65 -083a6dd0 l 00000008 sMovementActionFuncs_x66 -083a6dd8 l 0000000c sMovementActionFuncs_x67 -083a6de4 l 00000010 sMovementActionFuncs_x68 -083a6df4 l 00000010 sMovementActionFuncs_x69 -083a6e04 l 00000008 sMovementActionFuncs_x6A -083a6e0c l 00000008 sMovementActionFuncs_x6B -083a6e14 l 00000008 sMovementActionFuncs_x6C -083a6e1c l 00000008 sMovementActionFuncs_x6D -083a6e24 l 0000000c sMovementActionFuncs_x6E -083a6e30 l 0000000c sMovementActionFuncs_x6F -083a6e3c l 00000008 sMovementActionFuncs_x70 -083a6e44 l 00000008 sMovementActionFuncs_x71 -083a6e4c l 00000008 sMovementActionFuncs_x72 -083a6e54 l 00000008 sMovementActionFuncs_x73 -083a6e5c l 0000000c sMovementActionFuncs_x74 -083a6e68 l 0000000c sMovementActionFuncs_x75 -083a6e74 l 0000000c sMovementActionFuncs_x76 -083a6e80 l 0000000c sMovementActionFuncs_x77 -083a6e8c l 0000000c sMovementActionFuncs_x78 -083a6e98 l 0000000c sMovementActionFuncs_x79 -083a6ea4 l 0000000c sMovementActionFuncs_x7A -083a6eb0 l 0000003c sMovementActionFuncs_x7B -083a6eec l 0000000c sMovementActionFuncs_x7C -083a6ef8 l 0000000c sMovementActionFuncs_x7D -083a6f04 l 0000000c sMovementActionFuncs_x7E -083a6f10 l 0000000c sMovementActionFuncs_x7F -083a6f1c l 0000000c sMovementActionFuncs_x80 -083a6f28 l 0000000c sMovementActionFuncs_x81 -083a6f34 l 0000000c sMovementActionFuncs_x82 -083a6f40 l 0000000c sMovementActionFuncs_x83 -083a6f4c l 0000000c sMovementActionFuncs_x84 -083a6f58 l 0000000c sMovementActionFuncs_x85 -083a6f64 l 0000000c sMovementActionFuncs_x86 -083a6f70 l 0000000c sMovementActionFuncs_x87 -083a6f7c l 0000000c sMovementActionFuncs_x88 -083a6f88 l 0000000c sMovementActionFuncs_x89 -083a6f94 l 0000000c sMovementActionFuncs_x8A -083a6fa0 l 0000000c sMovementActionFuncs_x8B -083a6fac l 0000000c sMovementActionFuncs_x8C -083a6fb8 l 0000000c sMovementActionFuncs_x8D -083a6fc4 l 0000000c sMovementActionFuncs_x8E -083a6fd0 l 0000000c sMovementActionFuncs_x8F -083a6fdc l 0000000c sMovementActionFuncs_x90 -083a6fe8 l 0000000c sMovementActionFuncs_x91 -083a6ff4 l 0000000c sMovementActionFuncs_x92 -083a7000 l 0000000c sMovementActionFuncs_x93 -083a700c l 0000000c sMovementActionFuncs_x94 -083a7018 l 0000000c sMovementActionFuncs_x95 -083a7024 l 0000000c sMovementActionFuncs_x96 -083a7030 l 0000000c sMovementActionFuncs_x97 +083a6a80 l 00000008 sMovementActionFuncs_FaceDownFast +083a6a88 l 00000008 sMovementActionFuncs_FaceUpFast +083a6a90 l 00000008 sMovementActionFuncs_FaceLeftFast +083a6a98 l 00000008 sMovementActionFuncs_FaceRightFast +083a6aa0 l 0000000c sMovementActionFuncs_WalkInPlaceSlowDown +083a6aac l 0000000c sMovementActionFuncs_WalkInPlaceSlowUp +083a6ab8 l 0000000c sMovementActionFuncs_WalkInPlaceSlowLeft +083a6ac4 l 0000000c sMovementActionFuncs_WalkInPlaceSlowRight +083a6ad0 l 0000000c sMovementActionFuncs_WalkInPlaceNormalDown +083a6adc l 0000000c sMovementActionFuncs_WalkInPlaceNormalUp +083a6ae8 l 0000000c sMovementActionFuncs_WalkInPlaceNormalLeft +083a6af4 l 0000000c sMovementActionFuncs_WalkInPlaceNormalRight +083a6b00 l 0000000c sMovementActionFuncs_WalkInPlaceFastDown +083a6b0c l 0000000c sMovementActionFuncs_WalkInPlaceFastUp +083a6b18 l 0000000c sMovementActionFuncs_WalkInPlaceFastLeft +083a6b24 l 0000000c sMovementActionFuncs_WalkInPlaceFastRight +083a6b30 l 0000000c sMovementActionFuncs_WalkInPlaceFasterDown +083a6b3c l 0000000c sMovementActionFuncs_WalkInPlaceFasterUp +083a6b48 l 0000000c sMovementActionFuncs_WalkInPlaceFasterLeft +083a6b54 l 0000000c sMovementActionFuncs_WalkInPlaceFasterRight +083a6b60 l 0000000c sMovementActionFuncs_RideWaterCurrentDown +083a6b6c l 0000000c sMovementActionFuncs_RideWaterCurrentUp +083a6b78 l 0000000c sMovementActionFuncs_RideWaterCurrentLeft +083a6b84 l 0000000c sMovementActionFuncs_RideWaterCurrentRight +083a6b90 l 0000000c sMovementActionFuncs_WalkFasterDown +083a6b9c l 0000000c sMovementActionFuncs_WalkFasterUp +083a6ba8 l 0000000c sMovementActionFuncs_WalkFasterLeft +083a6bb4 l 0000000c sMovementActionFuncs_WalkFasterRight +083a6bc0 l 0000000c sMovementActionFuncs_SlideDown +083a6bcc l 0000000c sMovementActionFuncs_SlideUp +083a6bd8 l 0000000c sMovementActionFuncs_SlideLeft +083a6be4 l 0000000c sMovementActionFuncs_SlideRight +083a6bf0 l 0000000c sMovementActionFuncs_PlayerRunDown +083a6bfc l 0000000c sMovementActionFuncs_PlayerRunUp +083a6c08 l 0000000c sMovementActionFuncs_PlayerRunLeft +083a6c14 l 0000000c sMovementActionFuncs_PlayerRunRight +083a6c20 l 0000000c sMovementActionFuncs_PlayerRunDownSlow +083a6c2c l 0000000c sMovementActionFuncs_PlayerRunUpSlow +083a6c38 l 0000000c sMovementActionFuncs_PlayerRunLeftSlow +083a6c44 l 0000000c sMovementActionFuncs_PlayerRunRightSlow +083a6c50 l 0000000c sMovementActionFuncs_StartAnimInDirection +083a6c5c l 0000000c sMovementActionFuncs_JumpSpecialDown +083a6c68 l 0000000c sMovementActionFuncs_JumpSpecialUp +083a6c74 l 0000000c sMovementActionFuncs_JumpSpecialLeft +083a6c80 l 0000000c sMovementActionFuncs_JumpSpecialRight +083a6c8c l 0000000c sMovementActionFuncs_JumpSpecialWithEffectDown +083a6c98 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectUp +083a6ca4 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectLeft +083a6cb0 l 0000000c sMovementActionFuncs_JumpSpecialWithEffectRight +083a6cbc l 00000008 sMovementActionFuncs_FacePlayer +083a6cc4 l 00000008 sMovementActionFuncs_FaceAwayPlayer +083a6ccc l 00000008 sMovementActionFuncs_LockFacingDirection +083a6cd4 l 00000008 sMovementActionFuncs_UnlockFacingDirection +083a6cdc l 0000000c sMovementActionFuncs_JumpDown +083a6ce8 l 0000000c sMovementActionFuncs_JumpUp +083a6cf4 l 0000000c sMovementActionFuncs_JumpLeft +083a6d00 l 0000000c sMovementActionFuncs_JumpRight +083a6d0c l 0000000c sMovementActionFuncs_JumpInPlaceDown +083a6d18 l 0000000c sMovementActionFuncs_JumpInPlaceUp +083a6d24 l 0000000c sMovementActionFuncs_JumpInPlaceLeft +083a6d30 l 0000000c sMovementActionFuncs_JumpInPlaceRight +083a6d3c l 0000000c sMovementActionFuncs_JumpInPlaceDownUp +083a6d48 l 0000000c sMovementActionFuncs_JumpInPlaceUpDown +083a6d54 l 0000000c sMovementActionFuncs_JumpInPlaceLeftRight +083a6d60 l 0000000c sMovementActionFuncs_JumpInPlaceRightLeft +083a6d6c l 00000008 sMovementActionFuncs_FaceOriginalDirection +083a6d74 l 0000000c sMovementActionFuncs_NurseJoyBowDown +083a6d80 l 00000008 sMovementActionFuncs_EnableJumpLandingGroundEffect +083a6d88 l 00000008 sMovementActionFuncs_DisableJumpLandingGroundEffect +083a6d90 l 00000008 sMovementActionFuncs_DisableAnimation +083a6d98 l 00000008 sMovementActionFuncs_RestoreAnimation +083a6da0 l 00000008 sMovementActionFuncs_SetInvisible +083a6da8 l 00000008 sMovementActionFuncs_SetVisible +083a6db0 l 00000008 sMovementActionFuncs_EmoteExclamationMark +083a6db8 l 00000008 sMovementActionFuncs_EmoteQuestionMark +083a6dc0 l 00000008 sMovementActionFuncs_EmoteX +083a6dc8 l 00000008 sMovementActionFuncs_EmoteDoubleExclMark +083a6dd0 l 00000008 sMovementActionFuncs_EmoteSmile +083a6dd8 l 0000000c sMovementActionFuncs_RevealTrainer +083a6de4 l 00000010 sMovementActionFuncs_RockSmashBreak +083a6df4 l 00000010 sMovementActionFuncs_CutTree +083a6e04 l 00000008 sMovementActionFuncs_SetFixedPriority +083a6e0c l 00000008 sMovementActionFuncs_ClearFixedPriority +083a6e14 l 00000008 sMovementActionFuncs_InitAffineAnim +083a6e1c l 00000008 sMovementActionFuncs_ClearAffineAnim +083a6e24 l 0000000c sMovementActionFuncs_WalkDownStartAffine +083a6e30 l 0000000c sMovementActionFuncs_WalkDownAffine +083a6e3c l 00000008 sMovementActionFuncs_AcroWheelieFaceDown +083a6e44 l 00000008 sMovementActionFuncs_AcroWheelieFaceUp +083a6e4c l 00000008 sMovementActionFuncs_AcroWheelieFaceLeft +083a6e54 l 00000008 sMovementActionFuncs_AcroWheelieFaceRight +083a6e5c l 0000000c sMovementActionFuncs_AcroPopWheelieDown +083a6e68 l 0000000c sMovementActionFuncs_AcroPopWheelieUp +083a6e74 l 0000000c sMovementActionFuncs_AcroPopWheelieLeft +083a6e80 l 0000000c sMovementActionFuncs_AcroPopWheelieRight +083a6e8c l 0000000c sMovementActionFuncs_AcroEndWheelieFaceDown +083a6e98 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceUp +083a6ea4 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceLeft +083a6eb0 l 0000000c sMovementActionFuncs_AcroEndWheelieFaceRight +083a6ebc l 0000000c MovementActionFuncs_UnusedAcroActionDown +083a6ec8 l 0000000c MovementActionFuncs_UnusedAcroActionUp +083a6ed4 l 0000000c MovementActionFuncs_UnusedAcroActionLeft +083a6ee0 l 0000000c MovementActionFuncs_UnusedAcroActionRight +083a6eec l 0000000c sMovementActionFuncs_AcroWheelieHopFaceDown +083a6ef8 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceUp +083a6f04 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceLeft +083a6f10 l 0000000c sMovementActionFuncs_AcroWheelieHopFaceRight +083a6f1c l 0000000c sMovementActionFuncs_AcroWheelieHopDown +083a6f28 l 0000000c sMovementActionFuncs_AcroWheelieHopUp +083a6f34 l 0000000c sMovementActionFuncs_AcroWheelieHopLeft +083a6f40 l 0000000c sMovementActionFuncs_AcroWheelieHopRight +083a6f4c l 0000000c sMovementActionFuncs_AcroWheelieJumpDown +083a6f58 l 0000000c sMovementActionFuncs_AcroWheelieJumpUp +083a6f64 l 0000000c sMovementActionFuncs_AcroWheelieJumpLeft +083a6f70 l 0000000c sMovementActionFuncs_AcroWheelieJumpRight +083a6f7c l 0000000c sMovementActionFuncs_AcroWheelieInPlaceDown +083a6f88 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceUp +083a6f94 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceLeft +083a6fa0 l 0000000c sMovementActionFuncs_AcroWheelieInPlaceRight +083a6fac l 0000000c sMovementActionFuncs_AcroPopWheelieMoveDown +083a6fb8 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveUp +083a6fc4 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveLeft +083a6fd0 l 0000000c sMovementActionFuncs_AcroPopWheelieMoveRight +083a6fdc l 0000000c sMovementActionFuncs_AcroWheelieMoveDown +083a6fe8 l 0000000c sMovementActionFuncs_AcroWheelieMoveUp +083a6ff4 l 0000000c sMovementActionFuncs_AcroWheelieMoveLeft +083a7000 l 0000000c sMovementActionFuncs_AcroWheelieMoveRight +083a700c l 0000000c sMovementActionFuncs_SpinDown +083a7018 l 0000000c sMovementActionFuncs_SpinUp +083a7024 l 0000000c sMovementActionFuncs_SpinLeft +083a7030 l 0000000c sMovementActionFuncs_SpinRight 083a703c l 00000008 sMovementActionFuncs_x98 083a7044 l 00000008 sMovementActionFuncs_x99 083a704c l 00000008 sMovementActionFuncs_x9A -083a7054 l 00000008 sMovementActionFuncs_x9F -083a705c l 0000000c sMovementActionFuncs_xA4 -083a7068 l 0000000c sMovementActionFuncs_xA5 +083a7054 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace +083a705c l 0000000c sMovementActionFuncs_FlyUp +083a7068 l 0000000c sMovementActionFuncs_FlyDown 083a707c l 00000000 metatileFuncs.2418 083a7094 l 00000000 jumpLandingFlags.2419 083a70ac l 00000010 gUnknown_83A705C.2429 @@ -31114,17 +31118,17 @@ 083a70ec l 0000000c sGroundEffectTracksFuncs 083a70fc l 00000010 bikeTireTracks_Transitions.2493 083a710c l 00000050 sGroundEffectFuncs -083a715c l 00000040 sSpeed0 -083a719c l 00000020 sSpeed1 -083a71bc l 00000018 sSpeed2 -083a71d4 l 00000010 sSpeed3 -083a71e4 l 00000008 sSpeed4 -083a71ec l 00000014 sSpriteStepFuncsBySpeed -083a7200 l 0000000a sSpriteStepCountsBySpeed -083a720a l 00000010 sJumpHeight12 -083a721a l 00000010 sJumpHeight6 -083a722a l 00000010 sJumpHeight10 -083a723c l 0000000c sYDisplacementPtrs +083a715c l 00000040 sSpeedNormalStepFuncs +083a719c l 00000020 sSpeedFast1StepFuncs +083a71bc l 00000018 sSpeedFast2StepFuncs +083a71d4 l 00000010 sSpeedFasterStepFuncs +083a71e4 l 00000008 sSpeedFastestStepFuncs +083a71ec l 00000014 sNpcStepFuncTables +083a7200 l 0000000a sStepTimes +083a720a l 00000010 sJumpY_High +083a721a l 00000010 sJumpY_Low +083a722a l 00000010 sJumpY_Normal +083a723c l 0000000c sJumpYTable 083a7294 g 00000004 gNullScriptPtr 083a7298 l 00000012 sScriptConditionTable 083a72e4 g 0000000c sScriptStringVars