finished fldeff_strength + lots of clean up

asm/fldeff_cut.s

@@ -39,7 +39,7 @@ sub_8097898: @ 8097898
 	cmp r0, 0x1
 	beq _080978E0
 	movs r0, 0x5F
-	bl npc_before_player_of_type
+	bl CheckObjectGraphicsInFrontOfPlayer
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/fldeff_strength.s

@@ -1,111 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D07EC
-sub_80D07EC: @ 80D07EC
-	push {r4,lr}
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D0808
-	movs r0, 0x61
-	bl npc_before_player_of_type
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _080D080C
-_080D0808:
-	movs r0, 0
-	b _080D0826
-_080D080C:
-	ldr r4, _080D082C @ =gSpecialVar_Result
-	bl GetCursorSelectionMonId
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4]
-	ldr r1, _080D0830 @ =gFieldCallback2
-	ldr r0, _080D0834 @ =FieldCallback_PrepareFadeInFromMenu
-	str r0, [r1]
-	ldr r1, _080D0838 @ =gPostMenuFieldCallback
-	ldr r0, _080D083C @ =sub_80D0840
-	str r0, [r1]
-	movs r0, 0x1
-_080D0826:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080D082C: .4byte gSpecialVar_Result
-_080D0830: .4byte gFieldCallback2
-_080D0834: .4byte FieldCallback_PrepareFadeInFromMenu
-_080D0838: .4byte gPostMenuFieldCallback
-_080D083C: .4byte sub_80D0840
-	thumb_func_end sub_80D07EC
-
-	thumb_func_start sub_80D0840
-sub_80D0840: @ 80D0840
-	push {lr}
-	bl GetCursorSelectionMonId
-	ldr r1, _080D0858 @ =gFieldEffectArguments
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	ldr r0, _080D085C @ =gUnknown_81BE16E
-	bl ScriptContext1_SetupScript
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D0858: .4byte gFieldEffectArguments
-_080D085C: .4byte gUnknown_81BE16E
-	thumb_func_end sub_80D0840
-
-	thumb_func_start sub_80D0860
-sub_80D0860: @ 80D0860
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080D0894 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _080D0898 @ =sub_80D08A8
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	ldr r0, _080D089C @ =gFieldEffectArguments
-	ldr r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080D08A0 @ =gPlayerParty
-	adds r0, r1
-	ldr r1, _080D08A4 @ =gStringVar1
-	bl GetMonNickname
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080D0894: .4byte gTasks
-_080D0898: .4byte sub_80D08A8
-_080D089C: .4byte gFieldEffectArguments
-_080D08A0: .4byte gPlayerParty
-_080D08A4: .4byte gStringVar1
-	thumb_func_end sub_80D0860
-
-	thumb_func_start sub_80D08A8
-sub_80D08A8: @ 80D08A8
-	push {lr}
-	movs r0, 0x28
-	bl FieldEffectActiveListRemove
-	bl EnableBothScriptContexts
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D08A8
-
-	.align 2, 0 @ Don't pad with nop.

asm/rom6.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start npc_before_player_of_type
-npc_before_player_of_type: @ 80C97A8
+	thumb_func_start CheckObjectGraphicsInFrontOfPlayer
+CheckObjectGraphicsInFrontOfPlayer: @ 80C97A8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -46,7 +46,7 @@ _080C97F6:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end npc_before_player_of_type
+	thumb_func_end CheckObjectGraphicsInFrontOfPlayer
 
 	thumb_func_start oei_task_add
 oei_task_add: @ 80C97FC
@@ -283,7 +283,7 @@ _080C99D4: .4byte gPlayerAvatar
 SetUpFieldMove_RockSmash: @ 80C99D8
 	push {lr}
 	movs r0, 0x60
-	bl npc_before_player_of_type
+	bl CheckObjectGraphicsInFrontOfPlayer
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1