8 files changed, 22 insertions, 22 deletions
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 02319e8cf..c1cec509f 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -157,7 +157,7 @@ LilycoveCity_EventScript_1E2D11:: @ 81E2D11
 
 LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A
 	lockall
-	specialvar VAR_0x8004, sub_80F8940
+	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
 	case 0, LilycoveCity_EventScript_1E2D3A
 	msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 74bee15d3..42ce7beeb 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -100,7 +100,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
 	return
 
 LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
-	specialvar VAR_0x8004, sub_80F8940
+	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
 	case 1, LilycoveCity_ContestLobby_EventScript_21A3A2
 	case 2, LilycoveCity_ContestLobby_EventScript_21A3A6
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index f7fd5f453..03ac733f9 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -6,7 +6,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3
 	faceplayer
 	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9
 	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
-	specialvar VAR_RESULT, sub_80C08E4
+	specialvar VAR_RESULT, HasAllHoennMons
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702
 	release
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index da39ee655..f73fbf092 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -92,7 +92,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
 LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
 	lockall
 	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
-	specialvar VAR_0x8004, sub_80F8940
+	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
 	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
 	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 8568a72ef..1f65beda3 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -16,7 +16,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
-	specialvar VAR_RESULT, sub_80C08E4
+	specialvar VAR_RESULT, HasAllHoennMons
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
 	setobjectmovementtype 3, 3
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index 66dfab92a..915cdc93e 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955
 	return
 
 PetalburgCity_Gym_EventScript_20495D:: @ 820495D
-	setorcopyvar 0x8015, 269
+	setorcopyvar VAR_0x8015, 269
 	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare VAR_RESULT, 1
 	goto_if_eq PetalburgCity_Gym_EventScript_204985
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 4d315a158..846b7f6c3 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -16,10 +16,10 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
 
 TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
 	setvar VAR_0x8004, 4
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	setvar VAR_TEMP_0, 0
 	setvar VAR_0x8004, 9
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	compare VAR_RESULT, 0
 	goto_if_eq TrainerHill_Entrance_EventScript_2680FF
 	setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
@@ -28,7 +28,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
 
 TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
 	setvar VAR_0x8004, 16
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_Entrance_EventScript_26811A
 	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
@@ -75,7 +75,7 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
 TrainerHill_Entrance_EventScript_268182:: @ 8268182
 	setvar VAR_TEMP_0, 1
 	setvar VAR_0x8004, 6
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	switch VAR_RESULT
 	case 0, TrainerHill_Entrance_EventScript_2681B5
 	case 1, TrainerHill_Entrance_EventScript_2681CA
@@ -115,7 +115,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
 	lock
 	faceplayer
 	setvar VAR_0x8004, 10
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	compare VAR_RESULT, 0
 	goto_if_eq TrainerHill_Entrance_EventScript_26821F
 	msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT
@@ -134,11 +134,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229
 	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
 	msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 13
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	compare VAR_RESULT, 0
 	call_if_eq TrainerHill_Entrance_EventScript_26832E
 	setvar VAR_0x8004, 8
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_Entrance_EventScript_268275
 	msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT
@@ -170,13 +170,13 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
 	case 127, TrainerHill_Entrance_EventScript_268314
 	setvar VAR_0x8004, 17
 	copyvar VAR_0x8005, VAR_RESULT
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	setvar VAR_0x40D6, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
 	msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 0
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	releaseall
 	end
 
@@ -192,18 +192,18 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314
 TrainerHill_Entrance_EventScript_26832E:: @ 826832E
 	msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 14
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	setvar VAR_TEMP_5, 1
 	call TrainerHill_Entrance_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_if_eq TrainerHill_Entrance_EventScript_26835C
 	setvar VAR_0x8004, 14
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	return
 
 TrainerHill_Entrance_EventScript_26835C:: @ 826835C
 	setvar VAR_0x8004, 15
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	goto TrainerHill_Entrance_EventScript_268314
 	end
 
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index 19e8ef567..b959481f2 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -5,11 +5,11 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7
 
 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2
 	setvar VAR_0x8004, 12
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	lock
 	faceplayer
 	setvar VAR_0x8004, 1
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_268FEA
 	case 1, TrainerHill_Roof_EventScript_268FF2
@@ -20,7 +20,7 @@ TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA
 
 TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2
 	setvar VAR_0x8004, 2
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_269020
 	case 1, TrainerHill_Roof_EventScript_269037
@@ -42,7 +42,7 @@ TrainerHill_Roof_EventScript_269037:: @ 8269037
 
 TrainerHill_Roof_EventScript_269054:: @ 8269054
 	setvar VAR_0x8004, 3
-	special sp194_trainer_tower
+	special CallTrainerHillFunction
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_269082
 	case 1, TrainerHill_Roof_EventScript_269090