name field effect functions

11 files changed, 248 insertions, 248 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index bd268229c..d665a1f0f 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -578,8 +578,8 @@ _08126C5A:
 _08126C68: .4byte gSprites
 	thumb_func_end sub_8126BC4
 
-	thumb_func_start oei_shadow
-oei_shadow: @ 8126C6C
+	thumb_func_start FldEff_Shadow
+FldEff_Shadow: @ 8126C6C
 	push {r4,r5,lr}
 	ldr r5, _08126CF8
 	ldrb r0, [r5]
@@ -655,7 +655,7 @@ _08126D00: .4byte gFieldEffectObjectTemplatePointers
 _08126D04: .4byte gUnknown_08401E32
 _08126D08: .4byte gSprites
 _08126D0C: .4byte gUnknown_08401E36
-	thumb_func_end oei_shadow
+	thumb_func_end FldEff_Shadow
 
 	thumb_func_start oamc_shadow
 oamc_shadow: @ 8126D10
@@ -754,8 +754,8 @@ _08126DD0: .4byte gSprites
 _08126DD4: .4byte 0x00400001
 	thumb_func_end oamc_shadow
 
-	thumb_func_start oei_grass_normal
-oei_grass_normal: @ 8126DD8
+	thumb_func_start FldEff_TallGrass
+FldEff_TallGrass: @ 8126DD8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, _08126E70
@@ -833,7 +833,7 @@ _08126E64:
 _08126E70: .4byte gUnknown_0202FF84
 _08126E74: .4byte gFieldEffectObjectTemplatePointers
 _08126E78: .4byte gSprites
-	thumb_func_end oei_grass_normal
+	thumb_func_end FldEff_TallGrass
 
 	thumb_func_start unc_grass_normal
 unc_grass_normal: @ 8126E7C
@@ -969,8 +969,8 @@ _08126F70:
 _08126F7C: .4byte gMapObjects
 	thumb_func_end unc_grass_normal
 
-	thumb_func_start sub_8126F80
-sub_8126F80: @ 8126F80
+	thumb_func_start FldEff_JumpTallGrass
+FldEff_JumpTallGrass: @ 8126F80
 	push {r4,lr}
 	ldr r4, _08126FE4
 	adds r1, r4, 0x4
@@ -1024,7 +1024,7 @@ _08126FDC:
 _08126FE4: .4byte gUnknown_0202FF84
 _08126FE8: .4byte gFieldEffectObjectTemplatePointers
 _08126FEC: .4byte gSprites
-	thumb_func_end sub_8126F80
+	thumb_func_end FldEff_JumpTallGrass
 
 	thumb_func_start sub_8126FF0
 sub_8126FF0: @ 8126FF0
@@ -1102,8 +1102,8 @@ _08127074:
 	bx r1
 	thumb_func_end sub_8126FF0
 
-	thumb_func_start sub_8127080
-sub_8127080: @ 8127080
+	thumb_func_start FldEff_LongGrass
+FldEff_LongGrass: @ 8127080
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, _0812711C
@@ -1182,7 +1182,7 @@ _08127110:
 _0812711C: .4byte gUnknown_0202FF84
 _08127120: .4byte gFieldEffectObjectTemplatePointers
 _08127124: .4byte gSprites
-	thumb_func_end sub_8127080
+	thumb_func_end FldEff_LongGrass
 
 	thumb_func_start unc_grass_tall
 unc_grass_tall: @ 8127128
@@ -1310,8 +1310,8 @@ _0812720E:
 _0812721C: .4byte gMapObjects
 	thumb_func_end unc_grass_tall
 
-	thumb_func_start sub_8127220
-sub_8127220: @ 8127220
+	thumb_func_start FldEff_JumpLongGrass
+FldEff_JumpLongGrass: @ 8127220
 	push {r4,lr}
 	ldr r4, _08127284
 	adds r1, r4, 0x4
@@ -1365,10 +1365,10 @@ _0812727C:
 _08127284: .4byte gUnknown_0202FF84
 _08127288: .4byte gFieldEffectObjectTemplatePointers
 _0812728C: .4byte gSprites
-	thumb_func_end sub_8127220
+	thumb_func_end FldEff_JumpLongGrass
 
-	thumb_func_start sub_8127290
-sub_8127290: @ 8127290
+	thumb_func_start FldEff_ShortGrass
+FldEff_ShortGrass: @ 8127290
 	push {r4-r6,lr}
 	ldr r6, _08127324
 	ldrb r0, [r6]
@@ -1447,7 +1447,7 @@ _08127324: .4byte gUnknown_0202FF84
 _08127328: .4byte gMapObjects
 _0812732C: .4byte gFieldEffectObjectTemplatePointers
 _08127330: .4byte gSprites
-	thumb_func_end sub_8127290
+	thumb_func_end FldEff_ShortGrass
 
 	thumb_func_start sub_8127334
 sub_8127334: @ 8127334
@@ -1574,8 +1574,8 @@ _08127416:
 _08127424: .4byte gSprites
 	thumb_func_end sub_8127334
 
-	thumb_func_start sub_8127428
-sub_8127428: @ 8127428
+	thumb_func_start FldEff_SandFootprints
+FldEff_SandFootprints: @ 8127428
 	push {r4,lr}
 	ldr r4, _08127490
 	adds r1, r4, 0x4
@@ -1629,10 +1629,10 @@ _08127486:
 _08127490: .4byte gUnknown_0202FF84
 _08127494: .4byte gFieldEffectObjectTemplatePointers
 _08127498: .4byte gSprites
-	thumb_func_end sub_8127428
+	thumb_func_end FldEff_SandFootprints
 
-	thumb_func_start sub_812749C
-sub_812749C: @ 812749C
+	thumb_func_start FldEff_DeepSandFootprints
+FldEff_DeepSandFootprints: @ 812749C
 	push {r4,r5,lr}
 	ldr r4, _08127504
 	adds r1, r4, 0x4
@@ -1687,10 +1687,10 @@ _081274FC:
 _08127504: .4byte gUnknown_0202FF84
 _08127508: .4byte gFieldEffectObjectTemplatePointers
 _0812750C: .4byte gSprites
-	thumb_func_end sub_812749C
+	thumb_func_end FldEff_DeepSandFootprints
 
-	thumb_func_start sub_8127510
-sub_8127510: @ 8127510
+	thumb_func_start FldEff_BikeTireTracks
+FldEff_BikeTireTracks: @ 8127510
 	push {r4,r5,lr}
 	ldr r4, _08127578
 	adds r1, r4, 0x4
@@ -1745,7 +1745,7 @@ _08127570:
 _08127578: .4byte gUnknown_0202FF84
 _0812757C: .4byte gFieldEffectObjectTemplatePointers
 _08127580: .4byte gSprites
-	thumb_func_end sub_8127510
+	thumb_func_end FldEff_BikeTireTracks
 
 	thumb_func_start sub_8127584
 sub_8127584: @ 8127584
@@ -1824,8 +1824,8 @@ _08127608:
 	bx r0
 	thumb_func_end sub_81275C4
 
-	thumb_func_start sub_8127610
-sub_8127610: @ 8127610
+	thumb_func_start FldEff_Splash
+FldEff_Splash: @ 8127610
 	push {r4-r6,lr}
 	ldr r6, _081276A4
 	ldrb r0, [r6]
@@ -1901,7 +1901,7 @@ _081276A4: .4byte gUnknown_0202FF84
 _081276A8: .4byte gMapObjects
 _081276AC: .4byte gFieldEffectObjectTemplatePointers
 _081276B0: .4byte gSprites
-	thumb_func_end sub_8127610
+	thumb_func_end FldEff_Splash
 
 	thumb_func_start sub_81276B4
 sub_81276B4: @ 81276B4
@@ -1975,8 +1975,8 @@ _08127738: .4byte gSprites
 _0812773C: .4byte gMapObjects
 	thumb_func_end sub_81276B4
 
-	thumb_func_start sub_8127740
-sub_8127740: @ 8127740
+	thumb_func_start FldEff_JumpSmallSplash
+FldEff_JumpSmallSplash: @ 8127740
 	push {r4,lr}
 	ldr r4, _081277A4
 	adds r1, r4, 0x4
@@ -2030,10 +2030,10 @@ _0812779C:
 _081277A4: .4byte gUnknown_0202FF84
 _081277A8: .4byte gFieldEffectObjectTemplatePointers
 _081277AC: .4byte gSprites
-	thumb_func_end sub_8127740
+	thumb_func_end FldEff_JumpSmallSplash
 
-	thumb_func_start oei_water_drop_tall
-oei_water_drop_tall: @ 81277B0
+	thumb_func_start FldEff_JumpBigSplash
+FldEff_JumpBigSplash: @ 81277B0
 	push {r4,lr}
 	ldr r4, _08127814
 	adds r1, r4, 0x4
@@ -2087,10 +2087,10 @@ _0812780C:
 _08127814: .4byte gUnknown_0202FF84
 _08127818: .4byte gFieldEffectObjectTemplatePointers
 _0812781C: .4byte gSprites
-	thumb_func_end oei_water_drop_tall
+	thumb_func_end FldEff_JumpBigSplash
 
-	thumb_func_start sub_8127820
-sub_8127820: @ 8127820
+	thumb_func_start FldEff_FeetInFlowingWater
+FldEff_FeetInFlowingWater: @ 8127820
 	push {r4-r7,lr}
 	ldr r7, _081278C0
 	ldrb r0, [r7]
@@ -2174,7 +2174,7 @@ _081278C8: .4byte gFieldEffectObjectTemplatePointers
 _081278CC: .4byte gSprites
 _081278D0: .4byte sub_81278D8
 _081278D4: .4byte 0x0000ffff
-	thumb_func_end sub_8127820
+	thumb_func_end FldEff_FeetInFlowingWater
 
 	thumb_func_start sub_81278D8
 sub_81278D8: @ 81278D8
@@ -2258,8 +2258,8 @@ _0812796A:
 _08127974: .4byte gSprites
 	thumb_func_end sub_81278D8
 
-	thumb_func_start oei_ripples
-oei_ripples: @ 8127978
+	thumb_func_start FldEff_Ripple
+FldEff_Ripple: @ 8127978
 	push {r4,lr}
 	ldr r0, _081279CC
 	ldr r0, [r0, 0x14]
@@ -2306,10 +2306,10 @@ _081279C4:
 _081279CC: .4byte gFieldEffectObjectTemplatePointers
 _081279D0: .4byte gUnknown_0202FF84
 _081279D4: .4byte gSprites
-	thumb_func_end oei_ripples
+	thumb_func_end FldEff_Ripple
 
-	thumb_func_start sub_81279D8
-sub_81279D8: @ 81279D8
+	thumb_func_start FldEff_HotSpringsWater
+FldEff_HotSpringsWater: @ 81279D8
 	push {r4-r6,lr}
 	ldr r6, _08127A6C
 	ldrb r0, [r6]
@@ -2388,7 +2388,7 @@ _08127A6C: .4byte gUnknown_0202FF84
 _08127A70: .4byte gMapObjects
 _08127A74: .4byte gFieldEffectObjectTemplatePointers
 _08127A78: .4byte gSprites
-	thumb_func_end sub_81279D8
+	thumb_func_end FldEff_HotSpringsWater
 
 	thumb_func_start sub_8127A7C
 sub_8127A7C: @ 8127A7C
@@ -2469,8 +2469,8 @@ _08127B08:
 _08127B10: .4byte gSprites
 	thumb_func_end sub_8127A7C
 
-	thumb_func_start sub_8127B14
-sub_8127B14: @ 8127B14
+	thumb_func_start FldEff_Unknown19
+FldEff_Unknown19: @ 8127B14
 	push {r4,lr}
 	ldr r4, _08127B74
 	adds r1, r4, 0x4
@@ -2522,10 +2522,10 @@ _08127B6C:
 _08127B74: .4byte gUnknown_0202FF84
 _08127B78: .4byte gFieldEffectObjectTemplatePointers
 _08127B7C: .4byte gSprites
-	thumb_func_end sub_8127B14
+	thumb_func_end FldEff_Unknown19
 
-	thumb_func_start sub_8127B80
-sub_8127B80: @ 8127B80
+	thumb_func_start FldEff_Unknown20
+FldEff_Unknown20: @ 8127B80
 	push {r4,lr}
 	ldr r4, _08127BE0
 	adds r1, r4, 0x4
@@ -2577,10 +2577,10 @@ _08127BD8:
 _08127BE0: .4byte gUnknown_0202FF84
 _08127BE4: .4byte gFieldEffectObjectTemplatePointers
 _08127BE8: .4byte gSprites
-	thumb_func_end sub_8127B80
+	thumb_func_end FldEff_Unknown20
 
-	thumb_func_start sub_8127BEC
-sub_8127BEC: @ 8127BEC
+	thumb_func_start FldEff_Unknown21
+FldEff_Unknown21: @ 8127BEC
 	push {r4,lr}
 	ldr r4, _08127C4C
 	adds r1, r4, 0x4
@@ -2632,10 +2632,10 @@ _08127C44:
 _08127C4C: .4byte gUnknown_0202FF84
 _08127C50: .4byte gFieldEffectObjectTemplatePointers
 _08127C54: .4byte gSprites
-	thumb_func_end sub_8127BEC
+	thumb_func_end FldEff_Unknown21
 
-	thumb_func_start sub_8127C58
-sub_8127C58: @ 8127C58
+	thumb_func_start FldEff_Unknown22
+FldEff_Unknown22: @ 8127C58
 	push {r4,lr}
 	ldr r4, _08127CB8
 	adds r1, r4, 0x4
@@ -2687,7 +2687,7 @@ _08127CB0:
 _08127CB8: .4byte gUnknown_0202FF84
 _08127CBC: .4byte gFieldEffectObjectTemplatePointers
 _08127CC0: .4byte gSprites
-	thumb_func_end sub_8127C58
+	thumb_func_end FldEff_Unknown22
 
 	thumb_func_start ash
 ash: @ 8127CC4
@@ -2718,8 +2718,8 @@ ash: @ 8127CC4
 _08127CF4: .4byte gUnknown_0202FF84
 	thumb_func_end ash
 
-	thumb_func_start oei_ash
-oei_ash: @ 8127CF8
+	thumb_func_start FldEff_Ash
+FldEff_Ash: @ 8127CF8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, _08127D78
@@ -2787,7 +2787,7 @@ _08127D6E:
 _08127D78: .4byte gUnknown_0202FF84
 _08127D7C: .4byte gFieldEffectObjectTemplatePointers
 _08127D80: .4byte gSprites
-	thumb_func_end oei_ash
+	thumb_func_end FldEff_Ash
 
 	thumb_func_start sub_8127D84
 sub_8127D84: @ 8127D84
@@ -2904,8 +2904,8 @@ _08127E50:
 	bx r0
 	thumb_func_end sub_8127E30
 
-	thumb_func_start sub_8127E58
-sub_8127E58: @ 8127E58
+	thumb_func_start FldEff_SurfBlob
+FldEff_SurfBlob: @ 8127E58
 	push {r4,r5,lr}
 	ldr r4, _08127EC0
 	adds r1, r4, 0x4
@@ -2961,7 +2961,7 @@ _08127EC0: .4byte gUnknown_0202FF84
 _08127EC4: .4byte gFieldEffectObjectTemplatePointers
 _08127EC8: .4byte gSprites
 _08127ECC: .4byte 0x0000ffff
-	thumb_func_end sub_8127E58
+	thumb_func_end FldEff_SurfBlob
 
 	thumb_func_start sub_8127ED0
 sub_8127ED0: @ 8127ED0
@@ -3372,8 +3372,8 @@ _081281AC:
 _081281B0: .4byte gSprites
 	thumb_func_end sub_8128174
 
-	thumb_func_start sub_81281B4
-sub_81281B4: @ 81281B4
+	thumb_func_start FldEff_Dust
+FldEff_Dust: @ 81281B4
 	push {r4,lr}
 	ldr r4, _08128218
 	adds r1, r4, 0x4
@@ -3427,10 +3427,10 @@ _08128210:
 _08128218: .4byte gUnknown_0202FF84
 _0812821C: .4byte gFieldEffectObjectTemplatePointers
 _08128220: .4byte gSprites
-	thumb_func_end sub_81281B4
+	thumb_func_end FldEff_Dust
 
-	thumb_func_start sub_8128224
-sub_8128224: @ 8128224
+	thumb_func_start FldEff_SandPile
+FldEff_SandPile: @ 8128224
 	push {r4-r7,lr}
 	ldr r7, _081282D0
 	ldrb r0, [r7]
@@ -3519,7 +3519,7 @@ _081282D0: .4byte gUnknown_0202FF84
 _081282D4: .4byte gMapObjects
 _081282D8: .4byte gFieldEffectObjectTemplatePointers
 _081282DC: .4byte gSprites
-	thumb_func_end sub_8128224
+	thumb_func_end FldEff_SandPile
 
 	thumb_func_start sub_81282E0
 sub_81282E0: @ 81282E0
@@ -3626,8 +3626,8 @@ _081283A4: .4byte gSprites
 _081283A8: .4byte gMapObjects
 	thumb_func_end sub_81282E0
 
-	thumb_func_start sub_81283AC
-sub_81283AC: @ 81283AC
+	thumb_func_start FldEff_Bubbles
+FldEff_Bubbles: @ 81283AC
 	push {r4,lr}
 	ldr r4, _08128404
 	adds r1, r4, 0x4
@@ -3675,7 +3675,7 @@ _081283FC:
 _08128404: .4byte gUnknown_0202FF84
 _08128408: .4byte gFieldEffectObjectTemplatePointers
 _0812840C: .4byte gSprites
-	thumb_func_end sub_81283AC
+	thumb_func_end FldEff_Bubbles
 
 	thumb_func_start sub_8128410
 sub_8128410: @ 8128410
@@ -3711,8 +3711,8 @@ _08128444:
 _0812844C: .4byte 0x00001004
 	thumb_func_end sub_8128410
 
-	thumb_func_start sub_8128450
-sub_8128450: @ 8128450
+	thumb_func_start FldEff_BerryTreeGrowthSparkle
+FldEff_BerryTreeGrowthSparkle: @ 8128450
 	push {r4,lr}
 	ldr r4, _081284B8
 	adds r1, r4, 0x4
@@ -3768,10 +3768,10 @@ _081284B0:
 _081284B8: .4byte gUnknown_0202FF84
 _081284BC: .4byte gFieldEffectObjectTemplatePointers
 _081284C0: .4byte gSprites
-	thumb_func_end sub_8128450
+	thumb_func_end FldEff_BerryTreeGrowthSparkle
 
-	thumb_func_start ShowTreeDisguiseFieldEffect
-ShowTreeDisguiseFieldEffect: @ 81284C4
+	thumb_func_start FldEff_TreeDisguise
+FldEff_TreeDisguise: @ 81284C4
 	push {lr}
 	movs r0, 0x1C
 	movs r1, 0x18
@@ -3779,10 +3779,10 @@ ShowTreeDisguiseFieldEffect: @ 81284C4
 	bl ShowDisguiseFieldEffect
 	pop {r1}
 	bx r1
-	thumb_func_end ShowTreeDisguiseFieldEffect
+	thumb_func_end FldEff_TreeDisguise
 
-	thumb_func_start ShowMountainDisguiseFieldEffect
-ShowMountainDisguiseFieldEffect: @ 81284D4
+	thumb_func_start FldEff_MountainDisguise
+FldEff_MountainDisguise: @ 81284D4
 	push {lr}
 	movs r0, 0x1D
 	movs r1, 0x19
@@ -3790,10 +3790,10 @@ ShowMountainDisguiseFieldEffect: @ 81284D4
 	bl ShowDisguiseFieldEffect
 	pop {r1}
 	bx r1
-	thumb_func_end ShowMountainDisguiseFieldEffect
+	thumb_func_end FldEff_MountainDisguise
 
-	thumb_func_start ShowSandDisguiseFieldEffect
-ShowSandDisguiseFieldEffect: @ 81284E4
+	thumb_func_start FldEff_SandDisguise
+FldEff_SandDisguise: @ 81284E4
 	push {lr}
 	movs r0, 0x24
 	movs r1, 0x1C
@@ -3801,7 +3801,7 @@ ShowSandDisguiseFieldEffect: @ 81284E4
 	bl ShowDisguiseFieldEffect
 	pop {r1}
 	bx r1
-	thumb_func_end ShowSandDisguiseFieldEffect
+	thumb_func_end FldEff_SandDisguise
 
 	thumb_func_start ShowDisguiseFieldEffect
 ShowDisguiseFieldEffect: @ 81284F4
@@ -4081,8 +4081,8 @@ _081286FC:
 	bx r1
 	thumb_func_end sub_81286C4
 
-	thumb_func_start sub_8128700
-sub_8128700: @ 8128700
+	thumb_func_start FldEff_Sparkle
+FldEff_Sparkle: @ 8128700
 	push {r4,lr}
 	ldr r4, _08128768
 	ldr r0, [r4]
@@ -4138,7 +4138,7 @@ _08128760:
 _08128768: .4byte gUnknown_0202FF84
 _0812876C: .4byte gFieldEffectObjectTemplatePointers
 _08128770: .4byte gSprites
-	thumb_func_end sub_8128700
+	thumb_func_end FldEff_Sparkle
 
 	thumb_func_start sub_8128774
 sub_8128774: @ 8128774
diff --git a/asm/rom4.s b/asm/rom4.s
index ce1962a6f..fad0d3b08 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -34339,15 +34339,15 @@ GroundEffect_StepOnPuddle: @ 80640A8
 	bx r0
 	thumb_func_end GroundEffect_StepOnPuddle
 
-	thumb_func_start GroundEffect_SandHeap
-GroundEffect_SandHeap: @ 80640B8
+	thumb_func_start GroundEffect_SandPile
+GroundEffect_SandPile: @ 80640B8
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x27
 	bl oe_exec_and_other_stuff
 	pop {r0}
 	bx r0
-	thumb_func_end GroundEffect_SandHeap
+	thumb_func_end GroundEffect_SandPile
 
 	thumb_func_start GroundEffect_JumpOnTallGrass
 GroundEffect_JumpOnTallGrass: @ 80640C8
diff --git a/asm/rom5_part2.s b/asm/rom5_part2.s
index 3c103ba07..0df2c27d1 100644
--- a/asm/rom5_part2.s
+++ b/asm/rom5_part2.s
@@ -42854,8 +42854,8 @@ _080A25FC: .4byte gUnknown_0202FF84
 _080A2600: .4byte gUnknown_03005CE0
 	thumb_func_end sub_80A25E8
 
-	thumb_func_start sub_80A2604
-sub_80A2604: @ 80A2604
+	thumb_func_start FldEff_UseCutOnGrass
+FldEff_UseCutOnGrass: @ 80A2604
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -42877,7 +42877,7 @@ sub_80A2604: @ 80A2604
 	.align 2, 0
 _080A262C: .4byte gTasks
 _080A2630: .4byte sub_80A2684
-	thumb_func_end sub_80A2604
+	thumb_func_end FldEff_UseCutOnGrass
 
 	thumb_func_start sub_80A2634
 sub_80A2634: @ 80A2634
@@ -42896,8 +42896,8 @@ _080A264C: .4byte gUnknown_03005CE0
 _080A2650: .4byte UseCutScript
 	thumb_func_end sub_80A2634
 
-	thumb_func_start sub_80A2654
-sub_80A2654: @ 80A2654
+	thumb_func_start FldEff_UseCutOnTree
+FldEff_UseCutOnTree: @ 80A2654
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -42919,7 +42919,7 @@ sub_80A2654: @ 80A2654
 	.align 2, 0
 _080A267C: .4byte gTasks
 _080A2680: .4byte sub_80A2B00
-	thumb_func_end sub_80A2654
+	thumb_func_end FldEff_UseCutOnTree
 
 	thumb_func_start sub_80A2684
 sub_80A2684: @ 80A2684
@@ -42932,8 +42932,8 @@ sub_80A2684: @ 80A2684
 	bx r0
 	thumb_func_end sub_80A2684
 
-	thumb_func_start sub_80A2698
-sub_80A2698: @ 80A2698
+	thumb_func_start FldEff_CutGrass
+FldEff_CutGrass: @ 80A2698
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -43059,7 +43059,7 @@ _080A2798: .4byte gSprites
 _080A279C: .4byte gPlayerAvatar
 _080A27A0: .4byte gSpriteTemplate_CutGrass
 _080A27A4: .4byte 0x0201fff0
-	thumb_func_end sub_80A2698
+	thumb_func_end FldEff_CutGrass
 
 	thumb_func_start sub_80A27A8
 sub_80A27A8: @ 80A27A8
diff --git a/asm/rom6.s b/asm/rom6.s
index 056650bf5..e9941f11e 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -326,8 +326,8 @@ _0810B554: .4byte gUnknown_03005CE0
 _0810B558: .4byte UseRockSmashScript
 	thumb_func_end sub_810B53C
 
-	thumb_func_start oei_rocksmash
-oei_rocksmash: @ 810B55C
+	thumb_func_start FldEff_RockSmash
+FldEff_RockSmash: @ 810B55C
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -349,7 +349,7 @@ oei_rocksmash: @ 810B55C
 	.align 2, 0
 _0810B584: .4byte gTasks
 _0810B588: .4byte sub_810B58C
-	thumb_func_end oei_rocksmash
+	thumb_func_end FldEff_RockSmash
 
 	thumb_func_start sub_810B58C
 sub_810B58C: @ 810B58C
@@ -408,8 +408,8 @@ _0810B5F0: .4byte gUnknown_0202FF84
 _0810B5F4: .4byte gUnknown_03005CE0
 	thumb_func_end sub_810B5D8
 
-	thumb_func_start sub_810B5F8
-sub_810B5F8: @ 810B5F8
+	thumb_func_start FldEff_UseDig
+FldEff_UseDig: @ 810B5F8
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -436,7 +436,7 @@ _0810B624:
 	.align 2, 0
 _0810B62C: .4byte gTasks
 _0810B630: .4byte sub_810B634
-	thumb_func_end sub_810B5F8
+	thumb_func_end FldEff_UseDig
 
 	thumb_func_start sub_810B634
 sub_810B634: @ 810B634
@@ -31090,8 +31090,8 @@ _0811AA4C: .4byte gUnknown_0202FF84
 _0811AA50: .4byte gUnknown_03005CE0
 	thumb_func_end sub_811AA38
 
-	thumb_func_start sub_811AA54
-sub_811AA54: @ 811AA54
+	thumb_func_start FldEff_UseStrength
+FldEff_UseStrength: @ 811AA54
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -31122,7 +31122,7 @@ _0811AA8C: .4byte sub_811AA9C
 _0811AA90: .4byte gUnknown_0202FF84
 _0811AA94: .4byte gPlayerParty
 _0811AA98: .4byte gStringVar1
-	thumb_func_end sub_811AA54
+	thumb_func_end FldEff_UseStrength
 
 	thumb_func_start sub_811AA9C
 sub_811AA9C: @ 811AA9C
diff --git a/asm/rom_807C828.s b/asm/rom_807C828.s
index 68baca083..8827e6b8f 100644
--- a/asm/rom_807C828.s
+++ b/asm/rom_807C828.s
@@ -16694,8 +16694,8 @@ sub_80847D8: @ 80847D8
 	bx r0
 	thumb_func_end sub_80847D8
 
-	thumb_func_start oei_exclamation_mark
-oei_exclamation_mark: @ 80847EC
+	thumb_func_start FldEff_ExclamationMarkIcon1
+FldEff_ExclamationMarkIcon1: @ 80847EC
 	push {lr}
 	ldr r0, _0808481C
 	movs r1, 0
@@ -16721,10 +16721,10 @@ _08084814:
 	.align 2, 0
 _0808481C: .4byte gSpriteTemplate_839B510
 _08084820: .4byte gSprites
-	thumb_func_end oei_exclamation_mark
+	thumb_func_end FldEff_ExclamationMarkIcon1
 
-	thumb_func_start sub_8084824
-sub_8084824: @ 8084824
+	thumb_func_start FldEff_ExclamationMarkIcon2
+FldEff_ExclamationMarkIcon2: @ 8084824
 	push {lr}
 	ldr r0, _08084854
 	movs r1, 0
@@ -16750,10 +16750,10 @@ _0808484C:
 	.align 2, 0
 _08084854: .4byte gSpriteTemplate_839B510
 _08084858: .4byte gSprites
-	thumb_func_end sub_8084824
+	thumb_func_end FldEff_ExclamationMarkIcon2
 
-	thumb_func_start sub_808485C
-sub_808485C: @ 808485C
+	thumb_func_start FldEff_HeartIcon
+FldEff_HeartIcon: @ 808485C
 	push {lr}
 	ldr r0, _0808488C
 	movs r1, 0
@@ -16779,7 +16779,7 @@ _08084884:
 	.align 2, 0
 _0808488C: .4byte gSpriteTemplate_839B528
 _08084890: .4byte gSprites
-	thumb_func_end sub_808485C
+	thumb_func_end FldEff_HeartIcon
 
 	thumb_func_start sub_8084894
 sub_8084894: @ 8084894
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index 5189684c2..78b0e9812 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -2787,8 +2787,8 @@ _08086F24: .4byte gMapObjects
 _08086F28: .4byte sub_8086CBC
 	thumb_func_end sub_8086ED4
 
-	thumb_func_start sub_8086F2C
-sub_8086F2C: @ 8086F2C
+	thumb_func_start FldEff_UseWaterfall
+FldEff_UseWaterfall: @ 8086F2C
 	push {r4,lr}
 	ldr r4, _08086F58
 	adds r0, r4, 0
@@ -2813,7 +2813,7 @@ sub_8086F2C: @ 8086F2C
 _08086F58: .4byte sub_8086F64
 _08086F5C: .4byte gTasks
 _08086F60: .4byte gUnknown_0202FF84
-	thumb_func_end sub_8086F2C
+	thumb_func_end FldEff_UseWaterfall
 
 	thumb_func_start sub_8086F64
 sub_8086F64: @ 8086F64
@@ -2991,8 +2991,8 @@ _080870AA:
 	bx r1
 	thumb_func_end sub_8087058
 
-	thumb_func_start sub_80870B0
-sub_80870B0: @ 80870B0
+	thumb_func_start FldEff_UseDive
+FldEff_UseDive: @ 80870B0
 	push {r4,lr}
 	ldr r4, _080870E0
 	adds r0, r4, 0
@@ -3019,7 +3019,7 @@ sub_80870B0: @ 80870B0
 _080870E0: .4byte sub_80870EC
 _080870E4: .4byte gTasks
 _080870E8: .4byte gUnknown_0202FF84
-	thumb_func_end sub_80870B0
+	thumb_func_end FldEff_UseDive
 
 	thumb_func_start sub_80870EC
 sub_80870EC: @ 80870EC
@@ -3669,8 +3669,8 @@ _080875CC: .4byte gPlayerAvatar
 _080875D0: .4byte sub_8087470
 	thumb_func_end sub_808759C
 
-	thumb_func_start sub_80875D4
-sub_80875D4: @ 80875D4
+	thumb_func_start FldEff_LavaridgeGymWarp
+FldEff_LavaridgeGymWarp: @ 80875D4
 	push {r4,lr}
 	ldr r4, _0808762C
 	adds r1, r4, 0x4
@@ -3716,7 +3716,7 @@ sub_80875D4: @ 80875D4
 _0808762C: .4byte gUnknown_0202FF84
 _08087630: .4byte gFieldEffectObjectTemplatePointers
 _08087634: .4byte gSprites
-	thumb_func_end sub_80875D4
+	thumb_func_end FldEff_LavaridgeGymWarp
 
 	thumb_func_start sub_8087638
 sub_8087638: @ 8087638
@@ -3973,8 +3973,8 @@ _08087820: .4byte CB2_LoadMap
 _08087824: .4byte sub_808766C
 	thumb_func_end sub_80877D4
 
-	thumb_func_start sub_8087828
-sub_8087828: @ 8087828
+	thumb_func_start FldEff_PopOutOfAsh
+FldEff_PopOutOfAsh: @ 8087828
 	push {r4,lr}
 	ldr r4, _08087880
 	adds r1, r4, 0x4
@@ -4020,7 +4020,7 @@ sub_8087828: @ 8087828
 _08087880: .4byte gUnknown_0202FF84
 _08087884: .4byte gFieldEffectObjectTemplatePointers
 _08087888: .4byte gSprites
-	thumb_func_end sub_8087828
+	thumb_func_end FldEff_PopOutOfAsh
 
 	thumb_func_start sub_808788C
 sub_808788C: @ 808788C
@@ -5009,8 +5009,8 @@ _08088060: .4byte gMapObjects
 _08088064: .4byte sub_8087E1C
 	thumb_func_end sub_8087FDC
 
-	thumb_func_start sub_8088068
-sub_8088068: @ 8088068
+	thumb_func_start FldEff_FieldMoveShowMon
+FldEff_FieldMoveShowMon: @ 8088068
 	push {r4,lr}
 	bl sav1_map_get_light_level
 	lsls r0, 24
@@ -5052,10 +5052,10 @@ _0808808A:
 _080880B8: .4byte sub_808847C
 _080880BC: .4byte gUnknown_0202FF84
 _080880C0: .4byte gTasks
-	thumb_func_end sub_8088068
+	thumb_func_end FldEff_FieldMoveShowMon
 
-	thumb_func_start sub_80880C4
-sub_80880C4: @ 80880C4
+	thumb_func_start FldEff_FieldMoveShowMonInit
+FldEff_FieldMoveShowMonInit: @ 80880C4
 	push {r4-r6,lr}
 	ldr r5, _08088118
 	ldr r0, [r5]
@@ -5095,7 +5095,7 @@ sub_80880C4: @ 80880C4
 	.align 2, 0
 _08088118: .4byte gUnknown_0202FF84
 _0808811C: .4byte gPlayerParty
-	thumb_func_end sub_80880C4
+	thumb_func_end FldEff_FieldMoveShowMonInit
 
 	thumb_func_start sub_8088120
 sub_8088120: @ 8088120
@@ -6146,8 +6146,8 @@ _0808890E:
 	bx r0
 	thumb_func_end sub_80888F0
 
-	thumb_func_start sub_8088914
-sub_8088914: @ 8088914
+	thumb_func_start FldEff_UseSurf
+FldEff_UseSurf: @ 8088914
 	push {lr}
 	ldr r0, _08088944
 	movs r1, 0xFF
@@ -6173,7 +6173,7 @@ _08088944: .4byte sub_8088954
 _08088948: .4byte gTasks
 _0808894C: .4byte gUnknown_0202FF84
 _08088950: .4byte 0x0000016d
-	thumb_func_end sub_8088914
+	thumb_func_end FldEff_UseSurf
 
 	thumb_func_start sub_8088954
 sub_8088954: @ 8088954
@@ -6429,8 +6429,8 @@ _08088B60: .4byte gMapObjects
 _08088B64: .4byte sub_8088954
 	thumb_func_end sub_8088AF4
 
-	thumb_func_start sub_8088B68
-sub_8088B68: @ 8088B68
+	thumb_func_start FldEff_Unknown30
+FldEff_Unknown30: @ 8088B68
 	push {r4,lr}
 	ldr r0, _08088BB4
 	ldr r0, [r0, 0x68]
@@ -6471,7 +6471,7 @@ _08088BB4: .4byte gFieldEffectObjectTemplatePointers
 _08088BB8: .4byte gSprites
 _08088BBC: .4byte sub_8088BC4
 _08088BC0: .4byte gUnknown_0202FF84
-	thumb_func_end sub_8088B68
+	thumb_func_end FldEff_Unknown30
 
 	thumb_func_start sub_8088BC4
 sub_8088BC4: @ 8088BC4
@@ -6538,8 +6538,8 @@ _08088C36:
 _08088C3C: .4byte gSprites
 	thumb_func_end sub_8088BC4
 
-	thumb_func_start sub_8088C40
-sub_8088C40: @ 8088C40
+	thumb_func_start FldEff_UseFly
+FldEff_UseFly: @ 8088C40
 	push {lr}
 	ldr r0, _08088C64
 	movs r1, 0xFE
@@ -6561,7 +6561,7 @@ sub_8088C40: @ 8088C40
 _08088C64: .4byte sub_8088C70
 _08088C68: .4byte gTasks
 _08088C6C: .4byte gUnknown_0202FF84
-	thumb_func_end sub_8088C40
+	thumb_func_end FldEff_UseFly
 
 	thumb_func_start sub_8088C70
 sub_8088C70: @ 8088C70
@@ -7339,8 +7339,8 @@ _08089254: .4byte gSprites
 _08089258: .4byte sub_808914C
 	thumb_func_end sub_8089230
 
-	thumb_func_start sub_808925C
-sub_808925C: @ 808925C
+	thumb_func_start FldEff_FlyIn
+FldEff_FlyIn: @ 808925C
 	push {lr}
 	ldr r0, _0808926C
 	movs r1, 0xFE
@@ -7350,7 +7350,7 @@ sub_808925C: @ 808925C
 	bx r1
 	.align 2, 0
 _0808926C: .4byte sub_8089270
-	thumb_func_end sub_808925C
+	thumb_func_end FldEff_FlyIn
 
 	thumb_func_start sub_8089270
 sub_8089270: @ 8089270
diff --git a/asm/rom_80B5054.s b/asm/rom_80B5054.s
index 7be82588d..d296b1001 100644
--- a/asm/rom_80B5054.s
+++ b/asm/rom_80B5054.s
@@ -35381,8 +35381,8 @@ _080C63B4: .4byte gUnknown_03005CE0
 _080C63B8: .4byte gUnknown_081A2CE6
 	thumb_func_end sub_80C639C
 
-	thumb_func_start sub_80C63BC
-sub_80C63BC: @ 80C63BC
+	thumb_func_start FldEff_UseSecretPowerCave
+FldEff_UseSecretPowerCave: @ 80C63BC
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -35402,7 +35402,7 @@ sub_80C63BC: @ 80C63BC
 	.align 2, 0
 _080C63E0: .4byte gTasks
 _080C63E4: .4byte sub_80C63E8
-	thumb_func_end sub_80C63BC
+	thumb_func_end FldEff_UseSecretPowerCave
 
 	thumb_func_start sub_80C63E8
 sub_80C63E8: @ 80C63E8
@@ -35415,8 +35415,8 @@ sub_80C63E8: @ 80C63E8
 	bx r0
 	thumb_func_end sub_80C63E8
 
-	thumb_func_start sub_80C63FC
-sub_80C63FC: @ 80C63FC
+	thumb_func_start FldEff_SecretPowerCave
+FldEff_SecretPowerCave: @ 80C63FC
 	push {r4,lr}
 	bl sub_80C6280
 	ldr r0, _080C643C
@@ -35451,7 +35451,7 @@ _080C643C: .4byte gSpriteTemplate_83D2614
 _080C6440: .4byte gSprites
 _080C6444: .4byte gPlayerAvatar
 _080C6448: .4byte gUnknown_0202FF84
-	thumb_func_end sub_80C63FC
+	thumb_func_end FldEff_SecretPowerCave
 
 	thumb_func_start sub_80C644C
 sub_80C644C: @ 80C644C
@@ -35526,8 +35526,8 @@ _080C64C0: .4byte gUnknown_03005CE0
 _080C64C4: .4byte gUnknown_081A2D3E
 	thumb_func_end sub_80C64A8
 
-	thumb_func_start sub_80C64C8
-sub_80C64C8: @ 80C64C8
+	thumb_func_start FldEff_UseSecretPowerTree
+FldEff_UseSecretPowerTree: @ 80C64C8
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -35547,7 +35547,7 @@ sub_80C64C8: @ 80C64C8
 	.align 2, 0
 _080C64EC: .4byte gTasks
 _080C64F0: .4byte sub_80C64F4
-	thumb_func_end sub_80C64C8
+	thumb_func_end FldEff_UseSecretPowerTree
 
 	thumb_func_start sub_80C64F4
 sub_80C64F4: @ 80C64F4
@@ -35560,8 +35560,8 @@ sub_80C64F4: @ 80C64F4
 	bx r0
 	thumb_func_end sub_80C64F4
 
-	thumb_func_start sub_80C6508
-sub_80C6508: @ 80C6508
+	thumb_func_start FldEff_SecretPowerTree
+FldEff_SecretPowerTree: @ 80C6508
 	push {r4,lr}
 	ldr r1, _080C6580
 	movs r2, 0
@@ -35628,7 +35628,7 @@ _080C6588: .4byte gUnknown_0202FF84
 _080C658C: .4byte gSpriteTemplate_83D262C
 _080C6590: .4byte gSprites
 _080C6594: .4byte gPlayerAvatar
-	thumb_func_end sub_80C6508
+	thumb_func_end FldEff_SecretPowerTree
 
 	thumb_func_start sub_80C6598
 sub_80C6598: @ 80C6598
@@ -35713,8 +35713,8 @@ _080C6624: .4byte gUnknown_03005CE0
 _080C6628: .4byte gUnknown_081A2D96
 	thumb_func_end sub_80C660C
 
-	thumb_func_start sub_80C662C
-sub_80C662C: @ 80C662C
+	thumb_func_start FldEff_UseSecretPowerShrub
+FldEff_UseSecretPowerShrub: @ 80C662C
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -35734,7 +35734,7 @@ sub_80C662C: @ 80C662C
 	.align 2, 0
 _080C6650: .4byte gTasks
 _080C6654: .4byte sub_80C6658
-	thumb_func_end sub_80C662C
+	thumb_func_end FldEff_UseSecretPowerShrub
 
 	thumb_func_start sub_80C6658
 sub_80C6658: @ 80C6658
@@ -35747,8 +35747,8 @@ sub_80C6658: @ 80C6658
 	bx r0
 	thumb_func_end sub_80C6658
 
-	thumb_func_start sub_80C666C
-sub_80C666C: @ 80C666C
+	thumb_func_start FldEff_SecretPowerShrub
+FldEff_SecretPowerShrub: @ 80C666C
 	push {r4,lr}
 	bl sub_80C6280
 	ldr r0, _080C66AC
@@ -35783,7 +35783,7 @@ _080C66AC: .4byte gSpriteTemplate_83D2644
 _080C66B0: .4byte gSprites
 _080C66B4: .4byte gPlayerAvatar
 _080C66B8: .4byte gUnknown_0202FF84
-	thumb_func_end sub_80C666C
+	thumb_func_end FldEff_SecretPowerShrub
 
 	thumb_func_start sub_80C66BC
 sub_80C66BC: @ 80C66BC
@@ -35841,8 +35841,8 @@ sub_80C6708: @ 80C6708
 	bx r0
 	thumb_func_end sub_80C6708
 
-	thumb_func_start sub_80C6718
-sub_80C6718: @ 80C6718
+	thumb_func_start FldEff_PCTurnOn
+FldEff_PCTurnOn: @ 80C6718
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -35875,7 +35875,7 @@ sub_80C6718: @ 80C6718
 	.align 2, 0
 _080C6758: .4byte sub_80C6760
 _080C675C: .4byte gTasks
-	thumb_func_end sub_80C6718
+	thumb_func_end FldEff_PCTurnOn
 
 	thumb_func_start sub_80C6760
 sub_80C6760: @ 80C6760
@@ -36171,17 +36171,17 @@ _080C69B6:
 	bx r0
 	thumb_func_end sub_80C696C
 
-	thumb_func_start sub_80C69BC
-sub_80C69BC: @ 80C69BC
+	thumb_func_start FldEff_Nop47
+FldEff_Nop47: @ 80C69BC
 	movs r0, 0
 	bx lr
-	thumb_func_end sub_80C69BC
+	thumb_func_end FldEff_Nop47
 
-	thumb_func_start sub_80C69C0
-sub_80C69C0: @ 80C69C0
+	thumb_func_start FldEff_Nop48
+FldEff_Nop48: @ 80C69C0
 	movs r0, 0
 	bx lr
-	thumb_func_end sub_80C69C0
+	thumb_func_end FldEff_Nop48
 
 	thumb_func_start sub_80C69C4
 sub_80C69C4: @ 80C69C4
@@ -36580,8 +36580,8 @@ _080C6D34: .4byte gSprites
 _080C6D38: .4byte sub_80C6C64
 	thumb_func_end sub_80C6C90
 
-	thumb_func_start sub_80C6D3C
-sub_80C6D3C: @ 80C6D3C
+	thumb_func_start FldEff_SandPillar
+FldEff_SandPillar: @ 80C6D3C
 	push {r4,lr}
 	sub sp, 0x4
 	bl ScriptContext2_Enable
@@ -36719,7 +36719,7 @@ _080C6E4C:
 _080C6E58: .4byte gSpriteTemplate_83D26A0
 _080C6E5C: .4byte gSprites
 _080C6E60: .4byte gPlayerAvatar
-	thumb_func_end sub_80C6D3C
+	thumb_func_end FldEff_SandPillar
 
 	thumb_func_start door_restore_tilemap
 door_restore_tilemap: @ 80C6E64
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index d6bc66966..dd6e3a491 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -2254,8 +2254,8 @@ _0812BFE8: .4byte gUnknown_0202FF84
 _0812BFEC: .4byte gUnknown_03005CE0
 	thumb_func_end sub_812BFD4
 
-	thumb_func_start sub_812BFF0
-sub_812BFF0: @ 812BFF0
+	thumb_func_start FldEff_SweetScent
+FldEff_SweetScent: @ 812BFF0
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -2275,7 +2275,7 @@ sub_812BFF0: @ 812BFF0
 	.align 2, 0
 _0812C014: .4byte gTasks
 _0812C018: .4byte sub_812C01C
-	thumb_func_end sub_812BFF0
+	thumb_func_end FldEff_SweetScent
 
 	thumb_func_start sub_812C01C
 sub_812C01C: @ 812C01C
diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s
index 927ddc558..6cb4ed8a2 100644
--- a/asm/rom_813BA94.s
+++ b/asm/rom_813BA94.s
@@ -23647,8 +23647,8 @@ _081475D8: .4byte gUnknown_0202FF84
 _081475DC: .4byte gUnknown_03005CE0
 	thumb_func_end sub_81475C4
 
-	thumb_func_start sub_81475E0
-sub_81475E0: @ 81475E0
+	thumb_func_start FldEff_UseFlyAncientTomb
+FldEff_UseFlyAncientTomb: @ 81475E0
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -23668,7 +23668,7 @@ sub_81475E0: @ 81475E0
 	.align 2, 0
 _08147604: .4byte gTasks
 _08147608: .4byte sub_814760C
-	thumb_func_end sub_81475E0
+	thumb_func_end FldEff_UseFlyAncientTomb
 
 	thumb_func_start sub_814760C
 sub_814760C: @ 814760C
@@ -29369,8 +29369,8 @@ _0814A3CC: .4byte gUnknown_0202FF84
 _0814A3D0: .4byte gUnknown_03005CE0
 	thumb_func_end hm_teleport_run_dp02scr
 
-	thumb_func_start sub_814A3D4
-sub_814A3D4: @ 814A3D4
+	thumb_func_start FldEff_UseTeleport
+FldEff_UseTeleport: @ 814A3D4
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -29392,7 +29392,7 @@ sub_814A3D4: @ 814A3D4
 	.align 2, 0
 _0814A3FC: .4byte gTasks
 _0814A400: .4byte sub_814A404
-	thumb_func_end sub_814A3D4
+	thumb_func_end FldEff_UseTeleport
 
 	thumb_func_start sub_814A404
 sub_814A404: @ 814A404
diff --git a/data/data2.s b/data/data2.s
index fae808480..9e7be5b6e 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -6947,7 +6947,7 @@ gUnknown_083760A0:: @ 83760A0
 	.4byte sub_8063FCC
 	.4byte GroundEffect_Ripple
 	.4byte GroundEffect_StepOnPuddle
-	.4byte GroundEffect_SandHeap
+	.4byte GroundEffect_SandPile
 	.4byte GroundEffect_JumpOnTallGrass
 	.4byte GroundEffect_JumpOnLongGrass
 	.4byte GroundEffect_JumpOnShallowWater
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index ca5b40654..4f9ca690c 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -72,103 +72,103 @@ gFieldEffectScriptPointers:: @ 81D9B34
 	.4byte gFieldEffectScript_UseTeleport
 
 gFieldEffectScript_ExclamationMarkIcon1: @ 81D9C34
-	callnative oei_exclamation_mark
+	callnative FldEff_ExclamationMarkIcon1
 	end
 
 gFieldEffectScript_UseCutOnGrass: @ 81D9C3A
-	callnative sub_80A2604
+	callnative FldEff_UseCutOnGrass
 	end
 
 gFieldEffectScript_UseCutOnTree: @ 81D9C40
-	callnative sub_80A2654
+	callnative FldEff_UseCutOnTree
 	end
 
 gFieldEffectScript_Shadow: @ 81D9C46
-	callnative oei_shadow
+	callnative FldEff_Shadow
 	end
 
 gFieldEffectScript_TallGrass: @ 81D9C4C
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_grass_normal
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_TallGrass
 	end
 
 gFieldEffectScript_Ripple: @ 81D9C56
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ripples
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ripple
 	end
 
 gFieldEffectScript_FieldMoveShowMon: @ 81D9C60
-	callnative sub_8088068
+	callnative FldEff_FieldMoveShowMon
 	end
 
 gFieldEffectScript_Ash: @ 81D9C66
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ash
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ash
 	end
 
 gFieldEffectScript_SurfBlob: @ 81D9C70
-	callnative sub_8127E58
+	callnative FldEff_SurfBlob
 	end
 
 gFieldEffectScript_UseSurf: @ 81D9C76
-	callnative sub_8088914
+	callnative FldEff_UseSurf
 	end
 
 gFieldEffectScript_Dust: @ 81D9C7C
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_81281B4
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust
 	end
 
 gFieldEffectScript_UseSecretPowerCave: @ 81D9C86
-	callnative sub_80C63BC
+	callnative FldEff_UseSecretPowerCave
 	end
 
 gFieldEffectScript_JumpTallGrass: @ 81D9C8C
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8126F80
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpTallGrass
 	end
 
 gFieldEffectScript_SandFootprints: @ 81D9C96
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8127428
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandFootprints
 	end
 
 gFieldEffectScript_JumpBigSplash: @ 81D9CA0
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, oei_water_drop_tall
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpBigSplash
 	end
 
 gFieldEffectScript_Splash: @ 81D9CAA
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8127610
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Splash
 	end
 
 gFieldEffectScript_JumpSmallSplash: @ 81D9CB4
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8127740
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpSmallSplash
 	end
 
 gFieldEffectScript_LongGrass: @ 81D9CBE
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8127080
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass
 	end
 
 gFieldEffectScript_JumpLongGrass: @ 81D9CC8
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8127220
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass
 	end
 
 gFieldEffectScript_Unknown19: @ 81D9CD2
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8127B14
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown19
 	end
 
 gFieldEffectScript_Unknown20: @ 81D9CDC
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8127B80
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown20
 	end
 
 gFieldEffectScript_Unknown21: @ 81D9CE6
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8127BEC
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown21
 	end
 
 gFieldEffectScript_Unknown22: @ 81D9CF0
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8127C58
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown22
 	end
 
 gFieldEffectScript_BerryTreeGrowthSparkle: @ 81D9CFA
-	callnative sub_8128450
+	callnative FldEff_BerryTreeGrowthSparkle
 	end
 
 gFieldEffectScript_DeepSandFootprints: @ 81D9D00
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_812749C
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints
 	end
 
 gFieldEffectScript_PokecenterHeal: @ 81D9D0A
@@ -177,79 +177,79 @@ gFieldEffectScript_PokecenterHeal: @ 81D9D0A
 	end
 
 gFieldEffectScript_UseSecretPowerTree: @ 81D9D19
-	callnative sub_80C64C8
+	callnative FldEff_UseSecretPowerTree
 	end
 
 gFieldEffectScript_UseSecretPowerShrub: @ 81D9D1F
-	callnative sub_80C662C
+	callnative FldEff_UseSecretPowerShrub
 	end
 
 gFieldEffectScript_TreeDisguise: @ 81D9D25
-	callnative ShowTreeDisguiseFieldEffect
+	callnative FldEff_TreeDisguise
 	end
 
 gFieldEffectScript_MountainDisguise: @ 81D9D2B
-	callnative ShowMountainDisguiseFieldEffect
+	callnative FldEff_MountainDisguise
 	end
 
 gFieldEffectScript_Unknown30: @ 81D9D31
-	callnative sub_8088B68
+	callnative FldEff_Unknown30
 	end
 
 gFieldEffectScript_UseFly: @ 81D9D37
-	callnative sub_8088C40
+	callnative FldEff_UseFly
 	end
 
 gFieldEffectScript_FlyIn: @ 81D9D3D
-	callnative sub_808925C
+	callnative FldEff_FlyIn
 	end
 
 gFieldEffectScript_ExclamationMarkIcon2: @ 81D9D43
-	callnative sub_8084824
+	callnative FldEff_ExclamationMarkIcon2
 	end
 
 gFieldEffectScript_FeetInFlowingWater: @ 81D9D49
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8127820
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_FeetInFlowingWater
 	end
 
 gFieldEffectScript_BikeTireTracks: @ 81D9D53
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8127510
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_BikeTireTracks
 	end
 
 gFieldEffectScript_SandDisguise: @ 81D9D5D
-	callnative ShowSandDisguiseFieldEffect
+	callnative FldEff_SandDisguise
 	end
 
 gFieldEffectScript_UseRockSmash: @ 81D9D63
-	callnative oei_rocksmash
+	callnative FldEff_RockSmash
 	end
 
 gFieldEffectScript_UseStrength: @ 81D9D69
-	callnative sub_811AA54
+	callnative FldEff_UseStrength
 	end
 
 gFieldEffectScript_UseDig: @ 81D9D6F
-	callnative sub_810B5F8
+	callnative FldEff_UseDig
 	end
 
 gFieldEffectScript_SandPile: @ 81D9D75
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8128224
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile
 	end
 
 gFieldEffectScript_ShortGrass: @ 81D9D7F
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8127290
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_ShortGrass
 	end
 
 gFieldEffectScript_HotSpringsWater: @ 81D9D89
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81279D8
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater
 	end
 
 gFieldEffectScript_UseWaterfall: @ 81D9D93
-	callnative sub_8086F2C
+	callnative FldEff_UseWaterfall
 	end
 
 gFieldEffectScript_UseDive: @ 81D9D99
-	callnative sub_80870B0
+	callnative FldEff_UseDive
 	end
 
 gFieldEffectScript_Pokeball: @ 81D9D9F
@@ -258,67 +258,67 @@ gFieldEffectScript_Pokeball: @ 81D9D9F
 	end
 
 gFieldEffectScript_HeartIcon: @ 81D9DAA
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_808485C
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon
 	end
 
 gFieldEffectScript_Nop47: @ 81D9DB4
-	callnative sub_80C69BC
+	callnative FldEff_Nop47
 	end
 
 gFieldEffectScript_Nop48: @ 81D9DBA
-	callnative sub_80C69C0
+	callnative FldEff_Nop48
 	end
 
 gFieldEffectScript_PopOutOfAsh: @ 81D9DC0
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_8087828
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh
 	end
 
 gFieldEffectScript_LavaridgeGymWarp: @ 81D9DCA
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80875D4
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp
 	end
 
 gFieldEffectScript_SweetScent: @ 81D9DD4
-	callnative sub_812BFF0
+	callnative FldEff_SweetScent
 	end
 
 gFieldEffectScript_SandPillar: @ 81D9DDA
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80C6D3C
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
 	end
 
 gFieldEffectScript_Bubbles: @ 81D9DE4
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_81283AC
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles
 	end
 
 gFieldEffectScript_Sparkle: @ 81D9DEE
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, sub_8128700
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle
 	end
 
 gFieldEffectScript_SecretPowerCave: @ 81D9DF8
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80C63FC
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
 	end
 
 gFieldEffectScript_SecretPowerTree: @ 81D9E02
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80C6508
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
 	end
 
 gFieldEffectScript_SecretPowerShrub: @ 81D9E0C
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80C666C
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
 	end
 
 gFieldEffectScript_CutGrass: @ 81D9E16
-	loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80A2698
+	loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
 	end
 
 gFieldEffectScript_FieldMoveShowMonInit: @ 81D9E20
-	callnative sub_80880C4
+	callnative FldEff_FieldMoveShowMonInit
 	end
 
 gFieldEffectScript_UseFlyAncientTomb: @ 81D9E26
-	callnative sub_81475E0
+	callnative FldEff_UseFlyAncientTomb
 	end
 
 gFieldEffectScript_PCTurnOn: @ 81D9E2C
-	callnative sub_80C6718
+	callnative FldEff_PCTurnOn
 	end
 
 gFieldEffectScript_HallOfFameRecord: @ 81D9E32
@@ -327,5 +327,5 @@ gFieldEffectScript_HallOfFameRecord: @ 81D9E32
 	end
 
 gFieldEffectScript_UseTeleport: @ 81D9E41
-	callnative sub_814A3D4
+	callnative FldEff_UseTeleport
 	end