From e9558ed8ba1489bedaeaafe8295806ae5305c217 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Tue, 26 Oct 2021 18:35:16 +0000 Subject: [PATCH] Merge pull request #1527 from cbt6/field-player --- pokeemerald.sym | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 43245ebaa5..191e845ca8 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -4879,9 +4879,9 @@ 0808aef0 l 0000000e PlayerNotOnBikeTurningInPlace 0808af00 l 000000bc PlayerNotOnBikeMoving 0808afbc l 0000006c CheckForPlayerAvatarCollision -0808b028 l 0000006c sub_808B028 +0808b028 l 0000006c CheckForPlayerAvatarStaticCollision 0808b094 g 000000ce CheckForObjectEventCollision -0808b164 l 00000056 sub_808B164 +0808b164 l 00000056 CheckForObjectEventStaticCollision 0808b1bc l 00000058 CanStopSurfing 0808b214 l 00000022 ShouldJumpLedge 0808b238 l 000000aa TryPushBoulder @@ -4897,8 +4897,8 @@ 0808b534 l 00000034 PlayerAvatarTransition_Underwater 0808b568 l 00000010 PlayerAvatarTransition_ReturnToField 0808b578 g 00000044 UpdatePlayerAvatarTransitionState -0808b5bc l 0000005a player_is_anim_in_certain_ranges -0808b618 l 00000022 sub_808B618 +0808b5bc l 0000005a PlayerAnimIsMultiFrameStationary +0808b618 l 00000022 PlayerAnimIsMultiFrameStationaryAndStateNotTurning 0808b63c l 00000024 PlayerIsAnimActive 0808b660 l 00000024 PlayerCheckIfAnimFinishedOrInactive 0808b684 l 0000001c PlayerSetCopyableMovement @@ -4936,12 +4936,12 @@ 0808bc38 g 00000020 GetPlayerFacingDirection 0808bc58 g 0000001c GetPlayerMovementDirection 0808bc74 g 0000001c PlayerGetZCoord -0808bc90 g 00000030 sub_808BC90 +0808bc90 g 00000030 MovePlayerToMapCoords 0808bcc0 g 00000010 TestPlayerAvatarFlags 0808bcd0 g 0000000c GetPlayerAvatarFlags 0808bcdc g 0000000c GetPlayerAvatarSpriteId -0808bce8 g 0000000a sub_808BCE8 -0808bcf4 g 00000048 sub_808BCF4 +0808bce8 g 0000000a CancelPlayerForcedMovement +0808bcf4 g 00000048 StopPlayerAvatar 0808bd3c g 00000018 GetRivalAvatarGraphicsIdByStateIdAndGender 0808bd54 g 00000018 GetPlayerAvatarGraphicsIdByStateIdAndGender 0808bd6c g 00000010 GetFRLGAvatarGraphicsIdByGender @@ -43810,7 +43810,7 @@ 08497174 l 00000288 sDoorAnimGraphicsTable 084973fc l 00000048 sForcedMovementTestFuncs 08497444 l 0000004c sForcedMovementFuncs -08497490 l 0000000c gUnknown_08497490 +08497490 l 0000000c sPlayerNotOnBikeFuncs 0849749c l 00000014 sAcroBikeTrickMetatiles 084974b0 l 00000005 sAcroBikeTrickCollisionTypes 084974b8 l 00000020 sPlayerAvatarTransitionFuncs