Merge pull request #279 from PikalaxALT/field_effect

Field effect

3 files changed, 22 insertions, 454 deletions

diff --git a/data/event_object_movement.s b/data/event_object_movement.s
index 17adf3ef4..5920835c4 100644
--- a/data/event_object_movement.s
+++ b/data/event_object_movement.s
@@ -7028,7 +7028,7 @@ gUnknown_83A5EBC:: @ 83A5EBC
 	.4byte gUnknown_83A5EA4
 
 gUnknown_83A5EC0:: @ 83A5EC0
-	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, sub_8085604
+	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, SpriteCB_PopOutOfAsh
 
 gUnknown_83A5ED8:: @ 83A5ED8
 	obj_pal gUnknown_839C588, 0x100D
@@ -7052,7 +7052,7 @@ gUnknown_83A5F20:: @ 83A5F20
 	.4byte gUnknown_83A5F08
 
 gUnknown_83A5F24:: @ 83A5F24
-	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, sub_80853B0
+	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, SpriteCB_LavaridgeGymWarp
 
 gUnknown_83A5F3C:: @ 83A5F3C
 	overworld_frame gUnknown_839CAA8, 2, 4, 0
diff --git a/data/field_effect.s b/data/field_effect.s
deleted file mode 100644
index 7e797c560..000000000
--- a/data/field_effect.s
+++ /dev/null
@@ -1,432 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83CA770:: @ 3CA770 4bpp
-	.incbin "graphics/field_effects/unk_83CA770.4bpp"
-
-gUnknown_83CAF70:: @ 83CAF70 gbapal
-	.incbin "graphics/field_effects/unk_83CAF70.gbapal"
-
-gUnknown_83CAF90:: @ 83CAF90 4bpp
-	.incbin "graphics/field_effects/unk_83CAF90.4bpp"
-
-gUnknown_83CAFB0:: @ 83CAFB0 gbapal
-	.incbin "graphics/field_effects/unk_83CAFB0.gbapal"
-
-gUnknown_83CAFD0:: @ 83CAFD0 4bpp
-	.incbin "graphics/field_effects/unk_83CAFD0.4bpp"
-
-gUnknown_83CB3D0:: @ 83CB3D0 gbapal
-	.incbin "graphics/field_effects/unk_83CB3D0.gbapal"
-
-gUnknown_83CB3F0:: @ 83CB3F0 4bpp
-	.incbin "graphics/field_effects/unk_83CB3F0.4bpp"
-
-gUnknown_83CB5F0:: @ 83CB5F0 4bpp
-	.incbin "graphics/field_effects/unk_83CB5F0.4bpp"
-
-gUnknown_83CB7F0:: @ 83CB7F0 gbapal gUnknown_83CB5F0
-	.incbin "graphics/field_effects/unk_83CB7F0.gbapal"
-
-gUnknown_83CB810:: @ 83CB810 4bpp
-	.incbin "graphics/field_effects/unk_83CB810.bin"
-
-gUnknown_83CBA90:: @ 83CBA90 4bpp
-	.incbin "graphics/field_effects/unk_83CBA90.4bpp"
-
-gUnknown_83CBB10:: @ 83CBB10 gbapal gUnknown_83CBA90
-	.incbin "graphics/field_effects/unk_83CBB10.gbapal"
-
-gUnknown_83CBB30:: @ 83CBB30 4bpp
-	.incbin "graphics/field_effects/unk_83CBB30.bin"
-
-gUnknown_83CBDB0::
-	.incbin "graphics/field_effects/unk_83CBDB0.4bpp"
-
-	.align 2
-gUnknown_83CBE30:: @ 83CBE30 dataptr
-	.4byte FieldEffectCmd_loadtiles
-	.4byte FieldEffectCmd_loadfadedpal
-	.4byte FieldEffectCmd_loadpal
-	.4byte FieldEffectCmd_callnative
-	.4byte sub_80834DC
-	.4byte FieldEffectCmd_loadgfx_callnative
-	.4byte FieldEffectCmd_loadtiles_callnative
-	.4byte FieldEffectCmd_loadfadedpal_callnative
-
-gUnknown_83CBE50:: @ 83CBE50 oamdata
-	.4byte 0xc0000000, 0x00000000
-
-gOamData_83CBE58:: @ 83CBE58 oamdata
-	.4byte 0x00000000, 0x00000000
-
-gOamData_83CBE60:: @ 83CBE60 oamdata
-	.4byte 0x40000000, 0x00000000
-
-gUnknown_83CBE68:: @ 83CBE68 sprite_frames
-	obj_frame_tiles gUnknown_83CA770, 0x0800
-
-gUnknown_83CBE70:: @ 83CBE70 sprite_palette
-	obj_pal gUnknown_83CAF70, 4102
-
-gUnknown_83CBE78:: @ 83CBE78
-	obj_image_anim_frame 0x0000, 1
-	obj_image_anim_end
-
-	.align 2
-gUnknown_83CBE80:: @ 83CBE80 dataptr
-	.4byte gUnknown_83CBE78
-
-gUnknown_83CBE84:: @ 83CBE84 spr_template
-	spr_template 65535, 4102, gUnknown_83CBE50, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_83CBE9C:: @ 83CBE9C sprite_palette
-	obj_pal gUnknown_83CAFB0, 4103
-
-gUnknown_83CBEA4:: @ 83CBEA4 sprite_palette
-	obj_pal gUnknown_83CB3D0, 4112
-
-gOamData_83CBEAC:: @ 83CBEAC oam_data
-	.4byte 0x80004000, 0x00000000
-
-gUnknown_83CBEB4:: @ 83CBEB4 sprite_frames
-	obj_frame_tiles gUnknown_83CAF90, 0x0020
-
-gUnknown_83CBEBC:: @ 83CBEBC sprite_frames
-	obj_frame_tiles gUnknown_83CAFD0 + 0x000, 0x0100
-	obj_frame_tiles gUnknown_83CAFD0 + 0x100, 0x0100
-	obj_frame_tiles gUnknown_83CAFD0 + 0x200, 0x0100
-	obj_frame_tiles gUnknown_83CAFD0 + 0x300, 0x0100
-
-gUnknown_83CBEDC:: @ 83CBEDC sprite_frames
-	obj_frame_tiles gUnknown_83CB3F0 + 0x000, 0x0080
-	obj_frame_tiles gUnknown_83CB3F0 + 0x080, 0x0080
-	obj_frame_tiles gUnknown_83CB3F0 + 0x100, 0x0080
-	obj_frame_tiles gUnknown_83CB3F0 + 0x180, 0x0080
-
-gUnknown_83CBEFC:: @ 83CBEFC unknown
-	.byte 0xf4, 0xf8, 0x01, 0x80
-	.byte 0x04, 0xf8, 0x20, 0x80
-	.byte 0xf4, 0x00, 0x31, 0x80
-	.byte 0x04, 0x00, 0x50, 0x80
-	.byte 0x04, 0x00, 0x00, 0x00
-
-gUnknown_83CBF10:: @ 83CBF10 dataptr
-	.4byte gUnknown_83CBEFC
-
-gUnknown_83CBF14:: @ 83CBF14 unknown
-	.byte 0xe0, 0xf8, 0x05, 0x80
-	.byte 0x00, 0xf8, 0x45, 0x80
-	.byte 0xe0, 0x00, 0x85, 0x80
-	.byte 0x00, 0x00, 0xc5, 0x80
-	.byte 0x04, 0x00, 0x00, 0x00
-
-gUnknown_83CBF28:: @ 83CBE28 dataptr
-	.4byte gUnknown_83CBF14
-
-gUnknown_83CBF2C:: @ 83CBF2C animcmd
-	obj_image_anim_frame 0x0000, 1
-	obj_image_anim_jump 0
-
-gUnknown_83CBF34:: @ 83CBF34 animcmd
-	obj_image_anim_frame 0x0001, 5
-	obj_image_anim_frame 0x0002, 5
-	obj_image_anim_frame 0x0003, 7
-	obj_image_anim_frame 0x0002, 5
-	obj_image_anim_frame 0x0001, 5
-	obj_image_anim_frame 0x0000, 5
-	obj_image_anim_loop 3
-	obj_image_anim_end
-
-	.align 2
-gUnknown_83CBF54:: @ 83CBF54 dataptr
-	.4byte gUnknown_83CBF2C
-	.4byte gUnknown_83CBF34
-
-gUnknown_83CBF5C:: @ 83CBF5C animcmd
-	obj_image_anim_frame 0x0003, 8
-	obj_image_anim_frame 0x0002, 8
-	obj_image_anim_frame 0x0001, 8
-	obj_image_anim_frame 0x0000, 8
-	obj_image_anim_frame 0x0001, 8
-	obj_image_anim_frame 0x0002, 8
-	obj_image_anim_loop 2
-	obj_image_anim_frame 0x0001, 8
-	obj_image_anim_frame 0x0000, 8
-	obj_image_anim_end
-
-	.align 2
-gUnknown_83CBF84:: @ 83CBF84 dataptr
-	.4byte gUnknown_83CBF5C
-
-gUnknown_83CBF88:: @ 83CBF88 spr_template
-	spr_template 65535, 4103, gOamData_83CBE58, gUnknown_83CBF54, gUnknown_83CBEB4, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow
-
-gUnknown_83CBFA0:: @ 83CBFA0 spr_template
-	spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, sub_808424C
-
-gUnknown_83CBFB8:: @ 83CBFB8 spr_template
-	spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, sub_80842AC
-
-	.align 2
-gUnknown_83CBFD0:: @ 83CBFD0 dataptr
-	.4byte PokecenterHealEffect_0
-	.4byte PokecenterHealEffect_1
-	.4byte sub_8083C78
-	.4byte PokecenterHealEffect_3
-
-	.align 2
-gUnknown_83CBFE0:: @ 83CBFE0 dataptr
-	.4byte HallOfFameRecordEffect_0
-	.4byte sub_8083D74
-	.4byte sub_8083DAC
-	.4byte sub_8083DD4
-
-	.align 2
-gUnknown_83CBFF0:: @ 83CBFF0 dataptr
-	.4byte PokeballGlowEffect_0
-	.4byte PokeballGlowEffect_1
-	.4byte PokeballGlowEffect_2
-	.4byte PokeballGlowEffect_3
-	.4byte PokeballGlowEffect_4
-	.4byte PokeballGlowEffect_5
-	.4byte PokeballGlowEffect_6
-	.4byte nullsub_50
-
-gUnknown_83CC010:: @ 83CC010 data16
-	.2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008
-
-gUnknown_83CC028:: @ 83CC028 data8
-	.byte 0x10, 0x0c, 0x08, 0x00
-
-gUnknown_83CC02C:: @ 83CC02C data8
-	.byte 0x10, 0x0c, 0x08, 0x00
-
-gUnknown_83CC030:: @ 83CC030 data8
-	.byte 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_83CC034:: @ 83CC034 dataptr
-	.4byte sub_80844BC
-	.4byte sub_8084564
-	.4byte sub_8084580
-	.4byte sub_80845F4
-	.4byte sub_80846AC
-	.4byte sub_80846C8
-	.4byte sub_8084708
-
-	.align 2
-gUnknown_83CC050:: @ 83CC050 dataptr
-	.4byte sub_80847F8
-	.4byte sub_8084820
-	.4byte sub_8084890
-	.4byte sub_80848B4
-	.4byte sub_80848C4
-	.4byte sub_80848E8
-
-	.align 2
-gUnknown_83CC068:: @ 83CC068 dataptr
-	.4byte sub_8084A5C
-	.4byte sub_8084AD8
-	.4byte sub_8084B18
-	.4byte sub_8084B78
-	.4byte sub_8084BB8
-	.4byte sub_8084C18
-	.4byte sub_8084C3C
-
-	.align 2
-gUnknown_83CC084:: @ 83CC084 dataptr
-	.4byte sub_8084D24
-	.4byte waterfall_1_do_anim_probably
-	.4byte waterfall_2_wait_anim_finish_probably
-	.4byte sub_8084DA4
-	.4byte sub_8084DCC
-
-	.align 2
-gUnknown_83CC098:: @ 83CC098 dataptr
-	.4byte dive_1_lock
-	.4byte dive_2_unknown
-	.4byte dive_3_unknown
-
-	.align 2
-gUnknown_83CC0A4:: @ 83CC0A4 dataptr
-	.4byte sub_8084FA0
-	.4byte sub_8084FD8
-	.4byte sub_808500C
-	.4byte sub_8085058
-	.4byte sub_808514C
-	.4byte sub_8085168
-
-	.align 2
-gUnknown_83CC0BC:: @ 83CC0BC dataptr
-	.4byte sub_8085244
-	.4byte sub_8085274
-	.4byte sub_80852C0
-	.4byte sub_8085314
-
-	.align 2
-gUnknown_83CC0CC:: @ 83CC0CC dataptr
-	.4byte sub_8085440
-	.4byte sub_8085470
-	.4byte sub_80854EC
-	.4byte sub_8085524
-	.4byte sub_808554C
-
-	.align 2
-gUnknown_83CC0E0:: @ 83CC0E0 dataptr
-	.4byte sub_808566C
-	.4byte sub_8085690
-
-gUnknown_83CC0E8:: @ 83CC0E8 data8
-	.byte 0x01, 0x03, 0x04, 0x02, 0x01
-
-	.align 2
-gUnknown_83CC0F0:: @ 83CC0F0 dataptr
-	.4byte sub_8085A54
-	.4byte sub_8085A80
-
-	.align 2
-gUnknown_83CC0F8:: @ 83CC0F8 dataptr
-	.4byte sub_8085BA8
-	.4byte sub_8085BD0
-	.4byte sub_8085C60
-	.4byte sub_8085D34
-
-gUnknown_83CC108:: @ 83CC108 data8
-	.byte 0x01, 0x03, 0x04, 0x02, 0x01
-
-	.align 2
-gUnknown_83CC110:: @ 83CC110 dataptr
-	.4byte sub_8085E0C
-	.4byte sub_8085E98
-	.4byte sub_8085F9C
-
-	.align 2
-gUnknown_83CC11C:: @ 83CC11C dataptr
-	.4byte sub_8086110
-	.4byte sub_8086180
-	.4byte sub_80861FC
-	.4byte sub_8086288
-	.4byte sub_80862B8
-	.4byte sub_808630C
-	.4byte sub_8086358
-
-	.align 2
-gUnknown_83CC138:: @ 83CC138 dataptr
-	.4byte sub_8086498
-	.4byte sub_80864D4
-	.4byte sub_8086554
-	.4byte sub_80865C0
-	.4byte sub_80865F0
-	.4byte sub_8086630
-	.4byte sub_8086650
-
-	.align 2
-gUnknown_83CC154:: @ 83CC154 dataptr
-	.4byte sub_80869C0
-	.4byte sub_8086A20
-	.4byte sub_8086A6C
-	.4byte sub_8086AB4
-	.4byte sub_8086B30
-
-	.align 2
-gUnknown_83CC168:: @ 83CC168 dataptr
-	.4byte sub_8086C00
-	.4byte sub_8086C24
-	.4byte sub_8086C70
-	.4byte sub_8086CF4
-
-gUnknown_83CC178:: @ 83CC178 dataptr (incomplete)
-	.4byte sub_8086E70
-	.4byte sub_8086EC8
-	.4byte sub_8086F0C
-	.4byte sub_8086F64
-	.4byte sub_8086FA8
-	.4byte sub_8086FFC
-	.4byte sub_808706C
-	.4byte sub_8087118
-	.4byte sub_8087138
-
-gUnknown_83CC19C:: @ 83CC19C affineanimcmd
-	obj_rot_scal_anim_frame 8, 8, 226, 0
-	obj_rot_scal_anim_frame 28, 28, 0, 30
-	obj_rot_scal_anim_end
-
-gUnknown_83CC1B4:: @ 83CC1B4 affineanimcmd
-	obj_rot_scal_anim_frame 256, 256, 64, 0
-	obj_rot_scal_anim_frame -10, -10, 0, 22
-	obj_rot_scal_anim_end
-
-	.align 2
-gUnknown_83CC1CC:: @ 83CC1CC dataptr
-	.4byte gUnknown_83CC19C
-	.4byte gUnknown_83CC1B4
-
-	.align 2
-gUnknown_83CC1D4:: @ 83CC1D4 dataptr
-	.4byte sub_80874C8
-	.4byte sub_80875C8
-	.4byte sub_8087644
-	.4byte sub_8087698
-	.4byte sub_8087710
-	.4byte sub_8087748
-	.4byte fishE
-
-gUnknown_83CC1F0:: @ 83CC1F0 data16
-	.2byte 0xfffe, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8, 0xfff8, 0xfff8, 0xfff9, 0xfff9, 0xfffa, 0xfffb, 0xfffd, 0xfffe, 0x0000, 0x0002
-	.2byte 0x0004, 0x0008
-
-gUnknown_83CC214:: @ 83CC214 affineanimcmd
-	obj_rot_scal_anim_frame 24, 24, 0, 1
-	obj_rot_scal_anim_jump 0
-
-gUnknown_83CC224:: @ 83CC224 affineanimcmd
-	obj_rot_scal_anim_frame 512, 512, 0, 1
-	obj_rot_scal_anim_frame -16, -16, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gUnknown_83CC23C:: @ 83CC23C dataptr
-	.4byte gUnknown_83CC214
-	.4byte gUnknown_83CC224
-
-gUnknown_83CC244:: @ 83CC244 dataptr
-	.4byte sub_8087C00
-	.4byte sub_8087C2C
-	.4byte sub_8087CB4
-
-gUnknown_83CC250:: @ 83CC250 sprite_frames
-	obj_frame_tiles gUnknown_83CBDB0 + 0x00, 0x0020
-	obj_frame_tiles gUnknown_83CBDB0 + 0x20, 0x0020
-	obj_frame_tiles gUnknown_83CBDB0 + 0x40, 0x0020
-	obj_frame_tiles gUnknown_83CBDB0 + 0x60, 0x0020
-
-gUnknown_83CC270:: @ 83CC270 animcmd
-	obj_image_anim_frame 0x0000, 0
-	obj_image_anim_end
-
-gUnknown_83CC278:: @ 83CC278 animcmd
-	obj_image_anim_frame 0x0001, 0
-	obj_image_anim_end
-
-gUnknown_83CC280:: @ 83CC280 animcmd
-	obj_image_anim_frame 0x0002, 0
-	obj_image_anim_end
-
-gUnknown_83CC288:: @ 83CC288 animcmd
-	obj_image_anim_frame 0x0003, 0
-	obj_image_anim_end
-
-gUnknown_83CC290:: @ 83CC290 dataptr
-	.4byte gUnknown_83CC270
-	.4byte gUnknown_83CC278
-	.4byte gUnknown_83CC280
-	.4byte gUnknown_83CC288
-
-gUnknown_83CC2A0:: @ 83CC2A0 spr_template
-	spr_template 65535, 4371, gOamData_83CBE58, gUnknown_83CC290, gUnknown_83CC250, gDummySpriteAffineAnimTable, sub_8087D90
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index cac76bea9..95d63568c 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -1,7 +1,7 @@
 	.include "asm/macros/field_effect_script.inc"
 	.section script_data, "aw", %progbits
 	.align 2
-gUnknown_81D96AC:: @ 81D96AC
+gFieldEffectScriptPointers:: @ 81D96AC
 	.4byte gFldEffScript_ExclamationMarkIcon
 	.4byte gFldEffScript_UseCutOnGrass
 	.4byte gFldEffScript_UseCutOnTree
@@ -67,9 +67,9 @@ gUnknown_81D96AC:: @ 81D96AC
 	.4byte gFldEffScript_HallOfFameRecord
 	.4byte gFldEffScript_UseTeleport
 	.4byte gFldEffScript_SmileyFaceIcon
-	.4byte gFldEffScript_Unk41
+	.4byte gFldEffScript_UseVsSeeker
 	.4byte gFldEffScript_DoubleExclMarkIcon
-	.4byte gFldEffScript_Unk43
+	.4byte gFldEffScript_MoveDeoxysRock
 	.4byte gFldEffScript_Unk44
 	.4byte gFldEffScript_Unk45
 
@@ -102,15 +102,15 @@ gFldEffScript_FieldMoveShowMon:: @ 81D97F0
 	end 
 
 gFldEffScript_Ash:: @ 81D97F6
-	loadfadedpal_callnative gUnknown_83A5348, oei_ash
+	loadfadedpal_callnative gUnknown_83A5348, FldEff_Ash
 	end 
 
 gFldEffScript_SurfBlob:: @ 81D9800
-	callnative sub_80DC3D0
+	callnative FldEff_SurfBlob
 	end 
 
 gFldEffScript_UseSurf:: @ 81D9806
-	callnative sub_8086944
+	callnative FldEff_UseSurf
 	end 
 
 gFldEffScript_Dust:: @ 81D980C
@@ -165,7 +165,7 @@ gFldEffScript_Unknown22:: @ 81D987B
 	end 
 
 gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885
-	callnative sub_80DC9DC
+	callnative FldEff_BerryTreeGrowthSparkle
 	end 
 
 gFldEffScript_DeepSandFootprints:: @ 81D988B
@@ -174,7 +174,7 @@ gFldEffScript_DeepSandFootprints:: @ 81D988B
 
 gFldEffScript_PokecenterHeal:: @ 81D9895
 	loadfadedpal gUnknown_83CBE9C
-	loadfadedpal_callnative gUnknown_83A5340, sub_8083B8C
+	loadfadedpal_callnative gUnknown_83A5340, FldEff_PokecenterHeal
 	end 
 
 gFldEffScript_UseSecretPowerTree:: @ 81D98A4
@@ -192,7 +192,7 @@ gFldEffScript_MountainDisguise:: @ 81D98AC
 	end 
 
 gFldEffScript_NpcflyOut:: @ 81D98B2
-	callnative sub_8086D38
+	callnative FldEff_NpcFlyOut
 	end 
 
 gFldEffScript_UseFly:: @ 81D98B8
@@ -224,7 +224,7 @@ gFldEffScript_UseRockSmash:: @ 81D98E4
 	end 
 
 gFldEffScript_UseStrength:: @ 81D98EA
-	callnative sub_80D0860
+	callnative FldEff_UseStrength
 	end 
 
 gFldEffScript_UseDig:: @ 81D98F0
@@ -236,15 +236,15 @@ gFldEffScript_SandPile:: @ 81D98F6
 	end 
 
 gFldEffScript_ShortGrass:: @ 81D9900
-	loadfadedpal_callnative gUnknown_83A5348, sub_80DB808
+	loadfadedpal_callnative gUnknown_83A5348, FldEff_ShortGrass
 	end 
 
 gFldEffScript_HotSpringsWater:: @ 81D990A
-	loadfadedpal_callnative gUnknown_83A5348, sub_80DBF50
+	loadfadedpal_callnative gUnknown_83A5348, FldEff_HotSpringsWater
 	end 
 
 gFldEffScript_UseWaterfall:: @ 81D9914
-	callnative oei_waterfall
+	callnative FldEff_UseWaterfall
 	end 
 
 gFldEffScript_UseDive:: @ 81D991A
@@ -314,7 +314,7 @@ gFldEffScript_PcturnOn:: @ 81D9976
 
 gFldEffScript_HallOfFameRecord:: @ 81D9977
 	loadfadedpal gUnknown_83CBE9C
-	loadfadedpal_callnative gUnknown_83CBEA4, sub_8083CE0
+	loadfadedpal_callnative gUnknown_83CBEA4, FldEff_HallOfFameRecord
 	end 
 
 gFldEffScript_UseTeleport:: @ 81D9986
@@ -325,22 +325,22 @@ gFldEffScript_SmileyFaceIcon:: @ 81D998C
 	callnative FldEff_SmileyFaceIcon
 	end 
 
-gFldEffScript_Unk41:: @ 81D9992
-	callnative sub_8086BA8
+gFldEffScript_UseVsSeeker:: @ 81D9992
+	callnative FldEff_UseVsSeeker
 	end 
 
 gFldEffScript_DoubleExclMarkIcon:: @ 81D9998
 	callnative FldEff_DoubleExclMarkIcon
 	end 
 
-gFldEffScript_Unk43:: @ 81D999E
-	callnative sub_8087924
+gFldEffScript_MoveDeoxysRock:: @ 81D999E
+	callnative FldEff_MoveDeoxysRock
 	end 
 
 gFldEffScript_Unk44:: @ 81D99A4
-	callnative sub_8087AB4
+	callnative FldEff_Unk44
 	end 
 
 gFldEffScript_Unk45:: @ 81D99AA
-	callnative sub_8087E28
+	callnative FldEff_Unk45
 	end