1 files changed, 12 insertions, 12 deletions
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index d1f18a8ae..3b76df047 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -10857,7 +10857,7 @@ _0811B294: .4byte gUnknown_203B06C
 sub_811B298: @ 811B298
 	push {lr}
 	bl ScriptContext2_Enable
-	bl ScriptFreezeMapObjects
+	bl ScriptFreezeObjectEvents
 	pop {r0}
 	bx r0
 	thumb_func_end sub_811B298
@@ -11348,7 +11348,7 @@ sub_811B64C: @ 811B64C
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -11369,7 +11369,7 @@ sub_811B66C: @ 811B66C
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6D0
@@ -11378,16 +11378,16 @@ sub_811B66C: @ 811B66C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0811B6C0 @ =gMapObjects
+	ldr r1, _0811B6C0 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6D0
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6C4
@@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C
 	.align 2, 0
 _0811B6B8: .4byte gUnknown_8457120
 _0811B6BC: .4byte gSaveBlock1Ptr
-_0811B6C0: .4byte gMapObjects
+_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
@@ -11428,7 +11428,7 @@ sub_811B6E8: @ 811B6E8
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B748
@@ -11437,10 +11437,10 @@ sub_811B6E8: @ 811B6E8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0811B72C @ =gMapObjects
+	ldr r1, _0811B72C @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B730
@@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8
 	.align 2, 0
 _0811B724: .4byte gUnknown_8457120
 _0811B728: .4byte gSaveBlock1Ptr
-_0811B72C: .4byte gMapObjects
+_0811B72C: .4byte gObjectEvents
 _0811B730:
 	bl ScriptContext2_IsEnabled
 	lsls r0, 24
@@ -11460,7 +11460,7 @@ _0811B730:
 	b _0811B748
 _0811B742:
 	adds r0, r4, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 _0811B748:
 	movs r0, 0x1
 _0811B74A: