diff --git a/pokefirered.sym b/pokefirered.sym index 16a904613..5d8e96d59 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -3434,7 +3434,7 @@ 0805c20c g 00000018 PlayerFaceDirectionFast 0805c224 g 00000018 PlayerTurnInPlace 0805c23c g 00000024 PlayerJumpLedge -0805c260 g 0000000e sub_805C260 +0805c260 g 0000000e PlayerShakeHead 0805c270 g 00000044 HandleEnforcedLookDirectionOnPlayerStopMoving 0805c2b4 l 00000018 PlayerGoSpin 0805c2cc l 00000040 PlayerApplyTileForcedMovement @@ -3569,7 +3569,7 @@ 0805ed70 l 00000080 RemoveObjectEventIfOutsideView 0805edf0 g 0000004c ReloadMapObjectsWithOffset 0805ee3c l 000001b8 ReloadMapObjectWithOffset -0805eff4 l 00000038 sub_805EFF4 +0805eff4 l 00000038 ResetObjectEventFldEffData 0805f02c l 00000034 SetPlayerAvatarObjectEventIdAndObjectId 0805f060 g 00000178 ObjectEventSetGraphicsId 0805f1d8 g 00000040 ObjectEventSetGraphicsIdByLocalIdAndMap @@ -3586,7 +3586,7 @@ 0805f448 g 00000054 SetObjectPositionByLocalIdAndMap 0805f49c g 00000014 FreeAndReserveObjectSpritePalettes 0805f4b0 l 0000002c LoadObjectEventPalette -0805f4dc g 00000034 Unused_LoadObjectEventPaletteSet +0805f4dc g 00000034 LoadObjectEventPaletteSet 0805f510 l 00000026 TryLoadObjectPalette 0805f538 g 0000003c PatchObjectPalette 0805f574 g 0000002a PatchObjectPaletteRange @@ -3594,7 +3594,7 @@ 0805f5e8 g 0000006e LoadPlayerObjectReflectionPalette 0805f658 g 00000076 LoadSpecialObjectReflectionPalette 0805f6d0 g 00000010 sub_805F6D0 -0805f6e0 g 00000020 unref_sub_805F6E0 +0805f6e0 g 00000020 IncrementObjectEventCoords 0805f700 g 0000000e ShiftObjectEventCoords 0805f710 l 00000012 SetObjectEventCoords 0805f724 g 000000a0 MoveObjectEventToMapCoords @@ -3621,11 +3621,11 @@ 0805fc38 g 00000024 GetObjectEventScriptPointerByObjectEventId 0805fc5c l 00000018 GetObjectEventFlagIdByLocalIdAndMap 0805fc74 l 00000028 GetObjectEventFlagIdByObjectEventId -0805fc9c g 0000003c sub_805FC9C +0805fc9c g 0000003c GetObjectTrainerTypeByLocalIdAndMap 0805fcd8 g 00000018 GetObjectEventFlagByLocalIdAndMap -0805fcf0 g 00000018 sub_808F0BC -0805fd08 g 0000003c sub_805FD08 -0805fd44 g 00000018 ObjectEventGetBerryTreeId +0805fcf0 g 00000018 GetObjectTrainerTypeByObjectEventId +0805fd08 g 0000003c GetObjectEventBerryTreeIdByLocalIdAndMap +0805fd44 g 00000018 GetObjectEventBerryTreeId 0805fd5c l 00000052 GetObjectEventTemplateByLocalIdAndMap 0805fdb0 l 00000036 FindObjectEventTemplateByLocalId 0805fde8 g 00000074 GetBaseTemplateForObjectEvent @@ -3638,15 +3638,15 @@ 0805ffd8 l 00000004 MovementType_None_callback 0805ffdc l 00000024 MovementType_WanderAround 08060000 l 00000020 MovementType_WanderAround_callback -08060020 l 00000024 MovementType_WanderAroundSlowest -08060044 l 00000020 MovementType_WanderAroundSlowest_callback +08060020 l 00000024 MovementType_WanderAroundSlower +08060044 l 00000020 MovementType_WanderAroundSlower_callback 08060064 l 00000012 MovementType_WanderAround_Step0 08060078 l 0000002a MovementType_WanderAround_Step1 080600a4 l 0000003c MovementType_WanderAround_Step2 080600e0 l 00000020 MovementType_WanderAround_Step3 08060100 l 0000004c MovementType_WanderAround_Step4 0806014c l 00000030 MovementType_WanderAround_Step5 -0806017c l 00000030 MovementType_WanderAround_Step5Slowest +0806017c l 00000030 MovementType_WanderAround_Step5Slower 080601ac l 00000026 MovementType_WanderAround_Step6 080601d4 g 0000007a ObjectEventIsTrainerAndCloseToPlayer 08060250 l 00000030 GetVectorDirection @@ -3914,16 +3914,16 @@ 08063490 g 00000010 GetAcroWheelieDirectionAnimNum 080634a0 g 00000010 Unref_GetAnimNums_080634A0 080634b0 g 00000010 GetAcroEndWheelieDirectionAnimNum -080634c0 g 00000010 sub_80634C0 +080634c0 g 00000010 GetSpinDirectionAnimNum 080634d0 g 00000010 GetAcroUnusedActionDirectionAnimNum 080634e0 g 00000010 GetAcroWheeliePedalDirectionAnimNum 080634f0 g 00000010 GetFishingDirectionAnimNum 08063500 g 00000010 GetFishingNoCatchDirectionAnimNum 08063510 g 00000010 GetFishingBiteDirectionAnimNum 08063520 g 00000010 GetRunningDirectionAnimNum -08063530 l 00000024 sub_8063530 -08063554 g 00000048 npc_apply_anim_looping -0806359c g 0000003e obj_npc_animation_step +08063530 l 00000024 GetStepAnimTable +08063554 g 00000048 SetStepAnimHandleAlternation +0806359c g 0000003e SetStepAnim 080635dc g 00000034 GetDirectionToFace 08063610 g 0000004c SetTrainerMovementType 0806365c g 00000010 GetTrainerFacingDirectionMovementType @@ -3956,8 +3956,8 @@ 08063e28 g 00000090 sub_8063E28 08063eb8 g 0000002c GetFaceDirectionMovementAction 08063ee4 g 0000002c GetFaceDirectionFastMovementAction -08063f10 g 0000001c sub_8063F10 -08063f2c g 0000002c GetWalkSlowestMovementAction +08063f10 g 0000001c GetWalkSlowestMovementAction +08063f2c g 0000002c GetWalkSlowerMovementAction 08063f58 g 0000002c GetWalkSlowMovementAction 08063f84 g 0000002c GetWalkNormalMovementAction 08063fb0 g 0000002c GetWalkFastMovementAction @@ -3973,7 +3973,7 @@ 08064168 g 0000002c GetJumpInPlaceTurnAroundMovementAction 08064194 g 0000002c GetJumpMovementAction 080641c0 g 0000002c GetJumpSpecialMovementAction -080641ec g 0000002c sub_80641EC +080641ec g 0000002c GetJumpSpecialWithEffectMovementAction 08064218 g 0000002c GetStepInPlaceDelay32AnimId 08064244 g 0000002c GetWalkInPlaceNormalMovementAction 08064270 g 0000002c GetWalkInPlaceSlowMovementAction @@ -3989,8 +3989,8 @@ 08064428 g 0000002c GetAcroPopWheelieMoveDirectionMovementAction 08064454 g 0000002c GetAcroWheelieMoveDirectionMovementAction 08064480 g 00000032 GetOppositeDirection -080644b4 l 00000018 zffu_offset_calc -080644cc l 00000040 state_to_direction +080644b4 l 00000018 GetPlayerDirectionForCopy +080644cc l 00000040 GetCopyDirection 0806450c l 00000038 ObjectEventExecHeldMovementAction 08064544 l 00000044 sub_8064544 08064588 l 00000040 ObjectEventExecSingleMovementAction @@ -4000,16 +4000,16 @@ 08064648 l 0000000e MovementAction_FaceUp_Step0 08064658 l 0000000e MovementAction_FaceLeft_Step0 08064668 l 0000000e MovementAction_FaceRight_Step0 -08064678 g 00000084 npc_apply_direction -080646fc g 0000005c do_go_anim +08064678 g 00000084 InitNpcForMovement +080646fc g 0000005c InitMovementNormal 08064758 g 0000002e StartRunningAnim -08064788 g 00000038 npc_obj_ministep_stop_on_arrival -080647c0 g 00000070 InitNpcForWalkSlow -08064830 g 0000002c InitWalkSlow -0806485c g 00000038 an_walk_any_2 -08064894 g 00000070 InitNpcForWalkSlow2 -08064904 g 0000002c InitWalkSlow2 -08064930 g 00000038 UpdateWalkSlow +08064788 g 00000038 UpdateMovementNormal +080647c0 g 00000070 InitNpcForWalkSlower +08064830 g 0000002c InitWalkSlower +0806485c g 00000038 UpdateWalkSlower +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 @@ -4026,9 +4026,9 @@ 08064b08 l 0000001e MovementActionFunc_x0A_1 08064b28 l 0000001e MovementActionFunc_x0B_0 08064b48 l 0000001e MovementActionFunc_x0B_1 -08064b68 g 00000070 sub_8064B68 -08064bd8 g 0000002c sub_8064BD8 -08064c04 g 00000038 sub_8064C04 +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 @@ -4045,14 +4045,14 @@ 08064ddc l 0000001e MovementAction_WalkNormalLeft_Step1 08064dfc l 00000020 MovementAction_WalkNormalRight_Step0 08064e1c l 0000001e MovementAction_WalkNormalRight_Step1 -08064e3c g 000000bc sub_8064E3C -08064ef8 g 00000044 maybe_shadow_1 -08064f3c g 000000c2 sub_8064F3C -08065000 g 00000014 sub_8065000 -08065014 g 00000014 sub_8065014 -08065028 g 00000018 sub_8065028 -08065040 g 00000018 sub_8065040 -08065058 g 0000004e sub_8065058 +08064e3c g 000000bc InitJump +08064ef8 g 00000044 InitJumpRegular +08064f3c g 000000c2 UpdateJumpAnim +08065000 g 00000014 DoJumpAnimStep +08065014 g 00000014 DoJumpSpecialAnimStep +08065028 g 00000018 DoJumpAnim +08065040 g 00000018 DoJumpSpecialAnim +08065058 g 0000004e DoJumpInPlaceAnim 080650a8 l 0000002a MovementAction_Jump2Down_Step0 080650d4 l 0000002a MovementAction_Jump2Down_Step1 08065100 l 0000002a MovementAction_Jump2Up_Step0 @@ -4061,7 +4061,7 @@ 08065184 l 0000002a MovementAction_Jump2Left_Step1 080651b0 l 0000002a MovementAction_Jump2Right_Step0 080651dc l 0000002a MovementAction_Jump2Right_Step1 -08065208 g 00000008 sub_8065208 +08065208 g 00000008 InitMovementDelay 08065210 l 0000001c MovementAction_Delay_Step1 0806522c l 00000020 MovementAction_Delay1_Step0 0806524c l 00000020 MovementAction_Delay2_Step0 @@ -4090,7 +4090,7 @@ 08065610 l 0000003a MovementActionFunc_x05_0 0806564c l 0000003a MovementActionFunc_x06_0 08065688 l 0000003a MovementActionFunc_x07_0 -080656c4 g 00000048 sub_80656C4 +080656c4 g 00000048 InitMoveInPlace 0806570c l 00000028 MovementAction_WalkInPlace_Step1 08065734 l 0000003c MovementAction_WalkInPlaceSlow_Step1 08065770 l 00000036 MovementAction_WalkInPlaceSlowDown_Step0 @@ -4141,9 +4141,9 @@ 08065e90 l 0000001e MovementAction_PlayerRunLeft_Step1 08065eb0 l 0000001e MovementAction_PlayerRunRight_Step0 08065ed0 l 0000001e MovementAction_PlayerRunRight_Step1 -08065ef0 g 00000070 InitNpcForWalkSlow3 -08065f60 g 0000002c sub_8065F60 -08065f8c g 00000038 sub_8065F8C +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 @@ -4155,7 +4155,7 @@ 080660c4 g 0000002c StartSpriteAnimInDirection 080660f0 l 00000016 MovementAction_StartAnimInDirection_Step0 08066108 l 00000020 MovementAction_WaitSpriteAnim -08066128 g 00000032 sub_8066128 +08066128 g 00000032 InitJumpSpecial 0806615c l 0000001e MovementAction_JumpSpecialDown_Step0 0806617c l 00000028 MovementAction_JumpSpecialDown_Step1 080661a4 l 0000001e MovementAction_JumpSpecialUp_Step0 @@ -4229,7 +4229,7 @@ 08066be4 l 0000002a MovementAction_WalkDownStartAffine_Step1 08066c10 l 00000032 MovementAction_WalkDownAffine_Step0 08066c44 l 0000002a MovementAction_WalkDownAffine_Step1 -08066c70 g 00000040 sub_8066C70 +08066c70 g 00000040 AcroWheelieFaceDirection 08066cb0 l 0000000e MovementActionFunc_x70_0 08066cc0 l 0000000e MovementActionFunc_x71_0 08066cd0 l 0000000e MovementActionFunc_x72_0 @@ -4246,7 +4246,7 @@ 08066e34 l 00000024 MovementAction_UnusedAcroActionUp_Step0 08066e58 l 00000024 MovementAction_UnusedAcroActionLeft_Step0 08066e7c l 00000024 MovementAction_UnusedAcroActionRight_Step0 -08066ea0 g 00000042 sub_8066EA0 +08066ea0 g 00000042 InitAcroWheelieJump 08066ee4 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step0 08066f10 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step1 08066f3c l 0000002a MovementAction_AcroWheelieHopFaceUp_Step0 @@ -4275,7 +4275,7 @@ 0806733c l 00000036 MovementActionFunc_x89_0 08067374 l 00000036 MovementActionFunc_x8A_0 080673ac l 00000036 MovementActionFunc_x8B_0 -080673e4 g 00000036 sub_80673E4 +080673e4 g 00000036 InitAcroPopWheelie 0806741c l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 0806743c l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 0806745c l 00000020 MovementAction_AcroPopWheelieMoveUp_Step0 @@ -4284,7 +4284,7 @@ 080674bc l 0000001e MovementAction_AcroPopWheelieMoveLeft_Step1 080674dc l 00000020 MovementAction_AcroPopWheelieMoveRight_Step0 080674fc l 0000001e MovementAction_AcroPopWheelieMoveRight_Step1 -0806751c g 00000030 sub_806751C +0806751c g 00000030 InitAcroWheelieMove 0806754c l 00000020 MovementAction_AcroWheelieMoveDown_Step0 0806756c l 0000001e MovementAction_AcroWheelieMoveDown_Step1 0806758c l 00000020 MovementAction_AcroWheelieMoveUp_Step0 @@ -4293,7 +4293,7 @@ 080675ec l 0000001e MovementAction_AcroWheelieMoveLeft_Step1 0806760c l 00000020 MovementAction_AcroWheelieMoveRight_Step0 0806762c l 0000001e MovementAction_AcroWheelieMoveRight_Step1 -0806764c g 00000038 sub_806764C +0806764c g 00000038 InitSpin 08067684 l 00000020 MovementActionFunc_x94_0 080676a4 l 0000001e MovementActionFunc_x94_1 080676c4 l 00000020 MovementActionFunc_x95_0 @@ -4389,16 +4389,16 @@ 08068ad0 l 00000028 triple_little_steps 08068af8 l 00000024 quad_little_steps 08068b1c l 00000024 oct_little_steps -08068b40 g 00000012 oamt_npc_ministep_reset -08068b54 g 00000068 obj_npc_ministep -08068bbc g 0000000e SetSpriteDataForNormalStep -08068bcc g 0000003a NpcTakeStep -08068c08 g 0000000e SetSpriteDataForNormalStep3 -08068c18 g 0000003e sub_8068C18 -08068c58 g 0000000e SetSpriteDataForNormalStep2 -08068c68 g 0000003c UpdateWalkSlowAnim -08068ca4 g 0000000e SetSpriteDataForNormalStep4 -08068cb4 g 0000004a sub_8068CB4 +08068b40 g 00000012 SetSpriteDataForNormalStep +08068b54 g 00000068 NpcTakeStep +08068bbc g 0000000e SetWalkSlowerSpriteData +08068bcc g 0000003a UpdateWalkSlowerAnim +08068c08 g 0000000e SetWalkSlowSpriteData +08068c18 g 0000003e UpdateWalkSlowAnim +08068c58 g 0000000e SetWalkSlowestSpriteData +08068c68 g 0000003c UpdateWalkSlowestAnim +08068ca4 g 0000000e SetRunSlowSpriteData +08068cb4 g 0000004a UpdateRunSlowAnim 08068d00 l 0000001c GetJumpYDisplacement 08068d1c g 0000001e SetJumpSpriteData 08068d3c g 00000088 DoJumpSpriteMovement @@ -30782,7 +30782,7 @@ 083a6008 l 00000008 gMovementDelaysLong 083a6010 l 00000008 gMovementDelaysShort 083a6018 g 0000001c gMovementTypeFuncs_WanderAround -083a6034 g 0000001c gMovementTypeFuncs_WanderAroundSlowest +083a6034 g 0000001c gMovementTypeFuncs_WanderAroundSlower 083a6050 g 00000004 gStandardDirections 083a6054 g 0000002c gGetVectorDirectionFuncs 083a6080 g 00000014 gMovementTypeFuncs_LookAround @@ -30894,7 +30894,7 @@ 083a64c8 l 00000024 sDirectionToVectors 083a64ec l 00000005 gFaceDirectionMovementActions 083a64f1 l 00000005 gFaceDirectionFastMovementActions -083a64f6 l 00000005 gUnknown_83A64F6 +083a64f6 l 00000005 gWalkSlowestMovementActions 083a64fb l 00000005 gUnknown_83A64FB 083a6500 l 00000005 gUnknown_83A6500 083a6505 l 00000005 gUnknown_83A6505 @@ -30926,8 +30926,8 @@ 083a6587 l 00000005 gUnknown_83A6587 083a658c l 00000005 gUnknown_83A658C 083a6591 l 00000008 gOppositeDirections -083a6599 l 00000010 gUnknown_83A6599 -083a65a9 l 00000010 gUnknown_83A65A9 +083a6599 l 00000010 sPlayerDirectionsForCopy +083a65a9 l 00000010 sPlayerDirectionToCopyDirection 083a65bc g 000002a8 gMovementActionFuncs 083a6864 l 00000008 sMovementActionFuncs_x00 083a686c l 00000008 sMovementActionFuncs_x01 diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 26ed57b20..1dc2c9029 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -3434,7 +3434,7 @@ 0805c220 g 00000018 PlayerFaceDirectionFast 0805c238 g 00000018 PlayerTurnInPlace 0805c250 g 00000024 PlayerJumpLedge -0805c274 g 0000000e sub_805C260 +0805c274 g 0000000e PlayerShakeHead 0805c284 g 00000044 HandleEnforcedLookDirectionOnPlayerStopMoving 0805c2c8 l 00000018 PlayerGoSpin 0805c2e0 l 00000040 PlayerApplyTileForcedMovement @@ -3569,7 +3569,7 @@ 0805ed84 l 00000080 RemoveObjectEventIfOutsideView 0805ee04 g 0000004c ReloadMapObjectsWithOffset 0805ee50 l 000001b8 ReloadMapObjectWithOffset -0805f008 l 00000038 sub_805EFF4 +0805f008 l 00000038 ResetObjectEventFldEffData 0805f040 l 00000034 SetPlayerAvatarObjectEventIdAndObjectId 0805f074 g 00000178 ObjectEventSetGraphicsId 0805f1ec g 00000040 ObjectEventSetGraphicsIdByLocalIdAndMap @@ -3586,7 +3586,7 @@ 0805f45c g 00000054 SetObjectPositionByLocalIdAndMap 0805f4b0 g 00000014 FreeAndReserveObjectSpritePalettes 0805f4c4 l 0000002c LoadObjectEventPalette -0805f4f0 g 00000034 Unused_LoadObjectEventPaletteSet +0805f4f0 g 00000034 LoadObjectEventPaletteSet 0805f524 l 00000026 TryLoadObjectPalette 0805f54c g 0000003c PatchObjectPalette 0805f588 g 0000002a PatchObjectPaletteRange @@ -3594,7 +3594,7 @@ 0805f5fc g 0000006e LoadPlayerObjectReflectionPalette 0805f66c g 00000076 LoadSpecialObjectReflectionPalette 0805f6e4 g 00000010 sub_805F6D0 -0805f6f4 g 00000020 unref_sub_805F6E0 +0805f6f4 g 00000020 IncrementObjectEventCoords 0805f714 g 0000000e ShiftObjectEventCoords 0805f724 l 00000012 SetObjectEventCoords 0805f738 g 000000a0 MoveObjectEventToMapCoords @@ -3621,11 +3621,11 @@ 0805fc4c g 00000024 GetObjectEventScriptPointerByObjectEventId 0805fc70 l 00000018 GetObjectEventFlagIdByLocalIdAndMap 0805fc88 l 00000028 GetObjectEventFlagIdByObjectEventId -0805fcb0 g 0000003c sub_805FC9C +0805fcb0 g 0000003c GetObjectTrainerTypeByLocalIdAndMap 0805fcec g 00000018 GetObjectEventFlagByLocalIdAndMap -0805fd04 g 00000018 sub_808F0BC -0805fd1c g 0000003c sub_805FD08 -0805fd58 g 00000018 ObjectEventGetBerryTreeId +0805fd04 g 00000018 GetObjectTrainerTypeByObjectEventId +0805fd1c g 0000003c GetObjectEventBerryTreeIdByLocalIdAndMap +0805fd58 g 00000018 GetObjectEventBerryTreeId 0805fd70 l 00000052 GetObjectEventTemplateByLocalIdAndMap 0805fdc4 l 00000036 FindObjectEventTemplateByLocalId 0805fdfc g 00000074 GetBaseTemplateForObjectEvent @@ -3638,15 +3638,15 @@ 0805ffec l 00000004 MovementType_None_callback 0805fff0 l 00000024 MovementType_WanderAround 08060014 l 00000020 MovementType_WanderAround_callback -08060034 l 00000024 MovementType_WanderAroundSlowest -08060058 l 00000020 MovementType_WanderAroundSlowest_callback +08060034 l 00000024 MovementType_WanderAroundSlower +08060058 l 00000020 MovementType_WanderAroundSlower_callback 08060078 l 00000012 MovementType_WanderAround_Step0 0806008c l 0000002a MovementType_WanderAround_Step1 080600b8 l 0000003c MovementType_WanderAround_Step2 080600f4 l 00000020 MovementType_WanderAround_Step3 08060114 l 0000004c MovementType_WanderAround_Step4 08060160 l 00000030 MovementType_WanderAround_Step5 -08060190 l 00000030 MovementType_WanderAround_Step5Slowest +08060190 l 00000030 MovementType_WanderAround_Step5Slower 080601c0 l 00000026 MovementType_WanderAround_Step6 080601e8 g 0000007a ObjectEventIsTrainerAndCloseToPlayer 08060264 l 00000030 GetVectorDirection @@ -3914,16 +3914,16 @@ 080634a4 g 00000010 GetAcroWheelieDirectionAnimNum 080634b4 g 00000010 Unref_GetAnimNums_080634A0 080634c4 g 00000010 GetAcroEndWheelieDirectionAnimNum -080634d4 g 00000010 sub_80634C0 +080634d4 g 00000010 GetSpinDirectionAnimNum 080634e4 g 00000010 GetAcroUnusedActionDirectionAnimNum 080634f4 g 00000010 GetAcroWheeliePedalDirectionAnimNum 08063504 g 00000010 GetFishingDirectionAnimNum 08063514 g 00000010 GetFishingNoCatchDirectionAnimNum 08063524 g 00000010 GetFishingBiteDirectionAnimNum 08063534 g 00000010 GetRunningDirectionAnimNum -08063544 l 00000024 sub_8063530 -08063568 g 00000048 npc_apply_anim_looping -080635b0 g 0000003e obj_npc_animation_step +08063544 l 00000024 GetStepAnimTable +08063568 g 00000048 SetStepAnimHandleAlternation +080635b0 g 0000003e SetStepAnim 080635f0 g 00000034 GetDirectionToFace 08063624 g 0000004c SetTrainerMovementType 08063670 g 00000010 GetTrainerFacingDirectionMovementType @@ -3956,8 +3956,8 @@ 08063e3c g 00000090 sub_8063E28 08063ecc g 0000002c GetFaceDirectionMovementAction 08063ef8 g 0000002c GetFaceDirectionFastMovementAction -08063f24 g 0000001c sub_8063F10 -08063f40 g 0000002c GetWalkSlowestMovementAction +08063f24 g 0000001c GetWalkSlowestMovementAction +08063f40 g 0000002c GetWalkSlowerMovementAction 08063f6c g 0000002c GetWalkSlowMovementAction 08063f98 g 0000002c GetWalkNormalMovementAction 08063fc4 g 0000002c GetWalkFastMovementAction @@ -3973,7 +3973,7 @@ 0806417c g 0000002c GetJumpInPlaceTurnAroundMovementAction 080641a8 g 0000002c GetJumpMovementAction 080641d4 g 0000002c GetJumpSpecialMovementAction -08064200 g 0000002c sub_80641EC +08064200 g 0000002c GetJumpSpecialWithEffectMovementAction 0806422c g 0000002c GetStepInPlaceDelay32AnimId 08064258 g 0000002c GetWalkInPlaceNormalMovementAction 08064284 g 0000002c GetWalkInPlaceSlowMovementAction @@ -3989,8 +3989,8 @@ 0806443c g 0000002c GetAcroPopWheelieMoveDirectionMovementAction 08064468 g 0000002c GetAcroWheelieMoveDirectionMovementAction 08064494 g 00000032 GetOppositeDirection -080644c8 l 00000018 zffu_offset_calc -080644e0 l 00000040 state_to_direction +080644c8 l 00000018 GetPlayerDirectionForCopy +080644e0 l 00000040 GetCopyDirection 08064520 l 00000038 ObjectEventExecHeldMovementAction 08064558 l 00000044 sub_8064544 0806459c l 00000040 ObjectEventExecSingleMovementAction @@ -4000,16 +4000,16 @@ 0806465c l 0000000e MovementAction_FaceUp_Step0 0806466c l 0000000e MovementAction_FaceLeft_Step0 0806467c l 0000000e MovementAction_FaceRight_Step0 -0806468c g 00000084 npc_apply_direction -08064710 g 0000005c do_go_anim +0806468c g 00000084 InitNpcForMovement +08064710 g 0000005c InitMovementNormal 0806476c g 0000002e StartRunningAnim -0806479c g 00000038 npc_obj_ministep_stop_on_arrival -080647d4 g 00000070 InitNpcForWalkSlow -08064844 g 0000002c InitWalkSlow -08064870 g 00000038 an_walk_any_2 -080648a8 g 00000070 InitNpcForWalkSlow2 -08064918 g 0000002c InitWalkSlow2 -08064944 g 00000038 UpdateWalkSlow +0806479c g 00000038 UpdateMovementNormal +080647d4 g 00000070 InitNpcForWalkSlower +08064844 g 0000002c InitWalkSlower +08064870 g 00000038 UpdateWalkSlower +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 @@ -4026,9 +4026,9 @@ 08064b1c l 0000001e MovementActionFunc_x0A_1 08064b3c l 0000001e MovementActionFunc_x0B_0 08064b5c l 0000001e MovementActionFunc_x0B_1 -08064b7c g 00000070 sub_8064B68 -08064bec g 0000002c sub_8064BD8 -08064c18 g 00000038 sub_8064C04 +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 @@ -4045,14 +4045,14 @@ 08064df0 l 0000001e MovementAction_WalkNormalLeft_Step1 08064e10 l 00000020 MovementAction_WalkNormalRight_Step0 08064e30 l 0000001e MovementAction_WalkNormalRight_Step1 -08064e50 g 000000bc sub_8064E3C -08064f0c g 00000044 maybe_shadow_1 -08064f50 g 000000c2 sub_8064F3C -08065014 g 00000014 sub_8065000 -08065028 g 00000014 sub_8065014 -0806503c g 00000018 sub_8065028 -08065054 g 00000018 sub_8065040 -0806506c g 0000004e sub_8065058 +08064e50 g 000000bc InitJump +08064f0c g 00000044 InitJumpRegular +08064f50 g 000000c2 UpdateJumpAnim +08065014 g 00000014 DoJumpAnimStep +08065028 g 00000014 DoJumpSpecialAnimStep +0806503c g 00000018 DoJumpAnim +08065054 g 00000018 DoJumpSpecialAnim +0806506c g 0000004e DoJumpInPlaceAnim 080650bc l 0000002a MovementAction_Jump2Down_Step0 080650e8 l 0000002a MovementAction_Jump2Down_Step1 08065114 l 0000002a MovementAction_Jump2Up_Step0 @@ -4061,7 +4061,7 @@ 08065198 l 0000002a MovementAction_Jump2Left_Step1 080651c4 l 0000002a MovementAction_Jump2Right_Step0 080651f0 l 0000002a MovementAction_Jump2Right_Step1 -0806521c g 00000008 sub_8065208 +0806521c g 00000008 InitMovementDelay 08065224 l 0000001c MovementAction_Delay_Step1 08065240 l 00000020 MovementAction_Delay1_Step0 08065260 l 00000020 MovementAction_Delay2_Step0 @@ -4090,7 +4090,7 @@ 08065624 l 0000003a MovementActionFunc_x05_0 08065660 l 0000003a MovementActionFunc_x06_0 0806569c l 0000003a MovementActionFunc_x07_0 -080656d8 g 00000048 sub_80656C4 +080656d8 g 00000048 InitMoveInPlace 08065720 l 00000028 MovementAction_WalkInPlace_Step1 08065748 l 0000003c MovementAction_WalkInPlaceSlow_Step1 08065784 l 00000036 MovementAction_WalkInPlaceSlowDown_Step0 @@ -4141,9 +4141,9 @@ 08065ea4 l 0000001e MovementAction_PlayerRunLeft_Step1 08065ec4 l 0000001e MovementAction_PlayerRunRight_Step0 08065ee4 l 0000001e MovementAction_PlayerRunRight_Step1 -08065f04 g 00000070 InitNpcForWalkSlow3 -08065f74 g 0000002c sub_8065F60 -08065fa0 g 00000038 sub_8065F8C +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 @@ -4155,7 +4155,7 @@ 080660d8 g 0000002c StartSpriteAnimInDirection 08066104 l 00000016 MovementAction_StartAnimInDirection_Step0 0806611c l 00000020 MovementAction_WaitSpriteAnim -0806613c g 00000032 sub_8066128 +0806613c g 00000032 InitJumpSpecial 08066170 l 0000001e MovementAction_JumpSpecialDown_Step0 08066190 l 00000028 MovementAction_JumpSpecialDown_Step1 080661b8 l 0000001e MovementAction_JumpSpecialUp_Step0 @@ -4229,7 +4229,7 @@ 08066bf8 l 0000002a MovementAction_WalkDownStartAffine_Step1 08066c24 l 00000032 MovementAction_WalkDownAffine_Step0 08066c58 l 0000002a MovementAction_WalkDownAffine_Step1 -08066c84 g 00000040 sub_8066C70 +08066c84 g 00000040 AcroWheelieFaceDirection 08066cc4 l 0000000e MovementActionFunc_x70_0 08066cd4 l 0000000e MovementActionFunc_x71_0 08066ce4 l 0000000e MovementActionFunc_x72_0 @@ -4246,7 +4246,7 @@ 08066e48 l 00000024 MovementAction_UnusedAcroActionUp_Step0 08066e6c l 00000024 MovementAction_UnusedAcroActionLeft_Step0 08066e90 l 00000024 MovementAction_UnusedAcroActionRight_Step0 -08066eb4 g 00000042 sub_8066EA0 +08066eb4 g 00000042 InitAcroWheelieJump 08066ef8 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step0 08066f24 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step1 08066f50 l 0000002a MovementAction_AcroWheelieHopFaceUp_Step0 @@ -4275,7 +4275,7 @@ 08067350 l 00000036 MovementActionFunc_x89_0 08067388 l 00000036 MovementActionFunc_x8A_0 080673c0 l 00000036 MovementActionFunc_x8B_0 -080673f8 g 00000036 sub_80673E4 +080673f8 g 00000036 InitAcroPopWheelie 08067430 l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 08067450 l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 08067470 l 00000020 MovementAction_AcroPopWheelieMoveUp_Step0 @@ -4284,7 +4284,7 @@ 080674d0 l 0000001e MovementAction_AcroPopWheelieMoveLeft_Step1 080674f0 l 00000020 MovementAction_AcroPopWheelieMoveRight_Step0 08067510 l 0000001e MovementAction_AcroPopWheelieMoveRight_Step1 -08067530 g 00000030 sub_806751C +08067530 g 00000030 InitAcroWheelieMove 08067560 l 00000020 MovementAction_AcroWheelieMoveDown_Step0 08067580 l 0000001e MovementAction_AcroWheelieMoveDown_Step1 080675a0 l 00000020 MovementAction_AcroWheelieMoveUp_Step0 @@ -4293,7 +4293,7 @@ 08067600 l 0000001e MovementAction_AcroWheelieMoveLeft_Step1 08067620 l 00000020 MovementAction_AcroWheelieMoveRight_Step0 08067640 l 0000001e MovementAction_AcroWheelieMoveRight_Step1 -08067660 g 00000038 sub_806764C +08067660 g 00000038 InitSpin 08067698 l 00000020 MovementActionFunc_x94_0 080676b8 l 0000001e MovementActionFunc_x94_1 080676d8 l 00000020 MovementActionFunc_x95_0 @@ -4389,16 +4389,16 @@ 08068ae4 l 00000028 triple_little_steps 08068b0c l 00000024 quad_little_steps 08068b30 l 00000024 oct_little_steps -08068b54 g 00000012 oamt_npc_ministep_reset -08068b68 g 00000068 obj_npc_ministep -08068bd0 g 0000000e SetSpriteDataForNormalStep -08068be0 g 0000003a NpcTakeStep -08068c1c g 0000000e SetSpriteDataForNormalStep3 -08068c2c g 0000003e sub_8068C18 -08068c6c g 0000000e SetSpriteDataForNormalStep2 -08068c7c g 0000003c UpdateWalkSlowAnim -08068cb8 g 0000000e SetSpriteDataForNormalStep4 -08068cc8 g 0000004a sub_8068CB4 +08068b54 g 00000012 SetSpriteDataForNormalStep +08068b68 g 00000068 NpcTakeStep +08068bd0 g 0000000e SetWalkSlowerSpriteData +08068be0 g 0000003a UpdateWalkSlowerAnim +08068c1c g 0000000e SetWalkSlowSpriteData +08068c2c g 0000003e UpdateWalkSlowAnim +08068c6c g 0000000e SetWalkSlowestSpriteData +08068c7c g 0000003c UpdateWalkSlowestAnim +08068cb8 g 0000000e SetRunSlowSpriteData +08068cc8 g 0000004a UpdateRunSlowAnim 08068d14 l 0000001c GetJumpYDisplacement 08068d30 g 0000001e SetJumpSpriteData 08068d50 g 00000088 DoJumpSpriteMovement @@ -30783,7 +30783,7 @@ 083a6078 l 00000008 gMovementDelaysLong 083a6080 l 00000008 gMovementDelaysShort 083a6088 g 0000001c gMovementTypeFuncs_WanderAround -083a60a4 g 0000001c gMovementTypeFuncs_WanderAroundSlowest +083a60a4 g 0000001c gMovementTypeFuncs_WanderAroundSlower 083a60c0 g 00000004 gStandardDirections 083a60c4 g 0000002c gGetVectorDirectionFuncs 083a60f0 g 00000014 gMovementTypeFuncs_LookAround @@ -30895,7 +30895,7 @@ 083a6538 l 00000024 sDirectionToVectors 083a655c l 00000005 gFaceDirectionMovementActions 083a6561 l 00000005 gFaceDirectionFastMovementActions -083a6566 l 00000005 gUnknown_83A64F6 +083a6566 l 00000005 gWalkSlowestMovementActions 083a656b l 00000005 gUnknown_83A64FB 083a6570 l 00000005 gUnknown_83A6500 083a6575 l 00000005 gUnknown_83A6505 @@ -30927,8 +30927,8 @@ 083a65f7 l 00000005 gUnknown_83A6587 083a65fc l 00000005 gUnknown_83A658C 083a6601 l 00000008 gOppositeDirections -083a6609 l 00000010 gUnknown_83A6599 -083a6619 l 00000010 gUnknown_83A65A9 +083a6609 l 00000010 sPlayerDirectionsForCopy +083a6619 l 00000010 sPlayerDirectionToCopyDirection 083a662c g 000002a8 gMovementActionFuncs 083a68d4 l 00000008 sMovementActionFuncs_x00 083a68dc l 00000008 sMovementActionFuncs_x01 diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 77eeea240..cfc70fc12 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -3434,7 +3434,7 @@ 0805c20c g 00000018 PlayerFaceDirectionFast 0805c224 g 00000018 PlayerTurnInPlace 0805c23c g 00000024 PlayerJumpLedge -0805c260 g 0000000e sub_805C260 +0805c260 g 0000000e PlayerShakeHead 0805c270 g 00000044 HandleEnforcedLookDirectionOnPlayerStopMoving 0805c2b4 l 00000018 PlayerGoSpin 0805c2cc l 00000040 PlayerApplyTileForcedMovement @@ -3569,7 +3569,7 @@ 0805ed70 l 00000080 RemoveObjectEventIfOutsideView 0805edf0 g 0000004c ReloadMapObjectsWithOffset 0805ee3c l 000001b8 ReloadMapObjectWithOffset -0805eff4 l 00000038 sub_805EFF4 +0805eff4 l 00000038 ResetObjectEventFldEffData 0805f02c l 00000034 SetPlayerAvatarObjectEventIdAndObjectId 0805f060 g 00000178 ObjectEventSetGraphicsId 0805f1d8 g 00000040 ObjectEventSetGraphicsIdByLocalIdAndMap @@ -3586,7 +3586,7 @@ 0805f448 g 00000054 SetObjectPositionByLocalIdAndMap 0805f49c g 00000014 FreeAndReserveObjectSpritePalettes 0805f4b0 l 0000002c LoadObjectEventPalette -0805f4dc g 00000034 Unused_LoadObjectEventPaletteSet +0805f4dc g 00000034 LoadObjectEventPaletteSet 0805f510 l 00000026 TryLoadObjectPalette 0805f538 g 0000003c PatchObjectPalette 0805f574 g 0000002a PatchObjectPaletteRange @@ -3594,7 +3594,7 @@ 0805f5e8 g 0000006e LoadPlayerObjectReflectionPalette 0805f658 g 00000076 LoadSpecialObjectReflectionPalette 0805f6d0 g 00000010 sub_805F6D0 -0805f6e0 g 00000020 unref_sub_805F6E0 +0805f6e0 g 00000020 IncrementObjectEventCoords 0805f700 g 0000000e ShiftObjectEventCoords 0805f710 l 00000012 SetObjectEventCoords 0805f724 g 000000a0 MoveObjectEventToMapCoords @@ -3621,11 +3621,11 @@ 0805fc38 g 00000024 GetObjectEventScriptPointerByObjectEventId 0805fc5c l 00000018 GetObjectEventFlagIdByLocalIdAndMap 0805fc74 l 00000028 GetObjectEventFlagIdByObjectEventId -0805fc9c g 0000003c sub_805FC9C +0805fc9c g 0000003c GetObjectTrainerTypeByLocalIdAndMap 0805fcd8 g 00000018 GetObjectEventFlagByLocalIdAndMap -0805fcf0 g 00000018 sub_808F0BC -0805fd08 g 0000003c sub_805FD08 -0805fd44 g 00000018 ObjectEventGetBerryTreeId +0805fcf0 g 00000018 GetObjectTrainerTypeByObjectEventId +0805fd08 g 0000003c GetObjectEventBerryTreeIdByLocalIdAndMap +0805fd44 g 00000018 GetObjectEventBerryTreeId 0805fd5c l 00000052 GetObjectEventTemplateByLocalIdAndMap 0805fdb0 l 00000036 FindObjectEventTemplateByLocalId 0805fde8 g 00000074 GetBaseTemplateForObjectEvent @@ -3638,15 +3638,15 @@ 0805ffd8 l 00000004 MovementType_None_callback 0805ffdc l 00000024 MovementType_WanderAround 08060000 l 00000020 MovementType_WanderAround_callback -08060020 l 00000024 MovementType_WanderAroundSlowest -08060044 l 00000020 MovementType_WanderAroundSlowest_callback +08060020 l 00000024 MovementType_WanderAroundSlower +08060044 l 00000020 MovementType_WanderAroundSlower_callback 08060064 l 00000012 MovementType_WanderAround_Step0 08060078 l 0000002a MovementType_WanderAround_Step1 080600a4 l 0000003c MovementType_WanderAround_Step2 080600e0 l 00000020 MovementType_WanderAround_Step3 08060100 l 0000004c MovementType_WanderAround_Step4 0806014c l 00000030 MovementType_WanderAround_Step5 -0806017c l 00000030 MovementType_WanderAround_Step5Slowest +0806017c l 00000030 MovementType_WanderAround_Step5Slower 080601ac l 00000026 MovementType_WanderAround_Step6 080601d4 g 0000007a ObjectEventIsTrainerAndCloseToPlayer 08060250 l 00000030 GetVectorDirection @@ -3914,16 +3914,16 @@ 08063490 g 00000010 GetAcroWheelieDirectionAnimNum 080634a0 g 00000010 Unref_GetAnimNums_080634A0 080634b0 g 00000010 GetAcroEndWheelieDirectionAnimNum -080634c0 g 00000010 sub_80634C0 +080634c0 g 00000010 GetSpinDirectionAnimNum 080634d0 g 00000010 GetAcroUnusedActionDirectionAnimNum 080634e0 g 00000010 GetAcroWheeliePedalDirectionAnimNum 080634f0 g 00000010 GetFishingDirectionAnimNum 08063500 g 00000010 GetFishingNoCatchDirectionAnimNum 08063510 g 00000010 GetFishingBiteDirectionAnimNum 08063520 g 00000010 GetRunningDirectionAnimNum -08063530 l 00000024 sub_8063530 -08063554 g 00000048 npc_apply_anim_looping -0806359c g 0000003e obj_npc_animation_step +08063530 l 00000024 GetStepAnimTable +08063554 g 00000048 SetStepAnimHandleAlternation +0806359c g 0000003e SetStepAnim 080635dc g 00000034 GetDirectionToFace 08063610 g 0000004c SetTrainerMovementType 0806365c g 00000010 GetTrainerFacingDirectionMovementType @@ -3956,8 +3956,8 @@ 08063e28 g 00000090 sub_8063E28 08063eb8 g 0000002c GetFaceDirectionMovementAction 08063ee4 g 0000002c GetFaceDirectionFastMovementAction -08063f10 g 0000001c sub_8063F10 -08063f2c g 0000002c GetWalkSlowestMovementAction +08063f10 g 0000001c GetWalkSlowestMovementAction +08063f2c g 0000002c GetWalkSlowerMovementAction 08063f58 g 0000002c GetWalkSlowMovementAction 08063f84 g 0000002c GetWalkNormalMovementAction 08063fb0 g 0000002c GetWalkFastMovementAction @@ -3973,7 +3973,7 @@ 08064168 g 0000002c GetJumpInPlaceTurnAroundMovementAction 08064194 g 0000002c GetJumpMovementAction 080641c0 g 0000002c GetJumpSpecialMovementAction -080641ec g 0000002c sub_80641EC +080641ec g 0000002c GetJumpSpecialWithEffectMovementAction 08064218 g 0000002c GetStepInPlaceDelay32AnimId 08064244 g 0000002c GetWalkInPlaceNormalMovementAction 08064270 g 0000002c GetWalkInPlaceSlowMovementAction @@ -3989,8 +3989,8 @@ 08064428 g 0000002c GetAcroPopWheelieMoveDirectionMovementAction 08064454 g 0000002c GetAcroWheelieMoveDirectionMovementAction 08064480 g 00000032 GetOppositeDirection -080644b4 l 00000018 zffu_offset_calc -080644cc l 00000040 state_to_direction +080644b4 l 00000018 GetPlayerDirectionForCopy +080644cc l 00000040 GetCopyDirection 0806450c l 00000038 ObjectEventExecHeldMovementAction 08064544 l 00000044 sub_8064544 08064588 l 00000040 ObjectEventExecSingleMovementAction @@ -4000,16 +4000,16 @@ 08064648 l 0000000e MovementAction_FaceUp_Step0 08064658 l 0000000e MovementAction_FaceLeft_Step0 08064668 l 0000000e MovementAction_FaceRight_Step0 -08064678 g 00000084 npc_apply_direction -080646fc g 0000005c do_go_anim +08064678 g 00000084 InitNpcForMovement +080646fc g 0000005c InitMovementNormal 08064758 g 0000002e StartRunningAnim -08064788 g 00000038 npc_obj_ministep_stop_on_arrival -080647c0 g 00000070 InitNpcForWalkSlow -08064830 g 0000002c InitWalkSlow -0806485c g 00000038 an_walk_any_2 -08064894 g 00000070 InitNpcForWalkSlow2 -08064904 g 0000002c InitWalkSlow2 -08064930 g 00000038 UpdateWalkSlow +08064788 g 00000038 UpdateMovementNormal +080647c0 g 00000070 InitNpcForWalkSlower +08064830 g 0000002c InitWalkSlower +0806485c g 00000038 UpdateWalkSlower +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 @@ -4026,9 +4026,9 @@ 08064b08 l 0000001e MovementActionFunc_x0A_1 08064b28 l 0000001e MovementActionFunc_x0B_0 08064b48 l 0000001e MovementActionFunc_x0B_1 -08064b68 g 00000070 sub_8064B68 -08064bd8 g 0000002c sub_8064BD8 -08064c04 g 00000038 sub_8064C04 +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 @@ -4045,14 +4045,14 @@ 08064ddc l 0000001e MovementAction_WalkNormalLeft_Step1 08064dfc l 00000020 MovementAction_WalkNormalRight_Step0 08064e1c l 0000001e MovementAction_WalkNormalRight_Step1 -08064e3c g 000000bc sub_8064E3C -08064ef8 g 00000044 maybe_shadow_1 -08064f3c g 000000c2 sub_8064F3C -08065000 g 00000014 sub_8065000 -08065014 g 00000014 sub_8065014 -08065028 g 00000018 sub_8065028 -08065040 g 00000018 sub_8065040 -08065058 g 0000004e sub_8065058 +08064e3c g 000000bc InitJump +08064ef8 g 00000044 InitJumpRegular +08064f3c g 000000c2 UpdateJumpAnim +08065000 g 00000014 DoJumpAnimStep +08065014 g 00000014 DoJumpSpecialAnimStep +08065028 g 00000018 DoJumpAnim +08065040 g 00000018 DoJumpSpecialAnim +08065058 g 0000004e DoJumpInPlaceAnim 080650a8 l 0000002a MovementAction_Jump2Down_Step0 080650d4 l 0000002a MovementAction_Jump2Down_Step1 08065100 l 0000002a MovementAction_Jump2Up_Step0 @@ -4061,7 +4061,7 @@ 08065184 l 0000002a MovementAction_Jump2Left_Step1 080651b0 l 0000002a MovementAction_Jump2Right_Step0 080651dc l 0000002a MovementAction_Jump2Right_Step1 -08065208 g 00000008 sub_8065208 +08065208 g 00000008 InitMovementDelay 08065210 l 0000001c MovementAction_Delay_Step1 0806522c l 00000020 MovementAction_Delay1_Step0 0806524c l 00000020 MovementAction_Delay2_Step0 @@ -4090,7 +4090,7 @@ 08065610 l 0000003a MovementActionFunc_x05_0 0806564c l 0000003a MovementActionFunc_x06_0 08065688 l 0000003a MovementActionFunc_x07_0 -080656c4 g 00000048 sub_80656C4 +080656c4 g 00000048 InitMoveInPlace 0806570c l 00000028 MovementAction_WalkInPlace_Step1 08065734 l 0000003c MovementAction_WalkInPlaceSlow_Step1 08065770 l 00000036 MovementAction_WalkInPlaceSlowDown_Step0 @@ -4141,9 +4141,9 @@ 08065e90 l 0000001e MovementAction_PlayerRunLeft_Step1 08065eb0 l 0000001e MovementAction_PlayerRunRight_Step0 08065ed0 l 0000001e MovementAction_PlayerRunRight_Step1 -08065ef0 g 00000070 InitNpcForWalkSlow3 -08065f60 g 0000002c sub_8065F60 -08065f8c g 00000038 sub_8065F8C +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 @@ -4155,7 +4155,7 @@ 080660c4 g 0000002c StartSpriteAnimInDirection 080660f0 l 00000016 MovementAction_StartAnimInDirection_Step0 08066108 l 00000020 MovementAction_WaitSpriteAnim -08066128 g 00000032 sub_8066128 +08066128 g 00000032 InitJumpSpecial 0806615c l 0000001e MovementAction_JumpSpecialDown_Step0 0806617c l 00000028 MovementAction_JumpSpecialDown_Step1 080661a4 l 0000001e MovementAction_JumpSpecialUp_Step0 @@ -4229,7 +4229,7 @@ 08066be4 l 0000002a MovementAction_WalkDownStartAffine_Step1 08066c10 l 00000032 MovementAction_WalkDownAffine_Step0 08066c44 l 0000002a MovementAction_WalkDownAffine_Step1 -08066c70 g 00000040 sub_8066C70 +08066c70 g 00000040 AcroWheelieFaceDirection 08066cb0 l 0000000e MovementActionFunc_x70_0 08066cc0 l 0000000e MovementActionFunc_x71_0 08066cd0 l 0000000e MovementActionFunc_x72_0 @@ -4246,7 +4246,7 @@ 08066e34 l 00000024 MovementAction_UnusedAcroActionUp_Step0 08066e58 l 00000024 MovementAction_UnusedAcroActionLeft_Step0 08066e7c l 00000024 MovementAction_UnusedAcroActionRight_Step0 -08066ea0 g 00000042 sub_8066EA0 +08066ea0 g 00000042 InitAcroWheelieJump 08066ee4 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step0 08066f10 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step1 08066f3c l 0000002a MovementAction_AcroWheelieHopFaceUp_Step0 @@ -4275,7 +4275,7 @@ 0806733c l 00000036 MovementActionFunc_x89_0 08067374 l 00000036 MovementActionFunc_x8A_0 080673ac l 00000036 MovementActionFunc_x8B_0 -080673e4 g 00000036 sub_80673E4 +080673e4 g 00000036 InitAcroPopWheelie 0806741c l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 0806743c l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 0806745c l 00000020 MovementAction_AcroPopWheelieMoveUp_Step0 @@ -4284,7 +4284,7 @@ 080674bc l 0000001e MovementAction_AcroPopWheelieMoveLeft_Step1 080674dc l 00000020 MovementAction_AcroPopWheelieMoveRight_Step0 080674fc l 0000001e MovementAction_AcroPopWheelieMoveRight_Step1 -0806751c g 00000030 sub_806751C +0806751c g 00000030 InitAcroWheelieMove 0806754c l 00000020 MovementAction_AcroWheelieMoveDown_Step0 0806756c l 0000001e MovementAction_AcroWheelieMoveDown_Step1 0806758c l 00000020 MovementAction_AcroWheelieMoveUp_Step0 @@ -4293,7 +4293,7 @@ 080675ec l 0000001e MovementAction_AcroWheelieMoveLeft_Step1 0806760c l 00000020 MovementAction_AcroWheelieMoveRight_Step0 0806762c l 0000001e MovementAction_AcroWheelieMoveRight_Step1 -0806764c g 00000038 sub_806764C +0806764c g 00000038 InitSpin 08067684 l 00000020 MovementActionFunc_x94_0 080676a4 l 0000001e MovementActionFunc_x94_1 080676c4 l 00000020 MovementActionFunc_x95_0 @@ -4389,16 +4389,16 @@ 08068ad0 l 00000028 triple_little_steps 08068af8 l 00000024 quad_little_steps 08068b1c l 00000024 oct_little_steps -08068b40 g 00000012 oamt_npc_ministep_reset -08068b54 g 00000068 obj_npc_ministep -08068bbc g 0000000e SetSpriteDataForNormalStep -08068bcc g 0000003a NpcTakeStep -08068c08 g 0000000e SetSpriteDataForNormalStep3 -08068c18 g 0000003e sub_8068C18 -08068c58 g 0000000e SetSpriteDataForNormalStep2 -08068c68 g 0000003c UpdateWalkSlowAnim -08068ca4 g 0000000e SetSpriteDataForNormalStep4 -08068cb4 g 0000004a sub_8068CB4 +08068b40 g 00000012 SetSpriteDataForNormalStep +08068b54 g 00000068 NpcTakeStep +08068bbc g 0000000e SetWalkSlowerSpriteData +08068bcc g 0000003a UpdateWalkSlowerAnim +08068c08 g 0000000e SetWalkSlowSpriteData +08068c18 g 0000003e UpdateWalkSlowAnim +08068c58 g 0000000e SetWalkSlowestSpriteData +08068c68 g 0000003c UpdateWalkSlowestAnim +08068ca4 g 0000000e SetRunSlowSpriteData +08068cb4 g 0000004a UpdateRunSlowAnim 08068d00 l 0000001c GetJumpYDisplacement 08068d1c g 0000001e SetJumpSpriteData 08068d3c g 00000088 DoJumpSpriteMovement @@ -30784,7 +30784,7 @@ 083a5fe8 l 00000008 gMovementDelaysLong 083a5ff0 l 00000008 gMovementDelaysShort 083a5ff8 g 0000001c gMovementTypeFuncs_WanderAround -083a6014 g 0000001c gMovementTypeFuncs_WanderAroundSlowest +083a6014 g 0000001c gMovementTypeFuncs_WanderAroundSlower 083a6030 g 00000004 gStandardDirections 083a6034 g 0000002c gGetVectorDirectionFuncs 083a6060 g 00000014 gMovementTypeFuncs_LookAround @@ -30896,7 +30896,7 @@ 083a64a8 l 00000024 sDirectionToVectors 083a64cc l 00000005 gFaceDirectionMovementActions 083a64d1 l 00000005 gFaceDirectionFastMovementActions -083a64d6 l 00000005 gUnknown_83A64F6 +083a64d6 l 00000005 gWalkSlowestMovementActions 083a64db l 00000005 gUnknown_83A64FB 083a64e0 l 00000005 gUnknown_83A6500 083a64e5 l 00000005 gUnknown_83A6505 @@ -30928,8 +30928,8 @@ 083a6567 l 00000005 gUnknown_83A6587 083a656c l 00000005 gUnknown_83A658C 083a6571 l 00000008 gOppositeDirections -083a6579 l 00000010 gUnknown_83A6599 -083a6589 l 00000010 gUnknown_83A65A9 +083a6579 l 00000010 sPlayerDirectionsForCopy +083a6589 l 00000010 sPlayerDirectionToCopyDirection 083a659c g 000002a8 gMovementActionFuncs 083a6844 l 00000008 sMovementActionFuncs_x00 083a684c l 00000008 sMovementActionFuncs_x01 diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 0720a5da8..6cee6eb30 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -3434,7 +3434,7 @@ 0805c220 g 00000018 PlayerFaceDirectionFast 0805c238 g 00000018 PlayerTurnInPlace 0805c250 g 00000024 PlayerJumpLedge -0805c274 g 0000000e sub_805C260 +0805c274 g 0000000e PlayerShakeHead 0805c284 g 00000044 HandleEnforcedLookDirectionOnPlayerStopMoving 0805c2c8 l 00000018 PlayerGoSpin 0805c2e0 l 00000040 PlayerApplyTileForcedMovement @@ -3569,7 +3569,7 @@ 0805ed84 l 00000080 RemoveObjectEventIfOutsideView 0805ee04 g 0000004c ReloadMapObjectsWithOffset 0805ee50 l 000001b8 ReloadMapObjectWithOffset -0805f008 l 00000038 sub_805EFF4 +0805f008 l 00000038 ResetObjectEventFldEffData 0805f040 l 00000034 SetPlayerAvatarObjectEventIdAndObjectId 0805f074 g 00000178 ObjectEventSetGraphicsId 0805f1ec g 00000040 ObjectEventSetGraphicsIdByLocalIdAndMap @@ -3586,7 +3586,7 @@ 0805f45c g 00000054 SetObjectPositionByLocalIdAndMap 0805f4b0 g 00000014 FreeAndReserveObjectSpritePalettes 0805f4c4 l 0000002c LoadObjectEventPalette -0805f4f0 g 00000034 Unused_LoadObjectEventPaletteSet +0805f4f0 g 00000034 LoadObjectEventPaletteSet 0805f524 l 00000026 TryLoadObjectPalette 0805f54c g 0000003c PatchObjectPalette 0805f588 g 0000002a PatchObjectPaletteRange @@ -3594,7 +3594,7 @@ 0805f5fc g 0000006e LoadPlayerObjectReflectionPalette 0805f66c g 00000076 LoadSpecialObjectReflectionPalette 0805f6e4 g 00000010 sub_805F6D0 -0805f6f4 g 00000020 unref_sub_805F6E0 +0805f6f4 g 00000020 IncrementObjectEventCoords 0805f714 g 0000000e ShiftObjectEventCoords 0805f724 l 00000012 SetObjectEventCoords 0805f738 g 000000a0 MoveObjectEventToMapCoords @@ -3621,11 +3621,11 @@ 0805fc4c g 00000024 GetObjectEventScriptPointerByObjectEventId 0805fc70 l 00000018 GetObjectEventFlagIdByLocalIdAndMap 0805fc88 l 00000028 GetObjectEventFlagIdByObjectEventId -0805fcb0 g 0000003c sub_805FC9C +0805fcb0 g 0000003c GetObjectTrainerTypeByLocalIdAndMap 0805fcec g 00000018 GetObjectEventFlagByLocalIdAndMap -0805fd04 g 00000018 sub_808F0BC -0805fd1c g 0000003c sub_805FD08 -0805fd58 g 00000018 ObjectEventGetBerryTreeId +0805fd04 g 00000018 GetObjectTrainerTypeByObjectEventId +0805fd1c g 0000003c GetObjectEventBerryTreeIdByLocalIdAndMap +0805fd58 g 00000018 GetObjectEventBerryTreeId 0805fd70 l 00000052 GetObjectEventTemplateByLocalIdAndMap 0805fdc4 l 00000036 FindObjectEventTemplateByLocalId 0805fdfc g 00000074 GetBaseTemplateForObjectEvent @@ -3638,15 +3638,15 @@ 0805ffec l 00000004 MovementType_None_callback 0805fff0 l 00000024 MovementType_WanderAround 08060014 l 00000020 MovementType_WanderAround_callback -08060034 l 00000024 MovementType_WanderAroundSlowest -08060058 l 00000020 MovementType_WanderAroundSlowest_callback +08060034 l 00000024 MovementType_WanderAroundSlower +08060058 l 00000020 MovementType_WanderAroundSlower_callback 08060078 l 00000012 MovementType_WanderAround_Step0 0806008c l 0000002a MovementType_WanderAround_Step1 080600b8 l 0000003c MovementType_WanderAround_Step2 080600f4 l 00000020 MovementType_WanderAround_Step3 08060114 l 0000004c MovementType_WanderAround_Step4 08060160 l 00000030 MovementType_WanderAround_Step5 -08060190 l 00000030 MovementType_WanderAround_Step5Slowest +08060190 l 00000030 MovementType_WanderAround_Step5Slower 080601c0 l 00000026 MovementType_WanderAround_Step6 080601e8 g 0000007a ObjectEventIsTrainerAndCloseToPlayer 08060264 l 00000030 GetVectorDirection @@ -3914,16 +3914,16 @@ 080634a4 g 00000010 GetAcroWheelieDirectionAnimNum 080634b4 g 00000010 Unref_GetAnimNums_080634A0 080634c4 g 00000010 GetAcroEndWheelieDirectionAnimNum -080634d4 g 00000010 sub_80634C0 +080634d4 g 00000010 GetSpinDirectionAnimNum 080634e4 g 00000010 GetAcroUnusedActionDirectionAnimNum 080634f4 g 00000010 GetAcroWheeliePedalDirectionAnimNum 08063504 g 00000010 GetFishingDirectionAnimNum 08063514 g 00000010 GetFishingNoCatchDirectionAnimNum 08063524 g 00000010 GetFishingBiteDirectionAnimNum 08063534 g 00000010 GetRunningDirectionAnimNum -08063544 l 00000024 sub_8063530 -08063568 g 00000048 npc_apply_anim_looping -080635b0 g 0000003e obj_npc_animation_step +08063544 l 00000024 GetStepAnimTable +08063568 g 00000048 SetStepAnimHandleAlternation +080635b0 g 0000003e SetStepAnim 080635f0 g 00000034 GetDirectionToFace 08063624 g 0000004c SetTrainerMovementType 08063670 g 00000010 GetTrainerFacingDirectionMovementType @@ -3956,8 +3956,8 @@ 08063e3c g 00000090 sub_8063E28 08063ecc g 0000002c GetFaceDirectionMovementAction 08063ef8 g 0000002c GetFaceDirectionFastMovementAction -08063f24 g 0000001c sub_8063F10 -08063f40 g 0000002c GetWalkSlowestMovementAction +08063f24 g 0000001c GetWalkSlowestMovementAction +08063f40 g 0000002c GetWalkSlowerMovementAction 08063f6c g 0000002c GetWalkSlowMovementAction 08063f98 g 0000002c GetWalkNormalMovementAction 08063fc4 g 0000002c GetWalkFastMovementAction @@ -3973,7 +3973,7 @@ 0806417c g 0000002c GetJumpInPlaceTurnAroundMovementAction 080641a8 g 0000002c GetJumpMovementAction 080641d4 g 0000002c GetJumpSpecialMovementAction -08064200 g 0000002c sub_80641EC +08064200 g 0000002c GetJumpSpecialWithEffectMovementAction 0806422c g 0000002c GetStepInPlaceDelay32AnimId 08064258 g 0000002c GetWalkInPlaceNormalMovementAction 08064284 g 0000002c GetWalkInPlaceSlowMovementAction @@ -3989,8 +3989,8 @@ 0806443c g 0000002c GetAcroPopWheelieMoveDirectionMovementAction 08064468 g 0000002c GetAcroWheelieMoveDirectionMovementAction 08064494 g 00000032 GetOppositeDirection -080644c8 l 00000018 zffu_offset_calc -080644e0 l 00000040 state_to_direction +080644c8 l 00000018 GetPlayerDirectionForCopy +080644e0 l 00000040 GetCopyDirection 08064520 l 00000038 ObjectEventExecHeldMovementAction 08064558 l 00000044 sub_8064544 0806459c l 00000040 ObjectEventExecSingleMovementAction @@ -4000,16 +4000,16 @@ 0806465c l 0000000e MovementAction_FaceUp_Step0 0806466c l 0000000e MovementAction_FaceLeft_Step0 0806467c l 0000000e MovementAction_FaceRight_Step0 -0806468c g 00000084 npc_apply_direction -08064710 g 0000005c do_go_anim +0806468c g 00000084 InitNpcForMovement +08064710 g 0000005c InitMovementNormal 0806476c g 0000002e StartRunningAnim -0806479c g 00000038 npc_obj_ministep_stop_on_arrival -080647d4 g 00000070 InitNpcForWalkSlow -08064844 g 0000002c InitWalkSlow -08064870 g 00000038 an_walk_any_2 -080648a8 g 00000070 InitNpcForWalkSlow2 -08064918 g 0000002c InitWalkSlow2 -08064944 g 00000038 UpdateWalkSlow +0806479c g 00000038 UpdateMovementNormal +080647d4 g 00000070 InitNpcForWalkSlower +08064844 g 0000002c InitWalkSlower +08064870 g 00000038 UpdateWalkSlower +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 @@ -4026,9 +4026,9 @@ 08064b1c l 0000001e MovementActionFunc_x0A_1 08064b3c l 0000001e MovementActionFunc_x0B_0 08064b5c l 0000001e MovementActionFunc_x0B_1 -08064b7c g 00000070 sub_8064B68 -08064bec g 0000002c sub_8064BD8 -08064c18 g 00000038 sub_8064C04 +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 @@ -4045,14 +4045,14 @@ 08064df0 l 0000001e MovementAction_WalkNormalLeft_Step1 08064e10 l 00000020 MovementAction_WalkNormalRight_Step0 08064e30 l 0000001e MovementAction_WalkNormalRight_Step1 -08064e50 g 000000bc sub_8064E3C -08064f0c g 00000044 maybe_shadow_1 -08064f50 g 000000c2 sub_8064F3C -08065014 g 00000014 sub_8065000 -08065028 g 00000014 sub_8065014 -0806503c g 00000018 sub_8065028 -08065054 g 00000018 sub_8065040 -0806506c g 0000004e sub_8065058 +08064e50 g 000000bc InitJump +08064f0c g 00000044 InitJumpRegular +08064f50 g 000000c2 UpdateJumpAnim +08065014 g 00000014 DoJumpAnimStep +08065028 g 00000014 DoJumpSpecialAnimStep +0806503c g 00000018 DoJumpAnim +08065054 g 00000018 DoJumpSpecialAnim +0806506c g 0000004e DoJumpInPlaceAnim 080650bc l 0000002a MovementAction_Jump2Down_Step0 080650e8 l 0000002a MovementAction_Jump2Down_Step1 08065114 l 0000002a MovementAction_Jump2Up_Step0 @@ -4061,7 +4061,7 @@ 08065198 l 0000002a MovementAction_Jump2Left_Step1 080651c4 l 0000002a MovementAction_Jump2Right_Step0 080651f0 l 0000002a MovementAction_Jump2Right_Step1 -0806521c g 00000008 sub_8065208 +0806521c g 00000008 InitMovementDelay 08065224 l 0000001c MovementAction_Delay_Step1 08065240 l 00000020 MovementAction_Delay1_Step0 08065260 l 00000020 MovementAction_Delay2_Step0 @@ -4090,7 +4090,7 @@ 08065624 l 0000003a MovementActionFunc_x05_0 08065660 l 0000003a MovementActionFunc_x06_0 0806569c l 0000003a MovementActionFunc_x07_0 -080656d8 g 00000048 sub_80656C4 +080656d8 g 00000048 InitMoveInPlace 08065720 l 00000028 MovementAction_WalkInPlace_Step1 08065748 l 0000003c MovementAction_WalkInPlaceSlow_Step1 08065784 l 00000036 MovementAction_WalkInPlaceSlowDown_Step0 @@ -4141,9 +4141,9 @@ 08065ea4 l 0000001e MovementAction_PlayerRunLeft_Step1 08065ec4 l 0000001e MovementAction_PlayerRunRight_Step0 08065ee4 l 0000001e MovementAction_PlayerRunRight_Step1 -08065f04 g 00000070 InitNpcForWalkSlow3 -08065f74 g 0000002c sub_8065F60 -08065fa0 g 00000038 sub_8065F8C +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 @@ -4155,7 +4155,7 @@ 080660d8 g 0000002c StartSpriteAnimInDirection 08066104 l 00000016 MovementAction_StartAnimInDirection_Step0 0806611c l 00000020 MovementAction_WaitSpriteAnim -0806613c g 00000032 sub_8066128 +0806613c g 00000032 InitJumpSpecial 08066170 l 0000001e MovementAction_JumpSpecialDown_Step0 08066190 l 00000028 MovementAction_JumpSpecialDown_Step1 080661b8 l 0000001e MovementAction_JumpSpecialUp_Step0 @@ -4229,7 +4229,7 @@ 08066bf8 l 0000002a MovementAction_WalkDownStartAffine_Step1 08066c24 l 00000032 MovementAction_WalkDownAffine_Step0 08066c58 l 0000002a MovementAction_WalkDownAffine_Step1 -08066c84 g 00000040 sub_8066C70 +08066c84 g 00000040 AcroWheelieFaceDirection 08066cc4 l 0000000e MovementActionFunc_x70_0 08066cd4 l 0000000e MovementActionFunc_x71_0 08066ce4 l 0000000e MovementActionFunc_x72_0 @@ -4246,7 +4246,7 @@ 08066e48 l 00000024 MovementAction_UnusedAcroActionUp_Step0 08066e6c l 00000024 MovementAction_UnusedAcroActionLeft_Step0 08066e90 l 00000024 MovementAction_UnusedAcroActionRight_Step0 -08066eb4 g 00000042 sub_8066EA0 +08066eb4 g 00000042 InitAcroWheelieJump 08066ef8 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step0 08066f24 l 0000002a MovementAction_AcroWheelieHopFaceDown_Step1 08066f50 l 0000002a MovementAction_AcroWheelieHopFaceUp_Step0 @@ -4275,7 +4275,7 @@ 08067350 l 00000036 MovementActionFunc_x89_0 08067388 l 00000036 MovementActionFunc_x8A_0 080673c0 l 00000036 MovementActionFunc_x8B_0 -080673f8 g 00000036 sub_80673E4 +080673f8 g 00000036 InitAcroPopWheelie 08067430 l 00000020 MovementAction_AcroPopWheelieMoveDown_Step0 08067450 l 0000001e MovementAction_AcroPopWheelieMoveDown_Step1 08067470 l 00000020 MovementAction_AcroPopWheelieMoveUp_Step0 @@ -4284,7 +4284,7 @@ 080674d0 l 0000001e MovementAction_AcroPopWheelieMoveLeft_Step1 080674f0 l 00000020 MovementAction_AcroPopWheelieMoveRight_Step0 08067510 l 0000001e MovementAction_AcroPopWheelieMoveRight_Step1 -08067530 g 00000030 sub_806751C +08067530 g 00000030 InitAcroWheelieMove 08067560 l 00000020 MovementAction_AcroWheelieMoveDown_Step0 08067580 l 0000001e MovementAction_AcroWheelieMoveDown_Step1 080675a0 l 00000020 MovementAction_AcroWheelieMoveUp_Step0 @@ -4293,7 +4293,7 @@ 08067600 l 0000001e MovementAction_AcroWheelieMoveLeft_Step1 08067620 l 00000020 MovementAction_AcroWheelieMoveRight_Step0 08067640 l 0000001e MovementAction_AcroWheelieMoveRight_Step1 -08067660 g 00000038 sub_806764C +08067660 g 00000038 InitSpin 08067698 l 00000020 MovementActionFunc_x94_0 080676b8 l 0000001e MovementActionFunc_x94_1 080676d8 l 00000020 MovementActionFunc_x95_0 @@ -4389,16 +4389,16 @@ 08068ae4 l 00000028 triple_little_steps 08068b0c l 00000024 quad_little_steps 08068b30 l 00000024 oct_little_steps -08068b54 g 00000012 oamt_npc_ministep_reset -08068b68 g 00000068 obj_npc_ministep -08068bd0 g 0000000e SetSpriteDataForNormalStep -08068be0 g 0000003a NpcTakeStep -08068c1c g 0000000e SetSpriteDataForNormalStep3 -08068c2c g 0000003e sub_8068C18 -08068c6c g 0000000e SetSpriteDataForNormalStep2 -08068c7c g 0000003c UpdateWalkSlowAnim -08068cb8 g 0000000e SetSpriteDataForNormalStep4 -08068cc8 g 0000004a sub_8068CB4 +08068b54 g 00000012 SetSpriteDataForNormalStep +08068b68 g 00000068 NpcTakeStep +08068bd0 g 0000000e SetWalkSlowerSpriteData +08068be0 g 0000003a UpdateWalkSlowerAnim +08068c1c g 0000000e SetWalkSlowSpriteData +08068c2c g 0000003e UpdateWalkSlowAnim +08068c6c g 0000000e SetWalkSlowestSpriteData +08068c7c g 0000003c UpdateWalkSlowestAnim +08068cb8 g 0000000e SetRunSlowSpriteData +08068cc8 g 0000004a UpdateRunSlowAnim 08068d14 l 0000001c GetJumpYDisplacement 08068d30 g 0000001e SetJumpSpriteData 08068d50 g 00000088 DoJumpSpriteMovement @@ -30785,7 +30785,7 @@ 083a6058 l 00000008 gMovementDelaysLong 083a6060 l 00000008 gMovementDelaysShort 083a6068 g 0000001c gMovementTypeFuncs_WanderAround -083a6084 g 0000001c gMovementTypeFuncs_WanderAroundSlowest +083a6084 g 0000001c gMovementTypeFuncs_WanderAroundSlower 083a60a0 g 00000004 gStandardDirections 083a60a4 g 0000002c gGetVectorDirectionFuncs 083a60d0 g 00000014 gMovementTypeFuncs_LookAround @@ -30897,7 +30897,7 @@ 083a6518 l 00000024 sDirectionToVectors 083a653c l 00000005 gFaceDirectionMovementActions 083a6541 l 00000005 gFaceDirectionFastMovementActions -083a6546 l 00000005 gUnknown_83A64F6 +083a6546 l 00000005 gWalkSlowestMovementActions 083a654b l 00000005 gUnknown_83A64FB 083a6550 l 00000005 gUnknown_83A6500 083a6555 l 00000005 gUnknown_83A6505 @@ -30929,8 +30929,8 @@ 083a65d7 l 00000005 gUnknown_83A6587 083a65dc l 00000005 gUnknown_83A658C 083a65e1 l 00000008 gOppositeDirections -083a65e9 l 00000010 gUnknown_83A6599 -083a65f9 l 00000010 gUnknown_83A65A9 +083a65e9 l 00000010 sPlayerDirectionsForCopy +083a65f9 l 00000010 sPlayerDirectionToCopyDirection 083a660c g 000002a8 gMovementActionFuncs 083a68b4 l 00000008 sMovementActionFuncs_x00 083a68bc l 00000008 sMovementActionFuncs_x01