Decompile/port event_object_movement

asm/field_camera.s

@@ -797,7 +797,7 @@ _0805AB54: .4byte gSprites
 
 	thumb_func_start ResetCameraUpdateInfo
 ResetCameraUpdateInfo: @ 805AB58
-	ldr r1, _0805AB6C @ =gUnknown_3005050
+	ldr r1, _0805AB6C @ =gFieldCamera
 	movs r0, 0
 	str r0, [r1, 0x8]
 	str r0, [r1, 0xC]
@@ -807,7 +807,7 @@ ResetCameraUpdateInfo: @ 805AB58
 	str r0, [r1]
 	bx lr
 	.align 2, 0
-_0805AB6C: .4byte gUnknown_3005050
+_0805AB6C: .4byte gFieldCamera
 	thumb_func_end ResetCameraUpdateInfo
 
 	thumb_func_start InitCameraUpdateCallback
@@ -815,7 +815,7 @@ InitCameraUpdateCallback: @ 805AB70
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r4, _0805ABA4 @ =gUnknown_3005050
+	ldr r4, _0805ABA4 @ =gFieldCamera
 	ldr r1, [r4, 0x4]
 	cmp r1, 0
 	beq _0805AB8C
@@ -838,7 +838,7 @@ _0805AB8C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805ABA4: .4byte gUnknown_3005050
+_0805ABA4: .4byte gFieldCamera
 _0805ABA8: .4byte gSprites
 _0805ABAC: .4byte CameraUpdateCallback
 	thumb_func_end InitCameraUpdateCallback
@@ -848,7 +848,7 @@ CameraUpdate: @ 805ABB0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r6, _0805ACA4 @ =gUnknown_3005050
+	ldr r6, _0805ACA4 @ =gFieldCamera
 	ldr r1, [r6]
 	cmp r1, 0
 	beq _0805ABC4
@@ -903,7 +903,7 @@ _0805AC08:
 	ble _0805AC1C
 	movs r4, 0x1
 _0805AC1C:
-	ldr r2, _0805ACA4 @ =gUnknown_3005050
+	ldr r2, _0805ACA4 @ =gFieldCamera
 	ldr r0, [r2, 0x10]
 	adds r1, r0, r7
 	str r1, [r2, 0x10]
@@ -956,11 +956,11 @@ _0805AC7E:
 	adds r1, r7, 0
 	mov r2, r8
 	bl coords8_add
-	ldr r1, _0805ACAC @ =gUnknown_300506C
+	ldr r1, _0805ACAC @ =gTotalCameraPixelOffsetX
 	ldrh r0, [r1]
 	subs r0, r7
 	strh r0, [r1]
-	ldr r1, _0805ACB0 @ =gUnknown_3005068
+	ldr r1, _0805ACB0 @ =gTotalCameraPixelOffsetY
 	ldrh r0, [r1]
 	mov r2, r8
 	subs r0, r2
@@ -971,10 +971,10 @@ _0805AC7E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805ACA4: .4byte gUnknown_3005050
+_0805ACA4: .4byte gFieldCamera
 _0805ACA8: .4byte gUnknown_3000E90
-_0805ACAC: .4byte gUnknown_300506C
-_0805ACB0: .4byte gUnknown_3005068
+_0805ACAC: .4byte gTotalCameraPixelOffsetX
+_0805ACB0: .4byte gTotalCameraPixelOffsetY
 	thumb_func_end CameraUpdate
 
 	thumb_func_start sub_805ACB4
@@ -989,12 +989,12 @@ sub_805ACB4: @ 805ACB4
 	asrs r1, 16
 	bl UpdateObjectEventsForCameraUpdate
 	bl DrawWholeMapView
-	ldr r1, _0805ACE8 @ =gUnknown_300506C
+	ldr r1, _0805ACE8 @ =gTotalCameraPixelOffsetX
 	lsls r4, 4
 	ldrh r0, [r1]
 	subs r0, r4
 	strh r0, [r1]
-	ldr r1, _0805ACEC @ =gUnknown_3005068
+	ldr r1, _0805ACEC @ =gTotalCameraPixelOffsetY
 	lsls r5, 4
 	ldrh r0, [r1]
 	subs r0, r5
@@ -1003,8 +1003,8 @@ sub_805ACB4: @ 805ACB4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805ACE8: .4byte gUnknown_300506C
-_0805ACEC: .4byte gUnknown_3005068
+_0805ACE8: .4byte gTotalCameraPixelOffsetX
+_0805ACEC: .4byte gTotalCameraPixelOffsetY
 	thumb_func_end sub_805ACB4
 
 	thumb_func_start sub_805ACF0
@@ -1012,7 +1012,7 @@ sub_805ACF0: @ 805ACF0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r4, _0805ADCC @ =gUnknown_3005050
+	ldr r4, _0805ADCC @ =gFieldCamera
 	ldr r1, [r4]
 	cmp r1, 0
 	beq _0805AD04
@@ -1067,7 +1067,7 @@ _0805AD48:
 	ble _0805AD5C
 	movs r5, 0x1
 _0805AD5C:
-	ldr r2, _0805ADCC @ =gUnknown_3005050
+	ldr r2, _0805ADCC @ =gFieldCamera
 	ldr r0, [r2, 0x10]
 	adds r1, r0, r7
 	str r1, [r2, 0x10]
@@ -1123,7 +1123,7 @@ _0805ADB6:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805ADCC: .4byte gUnknown_3005050
+_0805ADCC: .4byte gFieldCamera
 _0805ADD0: .4byte gUnknown_3000E90
 	thumb_func_end sub_805ACF0
 
@@ -1184,14 +1184,14 @@ UpdateCameraPanning: @ 805AE28
 	bl _call_via_r0
 _0805AE36:
 	ldr r2, _0805AE5C @ =gSpriteCoordOffsetX
-	ldr r0, _0805AE60 @ =gUnknown_300506C
+	ldr r0, _0805AE60 @ =gTotalCameraPixelOffsetX
 	ldr r1, _0805AE64 @ =gUnknown_3000E98
 	ldrh r0, [r0]
 	ldrh r1, [r1]
 	subs r0, r1
 	strh r0, [r2]
 	ldr r2, _0805AE68 @ =gSpriteCoordOffsetY
-	ldr r0, _0805AE6C @ =gUnknown_3005068
+	ldr r0, _0805AE6C @ =gTotalCameraPixelOffsetY
 	ldr r1, _0805AE70 @ =gUnknown_3000E9A
 	ldrh r0, [r0]
 	ldrh r1, [r1]
@@ -1203,10 +1203,10 @@ _0805AE36:
 	.align 2, 0
 _0805AE58: .4byte gUnknown_3000EA0
 _0805AE5C: .4byte gSpriteCoordOffsetX
-_0805AE60: .4byte gUnknown_300506C
+_0805AE60: .4byte gTotalCameraPixelOffsetX
 _0805AE64: .4byte gUnknown_3000E98
 _0805AE68: .4byte gSpriteCoordOffsetY
-_0805AE6C: .4byte gUnknown_3005068
+_0805AE6C: .4byte gTotalCameraPixelOffsetY
 _0805AE70: .4byte gUnknown_3000E9A
 	thumb_func_end UpdateCameraPanning
 
@@ -1242,7 +1242,7 @@ _0805AEA8:
 	movs r0, 0
 	strb r0, [r1]
 _0805AEAE:
-	bl player_get_direction_upper_nybble
+	bl GetPlayerMovementDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2