2 files changed, 62 insertions, 62 deletions
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