name asm funcs

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,7 +1028,7 @@ 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
@@ -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

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

@@ -102,7 +102,7 @@ _0800449A:
 	thumb_func_start sub_0800449C
 sub_0800449C: @ 0x0800449C
 	push {r1, lr}
-	bl sub_080040A8
+	bl CheckOnScreen
 	cmp r0, #0
 	pop {r0}
 	beq _080044AC

asm/code_080732D0.s

@@ -272,7 +272,7 @@ sub_080734D4: @ 0x080734D4
 	push {r4, lr}
 	adds r4, r0, #0
 	ldr r1, _080734FC @ =0xFFFFF000
-	bl sub_08003FC4
+	bl GravityUpdate
 	ldr r0, [r4, #0x20]
 	cmp r0, #0
 	bgt _080734EE
@@ -307,7 +307,7 @@ sub_08073504: @ 0x08073504
 	lsls r1, r1, #4
 _08073516:
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	ldr r0, [r4, #0x20]
 	cmp r0, #0
 	bge _08073576
@@ -737,7 +737,7 @@ _0807382A:
 	movs r1, #0x80
 	lsls r1, r1, #2
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	b _0807387A
 	.align 2, 0
 _08073854: .4byte gScreenTransition
@@ -818,7 +818,7 @@ _080738EC:
 _080738F0:
 	ldr r1, _08073900 @ =0xFFFFE800
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r0, r4, #0
 	bl UpdateAnimationSingleFrame
 	pop {r4, pc}
@@ -1029,7 +1029,7 @@ _08073A48:
 _08073A7E:
 	adds r0, r4, #0
 	adds r1, r2, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _08073A90
 	adds r0, r4, #0
@@ -1206,7 +1206,7 @@ _08073BD0:
 	movs r1, #0x80
 	lsls r1, r1, #7
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	movs r0, #0x36
 	ldrsh r1, [r4, r0]
 	movs r0, #8
@@ -1500,7 +1500,7 @@ _08073E10:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r1, r0, #0
 	cmp r1, #0
 	bne _08073E32
@@ -1737,7 +1737,7 @@ _08073FF8:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	ldr r0, [r4, #0x20]
 	cmp r0, #0
 	bne _08074016
@@ -1796,7 +1796,7 @@ sub_08074060: @ 0x08074060
 	adds r4, r0, #0
 	movs r1, #0x80
 	lsls r1, r1, #6
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _080740D0
 	ldr r0, _080740C4 @ =gPlayerHitbox
@@ -1966,7 +1966,7 @@ _080741B0:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	bne _080741C2
 	bl sub_0807921C
@@ -3517,7 +3517,7 @@ _08074D20:
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r5, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	adds r0, r5, #0
 	bl UpdateAnimationSingleFrame
 	pop {r4, r5, r6, pc}
@@ -4009,7 +4009,7 @@ sub_0807508C: @ 0x0807508C
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r4, #0
-	bl sub_08003FC4
+	bl GravityUpdate
 	cmp r0, #0
 	beq _080750AA
 	adds r0, r4, #0

asm/code_08078778.s

@@ -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

@@ -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/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/gleerok.s

@@ -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

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
@@ -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

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

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/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/player/sub_08070DC4.inc

@@ -12,7 +12,7 @@
 	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

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/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/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/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/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