Merge pull request #227 from notyourav/cl

cleanup

Makefile

@@ -131,7 +131,7 @@ C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c)
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 
 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s $(ASM_SUBDIR)/*/*.s)
-ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
+ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS)) $(patsubst $(ASM_SUBDIR)/*/%.s,$(ASM_BUILDDIR)/**/%.o,$(ASM_SRCS))
 
 DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s $(DATA_ASM_SUBDIR)/**/*.s $(DATA_ASM_SUBDIR)/**/**/*.s)
 DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))

asm/code_080043E8.s

@@ -179,9 +179,9 @@ sub_0800451C: @ 0x0800451C
 	cmp r1, #0xb
 	beq sub_08004542
 	cmp r1, #0xa
-	beq sub_0800455E
+	beq ResetCollisionLayer
 	cmp r1, #9
-	beq sub_0800455E
+	beq ResetCollisionLayer
 	cmp r1, #0x26
 	beq _0800457A
 	cmp r1, #0x27
@@ -205,8 +205,8 @@ sub_08004542: @ 0x08004542
 	strb r1, [r0, #0x19]
 	bx lr
 
-	non_word_aligned_thumb_func_start sub_0800455E
-sub_0800455E: @ 0x0800455E
+	non_word_aligned_thumb_func_start ResetCollisionLayer
+ResetCollisionLayer: @ 0x0800455E
 	movs r1, #0x38
 	movs r2, #1
 	strb r2, [r0, r1]

asm/code_08016984.s

@@ -69,8 +69,8 @@ UpdateSpriteForCollisionLayer: @ 0x08016A04
 _08016A28:
 	.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40
 
-	thumb_func_start sub_08016A30
-sub_08016A30: @ 0x08016A30
+	thumb_func_start ResolveCollisionLayer
+ResolveCollisionLayer: @ 0x08016A30
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	movs r5, #0x38

asm/code_0801967C.s

@@ -3099,7 +3099,7 @@ sub_0801AD6C: @ 0x0801AD6C
 	adds r0, #0x38
 	strb r3, [r0]
 	adds r0, r5, #0
-	bl sub_08016A30
+	bl ResolveCollisionLayer
 	ldr r1, _0801ADD8 @ =gUnk_081091E4
 	ldrb r0, [r5, #8]
 	adds r0, r0, r1

asm/code_0804AA84.s

@@ -187,8 +187,8 @@ _0804ACEC: .4byte gFadeControl
 _0804ACF0: .4byte gArea
 _0804ACF4: .4byte gUnk_02032EDC
 
-	thumb_func_start sub_0804ACF8
-sub_0804ACF8: @ 0x0804ACF8
+	thumb_func_start RespawnAsMinish
+RespawnAsMinish: @ 0x0804ACF8
 	push {lr}
 	bl sub_0804AD18
 	cmp r0, #0

asm/code_08077698.s

@@ -137,7 +137,7 @@ sub_08077758: @ 0x08077758
 	.align 2, 0
 _08077794: .4byte gPlayerState
 _08077798:
-	bl sub_0807A108
+	bl DeleteClones
 _0807779C:
 	movs r0, #0
 _0807779E:
@@ -165,7 +165,7 @@ sub_080777A0: @ 0x080777A0
 	adds r1, #0xa0
 	movs r0, #1
 	strb r0, [r1]
-	bl sub_0807A108
+	bl DeleteClones
 _080777CC:
 	movs r0, #1
 	b _0807787C

asm/code_08078778.s

@@ -391,7 +391,7 @@ sub_08078AF0: @ 0x08078AF0
 	movs r1, #2
 	orrs r0, r1
 	strb r0, [r2, #0x11]
-	bl sub_0807A108
+	bl DeleteClones
 	pop {r4, pc}
 	.align 2, 0
 _08078B40: .4byte gPlayerState
@@ -1239,7 +1239,7 @@ sub_0807919C: @ 0x0807919C
 	ands r0, r1
 	cmp r0, #0
 	bne _080791B4
-	bl sub_080791BC
+	bl SetPlayerActionNormal
 	b _080791B8
 	.align 2, 0
 _080791B0: .4byte gPlayerState
@@ -1249,8 +1249,8 @@ _080791B8:
 	pop {pc}
 	.align 2, 0
 
-	thumb_func_start sub_080791BC
-sub_080791BC: @ 0x080791BC
+	thumb_func_start SetPlayerActionNormal
+SetPlayerActionNormal: @ 0x080791BC
 	ldr r0, _080791CC @ =gPlayerEntity
 	movs r2, #0
 	movs r1, #1
@@ -1261,8 +1261,8 @@ sub_080791BC: @ 0x080791BC
 	.align 2, 0
 _080791CC: .4byte gPlayerEntity
 
-	thumb_func_start sub_080791D0
-sub_080791D0: @ 0x080791D0
+	thumb_func_start ResetPlayerAnimationAndAction
+ResetPlayerAnimationAndAction: @ 0x080791D0
 	push {lr}
 	ldr r3, _0807920C @ =gPlayerState
 	ldr r0, [r3, #0x30]
@@ -1318,8 +1318,8 @@ sub_0807921C: @ 0x0807921C
 	ldr r1, _08079254 @ =0xFECBF6FA
 	ands r0, r1
 	str r0, [r2, #0x30]
-	bl sub_08079938
-	bl sub_080791BC
+	bl ResolvePlayerAnimation
+	bl SetPlayerActionNormal
 	adds r0, r4, #0
 	bl sub_0805E374
 	pop {r4, pc}
@@ -2248,8 +2248,8 @@ _0807992E:
 _08079930: .4byte gPlayerState
 _08079934: .4byte gPlayerEntity
 
-	thumb_func_start sub_08079938
-sub_08079938: @ 0x08079938
+	thumb_func_start ResolvePlayerAnimation
+ResolvePlayerAnimation: @ 0x08079938
 	push {r4, lr}
 	ldr r3, _08079954 @ =gPlayerState
 	ldr r2, [r3, #0x30]
@@ -2865,8 +2865,8 @@ _08079DFC: .4byte gPlayerEntity
 _08079E00: .4byte gPlayerState
 _08079E04: .4byte 0x00000193
 
-	thumb_func_start sub_08079E08
-sub_08079E08: @ 0x08079E08
+	thumb_func_start UpdatePlayerMovement
+UpdatePlayerMovement: @ 0x08079E08
 	push {r4, lr}
 	ldr r0, _08079E50 @ =gPlayerEntity
 	ldrh r2, [r0, #0x24]
@@ -3279,8 +3279,8 @@ _0807A104:
 	adds r0, r2, #0
 	pop {r4, r5, pc}
 
-	thumb_func_start sub_0807A108
-sub_0807A108: @ 0x0807A108
+	thumb_func_start DeleteClones
+DeleteClones: @ 0x0807A108
 	push {lr}
 	ldr r1, _0807A148 @ =gPlayerClones
 	movs r0, #0
@@ -5131,8 +5131,8 @@ _0807AEDE:
 	.align 2, 0
 _0807AEE0: .4byte gScreenTransition
 
-	thumb_func_start sub_0807AEE4
-sub_0807AEE4: @ 0x0807AEE4
+	thumb_func_start UpdatePlayerSkills
+UpdatePlayerSkills: @ 0x0807AEE4
 	push {r4, lr}
 	ldr r0, _0807AFE4 @ =gPlayerState
 	adds r4, r0, #0
@@ -5471,7 +5471,7 @@ sub_0807B144: @ 0x0807B144
 	ldr r1, _0807B170 @ =gPlayerState
 	movs r0, #0x81
 	strb r0, [r1, #2]
-	bl sub_080791BC
+	bl SetPlayerActionNormal
 	pop {pc}
 	.align 2, 0
 _0807B170: .4byte gPlayerState
@@ -5501,7 +5501,7 @@ sub_0807B178: @ 0x0807B178
 	ldr r1, _0807B1A4 @ =gPlayerState
 	movs r0, #0x81
 	strb r0, [r1, #2]
-	bl sub_080791BC
+	bl SetPlayerActionNormal
 	pop {pc}
 	.align 2, 0
 _0807B1A4: .4byte gPlayerState

asm/code_0807F0D8.s

@@ -485,7 +485,7 @@ sub_0807FF6C: @ 0x0807FF6C
 	adds r0, #4
 	strh r1, [r0]
 	bl ResetPlayer
-	bl sub_080791D0
+	bl ResetPlayerAnimationAndAction
 	ldr r0, _0807FFCC @ =gUnk_03004030
 	ldrb r0, [r0, #8]
 	cmp r0, #0

asm/code_080A29BC.s

@@ -211,7 +211,7 @@ _080A2C04:
 _080A2C0E:
 	ldrh r5, [r4, #0x32]
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrh r1, [r4, #0x32]
 	lsls r0, r5, #0x10
 	asrs r0, r0, #0x10
@@ -232,7 +232,7 @@ _080A2C38: .4byte gPlayerEntity
 _080A2C3C:
 	ldrh r5, [r4, #0x2e]
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrh r1, [r4, #0x2e]
 	lsls r0, r5, #0x10
 	asrs r0, r0, #0x10
@@ -253,7 +253,7 @@ _080A2C64: .4byte gPlayerEntity
 _080A2C68:
 	ldrh r5, [r4, #0x32]
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrh r1, [r4, #0x32]
 	lsls r0, r5, #0x10
 	asrs r0, r0, #0x10
@@ -274,7 +274,7 @@ _080A2C90: .4byte gPlayerEntity
 _080A2C94:
 	ldrh r5, [r4, #0x2e]
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrh r1, [r4, #0x2e]
 	lsls r0, r5, #0x10
 	asrs r0, r0, #0x10

asm/code_080A5574.s

@@ -4234,7 +4234,7 @@ sub_080A6DF8: @ 0x080A6DF8
 	.align 2, 0
 _080A6E14: .4byte gMenu
 _080A6E18:
-	bl sub_080791D0
+	bl ResetPlayerAnimationAndAction
 	ldr r0, _080A6E3C @ =gPlayerEntity
 	adds r1, r0, #0
 	adds r1, #0x58

asm/enemy/armos.s

@@ -459,7 +459,7 @@ _080304F0:
 sub_080304F4: @ 0x080304F4
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r0, r4, #0
 	bl sub_080309A8
 	ldrb r0, [r4, #0xe]

asm/enemy/bombarossa.s

@@ -162,7 +162,7 @@ sub_0803350C: @ 0x0803350C
 	cmp r0, #0
 	bne _08033520
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 _08033520:
 	adds r2, r4, #0
 	adds r2, #0x76

asm/enemy/cloudPiranha.s

@@ -607,6 +607,6 @@ _080388A8:
 	subs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 _080388B2:
 	pop {r4, r5, r6, pc}

asm/enemy/crow.s

@@ -431,7 +431,7 @@ sub_08032AF4: @ 0x08032AF4
 sub_08032B10: @ 0x08032B10
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r1, r4, #0
 	adds r1, #0x38
 	movs r0, #3

asm/enemy/cuccoAggr.s

@@ -430,7 +430,7 @@ _08038FE0:
 	adds r0, r4, #0
 	bl sub_080390F8
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r0, r4, #0
 	bl GetNextFrame
 	b _08039018
@@ -439,7 +439,7 @@ _08038FF4: .4byte 0x0000FFFF
 _08038FF8: .4byte gPlayerEntity
 _08038FFC:
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r0, r4, #0
 	bl GetNextFrame
 	adds r0, r4, #0

asm/enemy/dust.s

@@ -633,7 +633,7 @@ _08044570:
 	bl sub_080045D4
 	strb r0, [r6, #0x15]
 	adds r0, r6, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	b _080445BE
 	.align 2, 0
 _080445A8: .4byte gPlayerState

asm/enemy/enemy50.s

@@ -1050,7 +1050,7 @@ _08041250:
 	adds r1, #1
 	strb r0, [r1]
 	adds r0, r2, #0
-	bl sub_08016A30
+	bl ResolveCollisionLayer
 	adds r6, #2
 	movs r0, #6
 	ands r6, r0
@@ -1077,7 +1077,7 @@ _080412C8:
 	adds r0, #0x38
 	strb r3, [r0]
 	adds r0, r4, #0
-	bl sub_08016A30
+	bl ResolveCollisionLayer
 	pop {r3, r4, r5}
 	mov r8, r3
 	mov sb, r4

asm/enemy/gleerok.s

@@ -2883,7 +2883,7 @@ _0802E552:
 	lsls r0, r0, #8
 	strh r0, [r1, #0x24]
 	ldr r0, [r2, #0x3c]
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	movs r6, #0
 	movs r0, #0x3c
 	add r0, sb

asm/enemy/gyorgChild.s

@@ -181,7 +181,7 @@ _0804877A:
 sub_0804877C: @ 0x0804877C
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r4, #0xe]
 	cmp r0, #0
 	beq _080487AA
@@ -387,7 +387,7 @@ _08048900: .4byte gPlayerEntity
 sub_08048904: @ 0x08048904
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r0, r4, #0
 	bl GetNextFrame
 	ldrb r0, [r4, #0x14]

asm/enemy/takkuri.s

@@ -522,7 +522,7 @@ sub_0803BF2C: @ 0x0803BF2C
 sub_0803BF48: @ 0x0803BF48
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r1, r4, #0
 	adds r1, #0x38
 	movs r0, #3

asm/enemy/wizzrobeWind.s

@@ -711,7 +711,7 @@ _0802FA02:
 	cmp r0, #0
 	beq _0802FA3E
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r6]
 	cmp r0, #0
 	bne _0802FA3E

asm/loadRoomEntity.s

@@ -85,7 +85,7 @@ _0804AE94:
 _0804AEA0: .4byte gRoomControls
 _0804AEA4:
 	adds r0, r5, #0
-	bl sub_08016A30
+	bl ResolveCollisionLayer
 _0804AEAA:
 	adds r0, r5, #0
 _0804AEAC:

asm/non_matching/eu/HandlePlayerLife.inc

@@ -51,7 +51,7 @@ _0801708A:
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _080170A4
-	bl sub_0807A108
+	bl DeleteClones
 _080170A4:
 	bl sub_08079B24
 	cmp r0, #0

asm/non_matching/eu/sub_0802AC40.inc

@@ -3,7 +3,7 @@
 	adds r4, r0, #0
 	bl GetNextFrame
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r5, r4, #0
 	adds r5, #0x7a
 	ldrb r0, [r5]

asm/non_matching/fallingBoulder/sub_0802C334.inc

@@ -154,7 +154,7 @@ _0802C442:
 _0802C45C: .4byte gRoomControls
 _0802C460:
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	movs r1, #0x36
 	ldrsh r0, [r4, r1]
 	subs r0, r0, r5

asm/non_matching/itemGustJar/sub_08076F64.inc

@@ -99,7 +99,7 @@ _0807701C:
 	eors r1, r2
 	strb r1, [r0, #0x15]
 	strh r5, [r0, #0x24]
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 	b _08077110
 	.align 2, 0
 _08077044: .4byte gPlayerState
@@ -151,7 +151,7 @@ _0807708C:
 	strb r0, [r2, #0x15]
 	movs r0, #0x80
 	strh r0, [r2, #0x24]
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 	b _08077110
 	.align 2, 0
 _080770B0: .4byte gPlayerState

asm/non_matching/itemMoleMitts/sub_080772A8.inc

@@ -73,7 +73,7 @@ _0807732E:
 	ldrsh r0, [r5, r1]
 	cmp r0, #0
 	beq _08077344
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 _08077344:
 	ldrb r1, [r4, #0xe]
 	movs r0, #0x10

asm/non_matching/itemSword/sub_08075900.inc

@@ -54,7 +54,7 @@ _08075962:
 	movs r0, #0xc0
 	lsls r0, r0, #2
 	strh r0, [r4, #0x24]
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 	ldr r0, _08075994 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #3

asm/non_matching/mazaal/sub_0803473C.inc

@@ -59,7 +59,7 @@ _08034798:
 _080347A8:
 	strb r0, [r3, #0x15]
 	adds r0, r3, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 _080347B0:
 	pop {r4, r5, pc}
 	.align 2, 0

asm/non_matching/mazaal/sub_080347B4.inc

@@ -33,7 +33,7 @@ _080347E0:
 _080347F0:
 	strb r0, [r2, #0x15]
 	adds r0, r2, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 _080347F8:
 	pop {r4, r5, pc}
 	.align 2, 0

asm/non_matching/mazaal/sub_0803AA98.inc

@@ -24,7 +24,7 @@
 	cmp r0, #0
 	bne _0803AB0A
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r0, r4, #0
 	bl sub_0803B6F4
 	cmp r0, #0

asm/non_matching/player/PlayerNormal.inc

@@ -91,7 +91,7 @@ _08070842:
 	ands r4, r1
 	cmp r4, #0
 	beq _08070852
-	bl sub_08079938
+	bl ResolvePlayerAnimation
 	b _08070BE4
 _08070852:
 	adds r0, r5, #0
@@ -320,7 +320,7 @@ _08070A26:
 	b _08070BE4
 _08070A32:
 	adds r0, r5, #0
-	bl sub_08073904
+	bl DoJump
 	bl RunQueuedAction
 	cmp r0, #0
 	beq _08070A42
@@ -357,7 +357,7 @@ _08070A7C:
 	movs r0, #0xff
 	strb r0, [r5, #0x15]
 _08070A80:
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 	adds r0, r5, #0
 	adds r0, #0x5a
 	ldrb r1, [r0]
@@ -465,7 +465,7 @@ _08070B1E:
 	lsls r0, r0, #2
 	strb r0, [r5, #0x15]
 _08070B52:
-	bl sub_0807A108
+	bl DeleteClones
 _08070B56:
 	movs r4, #0
 	ldr r3, _08070BB8 @ =gPlayerState

asm/non_matching/player/sub_08070DC4.inc

@@ -4,7 +4,7 @@
 	bl UpdateAnimationSingleFrame
 	adds r0, r4, #0
 	bl sub_080085B0
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 	bl UpdateFloorType
 	bl RunQueuedAction
 	cmp r0, #0
@@ -31,7 +31,7 @@
 	beq _08070E1C
 _08070E10:
 	strb r5, [r6, #2]
-	bl sub_080791D0
+	bl ResetPlayerAnimationAndAction
 	b _08070E76
 	.align 2, 0
 _08070E18: .4byte gPlayerState
@@ -60,8 +60,8 @@ _08070E32:
 	beq _08070E56
 	movs r0, #7
 	strb r0, [r6, #0x11]
-	bl sub_08079938
-	bl sub_080791BC
+	bl ResolvePlayerAnimation
+	bl SetPlayerActionNormal
 	b _08070E76
 _08070E56:
 	movs r0, #1

asm/non_matching/player/sub_08072D54.inc

@@ -11,7 +11,7 @@
 	cmp r0, #0
 	beq _08072D7A
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
 	b _08072E80
@@ -140,10 +140,10 @@ _08072E6C:
 	cmp r0, #0
 	beq _08072E7A
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	b _08072E7E
 _08072E7A:
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 _08072E7E:
 	movs r0, #0
 _08072E80:
@@ -164,7 +164,7 @@ _08072E80:
 	cmp r0, #1
 	bne _08072EAA
 	adds r0, r4, #0
-	bl sub_0800455E
+	bl ResetCollisionLayer
 	b _08072EB0
 _08072EAA:
 	adds r0, r4, #0
@@ -187,7 +187,7 @@ _08072EB0:
 	ands r0, r1
 	cmp r0, #0
 	bne _08072F10
-	bl sub_080791BC
+	bl SetPlayerActionNormal
 	b _08072F10
 	.align 2, 0
 _08072EDC: .4byte gPlayerState

asm/non_matching/player/sub_08073584.inc

@@ -36,7 +36,7 @@ _080735C0:
 	strb r1, [r6, #2]
 	bl sub_0807921C
 	adds r0, r4, #0
-	bl sub_08073904
+	bl DoJump
 	movs r0, #0xe6
 	lsls r0, r0, #3
 	strh r0, [r6, #8]
@@ -114,7 +114,7 @@ _0807365A:
 	movs r1, #0x1f
 	ands r0, r1
 	strb r0, [r4, #0x15]
-	bl sub_08079E08
+	bl UpdatePlayerMovement
 	ldrb r2, [r4, #0x14]
 	lsls r3, r2, #2
 	ldrb r1, [r4, #0x15]

asm/non_matching/player/sub_080740D8.inc

@@ -102,7 +102,7 @@ _0807418C:
 	cmp r0, #0
 	beq _080741AC
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	b _080741B0
 	.align 2, 0
 _080741A4: .4byte gRoomControls

asm/non_matching/playerItem11/sub_08018E68.inc

@@ -38,7 +38,7 @@ _08018EA8:
 	cmp r0, #0xff
 	beq _08018F46
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r4, #0x15]
 	cmp r0, #8
 	beq _08018EEA

asm/non_matching/playerItem12/sub_080701F8.inc

@@ -57,7 +57,7 @@ _08070268:
 	adds r0, r5, #0
 	bl GetNextFrame
 	adds r0, r5, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r5, #0xa]
 	cmp r0, #0
 	bne _08070280

asm/non_matching/playerItem13/sub_080AD040.inc

@@ -54,7 +54,7 @@ _080AD088:
 	cmp r0, #0x74
 	bne _080AD0B4
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	b _080AD0C8
 	.align 2, 0
 _080AD0B0: .4byte gUnk_081320C4

asm/non_matching/playerItem15/sub_080A310C.inc

@@ -26,7 +26,7 @@ _080A312A:
 	adds r0, r4, #0
 	bl GetNextFrame
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r4, #0xe]
 	adds r0, #1
 	strb r0, [r4, #0xe]

asm/non_matching/playerItem3/sub_0801B680.inc

@@ -48,7 +48,7 @@ _0801B6D0:
 	strb r0, [r4, #0x15]
 _0801B6DC:
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	movs r5, #0
 	adds r0, r4, #0
 	bl sub_0801B864

asm/non_matching/playerItemBow/sub_0801917C.inc

@@ -31,7 +31,7 @@ _0801919C:
 	strb r0, [r4, #0x18]
 _080191BA:
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r0, r4, #0
 	adds r0, #0x40
 	ldrb r1, [r0]

asm/object/ambientClouds.s

@@ -116,7 +116,7 @@ _0808921C:
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl sub_08016A30
+	bl ResolveCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x15
 	bl ChangeObjPalette
@@ -222,7 +222,7 @@ _0808991A:
 	movs r0, #1
 	strb r0, [r5]
 	adds r0, r4, #0
-	bl sub_08016A30
+	bl ResolveCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x15
 	bl ChangeObjPalette

asm/object/bird.s

@@ -196,7 +196,7 @@ _0809D2D6:
 	strh r0, [r1]
 	bl sub_08079184
 	bl sub_08078B48
-	bl sub_080791D0
+	bl ResetPlayerAnimationAndAction
 	bl sub_08077B20
 	adds r0, r7, #0
 	adds r0, #0x26
@@ -220,7 +220,7 @@ _0809D2D6:
 	strb r3, [r0]
 _0809D3A8:
 	adds r0, r5, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	mov r0, r8
 	movs r2, #0
 	ldrsh r1, [r0, r2]
@@ -499,7 +499,7 @@ _0809D5E6:
 	movs r1, #1
 	orrs r0, r1
 	strb r0, [r6, #0x18]
-	bl sub_080791D0
+	bl ResetPlayerAnimationAndAction
 	bl ResetPlayerEventPriority
 	ldr r1, _0809D664 @ =gUnk_02034490
 	movs r0, #0
@@ -524,7 +524,7 @@ _0809D5E6:
 	bl SetGlobalFlag
 _0809D62E:
 	adds r0, r5, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	movs r0, #0
 	ldrsh r1, [r7, r0]
 	adds r0, r5, #0
@@ -692,7 +692,7 @@ _0809D76C:
 _0809D774: .4byte gRoomControls
 _0809D778: .4byte gUnk_02034490
 _0809D77C:
-	bl sub_080791D0
+	bl ResetPlayerAnimationAndAction
 _0809D780:
 	pop {r4, pc}
 	.align 2, 0

asm/object/blockPushed.s

@@ -243,7 +243,7 @@ _08083090: .4byte 0x0000010F
 sub_08083094: @ 0x08083094
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	adds r0, r4, #0
 	bl sub_0800445C
 	ldrb r0, [r4, #0xe]

asm/object/bossDoor.s

@@ -221,7 +221,7 @@ _0808C382:
 sub_0808C384: @ 0x0808C384
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
 	strb r0, [r4, #0xe]
@@ -296,7 +296,7 @@ _0808C410: .4byte gUnk_081214F4
 sub_0808C414: @ 0x0808C414
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
 	strb r0, [r4, #0xe]

asm/object/chestSpawner.s

@@ -371,7 +371,7 @@ sub_080840A8: @ 0x080840A8
 	ldr r0, _08084148 @ =0x0000FFF8
 	strh r0, [r5, #0x36]
 	adds r0, r5, #0
-	bl sub_08016A30
+	bl ResolveCollisionLayer
 	adds r0, r5, #0
 	movs r1, #0x11
 	movs r2, #0

asm/object/crenalBeanSprout.s

@@ -643,7 +643,7 @@ _08096802:
 	bl sub_080045D4
 	strb r0, [r4, #0x15]
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 _0809681C:
 	movs r1, #0x80
 	lsls r1, r1, #7

asm/object/deathFx.s

@@ -190,7 +190,7 @@ _0808177E:
 	cmp r0, #0
 	beq _0808178C
 	adds r0, r4, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 _0808178C:
 	pop {r4, pc}
 	.align 2, 0

asm/object/doubleBookshelf.s

@@ -136,7 +136,7 @@ sub_0809B034: @ 0x0809B034
 sub_0809B050: @ 0x0809B050
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	bl sub_0806F69C
+	bl LinearMoveUpdate
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
 	strb r0, [r4, #0xe]

asm/object/figurineDevice.s

@@ -167,7 +167,7 @@ _08087CCA:
 	beq _08087D1A
 	movs r0, #0
 	strb r0, [r1]
-	bl sub_080791D0
+	bl ResetPlayerAnimationAndAction
 	movs r0, #0x5e
 	bl CheckLocalFlag
 	cmp r0, #0