Finish field_specials

6 files changed, 29 insertions, 29 deletions

diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index f23c73615..05ef15804 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203
 	.byte 0
 
 BirthIsland_Exterior_MapScript3_165213:: @ 8165213
-	special sub_80CD008
+	special Special_SetDeoxysTriangleObjectPal
 	end
 
 BirthIsland_Exterior_MapScript1_165217:: @ 8165217
@@ -50,7 +50,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
-	special sub_80CCDFC
+	special Special_DeoxysSound
 	waitstate
 	switch VAR_RESULT
 	case 0, EventScript_1652BA
diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
index 437df0fe8..a334ab2df 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
@@ -49,12 +49,12 @@ EventScript_1688BA:: @ 81688BA
 EventScript_1688E3:: @ 81688E3
 	getspeciesname 1, SPECIES_TOGEPI
 	setvar VAR_0x8004, SPECIES_TOGEPI
-	specialvar VAR_RESULT, sub_80CD0F4
+	specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_168895
 	getspeciesname 1, SPECIES_TOGETIC
 	setvar VAR_0x8004, SPECIES_TOGETIC
-	specialvar VAR_RESULT, sub_80CD0F4
+	specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_168895
 	msgbox gUnknown_818A9C0
diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc
index 7ca07b4ba..c91cc86e5 100644
--- a/data/maps/FourIsland_PokemonDayCare/scripts.inc
+++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc
@@ -40,7 +40,7 @@ EventScript_171993:: @ 8171993
 	msgbox gUnknown_81BF860
 	waitmoncry
 	special StoreSelectedPokemonInDaycare
-	incrementgamestat 47
+	incrementgamestat GAME_STAT_USED_DAYCARE
 	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_171A01
diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc
index c3d8b7320..53aec5282 100644
--- a/data/maps/MtEmber_RubyPath_B5F/scripts.inc
+++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc
@@ -7,31 +7,31 @@ MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92C5
 	getbraillestringwidth gUnknown_81A92C5
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92D0
 	getbraillestringwidth gUnknown_81A92D0
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92DC
 	getbraillestringwidth gUnknown_81A92DC
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92E6
 	getbraillestringwidth gUnknown_81A92E6
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92F2
 	getbraillestringwidth gUnknown_81A92F2
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92FE
 	getbraillestringwidth gUnknown_81A92FE
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A930A
 	getbraillestringwidth gUnknown_81A930A
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	braillemessage gUnknown_81A9316
 	waitbuttonpress
 	releaseall
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index f73aaf1ec..59499f1cf 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -45,7 +45,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
 	special SpawnCameraObject
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 35
-	special sub_80CD1B4
+	special Special_LoopWingFlapSound
 	applymovement 1, Movement_1650E0
 	applymovement 127, Movement_1650CD
 	waitmovement 0
@@ -59,7 +59,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
 	delay 60
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 35
-	special sub_80CD1B4
+	special Special_LoopWingFlapSound
 	applymovement 127, Movement_1650D1
 	applymovement 1, Movement_1650D7
 	waitmovement 0
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
index 5d6fcfe53..64ef24b72 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
@@ -241,63 +241,63 @@ SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9321
 	getbraillestringwidth gUnknown_81A9321
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A932D
 	getbraillestringwidth gUnknown_81A932D
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9338
 	getbraillestringwidth gUnknown_81A9338
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A933F
 	getbraillestringwidth gUnknown_81A933F
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A934A
 	getbraillestringwidth gUnknown_81A934A
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9356
 	getbraillestringwidth gUnknown_81A9356
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9362
 	getbraillestringwidth gUnknown_81A9362
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9368
 	getbraillestringwidth gUnknown_81A9368
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9374
 	getbraillestringwidth gUnknown_81A9374
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A937C
 	getbraillestringwidth gUnknown_81A937C
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9387
 	getbraillestringwidth gUnknown_81A9387
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9393
 	getbraillestringwidth gUnknown_81A9393
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A939F
 	getbraillestringwidth gUnknown_81A939F
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A93AB
 	getbraillestringwidth gUnknown_81A93AB
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A93B4
 	getbraillestringwidth gUnknown_81A93B4
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	braillemessage gUnknown_81A93C0
 	waitbuttonpress
 	releaseall