diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/event_object_movement.h | 323 | ||||
| -rw-r--r-- | include/constants/field_effects.h | 12 | ||||
| -rw-r--r-- | include/constants/movement_commands.h | 121 | ||||
| -rw-r--r-- | include/constants/object_events.h | 4 | ||||
| -rw-r--r-- | include/event_object_80688E4.h | 15 | ||||
| -rw-r--r-- | include/event_object_8097404.h | 34 | ||||
| -rw-r--r-- | include/event_object_movement.h | 28 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 2 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 6 | ||||
| -rw-r--r-- | include/quest_log.h | 1 | ||||
| -rw-r--r-- | include/trainer_see.h | 10 |
11 files changed, 213 insertions, 343 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index bf75a47cc..08713a602 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -88,163 +88,180 @@ #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_FACE_DOWN_FAST 0x4 +#define MOVEMENT_ACTION_FACE_UP_FAST 0x5 +#define MOVEMENT_ACTION_FACE_LEFT_FAST 0x6 +#define MOVEMENT_ACTION_FACE_RIGHT_FAST 0x7 +#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9 +#define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0xA +#define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0xB +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0xC +#define MOVEMENT_ACTION_WALK_SLOW_UP 0xD +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0xE +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0xF +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x10 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x11 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0x12 +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0x13 +#define MOVEMENT_ACTION_JUMP_2_DOWN 0x14 +#define MOVEMENT_ACTION_JUMP_2_UP 0x15 +#define MOVEMENT_ACTION_JUMP_2_LEFT 0x16 +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0x17 +#define MOVEMENT_ACTION_DELAY_1 0x18 +#define MOVEMENT_ACTION_DELAY_2 0x19 +#define MOVEMENT_ACTION_DELAY_4 0x1A +#define MOVEMENT_ACTION_DELAY_8 0x1B +#define MOVEMENT_ACTION_DELAY_16 0x1C +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_FAST_UP 0x1E +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x28 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x29 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x2A +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x2B +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_FACE_DOWN_SLOW 0x31 +#define MOVEMENT_ACTION_FACE_UP_SLOW 0x32 +#define MOVEMENT_ACTION_FACE_LEFT_SLOW 0x33 +#define MOVEMENT_ACTION_FACE_RIGHT_SLOW 0x34 +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x35 +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x36 +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x37 +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x38 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x39 +#define MOVEMENT_ACTION_SLIDE_UP 0x3A +#define MOVEMENT_ACTION_SLIDE_LEFT 0x3B +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x3C +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x3D +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x3E +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x3F +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x40 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW 0x41 +#define MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW 0x42 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW 0x43 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW 0x44 +#define MOVEMENT_ACTION_UNKNOWN_STEP_45 0x45 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x47 +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x49 +#define MOVEMENT_ACTION_FACE_PLAYER 0x4A +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x4B +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x4C +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x4D +#define MOVEMENT_ACTION_JUMP_DOWN 0x4E +#define MOVEMENT_ACTION_JUMP_UP 0x4F +#define MOVEMENT_ACTION_JUMP_LEFT 0x50 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x51 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x52 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x53 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x54 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x55 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x56 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x57 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x58 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x59 +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x5A +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x5B +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x5C +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x5D +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x5E +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x5F +#define MOVEMENT_ACTION_SET_INVISIBLE 0x60 +#define MOVEMENT_ACTION_SET_VISIBLE 0x61 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x62 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x63 +#define MOVEMENT_ACTION_EMOTE_X 0x64 +#define MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK 0x65 +#define MOVEMENT_ACTION_EMOTE_SMILE 0x66 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x67 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x68 +#define MOVEMENT_ACTION_CUT_TREE 0x69 +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x6A +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x6B +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x6C +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x6D + +// These still exist in FRLG for some reason. They're not used by anything obvious. +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x6E +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x73 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x74 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x75 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x76 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x77 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x78 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x79 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x7A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x7D +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x7E +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x7F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x80 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x81 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x82 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x85 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x86 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x87 +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x88 +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x89 +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x8A +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x8B +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x8C +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x8D +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x8E +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x8F +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x90 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x91 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x92 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x93 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x94 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x95 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x96 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x97 + +// 98-A3 are unknown +#define MOVEMENT_ACTION_0x98 0x98 +#define MOVEMENT_ACTION_0x99 0x99 +#define MOVEMENT_ACTION_0x9A 0x9A +#define MOVEMENT_ACTION_0x9B 0x9B +#define MOVEMENT_ACTION_0x9C 0x9C +#define MOVEMENT_ACTION_0x9D 0x9D +#define MOVEMENT_ACTION_0x9E 0x9E +#define MOVEMENT_ACTION_0x9F 0x9F +#define MOVEMENT_ACTION_0xA0 0xA0 +#define MOVEMENT_ACTION_0xA1 0xA1 +#define MOVEMENT_ACTION_0xA2 0xA2 +#define MOVEMENT_ACTION_0xA3 0xA3 -// These two are verified correct in FRLG #define MOVEMENT_ACTION_FLY_UP 0xA4 #define MOVEMENT_ACTION_FLY_DOWN 0xA5 +// Duplicates of JUMP_SPECIAL? +#define MOVEMENT_ACTION_0xA6 0xA6 +#define MOVEMENT_ACTION_0xA7 0xA7 +#define MOVEMENT_ACTION_0xA8 0xA8 +#define MOVEMENT_ACTION_0xA9 0xA9 + #define MOVEMENT_ACTION_STEP_END 0xFE #endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 1fd6777f0..c56c97d73 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H #define GUARD_CONSTANTS_FIELD_EFFECTS_H -#define FLDEFF_EXCLAMATION_MARK_ICON_1 0 +#define FLDEFF_EXCLAMATION_MARK_ICON 0 #define FLDEFF_USE_CUT_ON_GRASS 1 #define FLDEFF_USE_CUT_ON_TREE 2 #define FLDEFF_SHADOW 3 @@ -34,7 +34,7 @@ #define FLDEFF_NPCFLY_OUT 30 #define FLDEFF_USE_FLY 31 #define FLDEFF_FLY_IN 32 -#define FLDEFF_EXCLAMATION_MARK_ICON_2 33 +#define FLDEFF_QUESTION_MARK_ICON 33 #define FLDEFF_FEET_IN_FLOWING_WATER 34 #define FLDEFF_BIKE_TIRE_TRACKS 35 #define FLDEFF_SAND_DISGUISE 36 @@ -47,7 +47,7 @@ #define FLDEFF_USE_WATERFALL 43 #define FLDEFF_USE_DIVE 44 #define FLDEFF_POKEBALL 45 -#define FLDEFF_HEART_ICON 46 +#define FLDEFF_X_ICON 46 #define FLDEFF_NOP_47 47 #define FLDEFF_NOP_48 48 #define FLDEFF_POP_OUT_OF_ASH 49 @@ -65,11 +65,11 @@ #define FLDEFF_PCTURN_ON 61 #define FLDEFF_HALL_OF_FAME_RECORD 62 #define FLDEFF_USE_TELEPORT 63 -#define FLDEFF_UNK_40 64 // TODO: game corner smile icon? +#define FLDEFF_SMILEY_FACE_ICON 64 #define FLDEFF_UNK_41 65 // TODO: related to vs_seeker -#define FLDEFF_UNK_42 66 // TODO: related to trainer see +#define FLDEFF_DOUBLE_EXCL_MARK_ICON 66 #define FLDEFF_UNK_43 67 // TODO: related to deoxys -#define FLDEFF_UNK_44 68 // TODO: related to trainer see +#define FLDEFF_UNK_44 68 // TODO: related to ??? #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/include/constants/movement_commands.h b/include/constants/movement_commands.h deleted file mode 100644 index 8556ba951..000000000 --- a/include/constants/movement_commands.h +++ /dev/null @@ -1,121 +0,0 @@ -#ifndef GUARD_CONSTANTS_MOVEMENT_COMMANDS_H -#define GUARD_CONSTANTS_MOVEMENT_COMMANDS_H - -enum -{ - face_down, - face_up, - face_left, - face_right, - face_down_fast, - face_up_fast, - face_left_fast, - face_right_fast, - walk_slowest_down, - walk_slowest_up, - walk_slowest_left, - walk_slowest_right, - walk_slow_down, - walk_slow_up, - walk_slow_left, - walk_slow_right, - walk_down, - walk_up, - walk_left, - walk_right, - jump_2_down, - jump_2_up, - jump_2_left, - jump_2_right, - delay_1, - delay_2, - delay_4, - delay_8, - delay_16, - walk_fast_down, - walk_fast_up, - walk_fast_left, - walk_fast_right, - walk_in_place_slow_down, - walk_in_place_slow_up, - walk_in_place_slow_left, - walk_in_place_slow_right, - walk_in_place_down, - walk_in_place_up, - walk_in_place_left, - walk_in_place_right, - walk_in_place_fast_down, - walk_in_place_fast_up, - walk_in_place_fast_left, - walk_in_place_fast_right, - walk_in_place_fastest_down, - walk_in_place_fastest_up, - walk_in_place_fastest_left, - walk_in_place_fastest_right, - face_down_slow, - face_up_slow, - face_left_slow, - face_right_slow, - walk_fastest_down, - walk_fastest_up, - walk_fastest_left, - walk_fastest_right, - slide_down, - slide_up, - slide_left, - slide_right, - player_run_down, - player_run_up, - player_run_left, - player_run_right, - player_run_down_slow, - player_run_up_slow, - player_run_left_slow, - player_run_right_slow, - step_45, - jump_down_run, - jump_up_run, - jump_left_run, - jump_right_run, - face_player, - face_away_player, - lock_facing_direction, - unlock_facing_direction, - jump_down, - jump_up, - jump_left, - jump_right, - jump_in_place_down, - jump_in_place_up, - jump_in_place_left, - jump_in_place_right, - jump_in_place_down_up, - jump_in_place_up_down, - jump_in_place_left_right, - jump_in_place_right_left, - face_original_direction, - nurse_joy_bow, - enable_jump_landing_ground_effect, - disable_jump_landing_ground_effect, - disable_anim, - restore_anim, - set_invisible, - set_visible, - emote_exclamation_mark, - emote_question_mark, - emote_x, - emote_double_exclamation_mark, - emote_smile, - step_67, - rock_smash_break, - cut_tree, - - step_91 = 0x91, - step_92, - - step_96 = 0x96, - - step_end = 0xfe, -}; - -#endif //GUARD_CONSTANTS_MOVEMENT_COMMANDS_H diff --git a/include/constants/object_events.h b/include/constants/object_events.h index d6f33b33c..89dd75b5f 100644 --- a/include/constants/object_events.h +++ b/include/constants/object_events.h @@ -3,14 +3,14 @@ #define OBJECT_EVENT_GFX_RED_NORMAL 0 #define OBJECT_EVENT_GFX_RED_BIKE 1 -#define OBJECT_EVENT_GFX_RED_RUN 2 +#define OBJECT_EVENT_GFX_RED_SURF 2 #define OBJECT_EVENT_GFX_RED_ITEM 3 #define OBJECT_EVENT_GFX_RED_FISH 4 #define OBJECT_EVENT_GFX_RED_ITEM_COPY 5 #define OBJECT_EVENT_GFX_RED_VS_SEEKER 6 #define OBJECT_EVENT_GFX_GREEN_NORMAL 7 #define OBJECT_EVENT_GFX_GREEN_BIKE 8 -#define OBJECT_EVENT_GFX_GREEN_RUN 9 +#define OBJECT_EVENT_GFX_GREEN_SURF 9 #define OBJECT_EVENT_GFX_GREEN_ITEM 10 #define OBJECT_EVENT_GFX_GREEN_FISH 11 #define OBJECT_EVENT_GFX_GREEN_ITEM_COPY 12 diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h deleted file mode 100644 index 241d48c3a..000000000 --- a/include/event_object_80688E4.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef GUARD_EVENT_OBJECT_80688E4_H -#define GUARD_EVENT_OBJECT_80688E4_H - -#include "global.h" - -void FreezeObjectEvents(void); -bool8 FreezeObjectEvent(struct ObjectEvent *); -void FreezeObjectEventsExceptOne(u8 objEventId); -void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction); -void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible); -bool32 RfuUnionObjectIsInvisible(u8 objectEventId); -void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); -bool32 RfuUnionObjectIsWarping(u8 objectEventId); - -#endif // GUARD_EVENT_OBJECT_80688E4_H diff --git a/include/event_object_8097404.h b/include/event_object_8097404.h deleted file mode 100644 index 23fce9576..000000000 --- a/include/event_object_8097404.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// Created by scott on 9/7/2017. -// - -#ifndef GUARD_EVENT_OBJECT_8097404_H -#define GUARD_EVENT_OBJECT_8097404_H - -#include "global.h" - -// Exported type declarations - -// Exported RAM declarations -extern void *gUnknown_020375B8; - -// Exported ROM declarations -void sub_8097AC8(struct Sprite *); -void UnfreezeObjectEvent(struct ObjectEvent *); -void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -u8 sub_8097F78(struct ObjectEvent *); -bool8 obj_npc_ministep(struct Sprite *sprite); -bool8 sub_80976EC(struct Sprite *sprite); -void sub_80976DC(struct Sprite *, u8); -void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct ObjectEvent *); -u8 sub_809785C(struct Sprite *); -u8 sub_80978E4(struct Sprite *); -void obj_anim_image_set_and_seek(struct Sprite *, u8, u8); -bool8 sub_80979BC(struct Sprite *); -void sub_8097750(struct Sprite *); -bool8 sub_8097758(struct Sprite *); -void sub_8097FA4(struct ObjectEvent *); -void sub_8098044(u8); - -#endif // GUARD_EVENT_OBJECT_8097404_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 650f137d9..b713dbd7d 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -48,7 +48,7 @@ void SpawnObjectEventsInView(s16, s16); u8 sprite_new(u8, u8, s16, s16, u8, u8); u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8); u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup); -u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8); +int SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8); u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); void sub_8093038(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); @@ -65,7 +65,7 @@ void sub_808E82C(u8, u8, u8, s16, s16); void sub_805F400(u8, u8, u8); void sub_805F3A8(u8, u8, u8, u8); void sub_808E75C(s16, s16); -void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, u8 *, u8 *, u8 *); +void ObjectEventGetLocalIdAndMap(struct ObjectEvent * objectEvent, u8 *localId, u8 *mapNum, u8 *mapGroup); void npc_coords_shift(struct ObjectEvent *, s16, s16); void sub_808EB08(struct ObjectEvent *, s16, s16); void sub_805FE94(u8, u8, u8); @@ -76,7 +76,7 @@ u8 GetStepInPlaceDelay4AnimId(u32); u8 GetStepInPlaceDelay8AnimId(u32); u8 GetStepInPlaceDelay16AnimId(u32); u8 GetStepInPlaceDelay32AnimId(u32); -u8 npc_block_way(struct ObjectEvent *, s16, s16, u32); +u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32); void MoveCoords(u8, s16 *, s16 *); bool8 ObjectEventIsSpecialAnimActive(struct ObjectEvent *); u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); @@ -84,7 +84,7 @@ u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z); void sub_8063E28(struct ObjectEvent *, struct Sprite *); bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8); void npc_coords_shift_still(struct ObjectEvent *); -void sub_805FE7C(struct ObjectEvent *, u8); +void TryOverrideTemplateCoordsForObjectEvent(struct ObjectEvent *, u8); void SetTrainerMovementType(struct ObjectEvent *, u8); u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); @@ -93,11 +93,29 @@ u8 sub_805EB44(u8, u8, s16, s16); void npc_paltag_set_load(u8 mode); bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent); u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); -u8 sub_8063F84(u8 direction); +u8 GetWalkNormalMovementAction(u8 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); void CameraObjectSetFollowedObjectId(u8 spriteId); void UnfreezeObjectEvents(void); void TurnObjectEvent(u8, u8); +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId); +u8 GetIndexOfFirstInactiveObjectEvent(void); +u8 GetCollisionFlagsAtCoords(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction); +u8 GetFaceDirectionMovementAction(u8 direction); +u8 GetJumpInPlaceMovementAction(u8 direction); +u8 sub_8063FB0(u8 direction); +void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *); +void sub_805C774(void); + +void FreezeObjectEvents(void); +bool8 FreezeObjectEvent(struct ObjectEvent *); +void UnfreezeObjectEvent(struct ObjectEvent *); +void FreezeObjectEventsExceptOne(u8 objEventId); +void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction); +void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible); +bool32 RfuUnionObjectIsInvisible(u8 objectEventId); +void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); +bool32 RfuUnionObjectIsWarping(u8 objectEventId); // Exported data declarations diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index a69ec6155..e9553025c 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -16,7 +16,7 @@ void sub_808D074(u8); void sub_805C270(void); void sub_805C780(void); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); -u8 sub_805C808(u8); +u8 GetPlayerAvatarGraphicsIdByStateId(u8); void SetPlayerAvatarStateMask(u8 mask); void sub_805D9C4(struct Sprite *sprite); void sub_805D154(u8 direction); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index e0053fe88..c599b68ab 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -205,9 +205,9 @@ struct ObjectEvent /*0x0A*/ u8 mapGroup; /*0x0B*/ u8 mapobj_unk_0B_0:4; u8 elevation:4; - /*0x0C*/ struct Coords16 coords1; - /*0x10*/ struct Coords16 coords2; - /*0x14*/ struct Coords16 coords3; + /*0x0C*/ struct Coords16 initialCoords; + /*0x10*/ struct Coords16 currentCoords; + /*0x14*/ struct Coords16 previousCoords; /*0x18*/ u8 facingDirection:4; //current direction? /*0x18*/ u8 placeholder18:4; /*0x19*/ union ObjectEventRange range; diff --git a/include/quest_log.h b/include/quest_log.h index eddd4c02a..25d0d5871 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -49,5 +49,6 @@ void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx); void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value); void sub_8110840(void *oldSave); void sub_8112F18(u8 windowId); +bool8 sub_8111C2C(void); #endif //GUARD_QUEST_LOG_H diff --git a/include/trainer_see.h b/include/trainer_see.h index 511edf404..65d4a9efe 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,8 +3,12 @@ #include "global.h" -void sub_80B4578(struct ObjectEvent *); -u8 sub_80B47BC(void); -void sub_8155D78(struct ObjectEvent *); +bool8 CheckForTrainersWantingBattle(void); +void MovementAction_RevealTrainer_RunTrainerSeeFuncList(struct ObjectEvent *var); +u8 FldEff_ExclamationMarkIcon1(void); +u8 FldEff_DoubleExclMarkIcon(void); +u8 FldEff_XIcon(void); +u8 FldEff_SmileyFaceIcon(void); +u8 FldEff_QuestionMarkIcon(void); #endif //GUARD_TRAINER_SEE_H |