Finish trainer_see

3 files changed, 6 insertions, 77 deletions

diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 98685da05..35f307e43 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -204,7 +204,7 @@ gFldEffScript_FlyIn:: @ 81D98BE
 	end 
 
 gFldEffScript_ExclamationMarkIcon2:: @ 81D98C4
-	callnative sub_8082624
+	callnative FldEff_QuestionMarkIcon
 	end 
 
 gFldEffScript_FeetInFlowingWater:: @ 81D98CA
@@ -257,7 +257,7 @@ gFldEffScript_Pokeball:: @ 81D9920
 	end 
 
 gFldEffScript_HeartIcon:: @ 81D992B
-	callnative sub_80825B4
+	callnative FldEff_XIcon
 	end 
 
 gFldEffScript_Nop47:: @ 81D9931
@@ -322,7 +322,7 @@ gFldEffScript_UseTeleport:: @ 81D9986
 	end 
 
 gFldEffScript_Unk40:: @ 81D998C
-	callnative sub_80825EC
+	callnative FldEff_SmileyFaceIcon
 	end 
 
 gFldEffScript_Unk41:: @ 81D9992
@@ -330,7 +330,7 @@ gFldEffScript_Unk41:: @ 81D9992
 	end 
 
 gFldEffScript_Unk42:: @ 81D9998
-	callnative sub_808257C
+	callnative FldEff_DoubleExclMarkIcon
 	end 
 
 gFldEffScript_Unk43:: @ 81D999E
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index c206f38b4..f44c2d29b 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -257,8 +257,8 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
 	setfieldeffectarg 0, 255
 	setfieldeffectarg 1, 10
 	setfieldeffectarg 2, 14
-	dofieldeffect FLDEFF_UNK_40
-	waitfieldeffect FLDEFF_UNK_40  @ Smile icon?
+	dofieldeffect FLDEFF_SMILEY_FACE_ICON
+	waitfieldeffect FLDEFF_SMILEY_FACE_ICON  @ Smile icon?
 	specialvar VAR_RESULT, Special_GetRandomSlotMachine
 	playslotmachine VAR_RESULT
 	releaseall
diff --git a/data/trainer_see.s b/data/trainer_see.s
deleted file mode 100644
index f10a0b2c4..000000000
--- a/data/trainer_see.s
+++ /dev/null
@@ -1,71 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83C7294:: @ 83C7294
-	.4byte sub_8082150
-	.4byte sub_8082184
-	.4byte sub_80821DC
-	.4byte sub_8082250
-
-gOamData_83C72A4::
-	.4byte 0x40000000, 0x00000400
-
-gSpriteImages_83C72AC::
-	.4byte gUnknown_83C6AC8 + 0x000, 0x80
-	.4byte gUnknown_83C6AC8 + 0x080, 0x80
-	.4byte gUnknown_83C6AC8 + 0x100, 0x80
-	.4byte gUnknown_83C6AC8 + 0x300, 0x80
-	.4byte gUnknown_83C6AC8 + 0x380, 0x80
-	.4byte gUnknown_83C6AC8 + 0x400, 0x80
-	.4byte gUnknown_83C6AC8 + 0x180, 0x80
-	.4byte gUnknown_83C6AC8 + 0x200, 0x80
-	.4byte gUnknown_83C6AC8 + 0x280, 0x80
-	.4byte gUnknown_83C6AC8 + 0x480, 0x80
-	.4byte gUnknown_83C6AC8 + 0x500, 0x80
-	.4byte gUnknown_83C6AC8 + 0x580, 0x80
-	.4byte gUnknown_83C6AC8 + 0x600, 0x80
-	.4byte gUnknown_83C6AC8 + 0x680, 0x80
-	.4byte gUnknown_83C6AC8 + 0x700, 0x80
-
-gAnimCmd_83C7324::
-	obj_image_anim_frame 0x0000, 0x0004
-	obj_image_anim_frame 0x0001, 0x0004
-	obj_image_anim_frame 0x0002, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7334::
-	obj_image_anim_frame 0x0006, 0x0004
-	obj_image_anim_frame 0x0007, 0x0004
-	obj_image_anim_frame 0x0008, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7344::
-	obj_image_anim_frame 0x0003, 0x0004
-	obj_image_anim_frame 0x0004, 0x0004
-	obj_image_anim_frame 0x0005, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7354::
-	obj_image_anim_frame 0x0009, 0x0004
-	obj_image_anim_frame 0x000a, 0x0004
-	obj_image_anim_frame 0x000b, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7364::
-	obj_image_anim_frame 0x000c, 0x0004
-	obj_image_anim_frame 0x000d, 0x0004
-	obj_image_anim_frame 0x000e, 0x0034
-	obj_image_anim_end
-
-gSpriteAnimTable_83C7374::
-	.4byte gAnimCmd_83C7324
-    .4byte gAnimCmd_83C7334
-    .4byte gAnimCmd_83C7344
-    .4byte gAnimCmd_83C7354
-    .4byte gAnimCmd_83C7364
-
-gUnknown_83C7388:: @ 83C7388
-	spr_template 65535, 65535, gOamData_83C72A4, gSpriteAnimTable_83C7374, gSpriteImages_83C72AC, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably