Use event object constants

5 files changed, 155 insertions, 153 deletions

diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index e50ad9f0a..96e9f86f5 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -595,76 +595,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
-	createvobject 46, 1, 3, 0, 3, 1
-	createvobject 22, 4, 6, 0, 3, 1
-	createvobject 5, 6, 8, 0, 3, 1
-	createvobject 12, 9, 11, 0, 3, 1
-	createvobject 46, 11, 13, 0, 3, 1
-	createvobject 66, 13, 15, 0, 3, 1
-	createvobject 45, 19, 7, 1, 3, 1
-	createvobject 34, 22, 11, 1, 3, 1
-	createvobject 11, 25, 15, 1, 3, 1
-	createvobject 35, 26, 2, 2, 3, 1
-	createvobject 38, 29, 5, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
-	createvobject 46, 1, 3, 0, 3, 1
-	createvobject 22, 4, 6, 0, 3, 1
-	createvobject 5, 6, 8, 0, 3, 1
-	createvobject 20, 7, 9, 0, 3, 1
-	createvobject 12, 9, 11, 0, 3, 1
-	createvobject 47, 10, 12, 0, 3, 1
-	createvobject 46, 11, 13, 0, 3, 1
-	createvobject 66, 13, 15, 0, 3, 1
-	createvobject 48, 15, 2, 1, 3, 1
-	createvobject 5, 16, 3, 1, 3, 1
-	createvobject 20, 17, 4, 1, 3, 1
-	createvobject 45, 19, 7, 1, 3, 1
-	createvobject 22, 20, 9, 1, 3, 1
-	createvobject 34, 22, 11, 1, 3, 1
-	createvobject 46, 23, 13, 1, 3, 1
-	createvobject 11, 25, 15, 1, 3, 1
-	createvobject 35, 26, 2, 2, 3, 1
-	createvobject 40, 28, 5, 2, 3, 1
-	createvobject 38, 29, 5, 1, 3, 1
-	createvobject 83, 30, 6, 2, 3, 1
-	createvobject 34, 31, 8, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
-	createvobject 5, 0, 2, 0, 3, 1
-	createvobject 46, 1, 3, 0, 3, 1
-	createvobject 45, 2, 15, 0, 3, 1
-	createvobject 66, 3, 5, 0, 3, 1
-	createvobject 22, 4, 6, 0, 3, 1
-	createvobject 46, 5, 7, 0, 3, 1
-	createvobject 5, 6, 8, 0, 3, 1
-	createvobject 20, 7, 9, 0, 3, 1
-	createvobject 24, 8, 10, 0, 3, 1
-	createvobject 12, 9, 11, 0, 3, 1
-	createvobject 47, 10, 12, 0, 3, 1
-	createvobject 46, 11, 13, 0, 3, 1
-	createvobject 45, 12, 14, 0, 3, 1
-	createvobject 66, 13, 15, 2, 3, 1
-	createvobject 55, 14, 12, 2, 3, 1
-	createvobject 48, 15, 2, 1, 3, 1
-	createvobject 5, 16, 3, 1, 3, 1
-	createvobject 20, 17, 4, 1, 3, 1
-	createvobject 24, 18, 6, 1, 3, 1
-	createvobject 45, 19, 7, 1, 3, 1
-	createvobject 22, 20, 9, 1, 3, 1
-	createvobject 23, 21, 10, 1, 3, 1
-	createvobject 34, 22, 11, 1, 3, 1
-	createvobject 46, 23, 13, 1, 3, 1
-	createvobject 48, 24, 14, 1, 3, 1
-	createvobject 11, 25, 15, 1, 3, 1
-	createvobject 35, 26, 2, 2, 3, 1
-	createvobject 17, 27, 3, 2, 3, 1
-	createvobject 40, 28, 5, 2, 3, 1
-	createvobject 38, 29, 5, 1, 3, 1
-	createvobject 83, 30, 6, 2, 3, 1
-	createvobject 34, 31, 8, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
 	return
 
 BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773
diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc
index 8b753471a..e0cd24eff 100644
--- a/data/maps/LinkContestRoom1/scripts.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
@@ -312,97 +312,97 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
 	return
 
 LinkContestRoom1_EventScript_23BB78:: @ 823BB78
-	createvobject 5, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
 	return
 
 LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 46, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 12, 13, 12, 8, 3, 3
-	createvobject 47, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, 4
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, 3
+	createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
 	return
 
 LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 48, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 22, 20, 3, 2, 3, 1
-	createvobject 23, 20, 6, 2, 3, 1
-	createvobject 34, 20, 7, 2, 3, 1
-	createvobject 46, 24, 8, 2, 3, 1
-	createvobject 48, 24, 11, 2, 3, 1
-	createvobject 11, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 17, 27, 5, 9, 3, 2
-	createvobject 40, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, 4
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
 	return
 
 LinkContestRoom1_EventScript_23BC92:: @ 823BC92
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	createvobject 49, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 48, 27, 5, 9, 3, 2
-	createvobject 40, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
+	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
+	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
+	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
+	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
+	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
+	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
+	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
 	return
 
 LinkContestRoom1_EventScript_23BD86:: @ 823BD86
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
+	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
+	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
+	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
+	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
+	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
+	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
+	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
 	return
 
 LinkContestRoom1_EventScript_23BE44:: @ 823BE44
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index ab2667c8c..b322fc1c7 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1337,13 +1337,13 @@ void SetPlayerAvatarStateMask(u8 flags)
     gPlayerAvatar.flags |= flags;
 }
 
-static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 a, u8 gender)
+static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
 {
     u8 i;
 
     for (i = 0; i < 5; i++)
     {
-        if (gUnknown_0849750C[gender][i][0] == a)
+        if (gUnknown_0849750C[gender][i][0] == graphicsId)
             return gUnknown_0849750C[gender][i][1];
     }
     return 1;
@@ -1362,9 +1362,9 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void)
     return 0;
 }
 
-void SetPlayerAvatarExtraStateTransition(u8 a, u8 b)
+void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b)
 {
-    u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(a, gPlayerAvatar.gender);
+    u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender);
 
     gPlayerAvatar.unk1 |= unk | b;
     DoPlayerAvatarTransition();
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index e059e6ef8..59077ebbd 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -13,6 +13,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
+#include "constants/event_objects.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
 
@@ -311,7 +312,7 @@ void Task_HandlePorthole(u8 taskId)
 
 void sub_80FB6EC(void)
 {
-    u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0);
+    u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0);
 
     gSprites[spriteId].coordOffsetEnabled = FALSE;
 
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
index 4c302c5eb..0b7324366 100644
--- a/src/union_room_player_avatar.c
+++ b/src/union_room_player_avatar.c
@@ -1,13 +1,14 @@
 #include "global.h"
-#include "constants/flags.h"
-#include "constants/event_object_movement_constants.h"
 #include "event_data.h"
 #include "event_object_movement.h"
-#include "script.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "union_room.h"
+#include "script.h"
 #include "task.h"
+#include "union_room.h"
+#include "constants/event_objects.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/flags.h"
 
 EWRAM_DATA struct UnkStruct_8019BA8 * gUnknown_02022C64 = NULL;
 EWRAM_DATA u32 gUnknown_02022C68 = 0;
@@ -390,7 +391,7 @@ void sub_8019E70(u8 * sp8, s32 r9)
     for (r7 = 0; r7 < 5; r7++)
     {
         s32 r5 = 5 * r9 + r7;
-        sp8[r5] = sprite_new(0x41, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1);
+        sp8[r5] = sprite_new(EVENT_OBJ_GFX_MAN_4, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1);
         sub_8097C44(r5 - 0x38, TRUE);
     }
 }