field_specials through sub_80CBDE8

29 files changed, 438 insertions, 39 deletions

diff --git a/data/field_specials.s b/data/field_specials.s
index 99179f0a4..3eadee1aa 100644
--- a/data/field_specials.s
+++ b/data/field_specials.s
@@ -335,33 +335,33 @@ gUnknown_83F5F26:: @ 83F5F26
 	.2byte 0xffff
 
 gUnknown_83F5F50:: @ 83F5F50
-	.incbin "baserom.gba", 0x3F5F50, 0x20
-	.incbin "baserom.gba", 0x3F5F70, 0x20
-	.incbin "baserom.gba", 0x3F5F90, 0x20
-	.incbin "baserom.gba", 0x3F5FB0, 0x20
-	.incbin "baserom.gba", 0x3F5FD0, 0x20
-	.incbin "baserom.gba", 0x3F5FF0, 0x20
-	.incbin "baserom.gba", 0x3F6010, 0x20
-	.incbin "baserom.gba", 0x3F6030, 0x20
-	.incbin "baserom.gba", 0x3F6050, 0x20
-	.incbin "baserom.gba", 0x3F6070, 0x20
-	.incbin "baserom.gba", 0x3F6090, 0x20
+	.incbin "data/field_specials/unk_83F5F50.gbapal"
+	.incbin "data/field_specials/unk_83F5F70.gbapal"
+	.incbin "data/field_specials/unk_83F5F90.gbapal"
+	.incbin "data/field_specials/unk_83F5FB0.gbapal"
+	.incbin "data/field_specials/unk_83F5FD0.gbapal"
+	.incbin "data/field_specials/unk_83F5FF0.gbapal"
+	.incbin "data/field_specials/unk_83F6010.gbapal"
+	.incbin "data/field_specials/unk_83F6030.gbapal"
+	.incbin "data/field_specials/unk_83F6050.gbapal"
+	.incbin "data/field_specials/unk_83F6070.gbapal"
+	.incbin "data/field_specials/unk_83F6090.gbapal"
 
 gUnknown_83F60B0:: @ 83F60B0
-	.incbin "baserom.gba", 0x3F60B0, 0x20
+	.incbin "data/field_specials/unk_83F60B0.gbapal"
 
 gUnknown_83F60D0:: @ 83F60D0
-	.incbin "baserom.gba", 0x3F60D0, 0x20
-	.incbin "baserom.gba", 0x3F60F0, 0x20
-	.incbin "baserom.gba", 0x3F6110, 0x20
-	.incbin "baserom.gba", 0x3F6130, 0x20
-	.incbin "baserom.gba", 0x3F6150, 0x20
-	.incbin "baserom.gba", 0x3F6170, 0x20
-	.incbin "baserom.gba", 0x3F6190, 0x20
-	.incbin "baserom.gba", 0x3F61B0, 0x20
+	.incbin "data/field_specials/unk_83F60D0.gbapal"
+	.incbin "data/field_specials/unk_83F60F0.gbapal"
+	.incbin "data/field_specials/unk_83F6110.gbapal"
+	.incbin "data/field_specials/unk_83F6130.gbapal"
+	.incbin "data/field_specials/unk_83F6150.gbapal"
+	.incbin "data/field_specials/unk_83F6170.gbapal"
+	.incbin "data/field_specials/unk_83F6190.gbapal"
+	.incbin "data/field_specials/unk_83F61B0.gbapal"
 
 gUnknown_83F61D0:: @ 83F61D0
-	.incbin "baserom.gba", 0x3F61D0, 0x20
+	.incbin "data/field_specials/unk_83F61D0.gbapal"
 
 gUnknown_83F61F0:: @ 83F61F0
 	.incbin "baserom.gba", 0x3F61F0, 0xB
diff --git a/data/field_specials/unk_83F5F50.pal b/data/field_specials/unk_83F5F50.pal
new file mode 100644
index 000000000..6528f9f75
--- /dev/null
+++ b/data/field_specials/unk_83F5F50.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
diff --git a/data/field_specials/unk_83F5F70.pal b/data/field_specials/unk_83F5F70.pal
new file mode 100644
index 000000000..934306488
--- /dev/null
+++ b/data/field_specials/unk_83F5F70.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+41 115 205
+82 82 106
diff --git a/data/field_specials/unk_83F5F90.pal b/data/field_specials/unk_83F5F90.pal
new file mode 100644
index 000000000..624c69448
--- /dev/null
+++ b/data/field_specials/unk_83F5F90.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+41 115 205
+131 238 255
+0 41 156
diff --git a/data/field_specials/unk_83F5FB0.pal b/data/field_specials/unk_83F5FB0.pal
new file mode 100644
index 000000000..fb3cdebd0
--- /dev/null
+++ b/data/field_specials/unk_83F5FB0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+41 115 205
+131 238 255
+82 172 230
+0 65 189
diff --git a/data/field_specials/unk_83F5FD0.pal b/data/field_specials/unk_83F5FD0.pal
new file mode 100644
index 000000000..f2c6c78af
--- /dev/null
+++ b/data/field_specials/unk_83F5FD0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+41 115 205
+131 238 255
+82 172 230
+41 115 205
+41 115 205
diff --git a/data/field_specials/unk_83F5FF0.pal b/data/field_specials/unk_83F5FF0.pal
new file mode 100644
index 000000000..3e2c5757a
--- /dev/null
+++ b/data/field_specials/unk_83F5FF0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+41 115 205
+131 238 255
+82 172 230
+41 115 205
+0 65 189
+82 172 230
diff --git a/data/field_specials/unk_83F6010.pal b/data/field_specials/unk_83F6010.pal
new file mode 100644
index 000000000..84e6e811a
--- /dev/null
+++ b/data/field_specials/unk_83F6010.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+131 238 255
+82 172 230
+41 115 205
+0 65 189
+0 41 156
+131 238 255
diff --git a/data/field_specials/unk_83F6030.pal b/data/field_specials/unk_83F6030.pal
new file mode 100644
index 000000000..f49f8ef99
--- /dev/null
+++ b/data/field_specials/unk_83F6030.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 172 230
+41 115 205
+0 65 189
+0 41 156
+82 82 106
+90 180 238
diff --git a/data/field_specials/unk_83F6050.pal b/data/field_specials/unk_83F6050.pal
new file mode 100644
index 000000000..538ebf789
--- /dev/null
+++ b/data/field_specials/unk_83F6050.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+41 115 205
+0 65 189
+0 41 156
+82 82 106
+82 82 106
+41 115 205
diff --git a/data/field_specials/unk_83F6070.pal b/data/field_specials/unk_83F6070.pal
new file mode 100644
index 000000000..49b9d85b6
--- /dev/null
+++ b/data/field_specials/unk_83F6070.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+0 65 189
+0 41 156
+82 82 106
+82 82 106
+82 82 106
+0 65 189
diff --git a/data/field_specials/unk_83F6090.pal b/data/field_specials/unk_83F6090.pal
new file mode 100644
index 000000000..ff81da8b3
--- /dev/null
+++ b/data/field_specials/unk_83F6090.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+0 41 156
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+0 41 156
diff --git a/data/field_specials/unk_83F60B0.pal b/data/field_specials/unk_83F60B0.pal
new file mode 100644
index 000000000..a0763ff47
--- /dev/null
+++ b/data/field_specials/unk_83F60B0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+131 238 255
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+172 172 98
+148 148 74
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
diff --git a/data/field_specials/unk_83F60D0.pal b/data/field_specials/unk_83F60D0.pal
new file mode 100644
index 000000000..6528f9f75
--- /dev/null
+++ b/data/field_specials/unk_83F60D0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
diff --git a/data/field_specials/unk_83F60F0.pal b/data/field_specials/unk_83F60F0.pal
new file mode 100644
index 000000000..75dfaa19a
--- /dev/null
+++ b/data/field_specials/unk_83F60F0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 172 230
+41 115 205
diff --git a/data/field_specials/unk_83F6110.pal b/data/field_specials/unk_83F6110.pal
new file mode 100644
index 000000000..092544dec
--- /dev/null
+++ b/data/field_specials/unk_83F6110.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 172 230
+41 115 205
+131 238 255
+82 172 230
diff --git a/data/field_specials/unk_83F6130.pal b/data/field_specials/unk_83F6130.pal
new file mode 100644
index 000000000..3b93965ad
--- /dev/null
+++ b/data/field_specials/unk_83F6130.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 172 230
+41 115 205
+131 238 255
+82 172 230
+82 172 230
+41 115 205
diff --git a/data/field_specials/unk_83F6150.pal b/data/field_specials/unk_83F6150.pal
new file mode 100644
index 000000000..be23edc23
--- /dev/null
+++ b/data/field_specials/unk_83F6150.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+131 238 255
+82 172 230
+82 172 230
+41 115 205
+41 115 205
+0 65 189
diff --git a/data/field_specials/unk_83F6170.pal b/data/field_specials/unk_83F6170.pal
new file mode 100644
index 000000000..788d0bd65
--- /dev/null
+++ b/data/field_specials/unk_83F6170.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 172 230
+41 115 205
+41 115 205
+0 65 189
+0 65 189
+82 82 106
diff --git a/data/field_specials/unk_83F6190.pal b/data/field_specials/unk_83F6190.pal
new file mode 100644
index 000000000..8ca385f0d
--- /dev/null
+++ b/data/field_specials/unk_83F6190.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+41 115 205
+0 65 189
+0 65 189
+82 82 106
+82 82 106
+82 82 106
diff --git a/data/field_specials/unk_83F61B0.pal b/data/field_specials/unk_83F61B0.pal
new file mode 100644
index 000000000..63fe8e97e
--- /dev/null
+++ b/data/field_specials/unk_83F61B0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+0 65 189
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
diff --git a/data/field_specials/unk_83F61D0.pal b/data/field_specials/unk_83F61D0.pal
new file mode 100644
index 000000000..a0763ff47
--- /dev/null
+++ b/data/field_specials/unk_83F61D0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+131 238 255
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+172 172 98
+148 148 74
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
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
diff --git a/data/specials.inc b/data/specials.inc
index b0eac8922..af5b87dd7 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -354,7 +354,7 @@ gSpecials:: @ 815FD60
 	def_special sub_807F904
 	def_special Special_ForcePlayerOntoBike
 	def_special Special_ListMenu
-	def_special sub_80CBC5C
+	def_special Special_ReturnToListMenu
 	def_special sub_80CADC4
 	def_special Special_SetVermilionTrashCans
 	def_special sub_805D1A8
@@ -362,9 +362,9 @@ gSpecials:: @ 815FD60
 	def_special Special_CheckAddCoins
 	def_special GetDaycarePokemonCount
 	def_special Special_CloseElevatorCurrentFloorWindow
-	def_special sub_80CBD80
+	def_special Special_ForcePlayerToStartSurfing
 	def_special ScrSpecial_GetStarter
-	def_special sub_80CBDCC
+	def_special Special_SetSeenMon
 	def_special sub_810C444
 	def_special sub_80CC7B4
 	def_special ChangeBoxPokemonNickname