Prelim names for mvmt actions; merge field_ground_effect into evobjmv

4 files changed, 139 insertions, 142 deletions

diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h
index 40e391f91..875655983 100644
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -88,65 +88,65 @@
 #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
 // Something else here maybe? idk
+#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_RIDE_WATER_CURRENT_DOWN         0x31
+#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP           0x32
+#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT         0x33
+#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT        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_START_ANIM_IN_DIRECTION         0x41
+#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
@@ -173,8 +173,9 @@
 #define MOVEMENT_ACTION_SET_VISIBLE                     0x61
 #define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK          0x62
 #define MOVEMENT_ACTION_EMOTE_QUESTION_MARK             0x63
-#define MOVEMENT_ACTION_EMOTE_HEART                     0x64
-// more stuff here? idk
+#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
@@ -182,72 +183,74 @@
 #define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY            0x6B
 #define MOVEMENT_ACTION_INIT_AFFINE_ANIM                0x6C
 #define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM               0x6D
-#define MOVEMENT_ACTION_HIDE_REFLECTION                 0x6E
-#define MOVEMENT_ACTION_SHOW_REFLECTION                 0x6F
-#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE          0x70
-#define MOVEMENT_ACTION_WALK_DOWN_AFFINE                0x71
-// Acro Bike related movement actions might not be in FRLG at all
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN          0x72
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP            0x73
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT          0x74
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT         0x75
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN           0x76
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP             0x77
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT           0x78
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT          0x79
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN      0x7A
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP        0x7B
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT      0x7C
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT     0x7D
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN      0x7E
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP        0x7F
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT      0x80
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT     0x81
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN           0x82
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP             0x83
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT           0x84
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT          0x85
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN          0x86
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP            0x87
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT          0x88
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT         0x89
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN      0x8A
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP        0x8B
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT      0x8C
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT     0x8D
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN      0x8E
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP        0x8F
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT      0x90
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT     0x91
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN          0x92
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP            0x93
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT          0x94
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT         0x95
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN      0x96
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP        0x97
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT      0x98
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT     0x99
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT    0x9A
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT   0x9B
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT  0x9C
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x9D
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT      0x9E
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT     0x9F
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT    0xA0
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT   0xA1
-#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM             0xA2
-#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM            0xA3
-#define MOVEMENT_ACTION_WALK_LEFT_AFFINE                0xA4
-#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE               0xA5
-#define MOVEMENT_ACTION_LEVITATE                        0xA6
-#define MOVEMENT_ACTION_STOP_LEVITATE                   0xA7
-#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP    0xA8
-#define MOVEMENT_ACTION_FIGURE_8                        0xA9
 
-// These two are verified correct in FRLG
+// 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
+
 #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 f0086c0c8..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
@@ -65,11 +65,11 @@
 #define FLDEFF_PCTURN_ON                 61
 #define FLDEFF_HALL_OF_FAME_RECORD       62
 #define FLDEFF_USE_TELEPORT              63
-#define FLDEFF_SMILEY_FACE_ICON                    64 // TODO: game corner smile icon?
+#define FLDEFF_SMILEY_FACE_ICON          64
 #define FLDEFF_UNK_41                    65 // TODO: related to vs_seeker
-#define FLDEFF_DOUBLE_EXCL_MARK_ICON                    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/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_movement.h b/include/event_object_movement.h
index 29f7ff3d7..9de104e49 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -107,6 +107,15 @@ u8 sub_8063FB0(u8 direction);
 void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *);
 void sub_805C774(void);
 
+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);
+
 // Exported data declarations
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];