field_specials through sub_80CBDE8

6 files changed, 15 insertions, 15 deletions

diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc
index 04577bf37..26995d532 100644
--- a/data/maps/CeruleanCity_House1/scripts.inc
+++ b/data/maps/CeruleanCity_House1/scripts.inc
@@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0
 EventScript_16A87D:: @ 816A87D
 	message Text_191967
 	waitmessage
-	special sub_80CBC5C
+	special Special_ReturnToListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, EventScript_16A8FB
diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc
index d62d5252d..ea921b4d1 100644
--- a/data/maps/FuchsiaCity/scripts.inc
+++ b/data/maps/FuchsiaCity/scripts.inc
@@ -72,7 +72,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07
 FuchsiaCity_EventScript_166E1F:: @ 8166E1F
 	lockall
 	setvar VAR_0x8004, SPECIES_CHANSEY
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_CHANSEY, 10, 3
 	msgbox gUnknown_81807A9
 	erasemonpic
@@ -82,7 +82,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F
 FuchsiaCity_EventScript_166E38:: @ 8166E38
 	lockall
 	setvar VAR_0x8004, SPECIES_VOLTORB
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_VOLTORB, 10, 3
 	msgbox gUnknown_81807D9
 	erasemonpic
@@ -92,7 +92,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38
 FuchsiaCity_EventScript_166E51:: @ 8166E51
 	lockall
 	setvar VAR_0x8004, SPECIES_KANGASKHAN
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_KANGASKHAN, 10, 3
 	msgbox gUnknown_8180806
 	erasemonpic
@@ -102,7 +102,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51
 FuchsiaCity_EventScript_166E6A:: @ 8166E6A
 	lockall
 	setvar VAR_0x8004, SPECIES_SLOWPOKE
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_SLOWPOKE, 10, 3
 	msgbox gUnknown_8180859
 	erasemonpic
@@ -112,7 +112,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A
 FuchsiaCity_EventScript_166E83:: @ 8166E83
 	lockall
 	setvar VAR_0x8004, SPECIES_LAPRAS
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_LAPRAS, 10, 3
 	msgbox gUnknown_8180887
 	erasemonpic
@@ -124,7 +124,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
 	checkflag FLAG_GOT_DOME_FOSSIL
 	goto_if TRUE, EventScript_166EBE
 	setvar VAR_0x8004, SPECIES_KABUTO
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_KABUTO, 10, 3
 	msgbox gUnknown_81808FA
 	erasemonpic
@@ -133,7 +133,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
 
 EventScript_166EBE:: @ 8166EBE
 	setvar VAR_0x8004, SPECIES_OMANYTE
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_OMANYTE, 10, 3
 	msgbox gUnknown_81808AE
 	erasemonpic
diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc
index 7ec851931..1b491d4e5 100644
--- a/data/maps/Route15_WestEntrance_2F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_2F/scripts.inc
@@ -9,7 +9,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_ARTICUNO
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	releaseall
 	end
 
diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc
index b3c8e79ed..76be366f2 100644
--- a/data/maps/Route25_SeaCottage/scripts.inc
+++ b/data/maps/Route25_SeaCottage/scripts.inc
@@ -263,7 +263,7 @@ EventScript_17082B:: @ 817082B
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_EEVEE
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 
@@ -272,7 +272,7 @@ EventScript_170840:: @ 8170840
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_FLAREON
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 
@@ -281,7 +281,7 @@ EventScript_170855:: @ 8170855
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_JOLTEON
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 
@@ -290,7 +290,7 @@ EventScript_17086A:: @ 817086A
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_VAPOREON
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 
diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc
index f3dc1f136..9748777c7 100644
--- a/data/maps/SSAnne_2F_Room1/scripts.inc
+++ b/data/maps/SSAnne_2F_Room1/scripts.inc
@@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
 	message Text_173CE3
 	waitmessage
 	setvar VAR_0x8004, SPECIES_SNORLAX
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_SNORLAX, 10, 3
 	waitbuttonpress
 	erasemonpic
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
index 3b618448c..d861d3700 100644
--- a/data/maps/SeafoamIslands_B4F/scripts.inc
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -70,7 +70,7 @@ SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7
 
 EventScript_1630F1:: @ 81630F1
 	turnobject 255, 2
-	special sub_80CBD80
+	special Special_ForcePlayerToStartSurfing
 	end
 
 SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9