8 files changed, 17 insertions, 8 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h
index 6a4405b65..bf75a47cc 100644
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
 #define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
 
+// FIXME: Different in FRLG
 #define MOVEMENT_TYPE_NONE                             0x0
 #define MOVEMENT_TYPE_LOOK_AROUND                      0x1
 #define MOVEMENT_TYPE_WANDER_AROUND                    0x2
@@ -239,8 +240,10 @@
 #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
+
+// These two are verified correct in FRLG
+#define MOVEMENT_ACTION_FLY_UP                          0xA4
+#define MOVEMENT_ACTION_FLY_DOWN                        0xA5
 
 #define MOVEMENT_ACTION_STEP_END 0xFE
 
diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h
index cee8ff707..611a57e00 100644
--- a/include/event_object_80688E4.h
+++ b/include/event_object_80688E4.h
@@ -6,5 +6,9 @@
 void FreezeObjectEvents(void);
 void FreezeObjectEvent(struct ObjectEvent *);
 void FreezeObjectEventsExceptOne(u8 objEventId);
+void sub_8069124(u8 a0, bool8 a1);
+u32 sub_806916C(u8 a0);
+void sub_80691A4(u8 a0, u8 a1);
+void sub_8069094(u8 a0, u8 a1);
 
 #endif // GUARD_EVENT_OBJECT_80688E4_H
diff --git a/include/event_object_8097404.h b/include/event_object_8097404.h
index 77781943e..23fce9576 100644
--- a/include/event_object_8097404.h
+++ b/include/event_object_8097404.h
@@ -14,7 +14,7 @@ extern void *gUnknown_020375B8;
 
 // Exported ROM declarations
 void sub_8097AC8(struct Sprite *);
-void npc_sync_anim_pause_bits(struct ObjectEvent *);
+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);
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index b81a61664..1b4c9e365 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -47,7 +47,7 @@ void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *);
 void SpawnObjectEventsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
 u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8);
-u8 show_sprite(u8, u8, u8);
+u8 TrySpawnObjectEvent(u8, u8, u8);
 u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
 void sub_8093038(s16, s16, s16 *, s16 *);
@@ -82,7 +82,7 @@ bool8 ObjectEventIsSpecialAnimActive(struct ObjectEvent *);
 u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *);
 u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
 void sub_8063E28(struct ObjectEvent *, struct Sprite *);
-void ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
+bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
 void npc_coords_shift_still(struct ObjectEvent *);
 void sub_805FE7C(struct ObjectEvent *, u8);
 void SetTrainerMovementType(struct ObjectEvent *, u8);
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index ec1a077be..a69ec6155 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -35,5 +35,6 @@ bool32 sub_805DAD0(void);
 bool32 sub_805DC24(void);
 bool8 PartyHasMonWithSurf(void);
 bool8 IsPlayerSurfingNorth(void);
+void player_get_pos_including_state_based_drift(s16 *x, s16 *y);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 1560a0841..91a45d8c5 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -31,5 +31,6 @@ void sub_8059948(u8 a0, u8 a1);
 void save_serialize_map(void);
 u32 sub_8058F1C(u32 original, u8 bit);
 u32 sub_8058F48(s16 x, s16 y, u8 z);
+void sub_8059024(s32 x, s32 y, bool32 arg2);
 
 #endif //GUARD_FIELDMAP_H
diff --git a/include/rfu_union_tool.h b/include/rfu_union_tool.h
index 4672d8c61..e7895d25f 100644
--- a/include/rfu_union_tool.h
+++ b/include/rfu_union_tool.h
@@ -11,7 +11,7 @@ void sub_811BECC(struct UnkStruct_URoom *arg0);
 void sub_811BEDC(struct UnkStruct_URoom *arg0);
 bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3);
 void sub_811C028(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2);
-u8 sub_811B754(struct UnkStruct_8019BA8 * ptr);
+u8 sub_811B754(struct UnionObj * ptr);
 void sub_811BA78(void);
 
 #endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H
diff --git a/include/union_room.h b/include/union_room.h
index 00ed90a14..4730dfb18 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -85,7 +85,7 @@ struct UnkStruct_Group
     u8 field_15;
 };
 
-struct UnkStruct_8019BA8
+struct UnionObj
 {
     u8 field_0;
     u8 field_1;
@@ -121,7 +121,7 @@ struct UnkStruct_URoom
     /* 0x058 */ u8 field_58[4][11];
     /* 0x084 */ u16 field_98;
     /* 0x086 */ u16 field_9A[3];
-    /* 0x08C */ struct UnkStruct_8019BA8 field_A0[8];
+    /* 0x08C */ struct UnionObj field_A0[8];
     /* 0x0AC */ u8 field_C0[12][15];
     /* 0x160 */ u8 field_174[48];
     /* 0x190 */ u8 field_1A4[200];