dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some movement actions and functions

Browse Source
This commit is contained in:
cbt6
2022-02-10 00:20:22 +08:00
parent bef2668d8b
commit ac3de6d02c
13 changed files with 644 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+6 -6
View File
@@ -831,7 +831,7 @@ static void QL_TryRecordNPCStepWithDuration32(struct ObjectEvent * objectEvent,
void PlayerGoSlowest(u8 direction)
{
PlayerSetAnimId(GetWalkSlowestMovementAction(direction), 2);
PlayerSetAnimId(GetWalkSlowerMovementAction(direction), 2);
}
void PlayerGoSlow(u8 direction)
@@ -908,9 +908,9 @@ void PlayerJumpLedge(u8 direction)
PlayerSetAnimId(GetJump2MovementAction(direction), 8);
}
void sub_805C260(void)
void PlayerShakeHead(void)
{
PlayerSetAnimId(MOVEMENT_ACTION_0x9F, 0);
PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD, 0);
}
void HandleEnforcedLookDirectionOnPlayerStopMoving(void)
@@ -1428,7 +1428,7 @@ static bool8 DoBoulderDust(struct Task *task, struct ObjectEvent *playerObject,
ObjectEventClearHeldMovementIfFinished(playerObject);
ObjectEventClearHeldMovementIfFinished(strengthObject);
QL_TryRecordPlayerStepWithDuration0(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2]));
QL_TryRecordNPCStepWithDuration32(strengthObject, GetWalkSlowestMovementAction((u8)task->data[2]));
QL_TryRecordNPCStepWithDuration32(strengthObject, GetWalkSlowerMovementAction((u8)task->data[2]));
gFieldEffectArguments[0] = strengthObject->currentCoords.x;
gFieldEffectArguments[1] = strengthObject->currentCoords.y;
gFieldEffectArguments[2] = strengthObject->previousElevation;
@@ -1560,7 +1560,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct Objec
{
if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
QL_TryRecordPlayerStepWithDuration0(objectEvent, GetWalkSlowestMovementAction(GetOppositeDirection(task->data[1])));
QL_TryRecordPlayerStepWithDuration0(objectEvent, GetWalkSlowerMovementAction(GetOppositeDirection(task->data[1])));
ScriptContext2_Disable();
gPlayerAvatar.preventStep = FALSE;
DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin));
@@ -1617,7 +1617,7 @@ static void Task_StopSurfingInit(u8 taskId)
return;
}
SetSurfBlob_BobState(playerObjEvent->fieldEffectSpriteId, 2);
QL_TryRecordPlayerStepWithDuration0(playerObjEvent, sub_80641EC((u8)gTasks[taskId].data[0]));
QL_TryRecordPlayerStepWithDuration0(playerObjEvent, GetJumpSpecialWithEffectMovementAction((u8)gTasks[taskId].data[0]));
gTasks[taskId].func = Task_WaitStopSurfing;
}