diff options
| -rw-r--r-- | asm/event_object_movement.s | 48 | ||||
| -rw-r--r-- | data/event_object_movement.s | 176 | ||||
| -rw-r--r-- | include/constants/event_object_movement.h | 247 | ||||
| -rw-r--r-- | include/constants/flags.h | 3 |
4 files changed, 443 insertions, 31 deletions
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s index f380b4b53..ad074cacd 100644 --- a/asm/event_object_movement.s +++ b/asm/event_object_movement.s @@ -501,7 +501,7 @@ _0805E14E: strb r0, [r4, 0x7] ldrh r0, [r5, 0xE] strb r0, [r4, 0x1D] - ldr r1, _0805E230 @ =gUnknown_839FD5D + ldr r1, _0805E230 @ =gInitialMovementTypeFacingDirections ldrb r0, [r5, 0x9] adds r0, r1 ldrb r1, [r0] @@ -513,7 +513,7 @@ _0805E14E: bl ObjectEventSetDirection adds r0, r4, 0 bl ObjectEventHandleDynamicGraphicsId - ldr r1, _0805E234 @ =gUnknown_839FD0C + ldr r1, _0805E234 @ =gRangedMovementTypes ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -559,8 +559,8 @@ _0805E220: pop {r1} bx r1 .align 2, 0 -_0805E230: .4byte gUnknown_839FD5D -_0805E234: .4byte gUnknown_839FD0C +_0805E230: .4byte gInitialMovementTypeFacingDirections +_0805E234: .4byte gRangedMovementTypes thumb_func_end sub_805E080 thumb_func_start sub_805E238 @@ -8196,7 +8196,7 @@ sub_8061954: @ 8061954 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08061988 @ =gUnknown_839FD5D + ldr r0, _08061988 @ =gInitialMovementTypeFacingDirections ldrb r1, [r4, 0x6] adds r1, r0 ldrb r1, [r1] @@ -8219,7 +8219,7 @@ _08061976: pop {r1} bx r1 .align 2, 0 -_08061988: .4byte gUnknown_839FD5D +_08061988: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8061954 thumb_func_start sub_806198C @@ -10449,7 +10449,7 @@ sub_8062970: @ 8062970 adds r5, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r1, _080629B4 @ =gUnknown_839FD5D + ldr r1, _080629B4 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10475,7 +10475,7 @@ sub_8062970: @ 8062970 pop {r1} bx r1 .align 2, 0 -_080629B4: .4byte gUnknown_839FD5D +_080629B4: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062970 thumb_func_start sub_80629B8 @@ -10489,7 +10489,7 @@ sub_80629B8: @ 80629B8 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062A6C @ =gUnknown_839FD5D + ldr r1, _08062A6C @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10564,7 +10564,7 @@ _08062A52: pop {r1} bx r1 .align 2, 0 -_08062A6C: .4byte gUnknown_839FD5D +_08062A6C: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_80629B8 thumb_func_start sub_8062A70 @@ -10578,7 +10578,7 @@ sub_8062A70: @ 8062A70 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062B24 @ =gUnknown_839FD5D + ldr r1, _08062B24 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10653,7 +10653,7 @@ _08062B0A: pop {r1} bx r1 .align 2, 0 -_08062B24: .4byte gUnknown_839FD5D +_08062B24: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062A70 thumb_func_start sub_8062B28 @@ -10667,7 +10667,7 @@ sub_8062B28: @ 8062B28 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062BDC @ =gUnknown_839FD5D + ldr r1, _08062BDC @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10742,7 +10742,7 @@ _08062BC2: pop {r1} bx r1 .align 2, 0 -_08062BDC: .4byte gUnknown_839FD5D +_08062BDC: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062B28 thumb_func_start sub_8062BE0 @@ -10756,7 +10756,7 @@ sub_8062BE0: @ 8062BE0 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062C94 @ =gUnknown_839FD5D + ldr r1, _08062C94 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10831,7 +10831,7 @@ _08062C7A: pop {r1} bx r1 .align 2, 0 -_08062C94: .4byte gUnknown_839FD5D +_08062C94: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062BE0 thumb_func_start cph_IM_DIFFERENT @@ -10841,7 +10841,7 @@ cph_IM_DIFFERENT: @ 8062C98 adds r5, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r1, _08062CDC @ =gUnknown_839FD5D + ldr r1, _08062CDC @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10867,7 +10867,7 @@ cph_IM_DIFFERENT: @ 8062C98 pop {r1} bx r1 .align 2, 0 -_08062CDC: .4byte gUnknown_839FD5D +_08062CDC: .4byte gInitialMovementTypeFacingDirections thumb_func_end cph_IM_DIFFERENT thumb_func_start sub_8062CE0 @@ -10881,7 +10881,7 @@ sub_8062CE0: @ 8062CE0 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062D94 @ =gUnknown_839FD5D + ldr r1, _08062D94 @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -10956,7 +10956,7 @@ _08062D7A: pop {r1} bx r1 .align 2, 0 -_08062D94: .4byte gUnknown_839FD5D +_08062D94: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_8062CE0 thumb_func_start oac_hopping @@ -10970,7 +10970,7 @@ oac_hopping: @ 8062D98 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08062E5C @ =gUnknown_839FD5D + ldr r1, _08062E5C @ =gInitialMovementTypeFacingDirections ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -11052,7 +11052,7 @@ _08062E40: pop {r1} bx r1 .align 2, 0 -_08062E5C: .4byte gUnknown_839FD5D +_08062E5C: .4byte gInitialMovementTypeFacingDirections thumb_func_end oac_hopping thumb_func_start sub_8062E60 @@ -19354,7 +19354,7 @@ _08066874: thumb_func_start sub_806687C sub_806687C: @ 806687C push {lr} - ldr r3, _08066890 @ =gUnknown_839FD5D + ldr r3, _08066890 @ =gInitialMovementTypeFacingDirections ldrb r2, [r0, 0x6] adds r2, r3 ldrb r2, [r2] @@ -19363,7 +19363,7 @@ sub_806687C: @ 806687C pop {r1} bx r1 .align 2, 0 -_08066890: .4byte gUnknown_839FD5D +_08066890: .4byte gInitialMovementTypeFacingDirections thumb_func_end sub_806687C thumb_func_start sub_8066894 diff --git a/data/event_object_movement.s b/data/event_object_movement.s index 3e140ec9c..d0d07db27 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -536,6 +536,7 @@ gUnknown_8398008:: @ 8398008 gUnknown_8398028:: @ 8398028 .incbin "graphics/object_events/12.gbapal" +gUnknown_8398048:: @ 8398048 .incbin "baserom.gba", 0x398048, 0x600 gUnknown_8398648:: @@ -544,6 +545,8 @@ gUnknown_8398648:: gUnknown_8398688:: .incbin "graphics/object_events/fldeff_cut.gbapal" + +gUnknown_83986A8:: @ 83986A8 .incbin "baserom.gba", 0x3986A8, 0xCE0 gUnknown_8399388:: @ 8399388 @@ -555,12 +558,173 @@ gUnknown_8399C90:: @ 8399C90 gUnknown_839FBC8:: @ 839FBC8 .incbin "baserom.gba", 0x39FBC8, 0x144 -gUnknown_839FD0C:: @ 839FD0C - .incbin "baserom.gba", 0x39FD0C, 0x51 - -gUnknown_839FD5D:: @ 839FD5D - .incbin "baserom.gba", 0x39FD5D, 0x53 - +gRangedMovementTypes:: @ 839FD0C + .byte FALSE @ MOVEMENT_TYPE_NONE + .byte FALSE @ MOVEMENT_TYPE_LOOK_AROUND + .byte TRUE @ MOVEMENT_TYPE_WANDER_AROUND + .byte TRUE @ MOVEMENT_TYPE_WANDER_UP_AND_DOWN + .byte TRUE @ MOVEMENT_TYPE_WANDER_DOWN_AND_UP + .byte TRUE @ MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_PLAYER + .byte FALSE @ MOVEMENT_TYPE_BERRY_TREE_GROWTH + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_UP + .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE + .byte FALSE @ MOVEMENT_TYPE_ROTATE_CLOCKWISE + .byte TRUE @ MOVEMENT_TYPE_WALK_UP_AND_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_DOWN_AND_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE + .byte FALSE @ MOVEMENT_TYPE_TREE_DISGUISE + .byte FALSE @ MOVEMENT_TYPE_MOUNTAIN_DISGUISE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS + .byte FALSE @ MOVEMENT_TYPE_HIDDEN + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_INVISIBLE + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + +gInitialMovementTypeFacingDirections:: @ 839FD5D + .byte 1 @ [MOVEMENT_TYPE_NONE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_SOUTH, + +.align 2, 0 gObjectEventGraphicsInfoPointers:: @ 839FDB0 .4byte gObjectEventGraphicsInfo_83A3BB0 .4byte gObjectEventGraphicsInfo_83A3BD4 diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h new file mode 100644 index 000000000..6a4405b65 --- /dev/null +++ b/include/constants/event_object_movement.h @@ -0,0 +1,247 @@ +#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H +#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H + +#define MOVEMENT_TYPE_NONE 0x0 +#define MOVEMENT_TYPE_LOOK_AROUND 0x1 +#define MOVEMENT_TYPE_WANDER_AROUND 0x2 +#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 +#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 +#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 +#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 +#define MOVEMENT_TYPE_FACE_UP 0x7 +#define MOVEMENT_TYPE_FACE_DOWN 0x8 +#define MOVEMENT_TYPE_FACE_LEFT 0x9 +#define MOVEMENT_TYPE_FACE_RIGHT 0xA +#define MOVEMENT_TYPE_PLAYER 0xB +#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC +#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD +#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE +#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF +#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 +#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 +#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 +#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 +#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 +#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 +#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 +#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 +#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A +#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B +#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 +#define MOVEMENT_TYPE_COPY_PLAYER 0x35 +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 +#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 +#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A +#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E +#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 +#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 +#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 +#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_INVISIBLE 0x4C +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x4D +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x4E +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x4F +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x50 + +#define MOVEMENT_ACTION_FACE_DOWN 0x0 +#define MOVEMENT_ACTION_FACE_UP 0x1 +#define MOVEMENT_ACTION_FACE_LEFT 0x2 +#define MOVEMENT_ACTION_FACE_RIGHT 0x3 +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 +#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB +#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC +#define MOVEMENT_ACTION_JUMP_2_UP 0xD +#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF +#define MOVEMENT_ACTION_DELAY_1 0x10 +#define MOVEMENT_ACTION_DELAY_2 0x11 +#define MOVEMENT_ACTION_DELAY_4 0x12 +#define MOVEMENT_ACTION_DELAY_8 0x13 +#define MOVEMENT_ACTION_DELAY_16 0x14 +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 +#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 +#define MOVEMENT_ACTION_SLIDE_UP 0x32 +#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D +#define MOVEMENT_ACTION_FACE_PLAYER 0x3E +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 +#define MOVEMENT_ACTION_JUMP_DOWN 0x42 +#define MOVEMENT_ACTION_JUMP_UP 0x43 +#define MOVEMENT_ACTION_JUMP_LEFT 0x44 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 +#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 +#define MOVEMENT_ACTION_SET_VISIBLE 0x55 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 +#define MOVEMENT_ACTION_EMOTE_HEART 0x58 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A +#define MOVEMENT_ACTION_CUT_TREE 0x5B +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F +#define MOVEMENT_ACTION_HIDE_REFLECTION 0x60 +#define MOVEMENT_ACTION_SHOW_REFLECTION 0x61 +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x62 +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x63 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x64 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x65 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x66 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x67 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x68 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x69 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x6A +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x6B +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6C +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6D +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6E +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x73 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x74 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x75 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x76 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x77 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x78 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x79 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x7A +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7D +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7E +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7F +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x80 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x81 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x82 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x85 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x86 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x87 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x88 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x89 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x8A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x8B +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT 0x8C +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT 0x8D +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT 0x8E +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT 0x90 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x91 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0x92 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0x93 +#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0x94 +#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0x95 +#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0x96 +#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0x97 +#define MOVEMENT_ACTION_LEVITATE 0x98 +#define MOVEMENT_ACTION_STOP_LEVITATE 0x99 +#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0x9A +#define MOVEMENT_ACTION_FIGURE_8 0x9B +#define MOVEMENT_ACTION_FLY_UP 0x9C +#define MOVEMENT_ACTION_FLY_DOWN 0x9D + +#define MOVEMENT_ACTION_STEP_END 0xFE + +#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/constants/flags.h b/include/constants/flags.h index bd356064c..8e7a6a694 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1310,7 +1310,8 @@ #define FLAG_TRAINER_FLAG_START 0x500 // Vanilla: SYS_FLAGS = 0x800 -#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + ((NUM_TRAINERS) + 31) / 32 * 32) +//#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + ((NUM_TRAINERS) + 31) / 32 * 32) +#define SYS_FLAGS 0x800 // SYSTEM FLAGS |