dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions 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
parent c98fbb5ca6 fca863244b
commit b16b918266
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+11 -7
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) 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)); SetStepAnimHandleAlternation(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection));
} }
@@ -8349,15 +8349,19 @@ static const SpriteStepFunc sStep8Funcs[] = {
}; };
static const SpriteStepFunc *const sNpcStepFuncTables[] = { static const SpriteStepFunc *const sNpcStepFuncTables[] = {
sStep1Funcs, [MOVE_SPEED_NORMAL] = sStep1Funcs,
sStep2Funcs, [MOVE_SPEED_FAST_1] = sStep2Funcs,
sStep3Funcs, [MOVE_SPEED_FAST_2] = sStep3Funcs,
sStep4Funcs, [MOVE_SPEED_FASTER] = sStep4Funcs,
sStep8Funcs, [MOVE_SPEED_FASTEST] = sStep8Funcs,
}; };
static const s16 sStepTimes[] = { 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) static bool8 NpcTakeStep(struct Sprite *sprite)