through sub_811BDA8

18 files changed, 485 insertions, 1179 deletions

diff --git a/asm/event_object_80688E4.s b/asm/event_object_80688E4.s
index 1482529fe..93309a80d 100644
--- a/asm/event_object_80688E4.s
+++ b/asm/event_object_80688E4.s
@@ -154,8 +154,8 @@ _080689EC: .4byte gObjectEvents
 _080689F0: .4byte gPlayerAvatar
 	thumb_func_end FreezeObjectEventsExceptOne
 
-	thumb_func_start npc_sync_anim_pause_bits
-npc_sync_anim_pause_bits: @ 80689F4
+	thumb_func_start UnfreezeObjectEvent
+UnfreezeObjectEvent: @ 80689F4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r2, [r5]
@@ -207,7 +207,7 @@ _08068A4C:
 	.align 2, 0
 _08068A54: .4byte 0x00000101
 _08068A58: .4byte gSprites
-	thumb_func_end npc_sync_anim_pause_bits
+	thumb_func_end UnfreezeObjectEvent
 
 	thumb_func_start UnfreezeObjectEvents
 UnfreezeObjectEvents: @ 8068A5C
@@ -224,7 +224,7 @@ _08068A62:
 	cmp r0, 0
 	beq _08068A78
 	adds r0, r1, 0
-	bl npc_sync_anim_pause_bits
+	bl UnfreezeObjectEvent
 _08068A78:
 	adds r0, r4, 0x1
 	lsls r0, 24
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index 66207007c..30af8949b 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -1427,8 +1427,8 @@ SpawnSpecialObjectEventParameterized: @ 805E830
 _0805E894: .4byte 0xfff90000
 	thumb_func_end SpawnSpecialObjectEventParameterized
 
-	thumb_func_start show_sprite
-show_sprite: @ 805E898
+	thumb_func_start TrySpawnObjectEvent
+TrySpawnObjectEvent: @ 805E898
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -1468,7 +1468,7 @@ _0805E8E0:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end show_sprite
+	thumb_func_end TrySpawnObjectEvent
 
 	thumb_func_start sub_805E8E8
 sub_805E8E8: @ 805E8E8
@@ -13157,7 +13157,7 @@ _08063CC8:
 	bl ObjectEventClearAnimIfSpecialAnimActive
 _08063CCE:
 	adds r0, r4, 0
-	bl npc_sync_anim_pause_bits
+	bl UnfreezeObjectEvent
 	movs r3, 0
 	strb r5, [r4, 0x1C]
 	ldrb r0, [r4]
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index e4b28d6c6..a605f1439 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -2445,8 +2445,8 @@ _0805C560: .4byte gObjectEvents
 _0805C564: .4byte gPlayerAvatar
 	thumb_func_end PlayerGetDestCoords
 
-	thumb_func_start plaer_get_pos_including_state_based_drift
-plaer_get_pos_including_state_based_drift: @ 805C568
+	thumb_func_start player_get_pos_including_state_based_drift
+player_get_pos_including_state_based_drift: @ 805C568
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -2580,7 +2580,7 @@ _0805C6BC:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end plaer_get_pos_including_state_based_drift
+	thumb_func_end player_get_pos_including_state_based_drift
 
 	thumb_func_start GetPlayerFacingDirection
 GetPlayerFacingDirection: @ 805C6C4
diff --git a/asm/rfu_union_tool.s b/asm/rfu_union_tool.s
index 65bdef3f9..12e5200bc 100644
--- a/asm/rfu_union_tool.s
+++ b/asm/rfu_union_tool.s
@@ -5,1130 +5,6 @@
 
 	.text
 
-	thumb_func_start IsUnionRoomPlayerHidden
-IsUnionRoomPlayerHidden: @ 811B5DC
-	push {lr}
-	adds r0, 0x63
-	lsls r0, 16
-	lsrs r0, 16
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end IsUnionRoomPlayerHidden
-
-	thumb_func_start sub_811B5F0
-sub_811B5F0: @ 811B5F0
-	push {lr}
-	adds r0, 0x63
-	lsls r0, 16
-	lsrs r0, 16
-	bl FlagSet
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811B5F0
-
-	thumb_func_start sub_811B600
-sub_811B600: @ 811B600
-	push {lr}
-	adds r0, 0x63
-	lsls r0, 16
-	lsrs r0, 16
-	bl FlagClear
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811B600
-
-	thumb_func_start sub_811B610
-sub_811B610: @ 811B610
-	push {lr}
-	ldr r2, _0811B628 @ =0x00004010
-	adds r0, r2
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	bl VarSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811B628: .4byte 0x00004010
-	thumb_func_end sub_811B610
-
-	thumb_func_start sub_811B62C
-sub_811B62C: @ 811B62C
-	push {lr}
-	ldr r1, _0811B644 @ =gUnknown_8457120
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, _0811B648 @ =gSaveBlock1Ptr
-	ldr r2, [r1]
-	ldrb r1, [r2, 0x5]
-	ldrb r2, [r2, 0x4]
-	bl show_sprite
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811B644: .4byte gUnknown_8457120
-_0811B648: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_811B62C
-
-	thumb_func_start sub_811B64C
-sub_811B64C: @ 811B64C
-	push {lr}
-	ldr r1, _0811B664 @ =gUnknown_8457120
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, _0811B668 @ =gSaveBlock1Ptr
-	ldr r2, [r1]
-	ldrb r1, [r2, 0x5]
-	ldrb r2, [r2, 0x4]
-	bl RemoveObjectEventByLocalIdAndMap
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811B664: .4byte gUnknown_8457120
-_0811B668: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_811B64C
-
-	thumb_func_start sub_811B66C
-sub_811B66C: @ 811B66C
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r5, r1, 0
-	ldr r1, _0811B6B8 @ =gUnknown_8457120
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, _0811B6BC @ =gSaveBlock1Ptr
-	ldr r2, [r1]
-	ldrb r1, [r2, 0x5]
-	ldrb r2, [r2, 0x4]
-	mov r3, sp
-	bl TryGetObjectEventIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	bne _0811B6D0
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0811B6C0 @ =gObjectEvents
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl ObjectEventIsMovementOverridden
-	lsls r0, 24
-	cmp r0, 0
-	bne _0811B6D0
-	ldrb r1, [r5]
-	adds r0, r4, 0
-	bl ObjectEventSetHeldMovement
-	lsls r0, 24
-	cmp r0, 0
-	bne _0811B6C4
-	movs r0, 0x1
-	b _0811B6D2
-	.align 2, 0
-_0811B6B8: .4byte gUnknown_8457120
-_0811B6BC: .4byte gSaveBlock1Ptr
-_0811B6C0: .4byte gObjectEvents
-_0811B6C4:
-	ldr r0, _0811B6DC @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
-	ldr r1, _0811B6E0 @ =0x00000183
-	ldr r2, _0811B6E4 @ =gUnknown_8457174	"0"
-	movs r3, 0x1
-	bl AGBAssert
-_0811B6D0:
-	movs r0, 0
-_0811B6D2:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0811B6DC: .4byte gUnknown_8457138
-_0811B6E0: .4byte 0x00000183
-_0811B6E4: .4byte gUnknown_8457174
-	thumb_func_end sub_811B66C
-
-	thumb_func_start sub_811B6E8
-sub_811B6E8: @ 811B6E8
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r1, _0811B724 @ =gUnknown_8457120
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, _0811B728 @ =gSaveBlock1Ptr
-	ldr r2, [r1]
-	ldrb r1, [r2, 0x5]
-	ldrb r2, [r2, 0x4]
-	mov r3, sp
-	bl TryGetObjectEventIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	bne _0811B748
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0811B72C @ =gObjectEvents
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl ObjectEventClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	bne _0811B730
-	movs r0, 0
-	b _0811B74A
-	.align 2, 0
-_0811B724: .4byte gUnknown_8457120
-_0811B728: .4byte gSaveBlock1Ptr
-_0811B72C: .4byte gObjectEvents
-_0811B730:
-	bl ScriptContext2_IsEnabled
-	lsls r0, 24
-	cmp r0, 0
-	bne _0811B742
-	adds r0, r4, 0
-	bl npc_sync_anim_pause_bits
-	b _0811B748
-_0811B742:
-	adds r0, r4, 0
-	bl FreezeObjectEvent
-_0811B748:
-	movs r0, 0x1
-_0811B74A:
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811B6E8
-
-	thumb_func_start sub_811B754
-sub_811B754: @ 811B754
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _0811B798 @ =gUnknown_203B088
-	movs r1, 0
-	str r1, [r0]
-	ldr r0, _0811B79C @ =UnionObjWork
-	str r4, [r0]
-	cmp r4, 0
-	bne _0811B774
-	ldr r0, _0811B7A0 @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
-	movs r1, 0xDD
-	lsls r1, 1
-	ldr r2, _0811B7A4 @ =gUnknown_8457178	"UnionObjWork != NULL"
-	movs r3, 0x1
-	bl AGBAssert
-_0811B774:
-	movs r1, 0
-	adds r0, r4, 0
-	movs r2, 0x7
-_0811B77A:
-	strb r1, [r0]
-	strb r1, [r0, 0x1]
-	strb r1, [r0, 0x2]
-	strb r1, [r0, 0x3]
-	adds r0, 0x4
-	subs r2, 0x1
-	cmp r2, 0
-	bge _0811B77A
-	bl sub_811BA18
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0811B798: .4byte gUnknown_203B088
-_0811B79C: .4byte UnionObjWork
-_0811B7A0: .4byte gUnknown_8457138
-_0811B7A4: .4byte gUnknown_8457178
-	thumb_func_end sub_811B754
-
-	thumb_func_start sub_811B7A8
-sub_811B7A8: @ 811B7A8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	movs r0, 0
-	ldrsb r0, [r5, r0]
-	cmp r0, 0
-	beq _0811B7BC
-	cmp r0, 0x1
-	beq _0811B7DC
-	b _0811B7FA
-_0811B7BC:
-	ldr r1, _0811B7D8 @ =gUnknown_845718D
-	adds r0, r4, 0
-	bl sub_811B66C
-	cmp r0, 0x1
-	bne _0811B7FA
-	adds r0, r4, 0
-	bl sub_811B5F0
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	b _0811B7FA
-	.align 2, 0
-_0811B7D8: .4byte gUnknown_845718D
-_0811B7DC:
-	adds r0, r4, 0
-	bl sub_811B6E8
-	cmp r0, 0
-	beq _0811B7FA
-	adds r0, r4, 0
-	bl sub_811B64C
-	adds r0, r4, 0
-	bl sub_811B5F0
-	movs r0, 0
-	strb r0, [r5]
-	movs r0, 0x1
-	b _0811B7FC
-_0811B7FA:
-	movs r0, 0
-_0811B7FC:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811B7A8
-
-	thumb_func_start sub_811B804
-sub_811B804: @ 811B804
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r6, r0, 0
-	adds r5, r1, 0
-	adds r7, r2, 0
-	movs r0, 0
-	ldrsb r0, [r6, r0]
-	cmp r0, 0x2
-	beq _0811B8A0
-	cmp r0, 0x2
-	bgt _0811B820
-	cmp r0, 0
-	beq _0811B826
-	b _0811B8B2
-_0811B820:
-	cmp r0, 0x3
-	beq _0811B888
-	b _0811B8B2
-_0811B826:
-	bl is_walking_or_running
-	cmp r0, 0
-	beq _0811B8B2
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r2, [r0, r1]
-	movs r0, 0
-	ldrsh r3, [r4, r0]
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_811B58C
-	cmp r0, 0x1
-	beq _0811B8B2
-	mov r0, sp
-	adds r1, r4, 0
-	bl plaer_get_pos_including_state_based_drift
-	mov r0, sp
-	movs r1, 0
-	ldrsh r2, [r0, r1]
-	movs r0, 0
-	ldrsh r3, [r4, r0]
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_811B58C
-	cmp r0, 0x1
-	beq _0811B8B2
-	ldrb r1, [r7, 0x1]
-	adds r0, r5, 0
-	bl sub_811B610
-	adds r0, r5, 0
-	bl sub_811B62C
-	adds r0, r5, 0
-	bl sub_811B600
-	ldrb r0, [r6]
-	adds r0, 0x1
-	strb r0, [r6]
-_0811B888:
-	ldr r1, _0811B89C @ =gUnknown_845718F
-	adds r0, r5, 0
-	bl sub_811B66C
-	cmp r0, 0x1
-	bne _0811B8B2
-	ldrb r0, [r6]
-	adds r0, 0x1
-	strb r0, [r6]
-	b _0811B8B2
-	.align 2, 0
-_0811B89C: .4byte gUnknown_845718F
-_0811B8A0:
-	adds r0, r5, 0
-	bl sub_811B6E8
-	cmp r0, 0
-	beq _0811B8B2
-	movs r0, 0
-	strb r0, [r6]
-	movs r0, 0x1
-	b _0811B8B4
-_0811B8B2:
-	movs r0, 0
-_0811B8B4:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811B804
-
-	thumb_func_start sub_811B8BC
-sub_811B8BC: @ 811B8BC
-	push {r4-r6,lr}
-	adds r5, r1, 0
-	adds r6, r2, 0
-	ldr r1, _0811B8F4 @ =UnionObjWork
-	lsls r0, 2
-	ldr r1, [r1]
-	adds r4, r1, r0
-	cmp r1, 0
-	bne _0811B8DA
-	ldr r0, _0811B8F8 @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
-	ldr r1, _0811B8FC @ =0x00000231
-	ldr r2, _0811B900 @ =gUnknown_8457178	"UnionObjWork != NULL"
-	movs r3, 0x1
-	bl AGBAssert
-_0811B8DA:
-	movs r0, 0x1
-	strb r0, [r4, 0x3]
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl sub_811B524
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0811B904
-	movs r0, 0
-	b _0811B906
-	.align 2, 0
-_0811B8F4: .4byte UnionObjWork
-_0811B8F8: .4byte gUnknown_8457138
-_0811B8FC: .4byte 0x00000231
-_0811B900: .4byte gUnknown_8457178
-_0811B904:
-	movs r0, 0x1
-_0811B906:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811B8BC
-
-	thumb_func_start sub_811B90C
-sub_811B90C: @ 811B90C
-	push {r4,lr}
-	ldr r1, _0811B934 @ =UnionObjWork
-	lsls r0, 2
-	ldr r1, [r1]
-	adds r4, r1, r0
-	cmp r1, 0
-	bne _0811B926
-	ldr r0, _0811B938 @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
-	ldr r1, _0811B93C @ =0x00000241
-	ldr r2, _0811B940 @ =gUnknown_8457178	"UnionObjWork != NULL"
-	movs r3, 0x1
-	bl AGBAssert
-_0811B926:
-	movs r0, 0x2
-	strb r0, [r4, 0x3]
-	ldrb r0, [r4]
-	cmp r0, 0x1
-	beq _0811B944
-	movs r0, 0
-	b _0811B946
-	.align 2, 0
-_0811B934: .4byte UnionObjWork
-_0811B938: .4byte gUnknown_8457138
-_0811B93C: .4byte 0x00000241
-_0811B940: .4byte gUnknown_8457178
-_0811B944:
-	movs r0, 0x1
-_0811B946:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811B90C
-
-	thumb_func_start sub_811B94C
-sub_811B94C: @ 811B94C
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldrb r1, [r4]
-	cmp r1, 0x1
-	beq _0811B9AE
-	cmp r1, 0x1
-	bgt _0811B962
-	cmp r1, 0
-	beq _0811B96C
-	b _0811B9CE
-_0811B962:
-	cmp r1, 0x2
-	beq _0811B978
-	cmp r1, 0x3
-	beq _0811B9BC
-	b _0811B9CE
-_0811B96C:
-	ldrb r0, [r4, 0x3]
-	cmp r0, 0x1
-	bne _0811B9CE
-	movs r0, 0x2
-	strb r0, [r4]
-	strb r1, [r4, 0x2]
-_0811B978:
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_811BBC8
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0811B99E
-	ldrb r0, [r4, 0x3]
-	cmp r0, 0x2
-	bne _0811B99E
-	strb r1, [r4]
-	strb r1, [r4, 0x2]
-	adds r0, r5, 0
-	bl sub_811B64C
-	adds r0, r5, 0
-	bl sub_811B5F0
-	b _0811B9CE
-_0811B99E:
-	adds r0, r4, 0x2
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl sub_811B804
-	cmp r0, 0x1
-	bne _0811B9CE
-	b _0811B9CC
-_0811B9AE:
-	ldrb r0, [r4, 0x3]
-	cmp r0, 0x2
-	bne _0811B9CE
-	movs r1, 0
-	movs r0, 0x3
-	strb r0, [r4]
-	strb r1, [r4, 0x2]
-_0811B9BC:
-	adds r0, r4, 0x2
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl sub_811B7A8
-	cmp r0, 0x1
-	bne _0811B9CE
-	movs r0, 0
-_0811B9CC:
-	strb r0, [r4]
-_0811B9CE:
-	movs r0, 0
-	strb r0, [r4, 0x3]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811B94C
-
-	thumb_func_start sub_811B9D8
-sub_811B9D8: @ 811B9D8
-	push {r4,r5,lr}
-	ldr r5, _0811BA08 @ =UnionObjWork
-	ldr r0, [r5]
-	cmp r0, 0
-	bne _0811B9EE
-	ldr r0, _0811BA0C @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
-	ldr r1, _0811BA10 @ =0x00000283
-	ldr r2, _0811BA14 @ =gUnknown_8457178	"UnionObjWork != NULL"
-	movs r3, 0x1
-	bl AGBAssert
-_0811B9EE:
-	movs r4, 0
-_0811B9F0:
-	lsls r0, r4, 2
-	ldr r1, [r5]
-	adds r1, r0
-	adds r0, r4, 0
-	bl sub_811B94C
-	adds r4, 0x1
-	cmp r4, 0x7
-	ble _0811B9F0
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811BA08: .4byte UnionObjWork
-_0811BA0C: .4byte gUnknown_8457138
-_0811BA10: .4byte 0x00000283
-_0811BA14: .4byte gUnknown_8457178
-	thumb_func_end sub_811B9D8
-
-	thumb_func_start sub_811BA18
-sub_811BA18: @ 811BA18
-	push {r4,lr}
-	ldr r4, _0811BA38 @ =sub_811B9D8
-	adds r0, r4, 0
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0811BA3C
-	adds r0, r4, 0
-	movs r1, 0x5
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	b _0811BA4A
-	.align 2, 0
-_0811BA38: .4byte sub_811B9D8
-_0811BA3C:
-	ldr r0, _0811BA50 @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
-	ldr r1, _0811BA54 @ =0x0000028f
-	ldr r2, _0811BA58 @ =gUnknown_8457174	"0"
-	movs r3, 0x1
-	bl AGBAssert
-	movs r0, 0x10
-_0811BA4A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0811BA50: .4byte gUnknown_8457138
-_0811BA54: .4byte 0x0000028f
-_0811BA58: .4byte gUnknown_8457174
-	thumb_func_end sub_811BA18
-
-	thumb_func_start sub_811BA5C
-sub_811BA5C: @ 811BA5C
-	push {lr}
-	ldr r0, _0811BA74 @ =sub_811B9D8
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xF
-	bhi _0811BA70
-	bl DestroyTask
-_0811BA70:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811BA74: .4byte sub_811B9D8
-	thumb_func_end sub_811BA5C
-
-	thumb_func_start sub_811BA78
-sub_811BA78: @ 811BA78
-	push {r4,lr}
-	movs r4, 0
-_0811BA7C:
-	adds r0, r4, 0
-	bl IsUnionRoomPlayerHidden
-	cmp r0, 0
-	bne _0811BA92
-	adds r0, r4, 0
-	bl sub_811B64C
-	adds r0, r4, 0
-	bl sub_811B5F0
-_0811BA92:
-	adds r4, 0x1
-	cmp r4, 0x7
-	ble _0811BA7C
-	ldr r1, _0811BAA8 @ =UnionObjWork
-	movs r0, 0
-	str r0, [r1]
-	bl sub_811BA5C
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811BAA8: .4byte UnionObjWork
-	thumb_func_end sub_811BA78
-
-	thumb_func_start sub_811BAAC
-sub_811BAAC: @ 811BAAC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	str r0, [sp, 0x8]
-	mov r9, r1
-	movs r7, 0
-	mov r0, r9
-	lsls r0, 2
-	mov r8, r0
-	ldr r0, _0811BB38 @ =gUnknown_84570EC
-	mov r2, r8
-	adds r1, r2, r0
-	ldrh r1, [r1]
-	mov r2, sp
-	strh r1, [r2, 0xC]
-	adds r0, 0x2
-	add r0, r8
-	ldrh r0, [r0]
-	mov r10, r0
-	ldr r6, _0811BB3C @ =gUnknown_845710C
-_0811BADA:
-	mov r5, r8
-	add r5, r9
-	adds r5, r7
-	adds r4, r5, 0
-	subs r4, 0x38
-	lsls r4, 24
-	lsrs r4, 24
-	movs r2, 0
-	ldrsb r2, [r6, r2]
-	mov r0, sp
-	ldrh r0, [r0, 0xC]
-	adds r2, r0, r2
-	lsls r2, 16
-	asrs r2, 16
-	movs r3, 0x1
-	ldrsb r3, [r6, r3]
-	add r3, r10
-	lsls r3, 16
-	asrs r3, 16
-	movs r0, 0x3
-	str r0, [sp]
-	movs r0, 0x1
-	str r0, [sp, 0x4]
-	movs r0, 0x19
-	adds r1, r4, 0
-	bl sprite_new
-	ldr r1, [sp, 0x8]
-	adds r5, r1, r5
-	strb r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8069124
-	adds r6, 0x2
-	adds r7, 0x1
-	cmp r7, 0x4
-	ble _0811BADA
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811BB38: .4byte gUnknown_84570EC
-_0811BB3C: .4byte gUnknown_845710C
-	thumb_func_end sub_811BAAC
-
-	thumb_func_start sub_811BB40
-sub_811BB40: @ 811BB40
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	movs r4, 0
-	ldr r6, _0811BB64 @ =gSprites
-_0811BB48:
-	adds r0, r5, r4
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	bl DestroySprite
-	adds r4, 0x1
-	cmp r4, 0x27
-	ble _0811BB48
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811BB64: .4byte gSprites
-	thumb_func_end sub_811BB40
-
-	thumb_func_start sub_811BB68
-sub_811BB68: @ 811BB68
-	push {r4-r7,lr}
-	sub sp, 0x8
-	movs r5, 0
-	add r7, sp, 0x4
-_0811BB70:
-	movs r4, 0
-	adds r6, r5, 0x1
-_0811BB74:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	mov r2, sp
-	adds r3, r7, 0
-	bl sub_811B53C
-	ldr r0, [sp]
-	ldr r1, [sp, 0x4]
-	movs r2, 0
-	bl sub_8059024
-	adds r4, 0x1
-	cmp r4, 0x4
-	ble _0811BB74
-	adds r5, r6, 0
-	cmp r5, 0x7
-	ble _0811BB70
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811BB68
-
-	thumb_func_start sub_811BBA0
-sub_811BBA0: @ 811BBA0
-	push {lr}
-	adds r1, r0, 0
-	cmp r1, 0
-	beq _0811BBB4
-	ldr r0, _0811BBB0 @ =gUnknown_845711B
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	b _0811BBC4
-	.align 2, 0
-_0811BBB0: .4byte gUnknown_845711B
-_0811BBB4:
-	ldrb r1, [r2, 0xA]
-	movs r0, 0x7F
-	ands r0, r1
-	cmp r0, 0x45
-	beq _0811BBC2
-	movs r0, 0x4
-	b _0811BBC4
-_0811BBC2:
-	movs r0, 0x1
-_0811BBC4:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811BBA0
-
-	thumb_func_start sub_811BBC8
-sub_811BBC8: @ 811BBC8
-	push {lr}
-	adds r2, r0, 0
-	lsls r0, r2, 2
-	adds r0, r2
-	adds r0, r1
-	subs r0, 0x38
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_806916C
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811BBC8
-
-	thumb_func_start sub_811BBE0
-sub_811BBE0: @ 811BBE0
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x8
-	adds r5, r0, 0
-	adds r6, r1, 0
-	mov r9, r3
-	lsls r2, 24
-	lsrs r2, 24
-	mov r8, r2
-	lsls r0, r5, 2
-	adds r0, r5
-	adds r7, r0, r6
-	adds r0, r5, 0
-	bl sub_811BBC8
-	cmp r0, 0x1
-	bne _0811BC1E
-	adds r4, r7, 0
-	subs r4, 0x38
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_8069124
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_80691A4
-_0811BC1E:
-	adds r0, r7, 0
-	subs r0, 0x38
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, r8
-	bl sub_8069094
-	adds r0, r6, 0
-	adds r1, r5, 0
-	mov r2, r9
-	bl sub_811BBA0
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl sub_811C008
-	add r3, sp, 0x4
-	adds r0, r5, 0
-	adds r1, r6, 0
-	mov r2, sp
-	bl sub_811B53C
-	ldr r0, [sp]
-	ldr r1, [sp, 0x4]
-	movs r2, 0x1
-	bl sub_8059024
-	add sp, 0x8
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811BBE0
-
-	thumb_func_start sub_811BC68
-sub_811BC68: @ 811BC68
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r0, r4, 2
-	adds r0, r4
-	adds r0, r5
-	subs r0, 0x38
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl sub_80691A4
-	add r3, sp, 0x4
-	adds r0, r4, 0
-	adds r1, r5, 0
-	mov r2, sp
-	bl sub_811B53C
-	ldr r0, [sp]
-	ldr r1, [sp, 0x4]
-	movs r2, 0
-	bl sub_8059024
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811BC68
-
-	thumb_func_start sub_811BCA0
-sub_811BCA0: @ 811BCA0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	adds r7, r0, 0
-	mov r8, r1
-	mov r6, sp
-	adds r6, 0x2
-	mov r0, sp
-	adds r1, r6, 0
-	bl PlayerGetDestCoords
-	add r4, sp, 0x4
-	mov r5, sp
-	adds r5, 0x6
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl plaer_get_pos_including_state_based_drift
-	lsls r0, r7, 2
-	adds r0, r7
-	subs r0, 0x38
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_806916C
-	mov r10, r6
-	mov r9, r4
-	adds r6, r5, 0
-	cmp r0, 0x1
-	bne _0811BD2C
-	mov r0, sp
-	movs r1, 0
-	ldrsh r2, [r0, r1]
-	mov r0, r10
-	movs r1, 0
-	ldrsh r3, [r0, r1]
-	adds r0, r7, 0
-	movs r1, 0
-	bl sub_811B58C
-	cmp r0, 0x1
-	beq _0811BD98
-	movs r0, 0
-	ldrsh r2, [r4, r0]
-	movs r1, 0
-	ldrsh r3, [r6, r1]
-	adds r0, r7, 0
-	movs r1, 0
-	bl sub_811B58C
-	cmp r0, 0x1
-	beq _0811BD98
-	mov r2, r8
-	ldrb r0, [r2, 0xB]
-	lsls r0, 31
-	lsrs r0, 31
-	ldrb r1, [r2, 0x2]
-	bl sub_811B524
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r7, 0
-	movs r1, 0
-	mov r3, r8
-	bl sub_811BBE0
-_0811BD2C:
-	movs r5, 0x1
-	mov r4, r8
-	adds r4, 0x4
-_0811BD32:
-	ldrb r0, [r4]
-	cmp r0, 0
-	bne _0811BD42
-	adds r0, r7, 0
-	adds r1, r5, 0
-	bl sub_811BC68
-	b _0811BD90
-_0811BD42:
-	mov r0, sp
-	movs r1, 0
-	ldrsh r2, [r0, r1]
-	mov r0, r10
-	movs r1, 0
-	ldrsh r3, [r0, r1]
-	adds r0, r7, 0
-	adds r1, r5, 0
-	bl sub_811B58C
-	cmp r0, 0
-	bne _0811BD90
-	mov r0, r9
-	movs r1, 0
-	ldrsh r2, [r0, r1]
-	movs r0, 0
-	ldrsh r3, [r6, r0]
-	adds r0, r7, 0
-	adds r1, r5, 0
-	bl sub_811B58C
-	cmp r0, 0
-	bne _0811BD90
-	ldrb r2, [r4]
-	lsrs r0, r2, 3
-	movs r1, 0x1
-	ands r0, r1
-	movs r1, 0x7
-	ands r1, r2
-	bl sub_811B524
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r7, 0
-	adds r1, r5, 0
-	mov r3, r8
-	bl sub_811BBE0
-_0811BD90:
-	adds r4, 0x1
-	adds r5, 0x1
-	cmp r5, 0x4
-	ble _0811BD32
-_0811BD98:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811BCA0
-
-	thumb_func_start sub_811BDA8
-sub_811BDA8: @ 811BDA8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldrb r0, [r4, 0xA]
-	lsls r0, 25
-	lsrs r0, 25
-	subs r0, 0x40
-	cmp r0, 0x14
-	bhi _0811BE4C
-	lsls r0, 2
-	ldr r1, _0811BDC4 @ =_0811BDC8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0811BDC4: .4byte _0811BDC8
-	.align 2, 0
-_0811BDC8:
-	.4byte _0811BE1C
-	.4byte _0811BE3C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE3C
-	.4byte _0811BE3C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE3C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE4C
-	.4byte _0811BE3C
-	.4byte _0811BE3C
-	.4byte _0811BE3C
-	.4byte _0811BE1C
-_0811BE1C:
-	ldrb r1, [r4, 0xB]
-	lsls r1, 31
-	lsrs r1, 31
-	ldrb r2, [r4, 0x2]
-	adds r0, r5, 0
-	bl sub_811B8BC
-	movs r4, 0
-_0811BE2C:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_811BC68
-	adds r4, 0x1
-	cmp r4, 0x4
-	bls _0811BE2C
-	b _0811BE58
-_0811BE3C:
-	adds r0, r5, 0
-	bl sub_811B90C
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_811BCA0
-	b _0811BE58
-_0811BE4C:
-	ldr r0, _0811BE60 @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
-	ldr r1, _0811BE64 @ =0x000003d3
-	ldr r2, _0811BE68 @ =gUnknown_8457174	"0"
-	movs r3, 0x1
-	bl AGBAssert
-_0811BE58:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811BE60: .4byte gUnknown_8457138
-_0811BE64: .4byte 0x000003d3
-_0811BE68: .4byte gUnknown_8457174
-	thumb_func_end sub_811BDA8
-
 	thumb_func_start sub_811BE6C
 sub_811BE6C: @ 811BE6C
 	push {r4,r5,lr}
diff --git a/asm/script_movement.s b/asm/script_movement.s
index 7a7adec6c..7b3a70a25 100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
@@ -482,7 +482,7 @@ _0809777C:
 	lsls r0, 2
 	ldr r1, _080977A8 @ =gObjectEvents
 	adds r0, r1
-	bl npc_sync_anim_pause_bits
+	bl UnfreezeObjectEvent
 _08097792:
 	adds r0, r5, 0x1
 	lsls r0, 24
diff --git a/data/rfu_union_tool.s b/data/rfu_union_tool.s
index 0c6460116..f9988661e 100644
--- a/data/rfu_union_tool.s
+++ b/data/rfu_union_tool.s
@@ -6,27 +6,6 @@
 	.section .rodata
 	.align 2
 
-gUnknown_8457120:: @ 8457120
-	.byte 0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00
-
-	.align 2
-gUnknown_8457138:: @ 8457138
-	abspath "rfu_union_tool.c"
-
-	.align 2
-gUnknown_8457174:: @ 8457174
-	.asciz "0"
-
-	.align 2
-gUnknown_8457178:: @ 8457178
-	.asciz "UnionObjWork != NULL"
-
-gUnknown_845718D:: @ 845718D
-	.byte 0xA4, 0xFE
-
-gUnknown_845718F:: @ 845718F
-	.byte 0xA5, 0xFE
-
 	.align 2
 gUnknown_8457194:: @ 8457194
 	.2byte 0x01FC, 0x0000 @ BgTemplate
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];
diff --git a/src/rfu_union_tool.c b/src/rfu_union_tool.c
index d50187b56..74dfaadd1 100644
--- a/src/rfu_union_tool.c
+++ b/src/rfu_union_tool.c
@@ -1,7 +1,23 @@
 #include "global.h"
 #include "event_data.h"
+#include "event_object_movement.h"
+#include "event_object_80688E4.h"
+#include "event_object_8097404.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
 #include "rfu_union_tool.h"
+#include "script.h"
+#include "task.h"
 #include "constants/flags.h"
+#include "constants/event_object_movement.h"
+#include "constants/object_events.h"
+
+EWRAM_DATA struct UnionObj * UnionObjWork = NULL;
+EWRAM_DATA u32 gUnknown_203B088 = 0;
+
+u8 sub_811BA18(void);
+u32 sub_811BBC8(u32 playerIdx, u32 arg1);
+void sub_811C008(s32 arg0, s32 arg1, u8 arg2);
 
 const u8 gUnknown_84570D8[][10] = {
     {0x29, 0x36, 0x27, 0x12, 0x13, 0x14, 0x19, 0x1A},
@@ -35,6 +51,12 @@ const u8 gUnknown_845711B[] = {
     0x01, 0x03, 0x01, 0x04, 0x02
 };
 
+const u8 gUnknown_8457120[] = {
+    0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03,
+    0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00,
+    0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00
+};
+
 bool32 is_walking_or_running(void)
 {
     if (gPlayerAvatar.tileTransitionState == 2 || gPlayerAvatar.tileTransitionState == 0)
@@ -73,8 +95,432 @@ bool32 sub_811B58C(u32 a0, u32 a1, s32 a2, s32 a3)
         return TRUE;
     }
 }
-//
-//bool32 IsUnionRoomPlayerHidden(u32 player_idx)
-//{
-//    return FlagGet(FLAG_HIDE_UNION_ROOM_PLAYER_1 + player_idx);
-//}
+
+bool32 IsUnionRoomPlayerHidden(u32 player_idx)
+{
+    return FlagGet(FLAG_HIDE_UNION_ROOM_PLAYER_1 + player_idx);
+}
+
+void HideUnionRoomPlayer(u32 player_idx)
+{
+    FlagSet(FLAG_HIDE_UNION_ROOM_PLAYER_1 + player_idx);
+}
+
+void ShowUnionRoomPlayer(u32 player_idx)
+{
+    FlagClear(FLAG_HIDE_UNION_ROOM_PLAYER_1 + player_idx);
+}
+
+void SetUnionRoomPlayerGfx(u32 playerIdx, u32 gfxId)
+{
+    VarSet(VAR_OBJ_GFX_ID_0 + playerIdx, gfxId);
+}
+
+void CreateUnionRoomPlayerObjectEvent(u32 playerIdx)
+{
+    TrySpawnObjectEvent(gUnknown_8457120[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+}
+
+void RemoveUnionRoomPlayerObjectEvent(u32 playerIdx)
+{
+    RemoveObjectEventByLocalIdAndMap(gUnknown_8457120[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+}
+
+bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * movement)
+{
+    u8 objectId;
+    struct ObjectEvent * object;
+    if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_8457120[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId))
+    {
+        return FALSE;
+    }
+    object = &gObjectEvents[objectId];
+    if (ObjectEventIsMovementOverridden(object))
+    {
+        return FALSE;
+    }
+    if (ObjectEventSetHeldMovement(object, *movement))
+    {
+        AGB_ASSERT_EX(0, ABSPATH("rfu_union_tool.c"), 387);
+        return FALSE;
+    }
+    return TRUE;
+}
+bool32 sub_811B6E8(u32 playerIdx)
+{
+    u8 objectId;
+    struct ObjectEvent * object;
+    if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_8457120[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId))
+    {
+        return TRUE;
+    }
+    object = &gObjectEvents[objectId];
+    if (!ObjectEventClearHeldMovementIfFinished(object))
+    {
+        return FALSE;
+    }
+    if (!ScriptContext2_IsEnabled())
+    {
+        UnfreezeObjectEvent(object);
+    }
+    else
+    {
+        FreezeObjectEvent(object);
+    }
+    return TRUE;
+}
+
+u8 sub_811B754(struct UnionObj * ptr)
+{
+    s32 i;
+
+    gUnknown_203B088 = 0;
+    UnionObjWork = ptr;
+    AGB_ASSERT_EX(UnionObjWork != NULL, ABSPATH("rfu_union_tool.c"), 442)
+    for (i = 0; i < 8; i++)
+    {
+        ptr[i].field_0 = 0;
+        ptr[i].field_1 = 0;
+        ptr[i].field_2 = 0;
+        ptr[i].field_3 = 0;
+    }
+    return sub_811BA18();
+}
+
+const u8 gUnknown_845718D[2] = {
+    MOVEMENT_ACTION_FLY_UP,
+    MOVEMENT_ACTION_STEP_END
+};
+
+bool32 sub_811B7A8(s8 * a0, u32 playerIdx, struct UnionObj * ptr)
+{
+    switch (*a0)
+    {
+    case 0:
+        if (SetUnionRoomPlayerEnterExitMovement(playerIdx, gUnknown_845718D) == TRUE)
+        {
+            HideUnionRoomPlayer(playerIdx);
+            (*a0)++;
+        }
+        break;
+    case 1:
+        if (sub_811B6E8(playerIdx))
+        {
+            RemoveUnionRoomPlayerObjectEvent(playerIdx);
+            HideUnionRoomPlayer(playerIdx);
+            *a0 = 0;
+            return TRUE;
+        }
+        break;
+    }
+    return FALSE;
+}
+
+const u8 gUnknown_845718F[2] = {
+    MOVEMENT_ACTION_FLY_DOWN,
+    MOVEMENT_ACTION_STEP_END
+};
+
+bool32 sub_811B804(s8 * a0, u32 playerIdx, struct UnionObj * ptr)
+{
+    s16 x, y;
+
+    switch (*a0)
+    {
+    case 0:
+        if (!is_walking_or_running())
+        {
+            break;
+        }
+        PlayerGetDestCoords(&x, &y);
+        if (sub_811B58C(playerIdx, 0, x, y) == 1)
+        {
+            break;
+        }
+        player_get_pos_including_state_based_drift(&x, &y);
+        if (sub_811B58C(playerIdx, 0, x, y) == 1)
+        {
+            break;
+        }
+        SetUnionRoomPlayerGfx(playerIdx, ptr->field_1);
+        CreateUnionRoomPlayerObjectEvent(playerIdx);
+        ShowUnionRoomPlayer(playerIdx);
+        (*a0)++;
+        // fallthrough
+    case 3: // incorrect?
+        if (SetUnionRoomPlayerEnterExitMovement(playerIdx, gUnknown_845718F) == 1)
+        {
+            (*a0)++;
+        }
+        break;
+    case 2:
+        if (sub_811B6E8(playerIdx))
+        {
+            *a0 = 0;
+            return TRUE;
+        }
+        break;
+    }
+    return FALSE;
+}
+
+bool32 sub_811B8BC(u32 playerIdx, u32 a1, u32 a2)
+{
+    struct UnionObj * ptr = &UnionObjWork[playerIdx];
+    AGB_ASSERT_EX(UnionObjWork != NULL, ABSPATH("rfu_union_tool.c"), 561)
+    ptr->field_3 = 1;
+    ptr->field_1 = sub_811B524(a1, a2);
+    if (ptr->field_0 == 0)
+    {
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+bool32 sub_811B90C(u32 playerIdx)
+{
+    struct UnionObj * ptr = &UnionObjWork[playerIdx];
+    AGB_ASSERT_EX(UnionObjWork != NULL, ABSPATH("rfu_union_tool.c"), 577)
+    ptr->field_3 = 2;
+    if (ptr->field_0 == 1)
+    {
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+void sub_811B94C(u32 playerIdx, struct UnionObj * ptr)
+{
+    switch (ptr->field_0)
+    {
+    case 0:
+        if (ptr->field_3 == 1)
+        {
+            ptr->field_0 = 2;
+            ptr->field_2 = 0;
+        }
+        else
+        {
+            break;
+        }
+        // fallthrough
+    case 2:
+        if (!sub_811BBC8(playerIdx, 0) && ptr->field_3 == 2)
+        {
+            ptr->field_0 = 0;
+            ptr->field_2 = 0;
+            RemoveUnionRoomPlayerObjectEvent(playerIdx);
+            HideUnionRoomPlayer(playerIdx);
+        }
+        else if (sub_811B804(&ptr->field_2, playerIdx, ptr) == 1)
+        {
+            ptr->field_0 = 1;
+        }
+        break;
+    case 1:
+        if (ptr->field_3 == 2)
+        {
+            ptr->field_0 = 3;
+            ptr->field_2 = 0;
+        }
+        else
+        {
+            break;
+        }
+        // fallthrough
+    case 3:
+        if (sub_811B7A8(&ptr->field_2, playerIdx, ptr) == 1)
+        {
+            ptr->field_0 = 0;
+        }
+        break;
+    }
+    ptr->field_3 = 0;
+}
+
+void sub_811B9D8(u8 taskId)
+{
+    s32 i;
+    AGB_ASSERT_EX(UnionObjWork != NULL, ABSPATH("rfu_union_tool.c"), 643)
+    for (i = 0; i < 8; i++)
+    {
+        sub_811B94C(i, &UnionObjWork[i]);
+    }
+}
+
+u8 sub_811BA18(void)
+{
+    if (FuncIsActiveTask(sub_811B9D8) == TRUE)
+    {
+        AGB_ASSERT_EX(0, ABSPATH("rfu_union_tool.c"), 655)
+        return NUM_TASKS;
+    }
+    else
+    {
+        return CreateTask(sub_811B9D8, 5);
+    }
+}
+
+void sub_811BA5C(void)
+{
+    u8 taskId = FindTaskIdByFunc(sub_811B9D8);
+    if (taskId < NUM_TASKS)
+    {
+        DestroyTask(taskId);
+    }
+}
+
+void sub_811BA78(void)
+{
+    s32 i;
+    for (i = 0; i < 8; i++)
+    {
+        if (!IsUnionRoomPlayerHidden(i))
+        {
+            RemoveUnionRoomPlayerObjectEvent(i);
+            HideUnionRoomPlayer(i);
+        }
+    }
+    UnionObjWork = NULL;
+    sub_811BA5C();
+}
+
+void sub_811BAAC(u8 * sp8, s32 r9)
+{
+    s32 r7;
+
+    for (r7 = 0; r7 < 5; r7++)
+    {
+        s32 r5 = 5 * r9 + r7;
+        sp8[r5] = sprite_new(OBJECT_EVENT_GFX_MAN, r5 - 0x38, gUnknown_84570EC[r9][0] + gUnknown_845710C[r7][0], gUnknown_84570EC[r9][1] + gUnknown_845710C[r7][1], 3, 1);
+        sub_8069124(r5 - 0x38, TRUE);
+    }
+}
+
+void sub_811BB40(u8 * r5)
+{
+    s32 i;
+    for (i = 0; i < 40; i++)
+    {
+        DestroySprite(&gSprites[r5[i]]);
+    }
+}
+
+void sub_811BB68(void)
+{
+    s32 i, j, x, y;
+    for (i = 0; i < 8; i++)
+    {
+        for (j = 0; j < 5; j++)
+        {
+            sub_811B53C(i, j, &x, &y);
+            sub_8059024(x, y, 0);
+        }
+    }
+}
+
+u8 sub_811BBA0(u32 r1, u32 unused, struct GFtgtGname * r2)
+{
+    if (r1 != 0)
+    {
+        return gUnknown_845711B[r1];
+    }
+    else if (r2->unk_0a_0 == 0x45)
+    {
+        return 1;
+    }
+    else
+    {
+        return 4;
+    }
+}
+
+u32 sub_811BBC8(u32 a0, u32 a1)
+{
+    return sub_806916C(5 * a0 + a1 - 0x38);
+}
+
+void sub_811BBE0(u32 r5, u32 r6, u8 r8, struct GFtgtGname * r9)
+{
+    s32 x, y;
+    s32 r7 = 5 * r5 + r6;
+    if (sub_811BBC8(r5, r6) == 1)
+    {
+        sub_8069124(r7 - 0x38, FALSE);
+        sub_80691A4(r7 - 0x38, 1);
+    }
+    sub_8069094(r7 - 0x38, r8);
+    sub_811C008(r6, r5, sub_811BBA0(r6, r5, r9));
+    sub_811B53C(r5, r6, &x, &y);
+    sub_8059024(x, y, 1);
+}
+
+void sub_811BC68(u32 a0, u32 a1)
+{
+    s32 x, y;
+    sub_80691A4(5 * a0 + a1 - 0x38, 2);
+    sub_811B53C(a0, a1, &x, &y);
+    sub_8059024(x, y, 0);
+}
+
+void sub_811BCA0(u32 r7, struct GFtgtGname * r8)
+{
+    s16 x, y, x2, y2;
+    s32 i;
+
+    PlayerGetDestCoords(&x, &y);
+    player_get_pos_including_state_based_drift(&x2, &y2);
+    if (sub_806916C(5 * r7 - 0x38) == 1)
+    {
+        if (sub_811B58C(r7, 0, x, y) == 1 || sub_811B58C(r7, 0, x2, y2) == 1)
+        {
+            return;
+        }
+        sub_811BBE0(r7, 0, sub_811B524(r8->playerGender, r8->unk_00.playerTrainerId[0]), r8);
+    }
+    for (i = 1; i < 5; i++)
+    {
+        if (r8->unk_04[i - 1] == 0)
+        {
+            sub_811BC68(r7, i);
+        }
+        else if (sub_811B58C(r7, i, x, y) == 0 && sub_811B58C(r7, i, x2, y2) == 0)
+        {
+            sub_811BBE0(r7, i, sub_811B524((r8->unk_04[i - 1] >> 3) & 1, r8->unk_04[i - 1] & 7), r8);
+        }
+    }
+}
+
+void sub_811BDA8(u32 r5, struct GFtgtGname * r4)
+{
+    u32 i;
+    switch (r4->unk_0a_0)
+    {
+    case 0x40:
+    case 0x54:
+        sub_811B8BC(r5, r4->playerGender, r4->unk_00.playerTrainerId[0]);
+        for (i = 0; i < 5; i++)
+        {
+            sub_811BC68(r5, i);
+        }
+        break;
+    case 0x41:
+    case 0x44:
+    case 0x45:
+    case 0x48:
+    case 0x51:
+    case 0x52:
+    case 0x53:
+        sub_811B90C(r5);
+        sub_811BCA0(r5, r4);
+        break;
+    default:
+        AGB_ASSERT_EX(0, ABSPATH("rfu_union_tool.c"), 979)
+    }
+}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index c083546eb..c2c422a0a 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1064,7 +1064,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx)
 {
     u16 objectId = VarGet(ScriptReadHalfword(ctx));
 
-    show_sprite(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    TrySpawnObjectEvent(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     return FALSE;
 }
 
@@ -1074,7 +1074,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    show_sprite(objectId, mapNum, mapGroup);
+    TrySpawnObjectEvent(objectId, mapNum, mapGroup);
     return FALSE;
 }
 
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index b88a7f15c..b35b6143e 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -1273,7 +1273,7 @@ static u8 GetRematchableTrainerLocalId(void)
 
 static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script)
 {
-    npc_sync_anim_pause_bits(&gObjectEvents[trainerInfo->objectEventId]);
+    UnfreezeObjectEvent(&gObjectEvents[trainerInfo->objectEventId]);
     ScriptMovement_StartObjectMovementScript(trainerInfo->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, script);
 }
 
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 86777e885..64bfc7e91 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -352,14 +352,10 @@ gUnknown_203ACF0: @ 203ACF0
 	.include "src/quest_log.o"
 	.align 2
 	.include "src/union_room.o"
-
 	.align 2
-UnionObjWork: @ 203B084
-	.space 0x4
-
-gUnknown_203B088: @ 203B088
-	.space 0x4
+	.include "src/rfu_union_tool.o"
 
+	.align 2
 gUnknown_203B08C: @ 203B08C
 	.space 0x4