Merge pull request #225 from notyourav/asm_funcs

finish player, label script functions

asm/ballChainSoldier.s

@@ -356,7 +356,7 @@ _0803E7A0:
 	strb r0, [r2, #0xe]
 	movs r0, #8
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 _0803E7B0:
 	pop {pc}
 	.align 2, 0

asm/bird.s

@@ -225,7 +225,7 @@ _0809D3A8:
 	movs r2, #0
 	ldrsh r1, [r0, r2]
 	adds r0, r5, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r0, r5, #0
 	bl UpdateAnimationSingleFrame
 	ldr r4, [r5, #0x54]
@@ -298,7 +298,7 @@ _0809D448:
 	bl CopyPosition
 _0809D454:
 	adds r0, r5, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	bne _0809D488
 	ldrb r0, [r5, #0xc]
@@ -528,11 +528,11 @@ _0809D62E:
 	movs r0, #0
 	ldrsh r1, [r7, r0]
 	adds r0, r5, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r0, r5, #0
 	bl UpdateAnimationSingleFrame
 	adds r0, r5, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	bne _0809D652
 	bl DeleteThisEntity

asm/chuchuBoss.s

@@ -1028,12 +1028,12 @@ sub_0802647C: @ 0x0802647C
 	adds r4, r0, #0
 	movs r1, #0x80
 	lsls r1, r1, #7
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _080264A6
 	movs r0, #0x10
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	ldr r0, _080264A8 @ =0x000001A1
 	bl SoundReq
 	adds r0, r4, #0
@@ -1551,7 +1551,7 @@ sub_0802686C: @ 0x0802686C
 	adds r4, r0, #0
 	movs r1, #0x80
 	lsls r1, r1, #7
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r5, r0, #0
 	cmp r5, #0
 	beq _08026888
@@ -1561,7 +1561,7 @@ sub_0802686C: @ 0x0802686C
 _08026888:
 	movs r0, #0x10
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	movs r0, #5
 	strb r0, [r4, #0xd]
 	adds r0, r4, #0
@@ -1852,7 +1852,7 @@ _08026A7C:
 	strh r0, [r1]
 	movs r0, #0x20
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	ldr r0, _08026B24 @ =0x0000010B
 	bl SoundReq
 	adds r0, r6, #0
@@ -2126,7 +2126,7 @@ _08026A98:
 	strh r0, [r1]
 	movs r0, #0x20
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	ldr r0, _08026B24 @ =0x0000010B
 	bl SoundReq
 	adds r0, r6, #0

asm/code_080011C4.s

@@ -109,7 +109,7 @@ sub_08001242: @ 0x08001242
 	pop {r0}
 _08001282:
 	ldr r1, _08001364 @ =0x00001800
-	bl sub_08003FC4
+	bl GravityUpdate
 	pop {pc}
 	.align 2, 0
 _0800128C:
@@ -126,6 +126,8 @@ sub_08001290: @ 0x08001290
 _0800129C:
 	bx lr
 
+	@ r0: Entity*
+	@ r1: Function* array
 	non_word_aligned_thumb_func_start EnemyFunctionHandler
 EnemyFunctionHandler: @ 0x0800129E
 	mov r3, lr

asm/code_08003FC4.s

@@ -5,8 +5,12 @@
 
 	.text
 
-	thumb_func_start sub_08003FC4
-sub_08003FC4: @ 0x08003FC4
+	thumb_func_start GravityUpdate
+GravityUpdate: @ 0x08003FC4
+	@ r0 = Entity*
+	@ r1 = Gravity strength
+	@ returns z pos
+
 	adds r3, r0, #0
 	ldr r0, [r3, #0x34]
 	ldr r2, [r3, #0x20]
@@ -141,8 +145,8 @@ sub_080040A2: @ 0x080040A2
 	lsrs r1, r1, #2
 	bhs _080040D0
 
-	thumb_func_start sub_080040A8
-sub_080040A8: @ 0x080040A8
+	thumb_func_start CheckOnScreen
+CheckOnScreen: @ 0x080040A8
 	ldr r1, _08004368 @ =gRoomControls
 	movs r2, #0x2e
 	ldrsh r2, [r0, r2]

asm/code_080043E8.s

@@ -99,10 +99,10 @@ EnqueueSFX: @ 0x08004488
 _0800449A:
 	bx lr
 
-	thumb_func_start sub_0800449C
-sub_0800449C: @ 0x0800449C
+	thumb_func_start SoundReqClipped
+SoundReqClipped: @ 0x0800449C
 	push {r1, lr}
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	pop {r0}
 	beq _080044AC

asm/code_0800857C.s

@@ -464,7 +464,7 @@ _0800890C:
 	.byte 0x00, 0xFA, 0x06, 0x00, 0x13, 0x12, 0x12, 0x10, 0x10, 0x11, 0x11, 0x13
 _0800891C:
 	push {r0}
-	bl sub_08078F60
+	bl ResetPlayerVelocity
 	pop {r0}
 _08008924:
 	pop {pc}

asm/code_08018500.s

@@ -160,8 +160,8 @@ _08018620:
 _08018624: .4byte gUnk_02033AB8
 _08018628: .4byte gUnk_080B3D20
 
-	thumb_func_start sub_0801862C
-sub_0801862C: @ 0x0801862C
+	thumb_func_start GenerateAreaHint
+GenerateAreaHint: @ 0x0801862C
 	push {r4, r5, lr}
 	ldr r1, _0801864C @ =gPlayerState
 	movs r2, #0

asm/code_0801967C.s

@@ -1260,7 +1260,7 @@ _08019FDA:
 	ands r7, r0
 	movs r4, #0
 	movs r6, #0
-	ldr r5, _0801A088 @ =gUnk_03004040
+	ldr r5, _0801A088 @ =gPlayerClones
 	mov sb, r5
 _08019FEC:
 	mov r1, sb
@@ -1340,7 +1340,7 @@ _0801A02A:
 _0801A07C: .4byte gPlayerState
 _0801A080: .4byte 0x0000FFFF
 _0801A084: .4byte 0x00000FFF
-_0801A088: .4byte gUnk_03004040
+_0801A088: .4byte gPlayerClones
 _0801A08C: .4byte gPlayerEntity
 _0801A090: .4byte gRoomControls
 _0801A094:
@@ -1465,7 +1465,7 @@ _0801A166:
 	b _0801A2A4
 _0801A174:
 	movs r4, #0
-	ldr r5, _0801A194 @ =gUnk_03004040
+	ldr r5, _0801A194 @ =gPlayerClones
 _0801A178:
 	ldr r0, [r5]
 	movs r1, #0
@@ -1481,7 +1481,7 @@ _0801A186:
 	b _0801A2A4
 	.align 2, 0
 _0801A190: .4byte gPlayerState
-_0801A194: .4byte gUnk_03004040
+_0801A194: .4byte gPlayerClones
 _0801A198:
 	subs r7, #0x40
 _0801A19A:
@@ -1499,7 +1499,7 @@ _0801A1A6:
 	cmp r0, #9
 	ble _0801A2A4
 	movs r4, #0
-	ldr r5, _0801A1D0 @ =gUnk_03004040
+	ldr r5, _0801A1D0 @ =gPlayerClones
 _0801A1B6:
 	ldr r0, [r5]
 	movs r1, #6
@@ -1513,7 +1513,7 @@ _0801A1B6:
 	b _0801A2A4
 	.align 2, 0
 _0801A1CC: .4byte gPlayerState
-_0801A1D0: .4byte gUnk_03004040
+_0801A1D0: .4byte gPlayerClones
 _0801A1D4:
 	movs r0, #2
 	ands r0, r1

asm/code_08049D30.s

@@ -6,8 +6,8 @@
 
 	.text
 
-	thumb_func_start sub_08049D30
-sub_08049D30: @ 0x08049D30
+	thumb_func_start UpdateRoomTracker
+UpdateRoomTracker: @ 0x08049D30
 	push {r4, r5, r6, lr}
 	ldr r1, _08049D58 @ =gUnk_020354B0
 	ldr r0, _08049D5C @ =gUnk_02024050

asm/code_08077B98.s

@@ -221,8 +221,8 @@ _0807815C:
 	pop {pc}
 	.align 2, 0
 
-	thumb_func_start sub_08078160
-sub_08078160: @ 0x08078160
+	thumb_func_start ForceSetPlayerState
+ForceSetPlayerState: @ 0x08078160
 	push {lr}
 	ldr r1, _08078178 @ =gPlayerState
 	adds r1, #0xa8
@@ -558,7 +558,7 @@ _08078418:
 	bl CreateEzloHint
 _08078420:
 	movs r0, #0x13
-	bl sub_08078160
+	bl ForceSetPlayerState
 	b _080784C4
 	.align 2, 0
 _08078428: .4byte 0x00000B65
@@ -599,7 +599,7 @@ _08078484:
 	movs r0, #7
 	strb r0, [r4, #0xc]
 	movs r0, #0x13
-	bl sub_08078160
+	bl ForceSetPlayerState
 _0807848E:
 	adds r1, r6, #0
 	adds r1, #0x39

asm/code_08078778.s

@@ -862,8 +862,8 @@ sub_08078EE4: @ 0x08078EE4
 _08078EF4: .4byte gPlayerEntity
 _08078EF8: .4byte gPlayerState
 
-	thumb_func_start sub_08078EFC
-sub_08078EFC: @ 0x08078EFC
+	thumb_func_start RunQueuedAction
+RunQueuedAction: @ 0x08078EFC
 	push {lr}
 	ldr r3, _08078F18 @ =gPlayerState
 	ldrb r2, [r3, #0xc]
@@ -894,7 +894,7 @@ sub_08078F24: @ 0x08078F24
 	ands r0, r3
 	cmp r0, #0
 	beq _08078F3C
-	bl sub_08078F60
+	bl ResetPlayerVelocity
 	b _08078F5A
 	.align 2, 0
 _08078F38: .4byte gPlayerState
@@ -919,8 +919,8 @@ _08078F5A:
 	.align 2, 0
 _08078F5C: .4byte gSineTable
 
-	thumb_func_start sub_08078F60
-sub_08078F60: @ 0x08078F60
+	thumb_func_start ResetPlayerVelocity
+ResetPlayerVelocity: @ 0x08078F60
 	ldr r0, _08078F70 @ =gPlayerState
 	adds r1, r0, #0
 	adds r1, #0x8c
@@ -3282,7 +3282,7 @@ _0807A104:
 	thumb_func_start sub_0807A108
 sub_0807A108: @ 0x0807A108
 	push {lr}
-	ldr r1, _0807A148 @ =gUnk_03004040
+	ldr r1, _0807A148 @ =gPlayerClones
 	movs r0, #0
 	str r0, [r1]
 	str r0, [r1, #4]
@@ -3315,7 +3315,7 @@ _0807A130:
 _0807A144:
 	pop {pc}
 	.align 2, 0
-_0807A148: .4byte gUnk_03004040
+_0807A148: .4byte gPlayerClones
 _0807A14C: .4byte gPlayerState
 _0807A150: .4byte 0xFFBFFFFF
 _0807A154: .4byte gPlayerEntity
@@ -3483,8 +3483,8 @@ _0807A28C: .4byte gPlayerEntity
 _0807A290: .4byte gPlayerState
 _0807A294: .4byte gUnk_08007CAC
 
-	thumb_func_start sub_0807A298
-sub_0807A298: @ 0x0807A298
+	thumb_func_start EnablePlayerDraw
+EnablePlayerDraw: @ 0x0807A298
 	movs r1, #0
 	strb r1, [r0, #0xb]
 	ldrb r1, [r0, #0x18]
@@ -5581,13 +5581,13 @@ sub_0807B21C: @ 0x0807B21C
 	movs r1, #0x80
 	lsls r1, r1, #3
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	b _0807B240
 _0807B236:
 	movs r1, #0x80
 	lsls r1, r1, #4
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 _0807B240:
 	ldr r1, [r4, #0x20]
 	ldr r0, _0807B260 @ =0xFFFF8000
@@ -5659,7 +5659,7 @@ sub_0807B2B8: @ 0x0807B2B8
 	push {r4, lr}
 	adds r4, r0, #0
 	ldr r1, _0807B2F0 @ =0xFFFFE000
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r0, r4, #0
 	bl UpdateAnimationSingleFrame
 	ldrb r0, [r4, #0xe]

asm/crenalBeanSprout.s

@@ -535,7 +535,7 @@ sub_08096740: @ 0x08096740
 	adds r4, r0, #0
 	movs r0, #0x10
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	movs r1, #0
 	movs r0, #1
 	strb r0, [r4, #0xc]
@@ -648,7 +648,7 @@ _0809681C:
 	movs r1, #0x80
 	lsls r1, r1, #7
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08096830
 	adds r0, r4, #0

asm/crow.s

@@ -280,7 +280,7 @@ sub_080329E8: @ 0x080329E8
 sub_080329F0: @ 0x080329F0
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	bne _08032A3A
 	movs r0, #4
@@ -326,7 +326,7 @@ _08032A46:
 sub_08032A48: @ 0x08032A48
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	adds r5, r0, #0
 	cmp r5, #0
 	bne _08032AAE

asm/cuccoAggr.s

@@ -312,7 +312,7 @@ sub_08038EE0: @ 0x08038EE0
 	movs r1, #0xe0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08038F1C
 	ldrb r0, [r4, #0xe]

asm/enemy4D.s

@@ -284,7 +284,7 @@ _0803EDC0:
 	strb r0, [r2, #0xe]
 	movs r0, #8
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 _0803EDD0:
 	pop {pc}
 	.align 2, 0

asm/enemy50.s

@@ -854,7 +854,7 @@ sub_08041134: @ 0x08041134
 	movs r0, #0x25
 	strb r0, [r1]
 	movs r5, #0
-	ldr r0, _08041168 @ =gUnk_03004040
+	ldr r0, _08041168 @ =gPlayerClones
 	ldr r0, [r0]
 	cmp r0, #0
 	beq _08041150
@@ -872,7 +872,7 @@ _08041150:
 	strh r0, [r1]
 	pop {r4, r5, pc}
 	.align 2, 0
-_08041168: .4byte gUnk_03004040
+_08041168: .4byte gPlayerClones
 _0804116C: .4byte gUnk_080D0E18
 
 	thumb_func_start sub_08041170

asm/enemy62.s

@@ -105,7 +105,7 @@ _08048E48:
 	bl SoundReq
 	movs r0, #0x28
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 _08048E5C:
 	adds r2, r5, #0
 	adds r2, #0x3d

asm/eyegore.s

@@ -161,7 +161,7 @@ sub_08030B34: @ 0x08030B34
 	movs r1, #0xe0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	b _08030B70
 _08030B52:
 	adds r0, r4, #0
@@ -425,7 +425,7 @@ _08030D44:
 	movs r1, #0xe0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08030D66
 	adds r0, r4, #0
@@ -506,7 +506,7 @@ _08030DDE:
 	movs r1, #0xe0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08030E1C
 	adds r0, r4, #0

asm/ezloCap.s

@@ -551,7 +551,7 @@ _08082D0C:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r5, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r0, r5, #0
 	bl UpdateAnimationSingleFrame
 _08082D1C:
@@ -709,7 +709,7 @@ sub_08082E14: @ 0x08082E14
 	movs r1, #0xc0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	ldrb r0, [r4, #0xd]
 	cmp r0, #0
 	beq _08082E38

asm/flyingPot.s

@@ -501,7 +501,7 @@ _080373F2:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08037406
 	adds r0, r4, #0

asm/flyingSkull.s

@@ -694,7 +694,7 @@ _0803A0CA:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _0803A0DE
 	adds r0, r4, #0

asm/ghini.s

@@ -851,7 +851,7 @@ sub_0803F630: @ 0x0803F630
 	movs r0, #0x25
 	strb r0, [r1]
 	movs r5, #0
-	ldr r0, _0803F664 @ =gUnk_03004040
+	ldr r0, _0803F664 @ =gPlayerClones
 	ldr r0, [r0]
 	cmp r0, #0
 	beq _0803F64C
@@ -869,7 +869,7 @@ _0803F64C:
 	strh r0, [r1]
 	pop {r4, r5, pc}
 	.align 2, 0
-_0803F664: .4byte gUnk_03004040
+_0803F664: .4byte gPlayerClones
 _0803F668: .4byte gUnk_080D0980
 
 	thumb_func_start sub_0803F66C
@@ -937,7 +937,7 @@ sub_0803F6C0: @ 0x0803F6C0
 	bl ModHealth
 	adds r0, r4, #0
 	movs r1, #0x7a
-	bl sub_0800449C
+	bl SoundReqClipped
 	pop {r4, pc}
 	.align 2, 0
 _0803F6E8: .4byte gPlayerEntity

asm/gleerok.s

@@ -900,7 +900,7 @@ sub_0802D6F0: @ 0x0802D6F0
 	str r0, [r2, #0x7c]
 	movs r0, #0x96
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 _0802D712:
 	pop {pc}
 
@@ -1294,7 +1294,7 @@ _0802D95E:
 	movs r1, #0xc0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0802D970
@@ -1526,7 +1526,7 @@ _0802DB20:
 	movs r1, #0xc0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	ldr r0, [r4, #0x20]
 	cmp r0, #0
 	bgt _0802DB7E
@@ -2496,7 +2496,7 @@ _0802E23A:
 	movs r0, #0xf0
 	strh r0, [r7]
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	b _0802E2E4
 	.align 2, 0
 _0802E280: .4byte gPlayerEntity
@@ -2545,7 +2545,7 @@ _0802E29E:
 	strh r0, [r1]
 	movs r0, #0x1e
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 _0802E2E4:
 	movs r0, #5
 	strb r0, [r5, #0xb]

asm/gyorgBossObject.s

@@ -399,7 +399,7 @@ sub_080A189C: @ 0x080A189C
 	bl SoundReq
 	movs r0, #0x96
 	movs r1, #1
-	bl sub_08080964
+	bl InitScreenShake
 _080A18E6:
 	ldr r2, _080A1904 @ =gPlayerState
 	ldr r1, _080A1908 @ =gRoomControls
@@ -521,7 +521,7 @@ sub_080A1990: @ 0x080A1990
 	bl SoundReq
 	movs r0, #0x96
 	movs r1, #1
-	bl sub_08080964
+	bl InitScreenShake
 _080A19D6:
 	ldr r2, _080A19F4 @ =gPlayerState
 	ldr r1, _080A19F8 @ =gRoomControls
@@ -640,7 +640,7 @@ sub_080A1A80: @ 0x080A1A80
 	bl SoundReq
 	movs r0, #0x96
 	movs r1, #1
-	bl sub_08080964
+	bl InitScreenShake
 _080A1AC0:
 	ldr r2, _080A1AE0 @ =gPlayerState
 	ldr r1, _080A1AE4 @ =gRoomControls
@@ -728,7 +728,7 @@ sub_080A1B4C: @ 0x080A1B4C
 	beq _080A1B80
 	movs r0, #0x2d
 	movs r1, #1
-	bl sub_08080964
+	bl InitScreenShake
 	movs r0, #0x94
 	lsls r0, r0, #1
 	bl SoundReq
@@ -860,7 +860,7 @@ _080A1C76:
 	movs r0, #0xb4
 	lsls r0, r0, #2
 	movs r1, #2
-	bl sub_08080964
+	bl InitScreenShake
 	b _080A1C9A
 _080A1C8A:
 	movs r0, #0x94
@@ -868,7 +868,7 @@ _080A1C8A:
 	bl SoundReq
 	movs r0, #0x4b
 	movs r1, #1
-	bl sub_08080964
+	bl InitScreenShake
 _080A1C9A:
 	pop {r4, pc}
 
@@ -1418,7 +1418,7 @@ _080A20A4:
 	bne _080A20B4
 	movs r0, #0x1e
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	b _080A20B4
 _080A20B2:
 	strb r0, [r4]

asm/gyorgFemale.s

@@ -813,7 +813,7 @@ _08046498:
 	beq _0804650E
 	movs r0, #8
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	adds r1, r4, #0
 	adds r1, #0x82
 	ldrb r0, [r1]
@@ -965,7 +965,7 @@ _080466D0:
 	beq _08046746
 	movs r0, #8
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	adds r1, r4, #0
 	adds r1, #0x82
 	ldrb r0, [r1]

asm/hittableLever.s

@@ -121,7 +121,7 @@ _0808A7C2:
 _0808A7C8:
 	ldr r1, _0808A7D4 @ =0x00000117
 	adds r0, r5, #0
-	bl sub_0800449C
+	bl SoundReqClipped
 _0808A7D0:
 	pop {r4, r5, pc}
 	.align 2, 0

asm/itemForSale.s

@@ -19,7 +19,7 @@ ItemForSale: @ 0x08081814
 	adds r0, r4, #0
 	bl _call_via_r1
 	adds r0, r4, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	beq _08081838
 	adds r0, r4, #0

asm/ladderUp.s

@@ -83,7 +83,7 @@ _0808D4D8:
 	movs r1, #0x80
 	lsls r1, r1, #5
 	adds r0, r7, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _0808D4E8
 	b _0808D642
@@ -101,7 +101,7 @@ _0808D4E8:
 _0808D4FE:
 	movs r0, #0x1e
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	ldr r0, _0808D514 @ =0x0000010B
 	bl SoundReq
 	movs r0, #2
@@ -340,7 +340,7 @@ _0808DBE8:
 	movs r1, #0x80
 	lsls r1, r1, #5
 	adds r0, r7, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _0808DBF8
 	b _0808DD72
@@ -358,7 +358,7 @@ _0808DBF8:
 _0808DC0E:
 	movs r0, #0x1e
 	movs r1, #0
-	bl sub_08080964
+	bl InitScreenShake
 	ldr r0, _0808DC28 @ =0x0000010B
 	bl SoundReq
 	movs r0, #2

asm/lavaPlatform.s

@@ -87,7 +87,7 @@ sub_080922E4: @ 0x080922E4
 	adds r4, r0, #0
 	movs r1, #0x90
 	lsls r1, r1, #6
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r2, r0, #0
 	cmp r2, #0
 	bne _08092322

asm/lilypadLarge.s

@@ -850,7 +850,7 @@ sub_08085B40: @ 0x08085B40
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r5, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _08085BE8
 	ldr r1, [r5, #0x78]
@@ -930,7 +930,7 @@ _08085BE8:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08085C58
 	adds r0, r4, #0
@@ -1380,7 +1380,7 @@ sub_08085F48: @ 0x08085F48
 	ldrb r0, [r5, #0x12]
 	cmp r0, #0x17
 	bne _08085F6A
-	bl sub_08078F60
+	bl ResetPlayerVelocity
 	movs r0, #0x19
 	strb r0, [r5, #0x12]
 _08085F6A:

asm/macroBook.s

@@ -132,7 +132,7 @@ _0809A85C:
 	beq _0809A87C
 	subs r0, #1
 	strb r0, [r4, #0xe]
-	ldr r0, _0809A878 @ =gUnk_03004040
+	ldr r0, _0809A878 @ =gPlayerClones
 	ldr r1, [r0]
 	cmp r1, #0
 	bne _0809A8A0
@@ -142,7 +142,7 @@ _0809A870:
 	strb r1, [r4, #0xe]
 	b _0809A8A0
 	.align 2, 0
-_0809A878: .4byte gUnk_03004040
+_0809A878: .4byte gPlayerClones
 _0809A87C:
 	adds r0, r4, #0
 	adds r0, #0x5a
@@ -241,7 +241,7 @@ _0809A92A:
 	adds r0, r4, #0
 	movs r2, #1
 	bl sub_0809AA9C
-	ldr r0, _0809A954 @ =gUnk_03004040
+	ldr r0, _0809A954 @ =gPlayerClones
 	ldr r1, [r0]
 	cmp r1, #0
 	beq _0809A94E
@@ -252,7 +252,7 @@ _0809A94E:
 	pop {r4, pc}
 	.align 2, 0
 _0809A950: .4byte gPlayerEntity
-_0809A954: .4byte gUnk_03004040
+_0809A954: .4byte gPlayerClones
 
 	thumb_func_start sub_0809A958
 sub_0809A958: @ 0x0809A958
@@ -408,7 +408,7 @@ _0809AA5C:
 	adds r1, r4, #0
 	movs r2, #1
 	bl sub_0809AA9C
-	ldr r0, _0809AA98 @ =gUnk_03004040
+	ldr r0, _0809AA98 @ =gPlayerClones
 	ldr r4, [r0]
 	cmp r4, #0
 	beq _0809AA8E
@@ -422,7 +422,7 @@ _0809AA8E:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 _0809AA94: .4byte gPlayerEntity
-_0809AA98: .4byte gUnk_03004040
+_0809AA98: .4byte gPlayerClones
 
 	thumb_func_start sub_0809AA9C
 sub_0809AA9C: @ 0x0809AA9C

asm/macroPlayer.s

@@ -262,7 +262,7 @@ sub_0808CCBC: @ 0x0808CCBC
 	movs r1, #0x80
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _0808CCFA
 	ldrb r0, [r4, #0xc]
@@ -300,7 +300,7 @@ sub_0808CD00: @ 0x0808CD00
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _0808CD24
 	adds r0, r4, #0
@@ -335,7 +335,7 @@ sub_0808CD44: @ 0x0808CD44
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _0808CD68
 	adds r0, r4, #0
@@ -368,7 +368,7 @@ sub_0808CD88: @ 0x0808CD88
 	movs r1, #0xc0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _0808CDB8
 	adds r0, r4, #0

asm/macros/scripts.inc

@@ -171,7 +171,7 @@
 	.2byte 0x0418
 .endm
 
-.macro _0807E30C 
+.macro FacePlayerAndCheckDist 
 	.2byte 0x0419
 .endm
 
@@ -180,7 +180,7 @@
 	.2byte \amount
 .endm
 
-.macro _0807E3BC s:req
+.macro HasShells s:req
 	.2byte 0x081b
 	.2byte \s
 .endm
@@ -209,17 +209,17 @@
 	.2byte \s
 .endm
 
-.macro _0807E4CC w:req
+.macro VariableBitSet w:req
 	.2byte 0x0c20
 	.4byte \w
 .endm
 
-.macro _0807E4EC w:req
+.macro VariableOnlyBitSet w:req
 	.2byte 0x0c21
 	.4byte \w
 .endm
 
-.macro _0807E514 w:req
+.macro VariableEqual w:req
 	.2byte 0x0c22
 	.4byte \w
 .endm
@@ -229,7 +229,7 @@
 	.4byte \w
 .endm
 
-.macro _0807E564 
+.macro CheckPlayerMinish 
 	.2byte 0x0424
 .endm
 
@@ -312,7 +312,7 @@
 	.2byte 0x0434
 .endm
 
-.macro WaitForPlayerAction0x17 
+.macro WaitForPlayerEnterRoom 
 	.2byte 0x0435
 .endm
 
@@ -324,7 +324,7 @@
 	.2byte 0x0437
 .endm
 
-.macro _0807E778 s:req
+.macro SetFadeTime s:req
 	.2byte 0x0838
 	.2byte \s
 .endm
@@ -334,7 +334,7 @@
 	.4byte \w
 .endm
 
-.macro _0807E79C 
+.macro FadeInvert 
 	.2byte 0x043a
 .endm
 
@@ -378,15 +378,15 @@
 	.2byte 0x0442
 .endm
 
-.macro _0807E864 
+.macro SetPlayerIdle 
 	.2byte 0x0443
 .endm
 
-.macro _0807E878 
+.macro EnablePlayerControl 
 	.2byte 0x0444
 .endm
 
-.macro _0807E888 
+.macro DisablePlayerControl 
 	.2byte 0x0445
 .endm
 
@@ -400,7 +400,7 @@
 	.4byte \script
 .endm
 
-.macro _0807E8D4 s:req
+.macro SetPlayerAnimation s:req
 	.2byte 0x0848
 	.2byte \s
 .endm
@@ -421,7 +421,7 @@
 	.2byte 0x044c
 .endm
 
-.macro _0807E908 s:req
+.macro SetAction s:req
 	.2byte 0x084d
 	.2byte \s
 .endm
@@ -431,16 +431,16 @@
 	.4byte \value
 .endm
 
-.macro _0807E924 
+.macro SetVariableToFrame 
 	.2byte 0x044f
 .endm
 
-.macro _0807E930 s:req
+.macro SetAnimation s:req
 	.2byte 0x0850
 	.2byte \s
 .endm
 
-.macro _0807E944 
+.macro TriggerInteract 
 	.2byte 0x0451
 .endm
 
@@ -509,7 +509,7 @@
 	.2byte 0x045e
 .endm
 
-.macro _0807EB28 s:req
+.macro EzloMessage s:req
 	.2byte 0x085f
 	.2byte \s
 .endm
@@ -518,7 +518,7 @@
 	.2byte 0x0460
 .endm
 
-.macro _0807EB44 s:req
+.macro SetAnimationState s:req
 	.2byte 0x0861
 	.2byte \s
 .endm
@@ -529,11 +529,11 @@
 	.2byte \b
 .endm
 
-.macro _0807EB74 
+.macro FacePlayer 
 	.2byte 0x0463
 .endm
 
-.macro _0807EB8C 
+.macro FaceAwayFromPlayer 
 	.2byte 0x0464
 .endm
 
@@ -552,7 +552,7 @@
 	.2byte \speed
 .endm
 
-.macro SetEntity0x20 value:req
+.macro SetEntityVelocity value:req
 	.2byte 0x0c68
 	.4byte \value
 .endm
@@ -577,27 +577,27 @@
 	.2byte 0x046c
 .endm
 
-.macro _0807EC1C s:req
+.macro WalkForward s:req
 	.2byte 0x086d
 	.2byte \s
 .endm
 
-.macro _0807EC64 s:req
+.macro WalkNorth s:req
 	.2byte 0x086e
 	.2byte \s
 .endm
 
-.macro _0807EC94 s:req
+.macro WalkEast s:req
 	.2byte 0x086f
 	.2byte \s
 .endm
 
-.macro _0807ECC4 s:req
+.macro WalkSouth s:req
 	.2byte 0x0870
 	.2byte \s
 .endm
 
-.macro _0807ECF4 s:req
+.macro WalkWest s:req
 	.2byte 0x0871
 	.2byte \s
 .endm
@@ -695,7 +695,7 @@
 	.2byte \s
 .endm
 
-.macro _0807F050 s:req
+.macro GiveKinstone s:req
 	.2byte 0x0883
 	.2byte \s
 .endm

asm/minecart.s

@@ -233,7 +233,7 @@ _08091DA0:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08091DD8
 	ldrb r1, [r4, #0xb]

asm/non_matching/castorWildsStatue/sub_080676E0.inc

@@ -49,7 +49,7 @@ _08067734:
 	movs r1, #0xc0
 	lsls r1, r1, #5
 	adds r0, r3, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _08067748
 _08067742:

asm/non_matching/cucco/sub_0806E564.inc

@@ -36,7 +36,7 @@ _0806E5AA:
 	movs r1, #0xa0
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _0806E5D4
 	ldrb r0, [r4, #0xe]

asm/non_matching/cuccoChick/sub_0806E7B0.inc

@@ -35,7 +35,7 @@ _0806E7F2:
 	movs r1, #0xc0
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _0806E81C
 	ldrb r0, [r4, #0xe]

asm/non_matching/mountainMinish/sub_08067EF0.inc

@@ -161,7 +161,7 @@ _0806802C:
 	ands r0, r2
 	strb r0, [r6]
 	adds r0, r5, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	bne _08068068
 	ldr r4, _08068064 @ =gUnk_0811137A

asm/non_matching/pesto/sub_08024E4C.inc

@@ -123,7 +123,7 @@ _08024ECC:
 	bl ModHealth
 	adds r0, r6, #0
 	movs r1, #0x7a
-	bl sub_0800449C
+	bl SoundReqClipped
 _08024F46:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0

asm/non_matching/player/PlayerNormal.inc

@@ -99,7 +99,7 @@ _08070852:
 	adds r0, r5, #0
 	adds r0, #0x40
 	strb r4, [r0]
-	bl sub_08078EFC
+	bl RunQueuedAction
 	cmp r0, #0
 	beq _08070868
 	b _08070BE4
@@ -156,7 +156,7 @@ _080708AC:
 	bne _080708C4
 	bl UpdateFloorType
 _080708C4:
-	bl sub_08078EFC
+	bl RunQueuedAction
 	cmp r0, #0
 	beq _080708CE
 	b _08070BE4
@@ -195,7 +195,7 @@ _08070902:
 	b _08070BE4
 _0807090C:
 	bl UpdateFloorType
-	bl sub_08078EFC
+	bl RunQueuedAction
 	b _08070BE4
 	.align 2, 0
 _08070918: .4byte gPlayerState
@@ -296,7 +296,7 @@ _080709D8:
 _080709FC:
 	adds r0, r5, #0
 	bl sub_08077698
-	bl sub_08078EFC
+	bl RunQueuedAction
 	cmp r0, #0
 	beq _08070A0C
 	b _08070BE4
@@ -321,7 +321,7 @@ _08070A26:
 _08070A32:
 	adds r0, r5, #0
 	bl sub_08073904
-	bl sub_08078EFC
+	bl RunQueuedAction
 	cmp r0, #0
 	beq _08070A42
 	b _08070BE4
@@ -432,7 +432,7 @@ _08070B00:
 _08070B0E:
 	cmp r0, #1
 	bne _08070B18
-	bl sub_08078F60
+	bl ResetPlayerVelocity
 	b _08070B1E
 _08070B18:
 	adds r0, r5, #0

asm/non_matching/player/sub_08070DC4.inc

@@ -6,18 +6,18 @@
 	bl sub_080085B0
 	bl sub_08079E08
 	bl UpdateFloorType
-	bl sub_08078EFC
+	bl RunQueuedAction
 	cmp r0, #0
 	bne _08070E76
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08070E76
 	ldr r6, _08070E18 @ =gPlayerState
 	strb r0, [r6, #2]
-	bl sub_08078EFC
+	bl RunQueuedAction
 	adds r5, r0, #0
 	cmp r5, #0
 	bne _08070E76

asm/non_matching/player/sub_08072D54.inc

@@ -151,7 +151,7 @@ _08072E80:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08072F10
 	ldrb r1, [r4, #0x10]

asm/non_matching/player/sub_08073584.inc

@@ -0,0 +1,280 @@
+    .syntax unified
+	push {r4, r5, r6, lr}
+	adds r4, r0, #0
+	ldr r2, _080735DC @ =gPlayerState
+	adds r0, r2, #0
+	adds r0, #0x92
+	ldrh r1, [r0]
+	movs r5, #0x80
+	adds r0, r5, #0
+	ands r0, r1
+	adds r6, r2, #0
+	cmp r0, #0
+	bne _080735C0
+	adds r0, r4, #0
+	adds r0, #0x3d
+	ldrb r0, [r0]
+	lsls r0, r0, #0x18
+	asrs r0, r0, #0x18
+	cmp r0, #0
+	bgt _080735C0
+	adds r0, r6, #0
+	adds r0, #0x3c
+	ldrb r0, [r0]
+	cmp r0, #0
+	bne _080735C0
+	ldr r0, [r6, #0x30]
+	movs r1, #0x80
+	lsls r1, r1, #0x11
+	ands r0, r1
+	cmp r0, #0
+	bne _080735E0
+_080735C0:
+	ldrb r0, [r6, #2]
+	movs r1, #0x40
+	orrs r1, r0
+	strb r1, [r6, #2]
+	bl sub_0807921C
+	adds r0, r4, #0
+	bl sub_08073904
+	movs r0, #0xe6
+	lsls r0, r0, #3
+	strh r0, [r6, #8]
+	b _08073794
+	.align 2, 0
+_080735DC: .4byte gPlayerState
+_080735E0:
+	ldr r0, _0807360C @ =gUnk_0200AF00
+	adds r0, #0x2f
+	movs r1, #1
+	strb r1, [r0]
+	movs r0, #0
+	bl sub_0807A2F8
+	cmp r0, #0
+	beq _08073610
+	ldrb r0, [r4, #0xd]
+	adds r0, #1
+	strb r0, [r4, #0xd]
+	ldrb r1, [r4, #0x14]
+	movs r0, #6
+	ands r0, r1
+	lsls r0, r0, #2
+	strb r0, [r4, #0x15]
+	ldrb r1, [r4, #0x10]
+	movs r0, #0x7f
+	ands r0, r1
+	strb r0, [r4, #0x10]
+	b _08073794
+	.align 2, 0
+_0807360C: .4byte gUnk_0200AF00
+_08073610:
+	ldr r0, _08073620 @ =gArea
+	ldrb r0, [r0, #1]
+	cmp r0, #0x10
+	bne _08073624
+	movs r0, #0x80
+	lsls r0, r0, #1
+	strh r0, [r4, #0x24]
+	b _08073626
+	.align 2, 0
+_08073620: .4byte gArea
+_08073624:
+	strh r5, [r4, #0x24]
+_08073626:
+	ldr r3, _08073650 @ =gPlayerState
+	ldrb r1, [r3, #0xd]
+	movs r0, #0x80
+	ands r0, r1
+	adds r2, r4, #0
+	adds r2, #0x80
+	cmp r0, #0
+	bne _0807365A
+	ldrb r0, [r4, #0x15]
+	cmp r0, r1
+	beq _0807365A
+	ldrb r1, [r3, #0xd]
+	subs r0, r0, r1
+	movs r1, #0x1f
+	ands r0, r1
+	cmp r0, #0xf
+	bgt _08073654
+	ldr r0, [r2]
+	subs r0, #0x20
+	b _08073658
+	.align 2, 0
+_08073650: .4byte gPlayerState
+_08073654:
+	ldr r0, [r2]
+	adds r0, #0x20
+_08073658:
+	str r0, [r2]
+_0807365A:
+	ldr r0, [r2]
+	lsrs r0, r0, #8
+	movs r1, #0x1f
+	ands r0, r1
+	strb r0, [r4, #0x15]
+	bl sub_08079E08
+	ldrb r2, [r4, #0x14]
+	lsls r3, r2, #2
+	ldrb r1, [r4, #0x15]
+	cmp r2, #0
+	bne _0807367C
+	adds r3, #8
+	movs r0, #0x1f
+	ands r3, r0
+	adds r1, #8
+	ands r1, r0
+_0807367C:
+	subs r0, r3, #7
+	cmp r0, r1
+	bls _08073686
+	subs r3, r2, #2
+	b _0807368E
+_08073686:
+	adds r0, r3, #7
+	cmp r0, r1
+	bhs _08073694
+	adds r3, r2, #2
+_0807368E:
+	movs r0, #7
+	ands r3, r0
+	b _08073696
+_08073694:
+	adds r3, r2, #0
+_08073696:
+	movs r0, #0x87
+	adds r0, r0, r4
+	mov ip, r0
+	ldrb r1, [r4, #0x14]
+	cmp r3, r1
+	beq _080736A8
+	movs r0, #0x14
+	mov r2, ip
+	strb r0, [r2]
+_080736A8:
+	strb r3, [r4, #0x14]
+	movs r5, #0
+	ldr r1, _080736E4 @ =gPlayerState
+	ldrb r2, [r1, #0xd]
+	lsrs r3, r2, #2
+	mov r6, ip
+	ldrb r0, [r6]
+	adds r6, r1, #0
+	cmp r0, #0
+	beq _080736CA
+	movs r0, #0x80
+	ands r0, r2
+	cmp r0, #0
+	bne _08073736
+	ldrb r0, [r4, #0x14]
+	cmp r0, r3
+	beq _08073736
+_080736CA:
+	movs r0, #0x80
+	ands r0, r2
+	cmp r0, #0
+	bne _080736FA
+	ldrb r2, [r4, #0x14]
+	cmp r2, r3
+	beq _080736FA
+	movs r0, #4
+	eors r0, r3
+	cmp r2, r0
+	bne _080736E8
+	movs r5, #2
+	b _080736FA
+	.align 2, 0
+_080736E4: .4byte gPlayerState
+_080736E8:
+	movs r0, #6
+	ands r0, r3
+	adds r0, #2
+	movs r1, #7
+	ands r0, r1
+	movs r5, #3
+	cmp r2, r0
+	bne _080736FA
+	movs r5, #1
+_080736FA:
+	ldr r1, _0807371C @ =gUnk_0811BC28
+	lsls r0, r5, #1
+	adds r0, r0, r1
+	ldrh r0, [r0]
+	ldrh r1, [r6, #8]
+	cmp r0, r1
+	bne _0807372C
+	ldr r0, _08073720 @ =gArea
+	ldrb r0, [r0, #1]
+	cmp r0, #0x10
+	bne _08073724
+	adds r0, r4, #0
+	movs r1, #2
+	bl sub_080042BA
+	b _0807372E
+	.align 2, 0
+_0807371C: .4byte gUnk_0811BC28
+_08073720: .4byte gArea
+_08073724:
+	adds r0, r4, #0
+	bl UpdateAnimationSingleFrame
+	b _0807372E
+_0807372C:
+	strh r0, [r6, #8]
+_0807372E:
+	adds r0, r4, #0
+	adds r0, #0x86
+	strb r5, [r0]
+	b _08073762
+_08073736:
+	mov r2, ip
+	ldrb r0, [r2]
+	subs r0, #1
+	strb r0, [r2]
+	ldr r1, _0807375C @ =gUnk_0811BC30
+	adds r0, r4, #0
+	adds r0, #0x86
+	ldrb r0, [r0]
+	lsls r0, r0, #1
+	adds r0, r0, r1
+	ldrh r0, [r0]
+	ldrh r1, [r6, #8]
+	cmp r0, r1
+	bne _08073760
+	adds r0, r4, #0
+	bl UpdateAnimationSingleFrame
+	b _08073762
+	.align 2, 0
+_0807375C: .4byte gUnk_0811BC30
+_08073760:
+	strh r0, [r6, #8]
+_08073762:
+	ldr r0, [r4, #0x7c]
+	subs r1, r0, #1
+	str r1, [r4, #0x7c]
+	movs r0, #1
+	rsbs r0, r0, #0
+	cmp r1, r0
+	bne _08073784
+	ldr r2, _08073780 @ =gPlayerState
+	ldrb r1, [r2, #2]
+	movs r0, #0x40
+	orrs r0, r1
+	strb r0, [r2, #2]
+	bl sub_0807921C
+	b _08073794
+	.align 2, 0
+_08073780: .4byte gPlayerState
+_08073784:
+	adds r0, r1, #0
+	movs r1, #0x14
+	bl __divsi3
+	ldr r2, _08073798 @ =0x0000FFF8
+	adds r1, r2, #0
+	subs r1, r1, r0
+	strh r1, [r4, #0x36]
+_08073794:
+	pop {r4, r5, r6, pc}
+	.align 2, 0
+_08073798: .4byte 0x0000FFF8
+    .syntax divided

asm/non_matching/player/sub_080740D8.inc

@@ -0,0 +1,123 @@
+    .syntax unified
+	push {r4, r5, r6, lr}
+	adds r4, r0, #0
+	bl UpdateAnimationSingleFrame
+	ldrb r0, [r4, #0xf]
+	cmp r0, #0
+	bne _080740EA
+	ldrb r0, [r4, #0x15]
+	b _080740F0
+_080740EA:
+	ldrb r1, [r4, #0x15]
+	movs r0, #0x10
+	eors r0, r1
+_080740F0:
+	cmp r0, #8
+	beq _08074128
+	cmp r0, #8
+	bhi _080740FE
+	cmp r0, #0
+	beq _08074168
+	b _0807418C
+_080740FE:
+	cmp r0, #0x10
+	beq _08074148
+	cmp r0, #0x18
+	bne _0807418C
+	movs r0, #0x2e
+	ldrsh r1, [r4, r0]
+	ldr r2, [r4, #0x48]
+	ldrb r0, [r2, #2]
+	subs r1, r1, r0
+	movs r0, #0
+	ldrsb r0, [r2, r0]
+	adds r1, r1, r0
+	ldr r3, _08074124 @ =gRoomControls
+	ldrh r0, [r3, #6]
+	subs r6, r1, r0
+	movs r1, #0x32
+	ldrsh r0, [r4, r1]
+	b _08074182
+	.align 2, 0
+_08074124: .4byte gRoomControls
+_08074128:
+	ldr r2, [r4, #0x48]
+	movs r1, #0x2e
+	ldrsh r0, [r4, r1]
+	ldrb r1, [r2, #2]
+	adds r0, r0, r1
+	movs r1, #0
+	ldrsb r1, [r2, r1]
+	adds r0, r0, r1
+	ldr r3, _08074144 @ =gRoomControls
+	ldrh r1, [r3, #6]
+	subs r6, r0, r1
+	movs r1, #0x32
+	ldrsh r0, [r4, r1]
+	b _08074182
+	.align 2, 0
+_08074144: .4byte gRoomControls
+_08074148:
+	movs r0, #0x2e
+	ldrsh r1, [r4, r0]
+	ldr r2, [r4, #0x48]
+	movs r0, #0
+	ldrsb r0, [r2, r0]
+	adds r1, r1, r0
+	ldr r3, _08074164 @ =gRoomControls
+	ldrh r0, [r3, #6]
+	subs r6, r1, r0
+	movs r1, #0x32
+	ldrsh r0, [r4, r1]
+	ldrb r1, [r2, #5]
+	adds r0, r0, r1
+	b _08074182
+	.align 2, 0
+_08074164: .4byte gRoomControls
+_08074168:
+	movs r0, #0x2e
+	ldrsh r1, [r4, r0]
+	ldr r2, [r4, #0x48]
+	movs r0, #0
+	ldrsb r0, [r2, r0]
+	adds r1, r1, r0
+	ldr r3, _080741A4 @ =gRoomControls
+	ldrh r0, [r3, #6]
+	subs r6, r1, r0
+	movs r1, #0x32
+	ldrsh r0, [r4, r1]
+	ldrb r1, [r2, #5]
+	subs r0, r0, r1
+_08074182:
+	movs r1, #1
+	ldrsb r1, [r2, r1]
+	adds r0, r0, r1
+	ldrh r1, [r3, #8]
+	subs r5, r0, r1
+_0807418C:
+	ldr r2, _080741A8 @ =gUnk_080082DC
+	adds r0, r6, #0
+	adds r1, r5, #0
+	bl sub_080086B4
+	cmp r0, #0
+	beq _080741AC
+	adds r0, r4, #0
+	bl sub_0806F69C
+	b _080741B0
+	.align 2, 0
+_080741A4: .4byte gRoomControls
+_080741A8: .4byte gUnk_080082DC
+_080741AC:
+	movs r0, #1
+	strb r0, [r4, #0xf]
+_080741B0:
+	movs r1, #0x80
+	lsls r1, r1, #6
+	adds r0, r4, #0
+	bl GravityUpdate
+	cmp r0, #0
+	bne _080741C2
+	bl sub_0807921C
+_080741C2:
+	pop {r4, r5, r6, pc}
+    .syntax divided

asm/non_matching/player/sub_08074678.inc

@@ -0,0 +1,146 @@
+    .syntax unified
+	push {r4, lr}
+	adds r4, r0, #0
+	bl sub_080741C4
+	cmp r0, #0
+	beq _08074690
+	ldr r0, _0807468C @ =gPlayerState
+	movs r1, #0
+	strb r1, [r0, #0x11]
+	b _080746CE
+	.align 2, 0
+_0807468C: .4byte gPlayerState
+_08074690:
+	adds r0, r4, #0
+	adds r0, #0x45
+	ldrb r0, [r0]
+	cmp r0, #0
+	beq _0807476C
+	adds r0, r4, #0
+	bl sub_08079C30
+	adds r1, r0, #0
+	cmp r1, #0
+	bne _080746B0
+	ldr r0, _080746AC @ =gPlayerState
+	strb r1, [r0, #0x11]
+	b _080746CE
+	.align 2, 0
+_080746AC: .4byte gPlayerState
+_080746B0:
+	ldr r3, _080746D4 @ =gPlayerState
+	ldr r1, [r3, #0x30]
+	movs r0, #0x80
+	ands r1, r0
+	cmp r1, #0
+	bne _0807476C
+	ldrb r2, [r3, #0x1e]
+	cmp r2, #0
+	beq _080746D8
+	movs r0, #0x40
+	ands r0, r2
+	cmp r0, #0
+	beq _080746DC
+	strb r1, [r3, #0x11]
+	adds r0, r3, #0
+_080746CE:
+	adds r0, #0x37
+	strb r1, [r0]
+	b _08074792
+	.align 2, 0
+_080746D4: .4byte gPlayerState
+_080746D8:
+	bl sub_08077B20
+_080746DC:
+	ldr r1, _08074700 @ =gPlayerState
+	adds r0, r1, #0
+	adds r0, #0x37
+	ldrb r0, [r0]
+	cmp r0, #1
+	bne _08074704
+	adds r0, r4, #0
+	movs r1, #0x70
+	movs r2, #0
+	movs r3, #0
+	bl CreateObjectWithParent
+	adds r0, r4, #0
+	movs r1, #0x52
+	movs r2, #0
+	bl CreateFx
+	b _08074714
+	.align 2, 0
+_08074700: .4byte gPlayerState
+_08074704:
+	adds r0, r1, #0
+	adds r0, #0x92
+	ldrh r1, [r0]
+	movs r0, #0xf0
+	lsls r0, r0, #4
+	ands r0, r1
+	cmp r0, #0
+	beq _08074720
+_08074714:
+	ldr r0, _0807471C @ =0x00000161
+	bl SoundReq
+	b _08074732
+	.align 2, 0
+_0807471C: .4byte 0x00000161
+_08074720:
+	ldr r0, _08074760 @ =gScreenTransition
+	ldr r0, [r0]
+	movs r1, #0xf
+	ands r0, r1
+	cmp r0, #0
+	bne _08074732
+	ldr r0, _08074764 @ =0x00000161
+	bl SoundReq
+_08074732:
+	ldr r2, _08074768 @ =gPlayerState
+	adds r1, r2, #0
+	adds r1, #0x80
+	ldrh r0, [r1]
+	subs r0, #0xf0
+	strh r0, [r1]
+	adds r1, #0x28
+	movs r0, #0x1b
+	strb r0, [r1]
+	adds r0, r2, #0
+	adds r0, #0x37
+	ldrb r0, [r0]
+	lsls r3, r0, #0x18
+	lsrs r0, r3, #0x18
+	cmp r0, #0xef
+	bhi _0807476C
+	subs r1, #0x69
+	lsrs r0, r3, #0x1d
+	adds r0, #4
+	ldrb r2, [r1]
+	adds r0, r0, r2
+	strb r0, [r1]
+	b _08074792
+	.align 2, 0
+_08074760: .4byte gScreenTransition
+_08074764: .4byte 0x00000161
+_08074768: .4byte gPlayerState
+_0807476C:
+	ldr r2, _08074794 @ =gPlayerState
+	ldr r0, [r2, #0x30]
+	ldr r1, _08074798 @ =0xFFFBFFFF
+	ands r0, r1
+	str r0, [r2, #0x30]
+	adds r0, r4, #0
+	movs r1, #0x52
+	movs r2, #0
+	bl CreateFx
+	adds r1, r4, #0
+	adds r1, #0x3d
+	movs r0, #0x20
+	strb r0, [r1]
+	subs r0, #0x24
+	bl ModHealth
+	bl RespawnPlayer
+_08074792:
+	pop {r4, pc}
+	.align 2, 0
+_08074794: .4byte gPlayerState
+_08074798: .4byte 0xFFFBFFFF
+    .syntax divided

asm/non_matching/player/sub_080751E8.inc

@@ -0,0 +1,84 @@
+    .syntax unified
+	push {r4, r5, r6, r7, lr}
+	adds r7, r0, #0
+	adds r5, r1, #0
+	adds r6, r2, #0
+	ldr r4, _08075230 @ =gPlayerScriptExecutionContext
+	adds r0, r4, #0
+	movs r1, #0x24
+	bl MemClear
+	str r6, [r4]
+	ldr r0, _08075234 @ =gPlayerEntity
+	adds r0, #0x84
+	str r4, [r0]
+	ldr r2, _08075238 @ =gPlayerState
+	movs r1, #0
+	movs r0, #0x1c
+	strb r0, [r2, #0xc]
+	adds r0, r2, #0
+	adds r0, #0x38
+	movs r4, #1
+	strb r4, [r0]
+	adds r3, r2, #0
+	adds r3, #0x39
+	strb r1, [r3]
+	adds r0, #2
+	strb r5, [r0]
+	ldr r0, [r2, #0x30]
+	movs r1, #8
+	orrs r0, r1
+	str r0, [r2, #0x30]
+	cmp r7, #0
+	bne _08075240
+	strb r7, [r3]
+	ldr r6, _0807523C @ =script_BedInLinksRoom
+	b _08075244
+	.align 2, 0
+_08075230: .4byte gPlayerScriptExecutionContext
+_08075234: .4byte gPlayerEntity
+_08075238: .4byte gPlayerState
+_0807523C: .4byte script_BedInLinksRoom
+_08075240:
+	strb r4, [r3]
+	ldr r6, _08075290 @ =script_BedAtSimons
+_08075244:
+	ldr r0, _08075294 @ =gPlayerState
+	adds r0, #0x39
+	ldrb r0, [r0]
+	movs r1, #0
+	cmp r0, #0
+	bne _08075252
+	movs r1, #2
+_08075252:
+	movs r0, #0x5b
+	movs r2, #0
+	bl CreateObject
+	adds r4, r0, #0
+	cmp r4, #0
+	beq _08075270
+	ldr r0, _08075298 @ =gPlayerEntity
+	adds r1, r4, #0
+	bl CopyPosition
+	adds r0, r4, #0
+	adds r1, r6, #0
+	bl StartCutscene
+_08075270:
+	ldr r4, _08075298 @ =gPlayerEntity
+	movs r1, #0xe
+	rsbs r1, r1, #0
+	movs r2, #0x1c
+	rsbs r2, r2, #0
+	adds r0, r4, #0
+	bl CreateSpeechBubbleSleep
+	str r0, [r4, #0x6c]
+	cmp r0, #0
+	beq _0807528C
+	movs r1, #3
+	bl SetDefaultPriority
+_0807528C:
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_08075290: .4byte script_BedAtSimons
+_08075294: .4byte gPlayerState
+_08075298: .4byte gPlayerEntity
+    .syntax divided

asm/non_matching/playerItem13/sub_080AD040.inc

@@ -71,7 +71,7 @@ _080AD0C8:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _080AD0D8
 	b _080AD202

asm/non_matching/playerItemSword/sub_080A7A84.inc

@@ -88,7 +88,7 @@ _080A7AEC:
 	bne _080A7B4C
 	ldr r0, _080A7B44 @ =gPlayerEntity
 	ldr r1, _080A7B48 @ =0x00000119
-	bl sub_0800449C
+	bl SoundReqClipped
 	b _080A7B54
 	.align 2, 0
 _080A7B44: .4byte gPlayerEntity
@@ -96,7 +96,7 @@ _080A7B48: .4byte 0x00000119
 _080A7B4C:
 	ldr r0, _080A7B90 @ =gPlayerEntity
 	movs r1, #0x74
-	bl sub_0800449C
+	bl SoundReqClipped
 _080A7B54:
 	movs r0, #0xf
 	movs r1, #0x1a

asm/non_matching/postman/sub_0806076C.inc

@@ -148,7 +148,7 @@ _08060864:
 	strh r0, [r7, #0x32]
 	adds r0, r7, #0
 	str r2, [sp]
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	beq _080608B8
 	ldr r0, [sp, #4]

asm/non_matching/sub_0804BF38.inc

@@ -96,7 +96,7 @@ _0804BFE0:
 _0804BFE8:
 	ldrh r0, [r4, #0xa]
 	ldrh r1, [r4, #0xc]
-	bl sub_08080964
+	bl InitScreenShake
 	ldrh r0, [r4, #0xe]
 	bl SoundReq
 	pop {r3, r4, r5}

asm/object10.s

@@ -142,7 +142,7 @@ sub_080848C8: @ 0x080848C8
 	lsls r0, r1, #0x10
 	cmp r0, #0
 	beq _0808493C
-	ldr r0, _0808498C @ =gUnk_03004040
+	ldr r0, _0808498C @ =gPlayerClones
 	ldrb r1, [r4, #0xa]
 	lsls r1, r1, #2
 	adds r1, r1, r0
@@ -182,7 +182,7 @@ _0808496A:
 _08084980: .4byte gPlayerState
 _08084984: .4byte gUnk_08120574
 _08084988: .4byte gPlayerEntity
-_0808498C: .4byte gUnk_03004040
+_0808498C: .4byte gPlayerClones
 _08084990: .4byte 0x00000315
 _08084994:
 	cmp r0, #4
@@ -195,7 +195,7 @@ _08084994:
 	adds r2, #0x38
 	ldrb r2, [r2]
 	bl sub_08000152
-	ldr r1, _080849C0 @ =gUnk_03004040
+	ldr r1, _080849C0 @ =gPlayerClones
 	ldrb r0, [r4, #0xa]
 	lsls r0, r0, #2
 	adds r0, r0, r1
@@ -205,7 +205,7 @@ _08084994:
 	b _080849D6
 	.align 2, 0
 _080849BC: .4byte 0x00000315
-_080849C0: .4byte gUnk_03004040
+_080849C0: .4byte gPlayerClones
 _080849C4:
 	ldrb r2, [r4, #0x18]
 	lsls r1, r2, #0x1e
@@ -246,7 +246,7 @@ _080849F6:
 	beq _08084A04
 	b _08084AF8
 _08084A04:
-	ldr r0, _08084A40 @ =gUnk_03004040
+	ldr r0, _08084A40 @ =gPlayerClones
 	ldrb r1, [r4, #0xa]
 	lsls r1, r1, #2
 	adds r1, r1, r0
@@ -276,7 +276,7 @@ _08084A04:
 	b _08084AF8
 	.align 2, 0
 _08084A3C: .4byte gPlayerState
-_08084A40: .4byte gUnk_03004040
+_08084A40: .4byte gPlayerClones
 _08084A44: .4byte gPlayerEntity
 _08084A48:
 	adds r0, r4, #0
@@ -585,7 +585,7 @@ _08084CA8: .4byte gPlayerState
 sub_08084CAC: @ 0x08084CAC
 	push {r4, r5, r6, r7, lr}
 	adds r5, r0, #0
-	ldr r6, _08084D18 @ =gUnk_03004040
+	ldr r6, _08084D18 @ =gPlayerClones
 	ldrb r0, [r5, #0xa]
 	lsls r0, r0, #2
 	adds r0, r0, r6
@@ -636,7 +636,7 @@ sub_08084CAC: @ 0x08084CAC
 	orrs r0, r1
 	b _08084D30
 	.align 2, 0
-_08084D18: .4byte gUnk_03004040
+_08084D18: .4byte gPlayerClones
 _08084D1C: .4byte gUnk_080B4468
 _08084D20: .4byte gRoomControls
 _08084D24:

asm/object1F.s

@@ -139,7 +139,7 @@ _08087788:
 	movs r1, #0xa0
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 _08087798:
 	cmp r0, #0
 	bne _080877A0

asm/object30.s

@@ -127,7 +127,7 @@ _0808A924:
 _0808A926:
 	ldr r1, [r4, #0x70]
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	b _0808A962
 _0808A930:
 	ldr r2, _0808A964 @ =gUnk_08121194

asm/object4B.s

@@ -141,7 +141,7 @@ sub_0808F858: @ 0x0808F858
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _0808F88A
 	adds r0, r4, #0

asm/object53.s

@@ -95,7 +95,7 @@ _080911AA:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _080911E8
 	ldrb r1, [r4, #0xb]

asm/object67.s

@@ -341,7 +341,7 @@ _080943A8:
 	movs r1, #0x80
 	lsls r1, r1, #7
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08094420
 	ldrb r0, [r4, #0xb]

asm/object97.s

@@ -197,7 +197,7 @@ sub_0809DB14: @ 0x0809DB14
 	adds r4, r0, #0
 	bl sub_0809E1F0
 	adds r0, r4, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	adds r5, r0, #0
 	cmp r5, #0
 	bne _0809DB36
@@ -586,7 +586,7 @@ sub_0809DDE4: @ 0x0809DDE4
 	adds r0, r4, #0
 	bl sub_0809E210
 	adds r0, r4, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	adds r5, r0, #0
 	cmp r5, #0
 	bne _0809DE2A
@@ -814,7 +814,7 @@ _0809DFD6:
 sub_0809DFE0: @ 0x0809DFE0
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	bne _0809E028
 	ldr r1, [r4, #0x54]

asm/objectB3.s

@@ -92,7 +92,7 @@ sub_080A0AC4: @ 0x080A0AC4
 sub_080A0AD0: @ 0x080A0AD0
 	push {lr}
 	movs r1, #0x80
-	bl sub_08003FC4
+	bl GravityUpdate
 	pop {pc}
 	.align 2, 0
 
@@ -131,7 +131,7 @@ sub_080A0AF0: @ 0x080A0AF0
 _080A0B1C:
 	adds r0, r4, #0
 	movs r1, #0x80
-	bl sub_08003FC4
+	bl GravityUpdate
 	pop {r4, pc}
 	.align 2, 0
 

asm/objectOnSpinyBeetle.s

@@ -517,7 +517,7 @@ _080988FA:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _0809890E
 	adds r0, r4, #0

asm/pressurePlate.s

@@ -250,7 +250,7 @@ _080889CA:
 	ands r0, r1
 	cmp r0, #0
 	beq _08088A3A
-	ldr r6, _08088A4C @ =gUnk_03004040
+	ldr r6, _08088A4C @ =gPlayerClones
 	ldr r1, [r6]
 	adds r0, r4, #0
 	bl sub_080177A0
@@ -305,4 +305,4 @@ _08088A3A:
 _08088A40: .4byte gPlayerEntity
 _08088A44: .4byte gUnk_08120BEC
 _08088A48: .4byte gPlayerState
-_08088A4C: .4byte gUnk_03004040
+_08088A4C: .4byte gPlayerClones

asm/stairsInteract.s

@@ -1,129 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_080731D8
-sub_080731D8: @ 0x080731D8
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	movs r2, #0
-	strb r0, [r4, #0x10]
-	movs r1, #0
-	movs r0, #0x40
-	strh r0, [r4, #0x24]
-	strb r1, [r4, #0x14]
-	ldrh r1, [r4, #0x2e]
-	movs r5, #0x10
-	rsbs r5, r5, #0
-	adds r0, r5, #0
-	ands r0, r1
-	movs r7, #8
-	orrs r0, r7
-	strh r0, [r4, #0x2e]
-	strh r2, [r4, #0x2c]
-	ldr r6, _08073214 @ =gPlayerState
-	adds r0, r6, #0
-	adds r0, #0x38
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _08073218
-	movs r0, #1
-	strb r0, [r4, #0xd]
-	b _0807329A
-	.align 2, 0
-_08073214: .4byte gPlayerState
-_08073218:
-	ldrb r0, [r4, #0x18]
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	movs r0, #3
-	strb r0, [r4, #0xd]
-	ldrh r0, [r4, #0x32]
-	adds r1, r4, #0
-	adds r1, #0x7e
-	strh r0, [r1]
-	ldrh r0, [r4, #0x32]
-	subs r0, #0x10
-	strh r0, [r4, #0x32]
-	adds r0, r4, #0
-	movs r1, #0x70
-	movs r2, #1
-	movs r3, #0
-	bl CreateObjectWithParent
-	str r0, [r4, #0x54]
-	adds r0, r6, #0
-	adds r0, #0x39
-	ldrb r0, [r0]
-	cmp r0, #7
-	bne _08073270
-	ldrh r1, [r4, #0x32]
-	adds r0, r5, #0
-	ands r0, r1
-	adds r0, #8
-	strh r0, [r4, #0x32]
-	ldrh r1, [r4, #0x2e]
-	adds r0, r5, #0
-	ands r0, r1
-	strh r0, [r4, #0x2e]
-	strb r7, [r4, #0x15]
-	movs r0, #2
-	strb r0, [r4, #0x14]
-	ldr r0, _0807326C @ =0x00000187
-	bl SoundReq
-	b _08073294
-	.align 2, 0
-_0807326C: .4byte 0x00000187
-_08073270:
-	ldrh r1, [r4, #0x32]
-	adds r0, r5, #0
-	ands r0, r1
-	adds r0, #2
-	strh r0, [r4, #0x32]
-	ldrh r1, [r4, #0x2e]
-	adds r0, r5, #0
-	ands r0, r1
-	adds r0, #0xf
-	strh r0, [r4, #0x2e]
-	movs r0, #0x18
-	strb r0, [r4, #0x15]
-	movs r0, #6
-	strb r0, [r4, #0x14]
-	movs r0, #0xc4
-	lsls r0, r0, #1
-	bl SoundReq
-_08073294:
-	adds r0, r4, #0
-	bl sub_08066DE4
-_0807329A:
-	ldr r2, _080732AC @ =gPlayerState
-	ldr r0, [r2, #0x30]
-	movs r1, #8
-	ands r0, r1
-	cmp r0, #0
-	beq _080732B4
-	ldr r0, _080732B0 @ =0x00000404
-	b _080732B8
-	.align 2, 0
-_080732AC: .4byte gPlayerState
-_080732B0: .4byte 0x00000404
-_080732B4:
-	movs r0, #0x82
-	lsls r0, r0, #1
-_080732B8:
-	strh r0, [r2, #8]
-	ldr r1, _080732CC @ =gRoomControls
-	movs r0, #0
-	str r0, [r1, #0x30]
-	bl sub_0807A108
-	bl ResetPlayer
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080732CC: .4byte gRoomControls

asm/stalfos.s

@@ -353,7 +353,7 @@ sub_08039530: @ 0x08039530
 	adds r4, r0, #0
 	movs r1, #0xc0
 	lsls r1, r1, #5
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08039568
 	adds r0, r4, #0
@@ -442,7 +442,7 @@ sub_080395D8: @ 0x080395D8
 	movs r1, #0xc0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08039602
 	adds r0, r4, #0
@@ -464,7 +464,7 @@ sub_08039604: @ 0x08039604
 	movs r1, #0xc0
 	lsls r1, r1, #5
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	ldr r0, [r4, #0x20]
 	cmp r0, #0
 	bge _08039624
@@ -563,7 +563,7 @@ sub_080396BC: @ 0x080396BC
 	adds r4, r0, #0
 	movs r1, #0xc0
 	lsls r1, r1, #5
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _080396E2
 	adds r1, r4, #0

asm/takkuri.s

@@ -226,7 +226,7 @@ sub_0803BD08: @ 0x0803BD08
 	cmp r0, #0
 	beq _0803BD2C
 	adds r0, r4, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	bne _0803BD80
 	strb r0, [r4, #0xf]
@@ -290,7 +290,7 @@ sub_0803BD88: @ 0x0803BD88
 sub_0803BD90: @ 0x0803BD90
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	bne _0803BDC8
 	movs r0, #4
@@ -415,7 +415,7 @@ _0803BE78: .4byte gRoomControls
 sub_0803BE7C: @ 0x0803BE7C
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	adds r5, r0, #0
 	cmp r5, #0
 	bne _0803BEE6

asm/wizzrobeFire.s

@@ -242,7 +242,7 @@ _0802FCDE:
 	cmp r0, #0
 	beq _0802FDCA
 	adds r0, r4, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	beq _0802FDCA
 	adds r0, r4, #0

asm/wizzrobeIce.s

@@ -269,7 +269,7 @@ _0802FFB6:
 	cmp r0, #0
 	beq _080300A2
 	adds r0, r4, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	beq _080300A2
 	adds r0, r4, #0

asm/wizzrobeWind.s

@@ -294,7 +294,7 @@ _0802F6B6:
 	cmp r0, #0
 	beq _0802F7A2
 	adds r0, r4, #0
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	beq _0802F7A2
 	adds r0, r4, #0

data/data_0811B9E0.s

@@ -1,69 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnk_0811BC08:: @ 0811BC08
-	.4byte sub_08073468
-	.4byte sub_080734D4
-	.4byte sub_08073504
-	.4byte sub_08073584
-	.4byte sub_0807379C
-	.4byte sub_080737BC
-	.4byte sub_0807380C
-	.4byte sub_08073884
-
-gUnk_0811BC28:: @ 0811BC28
-	.incbin "data_0811B9E0/gUnk_0811BC28.bin"
-
-gUnk_0811BC30:: @ 0811BC30
-	.incbin "data_0811B9E0/gUnk_0811BC30.bin"
-
-gUnk_0811BC38:: @ 0811BC38
-	.incbin "data_0811B9E0/gUnk_0811BC38.bin"
-
-gUnk_0811BC40:: @ 0811BC40
-	.incbin "data_0811B9E0/gUnk_0811BC40.bin"
-
-gUnk_0811BC48:: @ 0811BC48
-	.4byte sub_08073924
-	.4byte sub_08073968
-	.4byte sub_080739EC
-	.4byte sub_08073A94
-	.4byte sub_08073B8C
-	.4byte sub_08073C30
-
-gUnk_0811BC60:: @ 0811BC60
-	.4byte sub_08073C80
-	.4byte sub_08073D20
-	.4byte sub_08073F04
-	.4byte sub_08073F4C
-	.4byte sub_08073FD0
-	.4byte sub_08074018
-	.4byte sub_08074060
-	.4byte sub_080740D8
-
-gUnk_0811BC80:: @ 0811BC80
-	.incbin "data_0811B9E0/gUnk_0811BC80.bin"
-
-gUnk_0811BC88:: @ 0811BC88
-	.4byte sub_08074C68
-	.4byte sub_08074CF8
-	.4byte sub_08074F00
-	.4byte sub_080750F4
-
-gUnk_0811BC98:: @ 0811BC98
-	.4byte sub_08074F1C
-	.4byte sub_08074F2C
-	.4byte sub_08074F44
-	.4byte sub_08074F8C
-	.4byte sub_08074FEC
-	.4byte sub_0807501C
-	.4byte sub_0807508C
-
-gUnk_0811BCB4:: @ 0811BCB4
-	.4byte sub_08075110
-	.4byte sub_0807513C
-	.4byte sub_0807518C
-	.4byte sub_080751B4

data/data_0811BE38.s

@@ -90,52 +90,52 @@ gUnk_0811C118:: @ 0811C118
 	.incbin "data_0811BE38/gUnk_0811C118.bin"
 
 gUnk_0811C120:: @ 0811C120
-	.4byte nullsub_112
-	.4byte sub_08074200
+	.4byte SurfaceAction_DoNothing
+	.4byte SurfaceAction_Pit
 	.4byte 00000000
 	.4byte 00000000
-	.4byte sub_0807422C
-	.4byte sub_08074238
-	.4byte sub_080742AC
-	.4byte sub_080742E4
-	.4byte sub_08074314
-	.4byte sub_08074338
-	.4byte sub_0807435C
-	.4byte sub_08074380
-	.4byte sub_08074638
-	.4byte sub_08074B4C
-	.4byte sub_08074B74
-	.4byte sub_08074BA0
-	.4byte sub_08074BCC
-	.4byte sub_08074678
-	.4byte nullsub_112
-	.4byte nullsub_112
-	.4byte sub_080743D4
-	.4byte sub_0807441C
-	.4byte sub_0807450C
-	.4byte sub_08074584
-	.4byte sub_080745B4
-	.4byte sub_0807479C
-	.4byte sub_080748C4
-	.4byte sub_080748DC
-	.4byte sub_08074918
+	.4byte SurfaceAction_SlopeGndGndVertical
+	.4byte SurfaceAction_SlopeGndGndHorizontal
+	.4byte SurfaceAction_6
+	.4byte SurfaceAction_7
+	.4byte SurfaceAction_MinishDoorFront
+	.4byte SurfaceAction_MinishDoorBack
+	.4byte SurfaceAction_A
+	.4byte SurfaceAction_B
+	.4byte SurfaceAction_SlopeGndWater
+	.4byte SurfaceAction_D
+	.4byte SurfaceAction_E
+	.4byte SurfaceAction_F
+	.4byte SurfaceAction_10
+	.4byte SurfaceAction_Swamp
+	.4byte SurfaceAction_DoNothing
+	.4byte SurfaceAction_DoNothing
+	.4byte SurfaceAction_14
+	.4byte SurfaceAction_CloneTile
+	.4byte SurfaceAction_16
+	.4byte SurfaceAction_Ice
+	.4byte SurfaceAction_ShallowWater
+	.4byte SurfaceAction_Water
+	.4byte SurfaceAction_Button
+	.4byte SurfaceAction_1B
+	.4byte SurfaceAction_1C
 	.4byte 00000000
-	.4byte sub_0807496C
+	.4byte SurfaceAction_Ladder
 	.4byte 00000000
-	.4byte sub_08074A48
-	.4byte sub_0807450C
-	.4byte nullsub_504
-	.4byte sub_080742AC
-	.4byte sub_080742AC
-	.4byte sub_08074A9C
-	.4byte sub_08074AF4
-	.4byte sub_08074B18
-	.4byte sub_0807422C
-	.4byte sub_08074238
-	.4byte sub_080749D4
-	.4byte sub_0807493C
-	.4byte sub_080749A8
-	.4byte sub_08074A9C
+	.4byte SurfaceAction_20
+	.4byte SurfaceAction_16
+	.4byte SurfaceAction_22
+	.4byte SurfaceAction_6
+	.4byte SurfaceAction_6
+	.4byte SurfaceAction_Dust
+	.4byte SurfaceAction_26
+	.4byte SurfaceAction_Hole
+	.4byte SurfaceAction_SlopeGndGndVertical
+	.4byte SurfaceAction_SlopeGndGndHorizontal
+	.4byte SurfaceAction_AutoLadder
+	.4byte SurfaceAction_ClimbWall
+	.4byte SurfaceAction_2C
+	.4byte SurfaceAction_Dust
 
 gUnk_0811C1D8:: @ 0811C1D8
 	.4byte gUnk_0811C240

data/scripts/castorWilds/script_CastorWildsStatueLeft.inc

@@ -4,15 +4,15 @@ SCRIPT_START script_CastorWildsStatueLeft
 	CheckKinstoneFused 0x0006
 	JumpIf script_0800B302
 	_0807EA88 0x0006
-	_0807EB44 0x0002
+	SetAnimationState 0x0002
 	EndBlock
 script_0800B268:
 	_0807EA4C
 	_0807E9F0
-	_0807E864
+	SetPlayerIdle
 	CheckKinstoneFused 0x0006
 	JumpIf script_0800B2E2
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	Jump script_0800B268
 	.2byte 0x0000

data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc

@@ -4,15 +4,15 @@ SCRIPT_START script_CastorWildsStatueMiddle
 	CheckKinstoneFused 0x0007
 	JumpIf script_0800B302
 	_0807EA88 0x0007
-	_0807EB44 0x0002
+	SetAnimationState 0x0002
 	EndBlock
 script_0800B298:
 	_0807EA4C
 	_0807E9F0
-	_0807E864
+	SetPlayerIdle
 	CheckKinstoneFused 0x0007
 	JumpIf script_0800B2E2
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	Jump script_0800B298
 	.2byte 0x0000

data/scripts/castorWilds/script_CastorWildsStatueRight.inc

@@ -4,20 +4,20 @@ SCRIPT_START script_CastorWildsStatueRight
 	CheckKinstoneFused 0x0008
 	JumpIf script_0800B302
 	_0807EA88 0x0008
-	_0807EB44 0x0002
+	SetAnimationState 0x0002
 	EndBlock
 script_0800B2C8:
 	_0807EA4C
 	_0807E9F0
-	_0807E864
+	SetPlayerIdle
 	CheckKinstoneFused 0x0008
 	JumpIf script_0800B2E2
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	Jump script_0800B2C8
 script_0800B2E2:
 	DoPostScriptAction 0x0013
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	_0807E9DC
 	Call sub_080676E0
 	Call sub_08067534

data/scripts/castorWilds/script_GreatFairyRupees.inc

@@ -9,8 +9,8 @@ script_0800B6D4:
 	CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
 	JumpIfNot script_0800B6D4
 	Call sub_08079184
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	StartPlayerScript script_PlayerAtGreatFairy
 	WaitForSyncFlagAndClear 0x00000004
 	SetRoomFlag 0x0000
@@ -19,7 +19,7 @@ script_0800B6D4:
 	JumpIf script_0800B7A2
 	MessageNoOverlap 0x057b
 	WaitUntilTextboxCloses
-	CallWithArg sub_0807F970, 0x0000057d
+	CallWithArg CheckMessageEqual, 0x0000057d
 	JumpIf script_0800B6A6
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x009f

data/scripts/castorWilds/script_MalonAtRanch.inc

@@ -8,10 +8,10 @@ SCRIPT_START script_MalonAtRanch
 script_0800B5FA:
 	CheckEntityInteractType
 	JumpIfNot script_0800B5FA
-	_0807E864 
-	_0807EB74 
+	SetPlayerIdle 
+	FacePlayer 
 	MessageNoOverlap 0x2009
 	WaitUntilTextboxCloses
-	_0807E878 
-	_0807EB44 0x0004
+	EnablePlayerControl 
+	SetAnimationState 0x0004
 	Jump script_0800B5FA

data/scripts/castorWilds/script_Object69.inc

@@ -30,7 +30,7 @@ script_0800B216:
 	Wait 0x000c
 	CameraTargetPlayer
 	Wait 0x0008
-	_0807E878
+	EnablePlayerControl
 .ifdef JP
 	CheckLocalFlag 0x001e
 .else

data/scripts/castorWilds/script_Object69DarknutFight.inc

@@ -3,9 +3,9 @@ SCRIPT_START script_Object69DarknutFight
 	BeginBlock
 	Call sub_0807DF28
 	SetLocalFlag 0x0039
-	_0807E864
+	SetPlayerIdle
 	EndBlock
-	WaitForPlayerAction0x17
+	WaitForPlayerEnterRoom
 	StartPlayerScript script_PlayerAtDarknutFight
 	Wait 0x0018
 	SetSyncFlag 0x00000002
@@ -13,8 +13,8 @@ SCRIPT_START script_Object69DarknutFight
 	SetRoomFlag 0x0000
 	Wait 0x0010
 	PlayBgm BGM_FIGHT_THEME
-	_0807EB28 0x2701
-	_0807E878
+	EzloMessage 0x2701
+	EnablePlayerControl
 	Call sub_0807DF50
 SCRIPT_END
 	.2byte 0x0000

data/scripts/cloudTops/script_EzloTalkPoW.inc

@@ -1,12 +1,12 @@
 @ Ezlo talk after getting wind element
 SCRIPT_START script_EzloTalkPoW
-	_0807E864
+	SetPlayerIdle
 	Call sub_0807DF28
-	_0807EB28 0x1c05
+	EzloMessage 0x1c05
 	WaitUntilTextboxCloses
 	SetLocalFlagByBank 0x0100, 0x0005
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/cloudTops/script_GregalHealthy.inc

@@ -3,14 +3,14 @@ SCRIPT_START script_GregalHealthy
 	BeginBlock
 	Call sub_0806CD58
 	DoPostScriptAction 0x000a
-	_0807EB44 0x0004
-	_0807E930 0x0006
+	SetAnimationState 0x0004
+	SetAnimation 0x0006
 	EndBlock
 script_08014C42:
 	CheckEntityInteractType
 	JumpIfNot script_08014C42
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 script_08014C4C:
 	Call sub_0806CCD0
 	JumpIfNot script_08014C4C
@@ -30,7 +30,7 @@ script_08014C7C:
 	WaitUntilTextboxCloses
 script_08014C82:
 	Wait 0x000f
-	_0807E878
-	_0807EB44 0x0004
-	_0807E930 0x0006
+	EnablePlayerControl
+	SetAnimationState 0x0004
+	SetAnimation 0x0006
 	Jump script_08014C42

data/scripts/cloudTops/script_GregalSick.inc

@@ -2,7 +2,7 @@
 SCRIPT_START script_GregalSick
 	BeginBlock
 	DoPostScriptAction 0x000a
-	_0807E930 0x0000
+	SetAnimation 0x0000
 	EndBlock
 	CheckLocalFlag 0x0063
 	JumpIf script_08014BE8
@@ -14,21 +14,21 @@ script_08014B48:
 	CheckEntityInteractType
 	JumpIfNot script_08014B48
 	EndBlock 
-	_0807E864 
-	_0807EB74 
+	SetPlayerIdle 
+	FacePlayer 
 	MessageNoOverlap 0x2f01
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	_0807E878
+	EnablePlayerControl
 	Jump script_08014B48
 script_08014B70:
 	EndBlock
-	_0807E864
+	SetPlayerIdle
 	Call sub_0807DF28
 	SetSyncFlag 0x00000001
 	DoPostScriptAction 0x0004
 	WaitForSyncFlagAndClear 0x00000002
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	Call sub_0806CCF8
 	Wait 0x0014
 	Call sub_0806CD04
@@ -46,14 +46,14 @@ script_08014B70:
 	SetSyncFlag 0x00000001
 	WaitForSyncFlagAndClear 0x00000002
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 script_08014BE8:
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	Call sub_0806CD4C
 script_08014BF2:
 	CheckEntityInteractType
 	JumpIfNot script_08014BF2
-	_0807E864
+	SetPlayerIdle
 	CheckLocalFlag 0x0065
 	JumpIf script_08014C1C
 	SetLocalFlag 0x0065
@@ -68,5 +68,5 @@ script_08014C1C:
 	WaitUntilTextboxCloses
 script_08014C22:
 	Wait 0x000f
-	_0807E878
+	EnablePlayerControl
 	Jump script_08014BF2

data/scripts/cloudTops/script_Npc4EFirstCloud.inc

@@ -2,7 +2,7 @@
 @ Reponsible for Kinstone cutscenes
 SCRIPT_START script_Npc4EFirstCloud
 	BeginBlock
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	DoPostScriptAction 0x000b
 	DoPostScriptAction 0x0008
 	Call sub_0806DAAC
@@ -16,10 +16,10 @@ script_0800D636:
 	Call sub_0806DAAC
 	JumpIf script_0800D650
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	Jump script_0800D636
 script_0800D650:
-	_0807E864
+	SetPlayerIdle
 	Call sub_0807DF28
 	Call sub_0807FBC4
 	Call sub_0807FBA0

data/scripts/cloudTops/script_Npc4EKinstoneFused.inc

@@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EKinstoneFused
 	_0807F0B4 0x0004
 	CameraTargetPlayer
 	Call sub_0807FBCC
-	_0807E878
+	EnablePlayerControl
 	Call sub_0807DF50
 script_0800D6AE:
 	DoPostScriptAction 0x0006

data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc

@@ -1,7 +1,7 @@
 @ Cloud Tops OBJECT_69 great whirlwind revealed
 SCRIPT_START script_Object69GreatWhirlwindRevealed
 	BeginBlock
-	Call sub_0807F360
+	Call SetPriorityHighest
 	SetEntitySpeed 0x0700
 	_0807F0B4 0x0007
 	CameraTargetEntity
@@ -17,7 +17,7 @@ SCRIPT_START script_Object69GreatWhirlwindRevealed
 	_0807F0B4 0x0004
 	CameraTargetPlayer
 	Call sub_0807FBCC
-	_0807E878
+	EnablePlayerControl
 	Call sub_0807DF50
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/cloudTops/script_Object6AMysteriousCloud.inc

@@ -3,7 +3,7 @@ SCRIPT_START script_Object6AMysteriousCloud
 	BeginBlock
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x0011
-	Call sub_0807F158
+	Call SetCollisionLayer1
 	Call sub_0807F738
 	EndBlock
 SCRIPT_END

data/scripts/cloudTops/script_PlayerAtSiroc.inc

@@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtSiroc
 	SetEntitySpeed 0x0100
 	EndBlock
 	_0807EDD4 0x0078, 0x0040
-	_0807EB44 0x0000
+	SetAnimationState 0x0000
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00000001
 	Call sub_080791BC

data/scripts/cloudTops/script_Siroc.inc

@@ -5,13 +5,13 @@ SCRIPT_START script_Siroc
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08014AD2:
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_08014AD2
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	StartPlayerScript script_PlayerAtSiroc
 	WaitForSyncFlagAndClear 0x00000001
-	_0807EB74
+	FacePlayer
 	CheckLocalFlag 0x0064
 	JumpIf script_08014AFE
 	SetLocalFlag 0x0064
@@ -22,6 +22,6 @@ script_08014AFE:
 script_08014B02:
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	_0807E878
+	EnablePlayerControl
 	Jump script_08014AD2
 	.2byte 0x0000

data/scripts/cloudTops/script_WindTribespeople1.inc

@@ -5,17 +5,17 @@ SCRIPT_START script_WindTribespeople1
 	DoPostScriptAction 0x000a
 	CheckGlobalFlag 0x0058
 	JumpIf script_08014976
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	SetEntityPositionRelative 0x0078, 0x0128
 script_08014976:
 	EndBlock
 script_08014978:
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_08014978
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	Call sub_0806C90C
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	_0807E878
+	EnablePlayerControl
 	Jump script_08014978

data/scripts/cloudTops/script_WindTribespeople2.inc

@@ -7,14 +7,14 @@ SCRIPT_START script_WindTribespeople2
 	JumpIfNot script_080149C6
 	EndBlock
 script_080149AA:
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_080149AA
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	Call sub_0806C90C
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	_0807E878
+	EnablePlayerControl
 	Jump script_080149AA
 script_080149C6:
 	DoPostScriptAction 0x0006

data/scripts/cloudTops/script_WindTribespeople3.inc

@@ -6,10 +6,10 @@ SCRIPT_START script_WindTribespeople3
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080149DE:
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_080149DE
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	Call sub_0806C90C
 	WaitUntilTextboxCloses
 	CheckLocalFlag 0x0064
@@ -21,10 +21,10 @@ script_080149DE:
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0068, 0x00f8
 	PlaySound SFX_SECRET
-	_0807EB74
+	FacePlayer
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
 script_08014A20:
-	_0807E878
+	EnablePlayerControl
 	Jump script_080149DE
 	.2byte 0x0000

data/scripts/cloudTops/script_WindTribespeople4.inc

@@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople4
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08014A36:
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_08014A36
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	Call sub_0806C90C
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	_0807E878
+	EnablePlayerControl
 	Jump script_08014A36
 	.2byte 0x0000

data/scripts/cloudTops/script_WindTribespeople5.inc

@@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople5
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08014A62:
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_08014A62
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	Call sub_0806C90C
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	_0807E878
+	EnablePlayerControl
 	Jump script_08014A62
 	.2byte 0x0000

data/scripts/cloudTops/script_WindTribespeople6.inc

@@ -4,7 +4,7 @@ SCRIPT_START script_WindTribespeople6
 	DoPostScriptAction 0x000a
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000001
-	_0807EB74
+	FacePlayer
 	DoPostScriptAction 0x0004
 	SetSyncFlag 0x00000002
 	WaitForSyncFlagAndClear 0x00000001
@@ -12,12 +12,12 @@ SCRIPT_START script_WindTribespeople6
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00000002
 script_08014AAC:
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_08014AAC
-	_0807E864 
-	_0807EB74 
+	SetPlayerIdle 
+	FacePlayer 
 	MessageNoOverlap 0x2f0a
 	WaitUntilTextboxCloses
-	_0807E878 
+	EnablePlayerControl 
 	Jump script_08014AAC
 	.2byte 0x0000

data/scripts/cloudTops/script_WindTribespeople7.inc

@@ -12,14 +12,14 @@ script_08014CAE:
 	BeginBlock
 	CheckGlobalFlag 0x0024
 	JumpIf script_08014CD4
-	_0807E30C
+	FacePlayerAndCheckDist
 	JumpIfNot script_08014CAE
 	EndBlock
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	Call sub_0806C90C
 	WaitUntilTextboxCloses
-	_0807E878
+	EnablePlayerControl
 	Jump script_08014CAE
 script_08014CD4:
 	DoPostScriptAction 0x0006

data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc

@@ -1,10 +1,10 @@
 @ Cloud Tops WindTribespeople great whirlwind revealed 2
 SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1
 	BeginBlock
-	Call sub_0807F360
+	Call SetPriorityHighest
 	DoPostScriptAction 0x000b
 	SetEntitySpeed 0x0200
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000008
@@ -13,14 +13,14 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1
 	PlaySound SFX_123
 	CallWithArg sub_0807F464, 0x000001e0
 	_0807EDD4 0x01e0, 0x01d8
-	_0807EB44 0x0002
+	SetAnimationState 0x0002
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00000010
 	PlaySound SFX_PLY_JUMP
 	_0807EF3C 0x0180, 0x0030
 	PlaySound SFX_PLY_JUMP
 	_0807EF3C 0x0180, 0x0030
-	_0807EB44 0x0002
+	SetAnimationState 0x0002
 	DoPostScriptAction 0x0001
 	WaitForSyncFlagAndClear 0x00000008
 	Jump script_0800D80C

data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc

@@ -1,7 +1,7 @@
 @ Cloud Tops WindTribespeople great whirlwind revealed
 SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2
 	BeginBlock
-	Call sub_0807F360
+	Call SetPriorityHighest
 	DoPostScriptAction 0x000b
 	SetEntityPositionRelative 0x0268, 0x01d8
 	SetEntitySpeed 0x0100
@@ -15,11 +15,11 @@ script_0800D80C:
 	_0807EEF4 0x0000, 0xffe0
 	DoPostScriptAction 0x000e
 	Call sub_0806CA5C
-	SetEntity0x20 0x00040000
+	SetEntityVelocity 0x00040000
 	PlaySound SFX_F5
 script_0800D82A:
-	CallWithArg sub_0807F8D0, 0xffffe000
-	Call sub_0807F8BC
+	CallWithArg DoGravity, 0xffffe000
+	Call CheckEntityOnScreen
 	JumpIf script_0800D82A
 	SetSyncFlag 0x00000004
 	DoPostScriptAction 0x0006

data/scripts/cutscene/ezlo/script_EzloCap.inc

@@ -4,20 +4,20 @@ SCRIPT_START script_EzloCap
 	SetEntitySpeed 0x0040
 	DoPostScriptAction 0x0007
 	EndBlock
-	_0807E930 0x0020
+	SetAnimation 0x0020
 	WaitForSyncFlagAndClear 0x00000004
-	_0807E930 0x0022
+	SetAnimation 0x0022
 	Call sub_0807F3C8
 	MessageFromTargetPos 0x1102, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0020
+	SetAnimation 0x0020
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
-	_0807E930 0x0021
+	SetAnimation 0x0021
 	Call sub_0807F3C8
 	MessageFromTargetPos 0x1103, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0020
+	SetAnimation 0x0020
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
 	DoPostScriptAction 0x0004
@@ -25,32 +25,32 @@ SCRIPT_START script_EzloCap
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
 	DoPostScriptAction 0x0011
-	_0807E930 0x001c
+	SetAnimation 0x001c
 	MessageFromTargetPos 0x1105, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0020
+	SetAnimation 0x0020
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
-	_0807E930 0x0022
+	SetAnimation 0x0022
 	Call sub_0807F3C8
 	MessageFromTargetPos 0x1106, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x001c
+	SetAnimation 0x001c
 	Call sub_0806D96C
 	MessageFromTargetPos 0x1107, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0020
+	SetAnimation 0x0020
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
-	_0807E930 0x0021
+	SetAnimation 0x0021
 	Call sub_0807F3C8
 	MessageFromTargetPos 0x1108, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x001c
+	SetAnimation 0x001c
 	Call sub_0806D96C
 	MessageFromTargetPos 0x1109, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0020
+	SetAnimation 0x0020
 	DoPostScriptAction 0x000a
 	_0807E9D4
 	SetSyncFlag 0x00000008
@@ -62,16 +62,16 @@ script_080127F2:
 	CheckEntityInteractType
 	JumpIfNot script_080127F2
 	EndBlock
-	_0807E864
+	SetPlayerIdle
 	Call sub_0806D944
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x1114, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0020
-	_0807E878
+	SetAnimation 0x0020
+	EnablePlayerControl
 	Jump script_080127F2
 script_08012824:
-	_0807E864
+	SetPlayerIdle
 	_0807E9DC
 	CallWithArg sub_0807F5B0, 0x0000003c
 	Call sub_080791D0
@@ -82,39 +82,39 @@ script_08012824:
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
 	Call sub_0806D944
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x110a, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x001f
+	SetAnimation 0x001f
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x110b, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x001f
+	SetAnimation 0x001f
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
 	DoPostScriptAction 0x0004
 	Wait 0x003c
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x110c, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x001f
+	SetAnimation 0x001f
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x110d, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x001f
+	SetAnimation 0x001f
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x110e, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0018
+	SetAnimation 0x0018
 	SetEntitySpeed 0x0080
 	Call sub_0806D908
-	_0807EC1C 0x0010
+	WalkForward 0x0010
 	DoPostScriptAction 0x000a
 	_0807E9D4
 	SetSyncFlag 0x00000008
@@ -129,30 +129,30 @@ script_08012904:
 	JumpIfNot script_0801293A
 	Jump script_08012904
 script_08012920:
-	_0807E864
-	_0807E930 0x0010
+	SetPlayerIdle
+	SetAnimation 0x0010
 	EndBlock 
 	MessageFromTargetPos 0x1115, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0018
-	_0807E878
+	SetAnimation 0x0018
+	EnablePlayerControl
 	Jump script_08012904
 script_0801293A:
 	EndBlock
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
-	_0807EB8C
+	FaceAwayFromPlayer
 	Call sub_0806D944
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x110f, 0x000c
-	_0807E930 0x0018
+	SetAnimation 0x0018
 	SetEntitySpeed 0x0080
 	Call sub_0806D908
-	_0807EC1C 0x0050
+	WalkForward 0x0050
 	WaitUntilTextboxCloses
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
 script_08012984:
@@ -165,31 +165,31 @@ script_08012984:
 	JumpIfNot script_080129BA
 	Jump script_08012984
 script_080129A0:
-	_0807E864
-	_0807E930 0x0010
+	SetPlayerIdle
+	SetAnimation 0x0010
 	EndBlock 
 	MessageFromTargetPos 0x1115, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0018
-	_0807E878
+	SetAnimation 0x0018
+	EnablePlayerControl
 	Jump script_08012984
 script_080129BA:
 	EndBlock
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
-	_0807EB8C
+	FaceAwayFromPlayer
 	Call sub_0806D944
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x1110, 0x000c
-	_0807E930 0x0018
+	SetAnimation 0x0018
 	SetEntitySpeed 0x0080
 	Call sub_0806D908
-	_0807EC1C 0x0050
-	_0807E930 0x0018
+	WalkForward 0x0050
+	SetAnimation 0x0018
 	WaitUntilTextboxCloses
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	SetSyncFlag 0x00000008
 	WaitForSyncFlagAndClear 0x00000004
 script_08012A08:
@@ -202,32 +202,32 @@ script_08012A08:
 	JumpIfNot script_08012A3E
 	Jump script_08012A08
 script_08012A24:
-	_0807E864
-	_0807E930 0x0010
+	SetPlayerIdle
+	SetAnimation 0x0010
 	EndBlock 
 	MessageFromTargetPos 0x1115, 0x000c
 	WaitUntilTextboxCloses
-	_0807E930 0x0018
-	_0807E878
+	SetAnimation 0x0018
+	EnablePlayerControl
 	Jump script_08012A08
 script_08012A3E:
 	EndBlock
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
 	StopBgm
 	DoPostScriptAction 0x000b
-	_0807EB8C
+	FaceAwayFromPlayer
 	Call sub_0806D944
-	_0807E930 0x0010
+	SetAnimation 0x0010
 	MessageFromTargetPos 0x1111, 0x000c
-	_0807E930 0x0018
+	SetAnimation 0x0018
 	SetEntitySpeed 0x0080
 	Call sub_0806D8A0
 script_08012A74:
 	_0807EE30
 	JumpIfNot script_08012A74
-	_0807E930 0x001f
+	SetAnimation 0x001f
 	WaitUntilTextboxCloses
 	StartPlayerScript script_PlayerGetEzloCap
 	Call sub_0806D9A4
@@ -236,7 +236,7 @@ script_08012A74:
 	PlayBgm BGM_EZLO_THEME
 	BeginBlock
 	_0807E8E4_2
-	_0807EB28 0x1112
+	EzloMessage 0x1112
 	EndBlock
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00000008

data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc

@@ -7,14 +7,14 @@ script_0801248A:
 	CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
 	JumpIfNot script_0801248A
 	StopBgm
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
 	StartPlayerScript script_PlayerAtFirstLookAtEzlo
 	MessageFromTargetPos 0x1101, 0x0007
 	WaitUntilTextboxCloses
 	CameraTargetPlayer 
-	_0807E778 0x0004
+	SetFadeTime 0x0004
 	_0807E80C 0x00000000
 	WaitForFadeFinish
 	_0807E858 0x0000
@@ -23,7 +23,7 @@ script_0801248A:
 	Call DeleteAllEnemies
 	SetEntityPositionRelative 0x0388, 0x0168
 	Call sub_0807F844
-	_0807E778 0x0004
+	SetFadeTime 0x0004
 	_0807E800 0x00000000
 	WaitForFadeFinish
 	PlayBgm BGM_EZLO_THEME
@@ -38,24 +38,24 @@ script_0801248A:
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000008
 	StopBgm
-	_0807E778 0x0004
+	SetFadeTime 0x0004
 	_0807E80C 0x00000000
 	WaitForFadeFinish
 	MoveEntityToPlayer
 	Call sub_0807F844
 	CameraTargetPlayer
 	SetFadeMask 0xffffffff
-	_0807E778 0x0004
+	SetFadeTime 0x0004
 	_0807E800 0x00000000
 	WaitForFadeFinish
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	PlayBGM
 script_08012566:
 	CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
 	JumpIfNot script_08012566
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
 	Call sub_0806DC7C
 	StopBgm
@@ -83,12 +83,12 @@ script_08012566:
 	StopBgm
 	PlayBgm BGM_FIGHT_THEME2
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	SetSyncFlag 0x00000050
 	LoadRoomEntityList gUnk_080F51D0
 	WaitForSyncFlagAndClear 0x00000008
-	_0807E864
-	Call sub_0807FA40
+	SetPlayerIdle
+	Call WaitForPlayerNormalOrTalkEzlo
 	Call sub_0807DF28
 	PlaySound SFX_SECRET
 	StopBgm
@@ -116,7 +116,7 @@ script_08012566:
 	_0807F0B4 0x0004
 	CameraTargetPlayer
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000008
 	SetSyncFlag 0x00000004
@@ -128,8 +128,8 @@ script_08012566:
 	PlayBGM
 	Call sub_08054570
 	SetGlobalFlag 0x0014
-	CallWithArg sub_0807F6F8, 0x00000008
+	CallWithArg ResetPlayerFlag, 0x00000008
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc

@@ -1,20 +1,20 @@
 @ First look at Ezlo OBJECT_6A left octorok
 SCRIPT_START script_Object6ALeftBullyingOctorok
 	BeginBlock
-	_0807EB44 0x0002
+	SetAnimationState 0x0002
 	DoPostScriptAction 0x0007
-	_0807E930 0x0001
+	SetAnimation 0x0001
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000040
-	_0807E930 0x0005
+	SetAnimation 0x0005
 	Wait 0x001e
 	SetSyncFlag 0x00000080
-	_0807E930 0x0001
+	SetAnimation 0x0001
 	WaitForSyncFlagAndClear 0x00000040
-	_0807E930 0x0005
+	SetAnimation 0x0005
 	Wait 0x001e
 	SetSyncFlag 0x00000080
-	_0807E930 0x0001
+	SetAnimation 0x0001
 	WaitForSyncFlagAndClear 0x00000040
 	Wait 0x0001
 	DoPostScriptAction 0x0006

data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc

@@ -1,20 +1,20 @@
 @ First look at Ezlo OBJECT_6A right octorok
 SCRIPT_START script_Object6ARightBullyingOctorok
 	BeginBlock
-	_0807EB44 0x0006
+	SetAnimationState 0x0006
 	DoPostScriptAction 0x0007
-	_0807E930 0x0003
+	SetAnimation 0x0003
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000010
-	_0807E930 0x0007
+	SetAnimation 0x0007
 	Wait 0x001e
 	SetSyncFlag 0x00000020
-	_0807E930 0x0003
+	SetAnimation 0x0003
 	WaitForSyncFlagAndClear 0x00000010
-	_0807E930 0x0007
+	SetAnimation 0x0007
 	Wait 0x001e
 	SetSyncFlag 0x00000020
-	_0807E930 0x0003
+	SetAnimation 0x0003
 	WaitForSyncFlagAndClear 0x00000010
 	Wait 0x0001
 	DoPostScriptAction 0x0006

data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc

@@ -2,9 +2,9 @@
 SCRIPT_START script_PlayerAtFirstLookAtEzlo
 	EndBlock
 script_08012AB2:
-	_0807EB44 0x0002
+	SetAnimationState 0x0002
 	Wait 0x000a
-	_0807EB44 0x0006
+	SetAnimationState 0x0006
 	Wait 0x000a
 	Jump script_08012AB2
 	.2byte 0x0000