Merge pull request #174 from garakmon/object_event

Dissassemble Event Object Data

4 files changed, 435 insertions, 187 deletions

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
 
diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h
deleted file mode 100644
index 39c8871e1..000000000
--- a/include/constants/map_objects.h
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
-#define GUARD_CONSTANTS_MAP_OBJECTS_H
-
-#define MAP_OBJ_GFX_RED_NORMAL 0
-#define MAP_OBJ_GFX_RED_BIKE 1
-#define MAP_OBJ_GFX_RED_RUN 2
-#define MAP_OBJ_GFX_RED_ITEM 3
-#define MAP_OBJ_GFX_RED_FISH 4
-#define MAP_OBJ_GFX_RED_ITEM_COPY 5
-#define MAP_OBJ_GFX_RED_VS_SEEKER 6
-#define MAP_OBJ_GFX_GREEN_NORMAL 7
-#define MAP_OBJ_GFX_GREEN_BIKE 8
-#define MAP_OBJ_GFX_GREEN_RUN 9
-#define MAP_OBJ_GFX_GREEN_ITEM 10
-#define MAP_OBJ_GFX_GREEN_FISH 11
-#define MAP_OBJ_GFX_GREEN_ITEM_COPY 12
-#define MAP_OBJ_GFX_GREEN_VS_SEEKER 13
-#define MAP_OBJ_GFX_RS_BRENDAN 14
-#define MAP_OBJ_GFX_RS_MAY 15
-#define MAP_OBJ_GFX_LITTLE_BOY 16
-#define MAP_OBJ_GFX_LITTLE_GIRL 17
-#define MAP_OBJ_GFX_YOUNGSTER 18
-#define MAP_OBJ_GFX_BOY 19
-#define MAP_OBJ_GFX_BUG_CATCHER 20
-#define MAP_OBJ_GFX_SITTING_BOY 21
-#define MAP_OBJ_GFX_LASS 22
-#define MAP_OBJ_GFX_WOMAN_1 23
-#define MAP_OBJ_GFX_BATTLE_GIRL 24
-#define MAP_OBJ_GFX_MAN 25
-#define MAP_OBJ_GFX_ROCKER 26
-#define MAP_OBJ_GFX_FAT_MAN 27
-#define MAP_OBJ_GFX_WOMAN_2 28
-#define MAP_OBJ_GFX_BEAUTY 29
-#define MAP_OBJ_GFX_BALDING_MAN 30
-#define MAP_OBJ_GFX_WOMAN_3 31
-#define MAP_OBJ_GFX_OLD_MAN_1 32
-#define MAP_OBJ_GFX_OLD_MAN_2 33
-#define MAP_OBJ_GFX_VIRIDIAN_DRUNK 34
-#define MAP_OBJ_GFX_OLD_WOMAN 35
-#define MAP_OBJ_GFX_TUBER_M_1 36
-#define MAP_OBJ_GFX_TUBER_F 37
-#define MAP_OBJ_GFX_TUBER_M_2 38
-#define MAP_OBJ_GFX_CAMPER 39
-#define MAP_OBJ_GFX_PICNICKER 40
-#define MAP_OBJ_GFX_COOLTRAINER_M 41
-#define MAP_OBJ_GFX_COOLTRAINER_F 42
-#define MAP_OBJ_GFX_SWIMMER_M_WATER 43
-#define MAP_OBJ_GFX_SWIMMER_F_WATER 44
-#define MAP_OBJ_GFX_SWIMMER_M_LAND 45
-#define MAP_OBJ_GFX_SWIMMER_F_LAND 46
-#define MAP_OBJ_GFX_WORKER_M 47
-#define MAP_OBJ_GFX_WORKER_F 48
-#define MAP_OBJ_GFX_ROCKET_M 49
-#define MAP_OBJ_GFX_ROCKET_F 50
-#define MAP_OBJ_GFX_GBA_KID 51
-#define MAP_OBJ_GFX_SUPER_NERD 52
-#define MAP_OBJ_GFX_BIKER 53
-#define MAP_OBJ_GFX_BLACKBELT 54
-#define MAP_OBJ_GFX_SCIENTIST 55
-#define MAP_OBJ_GFX_HIKER 56
-#define MAP_OBJ_GFX_FISHER 57
-#define MAP_OBJ_GFX_CHANNELER 58
-#define MAP_OBJ_GFX_CHEF 59
-#define MAP_OBJ_GFX_POLICEMAN 60
-#define MAP_OBJ_GFX_GENTLEMAN 61
-#define MAP_OBJ_GFX_SAILOR 62
-#define MAP_OBJ_GFX_CAPTAIN 63
-#define MAP_OBJ_GFX_NURSE 64
-#define MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST 65
-#define MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST 66
-#define MAP_OBJ_GFX_UNUSED_MALE_RECEPTIONIST 67
-#define MAP_OBJ_GFX_CLERK 68
-#define MAP_OBJ_GFX_MG_DELIVERYMAN 69
-#define MAP_OBJ_GFX_TRAINER_TOWER_DUDE 70
-#define MAP_OBJ_GFX_PROF_OAK 71
-#define MAP_OBJ_GFX_BLUE 72
-#define MAP_OBJ_GFX_BILL 73
-#define MAP_OBJ_GFX_LANCE 74
-#define MAP_OBJ_GFX_AGATHA 75
-#define MAP_OBJ_GFX_DAISY 76
-#define MAP_OBJ_GFX_LORELEI 77
-#define MAP_OBJ_GFX_MR_FUJI 78
-#define MAP_OBJ_GFX_BRUNO 79
-#define MAP_OBJ_GFX_BROCK 80
-#define MAP_OBJ_GFX_MISTY 81
-#define MAP_OBJ_GFX_LT_SURGE 82
-#define MAP_OBJ_GFX_ERIKA 83
-#define MAP_OBJ_GFX_KOGA 84
-#define MAP_OBJ_GFX_SABRINA 85
-#define MAP_OBJ_GFX_BLAINE 86
-#define MAP_OBJ_GFX_GIOVANNI 87
-#define MAP_OBJ_GFX_MOM 88
-#define MAP_OBJ_GFX_CELIO 89
-#define MAP_OBJ_GFX_TEACHY_TV_HOST 90
-#define MAP_OBJ_GFX_GYM_GUY 91
-#define MAP_OBJ_GFX_ITEM_BALL 92
-#define MAP_OBJ_GFX_TOWN_MAP 93
-#define MAP_OBJ_GFX_POKEDEX 94
-#define MAP_OBJ_GFX_CUT_TREE 95
-#define MAP_OBJ_GFX_ROCK_SMASH_ROCK 96
-#define MAP_OBJ_GFX_STRENGTH_BOULDER 97
-#define MAP_OBJ_GFX_FOSSIL 98
-#define MAP_OBJ_GFX_RUBY 99
-#define MAP_OBJ_GFX_SAPPHIRE 100
-#define MAP_OBJ_GFX_OLD_AMBER 101
-#define MAP_OBJ_GFX_GYM_SIGN 102
-#define MAP_OBJ_GFX_SIGN 103
-#define MAP_OBJ_GFX_TRAINER_TIPS 104
-#define MAP_OBJ_GFX_CLIPBOARD 105
-#define MAP_OBJ_GFX_METEORITE 106
-#define MAP_OBJ_GFX_LAPRAS_DOLL 107
-#define MAP_OBJ_GFX_SEAGALLOP 108
-#define MAP_OBJ_GFX_SNORLAX 109
-#define MAP_OBJ_GFX_SPEAROW 110
-#define MAP_OBJ_GFX_CUBONE 111
-#define MAP_OBJ_GFX_POLIWRATH 112
-#define MAP_OBJ_GFX_CLEFAIRY 113
-#define MAP_OBJ_GFX_PIDGEOT 114
-#define MAP_OBJ_GFX_JIGGLYPUFF 115
-#define MAP_OBJ_GFX_PIDGEY 116
-#define MAP_OBJ_GFX_CHANSEY 117
-#define MAP_OBJ_GFX_OMANYTE 118
-#define MAP_OBJ_GFX_KANGASKHAN 119
-#define MAP_OBJ_GFX_PIKACHU 120
-#define MAP_OBJ_GFX_PSYDUCK 121
-#define MAP_OBJ_GFX_NIDORAN_F 122
-#define MAP_OBJ_GFX_NIDORAN_M 123
-#define MAP_OBJ_GFX_NIDORINO 124
-#define MAP_OBJ_GFX_MEOWTH 125
-#define MAP_OBJ_GFX_SEEL 126
-#define MAP_OBJ_GFX_VOLTORB 127
-#define MAP_OBJ_GFX_SLOWPOKE 128
-#define MAP_OBJ_GFX_SLOWBRO 129
-#define MAP_OBJ_GFX_MACHOP 130
-#define MAP_OBJ_GFX_WIGGLYTUFF 131
-#define MAP_OBJ_GFX_DODUO 132
-#define MAP_OBJ_GFX_FEAROW 133
-#define MAP_OBJ_GFX_MACHOKE 134
-#define MAP_OBJ_GFX_LAPRAS 135
-#define MAP_OBJ_GFX_ZAPDOS 136
-#define MAP_OBJ_GFX_MOLTRES 137
-#define MAP_OBJ_GFX_ARTICUNO 138
-#define MAP_OBJ_GFX_MEWTWO 139
-#define MAP_OBJ_GFX_MEW 140
-#define MAP_OBJ_GFX_ENTEI 141
-#define MAP_OBJ_GFX_SUICUNE 142
-#define MAP_OBJ_GFX_RAIKOU 143
-#define MAP_OBJ_GFX_LUGIA 144
-#define MAP_OBJ_GFX_HO_OH 145
-#define MAP_OBJ_GFX_CELEBI 146
-#define MAP_OBJ_GFX_KABUTO 147
-#define MAP_OBJ_GFX_DEOXYS_D 148
-#define MAP_OBJ_GFX_DEOXYS_A 149
-#define MAP_OBJ_GFX_DEOXYS_N 150
-#define MAP_OBJ_GFX_SS_ANNE 151
-
-#define MAP_OBJ_GFX_VAR_0 240
-#define MAP_OBJ_GFX_VAR_1 241
-#define MAP_OBJ_GFX_VAR_2 242
-#define MAP_OBJ_GFX_VAR_3 243
-#define MAP_OBJ_GFX_VAR_4 244
-#define MAP_OBJ_GFX_VAR_5 245
-#define MAP_OBJ_GFX_VAR_6 246
-#define MAP_OBJ_GFX_VAR_7 247
-#define MAP_OBJ_GFX_VAR_8 248
-#define MAP_OBJ_GFX_VAR_9 249
-#define MAP_OBJ_GFX_VAR_A 250
-#define MAP_OBJ_GFX_VAR_B 251
-#define MAP_OBJ_GFX_VAR_C 252
-#define MAP_OBJ_GFX_VAR_D 253
-#define MAP_OBJ_GFX_VAR_E 254
-#define MAP_OBJ_GFX_VAR_F 255
-
-#define SHADOW_SIZE_S   0
-#define SHADOW_SIZE_M   1
-#define SHADOW_SIZE_L   2
-#define SHADOW_SIZE_XL  3
-
-#define F_INANIMATE                        (1 << 6)
-#define F_DISABLE_REFLECTION_PALETTE_LOAD  (1 << 7)
-
-#define TRACKS_NONE       0
-#define TRACKS_FOOT       1
-#define TRACKS_BIKE_TIRE  2
-
-#endif  // GUARD_CONSTANTS_MAP_OBJECTS_H
diff --git a/include/constants/object_events.h b/include/constants/object_events.h
new file mode 100644
index 000000000..c1793827e
--- /dev/null
+++ b/include/constants/object_events.h
@@ -0,0 +1,186 @@
+#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
+#define GUARD_CONSTANTS_MAP_OBJECTS_H
+
+#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_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_ITEM 10
+#define OBJECT_EVENT_GFX_GREEN_FISH 11
+#define OBJECT_EVENT_GFX_GREEN_ITEM_COPY 12
+#define OBJECT_EVENT_GFX_GREEN_VS_SEEKER 13
+#define OBJECT_EVENT_GFX_RS_BRENDAN 14
+#define OBJECT_EVENT_GFX_RS_MAY 15
+#define OBJECT_EVENT_GFX_LITTLE_BOY 16
+#define OBJECT_EVENT_GFX_LITTLE_GIRL 17
+#define OBJECT_EVENT_GFX_YOUNGSTER 18
+#define OBJECT_EVENT_GFX_BOY 19
+#define OBJECT_EVENT_GFX_BUG_CATCHER 20
+#define OBJECT_EVENT_GFX_SITTING_BOY 21
+#define OBJECT_EVENT_GFX_LASS 22
+#define OBJECT_EVENT_GFX_WOMAN_1 23
+#define OBJECT_EVENT_GFX_BATTLE_GIRL 24
+#define OBJECT_EVENT_GFX_MAN 25
+#define OBJECT_EVENT_GFX_ROCKER 26
+#define OBJECT_EVENT_GFX_FAT_MAN 27
+#define OBJECT_EVENT_GFX_WOMAN_2 28
+#define OBJECT_EVENT_GFX_BEAUTY 29
+#define OBJECT_EVENT_GFX_BALDING_MAN 30
+#define OBJECT_EVENT_GFX_WOMAN_3 31
+#define OBJECT_EVENT_GFX_OLD_MAN_1 32
+#define OBJECT_EVENT_GFX_OLD_MAN_2 33
+#define OBJECT_EVENT_GFX_VIRIDIAN_DRUNK 34
+#define OBJECT_EVENT_GFX_OLD_WOMAN 35
+#define OBJECT_EVENT_GFX_TUBER_M_1 36
+#define OBJECT_EVENT_GFX_TUBER_F 37
+#define OBJECT_EVENT_GFX_TUBER_M_2 38
+#define OBJECT_EVENT_GFX_CAMPER 39
+#define OBJECT_EVENT_GFX_PICNICKER 40
+#define OBJECT_EVENT_GFX_COOLTRAINER_M 41
+#define OBJECT_EVENT_GFX_COOLTRAINER_F 42
+#define OBJECT_EVENT_GFX_SWIMMER_M_WATER 43
+#define OBJECT_EVENT_GFX_SWIMMER_F_WATER 44
+#define OBJECT_EVENT_GFX_SWIMMER_M_LAND 45
+#define OBJECT_EVENT_GFX_SWIMMER_F_LAND 46
+#define OBJECT_EVENT_GFX_WORKER_M 47
+#define OBJECT_EVENT_GFX_WORKER_F 48
+#define OBJECT_EVENT_GFX_ROCKET_M 49
+#define OBJECT_EVENT_GFX_ROCKET_F 50
+#define OBJECT_EVENT_GFX_GBA_KID 51
+#define OBJECT_EVENT_GFX_SUPER_NERD 52
+#define OBJECT_EVENT_GFX_BIKER 53
+#define OBJECT_EVENT_GFX_BLACKBELT 54
+#define OBJECT_EVENT_GFX_SCIENTIST 55
+#define OBJECT_EVENT_GFX_HIKER 56
+#define OBJECT_EVENT_GFX_FISHER 57
+#define OBJECT_EVENT_GFX_CHANNELER 58
+#define OBJECT_EVENT_GFX_CHEF 59
+#define OBJECT_EVENT_GFX_POLICEMAN 60
+#define OBJECT_EVENT_GFX_GENTLEMAN 61
+#define OBJECT_EVENT_GFX_SAILOR 62
+#define OBJECT_EVENT_GFX_CAPTAIN 63
+#define OBJECT_EVENT_GFX_NURSE 64
+#define OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST 65
+#define OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST 66
+#define OBJECT_EVENT_GFX_UNUSED_MALE_RECEPTIONIST 67
+#define OBJECT_EVENT_GFX_CLERK 68
+#define OBJECT_EVENT_GFX_MG_DELIVERYMAN 69
+#define OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE 70
+#define OBJECT_EVENT_GFX_PROF_OAK 71
+#define OBJECT_EVENT_GFX_BLUE 72
+#define OBJECT_EVENT_GFX_BILL 73
+#define OBJECT_EVENT_GFX_LANCE 74
+#define OBJECT_EVENT_GFX_AGATHA 75
+#define OBJECT_EVENT_GFX_DAISY 76
+#define OBJECT_EVENT_GFX_LORELEI 77
+#define OBJECT_EVENT_GFX_MR_FUJI 78
+#define OBJECT_EVENT_GFX_BRUNO 79
+#define OBJECT_EVENT_GFX_BROCK 80
+#define OBJECT_EVENT_GFX_MISTY 81
+#define OBJECT_EVENT_GFX_LT_SURGE 82
+#define OBJECT_EVENT_GFX_ERIKA 83
+#define OBJECT_EVENT_GFX_KOGA 84
+#define OBJECT_EVENT_GFX_SABRINA 85
+#define OBJECT_EVENT_GFX_BLAINE 86
+#define OBJECT_EVENT_GFX_GIOVANNI 87
+#define OBJECT_EVENT_GFX_MOM 88
+#define OBJECT_EVENT_GFX_CELIO 89
+#define OBJECT_EVENT_GFX_TEACHY_TV_HOST 90
+#define OBJECT_EVENT_GFX_GYM_GUY 91
+#define OBJECT_EVENT_GFX_ITEM_BALL 92
+#define OBJECT_EVENT_GFX_TOWN_MAP 93
+#define OBJECT_EVENT_GFX_POKEDEX 94
+#define OBJECT_EVENT_GFX_CUT_TREE 95
+#define OBJECT_EVENT_GFX_ROCK_SMASH_ROCK 96
+#define OBJECT_EVENT_GFX_STRENGTH_BOULDER 97
+#define OBJECT_EVENT_GFX_FOSSIL 98
+#define OBJECT_EVENT_GFX_RUBY 99
+#define OBJECT_EVENT_GFX_SAPPHIRE 100
+#define OBJECT_EVENT_GFX_OLD_AMBER 101
+#define OBJECT_EVENT_GFX_GYM_SIGN 102
+#define OBJECT_EVENT_GFX_SIGN 103
+#define OBJECT_EVENT_GFX_TRAINER_TIPS 104
+#define OBJECT_EVENT_GFX_CLIPBOARD 105
+#define OBJECT_EVENT_GFX_METEORITE 106
+#define OBJECT_EVENT_GFX_LAPRAS_DOLL 107
+#define OBJECT_EVENT_GFX_SEAGALLOP 108
+#define OBJECT_EVENT_GFX_SNORLAX 109
+#define OBJECT_EVENT_GFX_SPEAROW 110
+#define OBJECT_EVENT_GFX_CUBONE 111
+#define OBJECT_EVENT_GFX_POLIWRATH 112
+#define OBJECT_EVENT_GFX_CLEFAIRY 113
+#define OBJECT_EVENT_GFX_PIDGEOT 114
+#define OBJECT_EVENT_GFX_JIGGLYPUFF 115
+#define OBJECT_EVENT_GFX_PIDGEY 116
+#define OBJECT_EVENT_GFX_CHANSEY 117
+#define OBJECT_EVENT_GFX_OMANYTE 118
+#define OBJECT_EVENT_GFX_KANGASKHAN 119
+#define OBJECT_EVENT_GFX_PIKACHU 120
+#define OBJECT_EVENT_GFX_PSYDUCK 121
+#define OBJECT_EVENT_GFX_NIDORAN_F 122
+#define OBJECT_EVENT_GFX_NIDORAN_M 123
+#define OBJECT_EVENT_GFX_NIDORINO 124
+#define OBJECT_EVENT_GFX_MEOWTH 125
+#define OBJECT_EVENT_GFX_SEEL 126
+#define OBJECT_EVENT_GFX_VOLTORB 127
+#define OBJECT_EVENT_GFX_SLOWPOKE 128
+#define OBJECT_EVENT_GFX_SLOWBRO 129
+#define OBJECT_EVENT_GFX_MACHOP 130
+#define OBJECT_EVENT_GFX_WIGGLYTUFF 131
+#define OBJECT_EVENT_GFX_DODUO 132
+#define OBJECT_EVENT_GFX_FEAROW 133
+#define OBJECT_EVENT_GFX_MACHOKE 134
+#define OBJECT_EVENT_GFX_LAPRAS 135
+#define OBJECT_EVENT_GFX_ZAPDOS 136
+#define OBJECT_EVENT_GFX_MOLTRES 137
+#define OBJECT_EVENT_GFX_ARTICUNO 138
+#define OBJECT_EVENT_GFX_MEWTWO 139
+#define OBJECT_EVENT_GFX_MEW 140
+#define OBJECT_EVENT_GFX_ENTEI 141
+#define OBJECT_EVENT_GFX_SUICUNE 142
+#define OBJECT_EVENT_GFX_RAIKOU 143
+#define OBJECT_EVENT_GFX_LUGIA 144
+#define OBJECT_EVENT_GFX_HO_OH 145
+#define OBJECT_EVENT_GFX_CELEBI 146
+#define OBJECT_EVENT_GFX_KABUTO 147
+#define OBJECT_EVENT_GFX_DEOXYS_D 148
+#define OBJECT_EVENT_GFX_DEOXYS_A 149
+#define OBJECT_EVENT_GFX_DEOXYS_N 150
+#define OBJECT_EVENT_GFX_SS_ANNE 151
+
+#define OBJECT_EVENT_GFX_VAR_0 240
+#define OBJECT_EVENT_GFX_VAR_1 241
+#define OBJECT_EVENT_GFX_VAR_2 242
+#define OBJECT_EVENT_GFX_VAR_3 243
+#define OBJECT_EVENT_GFX_VAR_4 244
+#define OBJECT_EVENT_GFX_VAR_5 245
+#define OBJECT_EVENT_GFX_VAR_6 246
+#define OBJECT_EVENT_GFX_VAR_7 247
+#define OBJECT_EVENT_GFX_VAR_8 248
+#define OBJECT_EVENT_GFX_VAR_9 249
+#define OBJECT_EVENT_GFX_VAR_A 250
+#define OBJECT_EVENT_GFX_VAR_B 251
+#define OBJECT_EVENT_GFX_VAR_C 252
+#define OBJECT_EVENT_GFX_VAR_D 253
+#define OBJECT_EVENT_GFX_VAR_E 254
+#define OBJECT_EVENT_GFX_VAR_F 255
+
+#define SHADOW_SIZE_S   0
+#define SHADOW_SIZE_M   1
+#define SHADOW_SIZE_L   2
+#define SHADOW_SIZE_XL  3
+
+#define F_INANIMATE                        (1 << 6)
+#define F_DISABLE_REFLECTION_PALETTE_LOAD  (1 << 7)
+
+#define TRACKS_NONE       0
+#define TRACKS_FOOT       1
+#define TRACKS_BIKE_TIRE  2
+
+#endif  // GUARD_CONSTANTS_MAP_OBJECTS_H