atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move definition of constants for movement speed

Browse source
This commit is contained in:
cbt6 2021-11-03 02:56:23 +08:00
parent 3556024a06
commit 510ccbdf4c
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/data/object_events/movement_action_func_tables.h
View file

@ -602,14 +602,6 @@ u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite
MovementAction_PauseSpriteAnim, MovementAction_PauseSpriteAnim,
}; };
enum {
MOVE_SPEED_NORMAL, // walking
MOVE_SPEED_FAST_1, // running / surfing / sliding (ice tile)
MOVE_SPEED_FAST_2, // water current / acro bike
MOVE_SPEED_FASTER, // mach bike's max speed
MOVE_SPEED_FASTEST,
};
static u8 (*const sDirectionAnimFuncsBySpeed[])(u8) = { static u8 (*const sDirectionAnimFuncsBySpeed[])(u8) = {
[MOVE_SPEED_NORMAL] = GetMoveDirectionAnimNum, [MOVE_SPEED_NORMAL] = GetMoveDirectionAnimNum,
[MOVE_SPEED_FAST_1] = GetMoveDirectionFastAnimNum, [MOVE_SPEED_FAST_1] = GetMoveDirectionFastAnimNum,

8
src/event_object_movement.c
View file

@ -32,6 +32,14 @@
// this file was known as evobjmv.c in Game Freak's original source // this file was known as evobjmv.c in Game Freak's original source
enum {
MOVE_SPEED_NORMAL, // walking
MOVE_SPEED_FAST_1, // running / surfing / sliding (ice tile)
MOVE_SPEED_FAST_2, // water current / acro bike
MOVE_SPEED_FASTER, // mach bike's max speed
MOVE_SPEED_FASTEST,
};
// Sprite data used throughout // Sprite data used throughout
#define sObjEventId data[0] #define sObjEventId data[0]
#define sTypeFuncId data[1] // Index into corresponding gMovementTypeFuncs_* table #define sTypeFuncId data[1] // Index into corresponding gMovementTypeFuncs_* table