ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1541 from cbt6/move-speed

Browse Source 
Use constants for movement speeds
This commit is contained in:
GriffinR 2021-11-03 11:18:54 -04:00 committed by GitHub
commit b16b918266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/event_object_movement.c
View File

@ -5184,7 +5184,7 @@ static void InitMovementNormal(struct ObjectEvent *objectEvent, struct Sprite *s
static void StartRunningAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction)
{
InitNpcForMovement(objectEvent, sprite, direction, 1);
InitNpcForMovement(objectEvent, sprite, direction, MOVE_SPEED_FAST_1);
SetStepAnimHandleAlternation(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection));
}
@ -8349,15 +8349,19 @@ static const SpriteStepFunc sStep8Funcs[] = {
};
static const SpriteStepFunc *const sNpcStepFuncTables[] = {
sStep1Funcs,
sStep2Funcs,
sStep3Funcs,
sStep4Funcs,
sStep8Funcs,
[MOVE_SPEED_NORMAL] = sStep1Funcs,
[MOVE_SPEED_FAST_1] = sStep2Funcs,
[MOVE_SPEED_FAST_2] = sStep3Funcs,
[MOVE_SPEED_FASTER] = sStep4Funcs,
[MOVE_SPEED_FASTEST] = sStep8Funcs,
};
static const s16 sStepTimes[] = {
16, 8, 6, 4, 2
[MOVE_SPEED_NORMAL] = 16,
[MOVE_SPEED_FAST_1] = 8,
[MOVE_SPEED_FAST_2] = 6,
[MOVE_SPEED_FASTER] = 4,
[MOVE_SPEED_FASTEST] = 2,
};
static bool8 NpcTakeStep(struct Sprite *sprite)