Merge pull request #358 from Deokishisu/LabelOWsProperly

Label OWs More Descriptively

spritesheet_rules.mk

@@ -171,10 +171,10 @@ $(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 $(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png
@@ -186,7 +186,7 @@ $(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/contest_old_man.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 $(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png
@@ -231,16 +231,16 @@ $(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/leaf.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/twin.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
 $(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png
@@ -249,6 +249,9 @@ $(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
+$(EVENTOBJGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
 $(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
@@ -258,10 +261,7 @@ $(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/man_6.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -mwidth 2 -mheight 4
-
-$(EVENTOBJGFXDIR)/people/man_7.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 $(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png
@@ -285,16 +285,16 @@ $(EVENTOBJGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/old_man.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 $(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png
@@ -381,6 +381,9 @@ $(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
+$(EVENTOBJGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
 $(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
@@ -390,15 +393,12 @@ $(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png
 $(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
+$(EVENTOBJGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
 $(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -mwidth 2 -mheight 4
-
-$(EVENTOBJGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -mwidth 2 -mheight 4
-
 $(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 

src/data/field_event_obj/event_object_graphics.h

@@ -71,36 +71,36 @@ const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/f
 const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal");
 const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal");
 const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal");
-const u32 gEventObjectPic_LittleBoy1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1.4bpp");
-const u32 gEventObjectPic_LittleGirl1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1.4bpp");
+const u32 gEventObjectPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp");
+const u32 gEventObjectPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp");
 const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp");
 const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp");
 const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp");
 const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp");
-const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2.4bpp");
-const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp");
+const u32 gEventObjectPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp");
+const u32 gEventObjectPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp");
 const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp");
 const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp");
-const u32 gEventObjectPic_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.4bpp");
+const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp");
 const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp");
 const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp");
-const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp");
+const u32 gEventObjectPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp");
 const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp");
-const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp");
-const u32 gEventObjectPic_OldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1.4bpp");
-const u32 gEventObjectPic_OldWoman1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1.4bpp");
+const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp");
+const u32 gEventObjectPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp");
+const u32 gEventObjectPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp");
 const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp");
+const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp");
+const u32 gEventObjectPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp");
 const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp");
-const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp");
-const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp");
 const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp");
-const u32 gEventObjectPic_Woman6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6.4bpp");
-const u32 gEventObjectPic_OldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2.4bpp");
-const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2.4bpp");
+const u32 gEventObjectPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp");
+const u32 gEventObjectPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp");
+const u32 gEventObjectPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp");
 const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp");
 const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp");
-const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp");
-const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.4bpp");
+const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp");
+const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp");
 const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp");
 const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp");
 const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp");
@@ -124,8 +124,8 @@ const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/peo
 const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp");
 const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp");
 const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp");
+const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp");
 const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp");
-const u32 gEventObjectPic_Man6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6.4bpp");
 const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp");
 const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp");
 const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp");
@@ -139,7 +139,7 @@ const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/peop
 const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp");
 const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp");
 const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp");
-const u32 gEventObjectPic_Man7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7.4bpp");
+const u32 gEventObjectPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp");
 const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp");
 const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp");
 const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp");
@@ -162,8 +162,8 @@ const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/peop
 const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp");
 const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp");
 const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp");
-const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.4bpp");
-const u32 gEventObjectPic_ContestOldMan[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man.4bpp");
+const u32 gEventObjectPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp");
+const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp");
 const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp");
 const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp");
 const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp");

src/data/field_event_obj/event_object_graphics_info.h

@@ -7,36 +7,36 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike =
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_NinjaBoy, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Twin, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanF, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan1, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertF, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman6, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan2, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LinkReceptionist, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman7, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable};
@@ -66,8 +66,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFF
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man6, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
@@ -118,7 +118,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man7, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_DevonEmployee, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
@@ -191,8 +191,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy5, gDummySpriteAffineAnimTable};
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestOldMan, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GameboyKid, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};

src/data/field_event_obj/event_object_graphics_info_pointers.h

@@ -6,36 +6,36 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM;
@@ -66,8 +66,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStag
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard;
@@ -117,7 +117,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM;
@@ -190,8 +190,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5;
-const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating;
@@ -255,36 +255,36 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
 	&gEventObjectGraphicsInfo_BrendanSurfing,
 	&gEventObjectGraphicsInfo_BrendanFieldMove,
 	&gEventObjectGraphicsInfo_QuintyPlump,
-	&gEventObjectGraphicsInfo_LittleBoy1,
-	&gEventObjectGraphicsInfo_LittleGirl1,
+	&gEventObjectGraphicsInfo_NinjaBoy,
+	&gEventObjectGraphicsInfo_Twin,
 	&gEventObjectGraphicsInfo_Boy1,
 	&gEventObjectGraphicsInfo_Girl1,
 	&gEventObjectGraphicsInfo_Boy2,
 	&gEventObjectGraphicsInfo_Girl2,
-	&gEventObjectGraphicsInfo_LittleBoy2,
-	&gEventObjectGraphicsInfo_LittleGirl2,
+	&gEventObjectGraphicsInfo_LittleBoy,
+	&gEventObjectGraphicsInfo_LittleGirl,
 	&gEventObjectGraphicsInfo_Boy3,
 	&gEventObjectGraphicsInfo_Girl3,
-	&gEventObjectGraphicsInfo_Boy4,
+	&gEventObjectGraphicsInfo_RichBoy,
 	&gEventObjectGraphicsInfo_Woman1,
 	&gEventObjectGraphicsInfo_FatMan,
-	&gEventObjectGraphicsInfo_Woman2,
+	&gEventObjectGraphicsInfo_PokefanF,
 	&gEventObjectGraphicsInfo_Man1,
-	&gEventObjectGraphicsInfo_Woman3,
-	&gEventObjectGraphicsInfo_OldMan1,
-	&gEventObjectGraphicsInfo_OldWoman1,
+	&gEventObjectGraphicsInfo_Woman2,
+	&gEventObjectGraphicsInfo_ExpertM,
+	&gEventObjectGraphicsInfo_ExpertF,
 	&gEventObjectGraphicsInfo_Man2,
+	&gEventObjectGraphicsInfo_Woman3,
+	&gEventObjectGraphicsInfo_PokefanM,
 	&gEventObjectGraphicsInfo_Woman4,
-	&gEventObjectGraphicsInfo_Man3,
-	&gEventObjectGraphicsInfo_Woman5,
 	&gEventObjectGraphicsInfo_Cook,
-	&gEventObjectGraphicsInfo_Woman6,
-	&gEventObjectGraphicsInfo_OldMan2,
-	&gEventObjectGraphicsInfo_OldWoman2,
+	&gEventObjectGraphicsInfo_LinkReceptionist,
+	&gEventObjectGraphicsInfo_OldMan,
+	&gEventObjectGraphicsInfo_OldWoman,
 	&gEventObjectGraphicsInfo_Camper,
 	&gEventObjectGraphicsInfo_Picnicker,
-	&gEventObjectGraphicsInfo_Man4,
-	&gEventObjectGraphicsInfo_Woman7,
+	&gEventObjectGraphicsInfo_Man3,
+	&gEventObjectGraphicsInfo_Woman5,
 	&gEventObjectGraphicsInfo_Youngster,
 	&gEventObjectGraphicsInfo_BugCatcher,
 	&gEventObjectGraphicsInfo_PsychicM,
@@ -315,8 +315,8 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
 	&gEventObjectGraphicsInfo_BerryTreeLateStages,
 	&gEventObjectGraphicsInfo_BrendanAcroBike,
 	&gEventObjectGraphicsInfo_ProfBirch,
+	&gEventObjectGraphicsInfo_Man4,
 	&gEventObjectGraphicsInfo_Man5,
-	&gEventObjectGraphicsInfo_Man6,
 	&gEventObjectGraphicsInfo_ReporterM,
 	&gEventObjectGraphicsInfo_ReporterF,
 	&gEventObjectGraphicsInfo_Bard,
@@ -366,7 +366,7 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
 	&gEventObjectGraphicsInfo_MovingBox,
 	&gEventObjectGraphicsInfo_CableCar,
 	&gEventObjectGraphicsInfo_Scientist2,
-	&gEventObjectGraphicsInfo_Man7,
+	&gEventObjectGraphicsInfo_DevonEmployee,
 	&gEventObjectGraphicsInfo_AquaMemberM,
 	&gEventObjectGraphicsInfo_AquaMemberF,
 	&gEventObjectGraphicsInfo_MagmaMemberM,
@@ -439,8 +439,8 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
 	&gEventObjectGraphicsInfo_BigRegisteelDoll,
 	&gEventObjectGraphicsInfo_Latias,
 	&gEventObjectGraphicsInfo_Latios,
-	&gEventObjectGraphicsInfo_Boy5,
-	&gEventObjectGraphicsInfo_ContestOldMan,
+	&gEventObjectGraphicsInfo_GameboyKid,
+	&gEventObjectGraphicsInfo_ContestJudge,
 	&gEventObjectGraphicsInfo_BrendanWatering,
 	&gEventObjectGraphicsInfo_MayWatering,
 	&gEventObjectGraphicsInfo_BrendanDecorating,

src/data/field_event_obj/event_object_pic_tables.h

@@ -109,28 +109,28 @@ const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = {
     overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = {
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 0),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 1),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 2),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 3),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 4),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 5),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 6),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 7),
-    overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 8),
+const struct SpriteFrameImage gEventObjectPicTable_NinjaBoy[] = {
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 0),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 1),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 2),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 3),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 4),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 5),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 6),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 7),
+    overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = {
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 0),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 1),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 2),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 3),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 4),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 5),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 6),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 7),
-    overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_Twin[] = {
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 0),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 1),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 2),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 3),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 4),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 5),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 6),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 7),
+    overworld_frame(gEventObjectPic_Twin, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = {
@@ -181,28 +181,28 @@ const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = {
     overworld_frame(gEventObjectPic_Girl2, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = {
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 0),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 1),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 2),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 3),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 4),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 5),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 6),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 7),
-    overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 8),
+const struct SpriteFrameImage gEventObjectPicTable_LittleBoy[] = {
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 0),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 1),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 2),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 3),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 4),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 5),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 6),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 7),
+    overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = {
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 0),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 1),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 2),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 3),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 4),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 5),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 6),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 7),
-    overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 8),
+const struct SpriteFrameImage gEventObjectPicTable_LittleGirl[] = {
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 0),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 1),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 2),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 3),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 4),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 5),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 6),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 7),
+    overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = {
@@ -229,16 +229,16 @@ const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = {
     overworld_frame(gEventObjectPic_Girl3, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = {
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Boy4, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_RichBoy[] = {
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 0),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 1),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 2),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 3),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 4),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 5),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 6),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 7),
+    overworld_frame(gEventObjectPic_RichBoy, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = {
@@ -265,16 +265,16 @@ const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = {
     overworld_frame(gEventObjectPic_FatMan, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = {
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Woman2, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_PokefanF[] = {
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 0),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 1),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 2),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 3),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 4),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 5),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 6),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 7),
+    overworld_frame(gEventObjectPic_PokefanF, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man1[] = {
@@ -289,40 +289,40 @@ const struct SpriteFrameImage gEventObjectPicTable_Man1[] = {
     overworld_frame(gEventObjectPic_Man1, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = {
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Woman3, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = {
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 0),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 1),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 2),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 3),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 4),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 5),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 6),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 7),
+    overworld_frame(gEventObjectPic_Woman2, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = {
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 0),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 1),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 2),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 3),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 4),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 5),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 6),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 7),
-    overworld_frame(gEventObjectPic_OldMan1, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_ExpertM[] = {
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 0),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 1),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 2),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 3),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 4),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 5),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 6),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 7),
+    overworld_frame(gEventObjectPic_ExpertM, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = {
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 0),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 1),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 2),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 3),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 4),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 5),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 6),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 7),
-    overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_ExpertF[] = {
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 0),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 1),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 2),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 3),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 4),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 5),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 6),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 7),
+    overworld_frame(gEventObjectPic_ExpertF, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man2[] = {
@@ -337,6 +337,30 @@ const struct SpriteFrameImage gEventObjectPicTable_Man2[] = {
     overworld_frame(gEventObjectPic_Man2, 2, 4, 8),
 };
 
+const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = {
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 0),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 1),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 2),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 3),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 4),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 5),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 6),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 7),
+    overworld_frame(gEventObjectPic_Woman3, 2, 4, 8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PokefanM[] = {
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 0),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 1),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 2),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 3),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 4),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 5),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 6),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 7),
+    overworld_frame(gEventObjectPic_PokefanM, 2, 4, 8),
+};
+
 const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = {
     overworld_frame(gEventObjectPic_Woman4, 2, 4, 0),
     overworld_frame(gEventObjectPic_Woman4, 2, 4, 1),
@@ -349,30 +373,6 @@ const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = {
     overworld_frame(gEventObjectPic_Woman4, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Man3[] = {
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Man3, 2, 4, 8),
-};
-
-const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = {
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Woman5, 2, 4, 8),
-};
-
 const struct SpriteFrameImage gEventObjectPicTable_Cook[] = {
     overworld_frame(gEventObjectPic_Cook, 2, 4, 0),
     overworld_frame(gEventObjectPic_Cook, 2, 4, 1),
@@ -385,40 +385,40 @@ const struct SpriteFrameImage gEventObjectPicTable_Cook[] = {
     overworld_frame(gEventObjectPic_Cook, 2, 4, 2),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = {
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Woman6, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_LinkReceptionist[] = {
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 0),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 1),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 2),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 3),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 4),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 5),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 6),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 7),
+    overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = {
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2),
-    overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2),
+const struct SpriteFrameImage gEventObjectPicTable_OldMan[] = {
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 0),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 1),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 2),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 0),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 0),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 1),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 1),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 2),
+    overworld_frame(gEventObjectPic_OldMan, 2, 4, 2),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = {
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 3),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 4),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 5),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 6),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 7),
-    overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_OldWoman[] = {
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 0),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 1),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 2),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 3),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 4),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 5),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 6),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 7),
+    overworld_frame(gEventObjectPic_OldWoman, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Camper[] = {
@@ -445,28 +445,28 @@ const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = {
     overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Man4[] = {
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Man4, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_Man3[] = {
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 0),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 1),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 2),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 3),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 4),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 5),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 6),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 7),
+    overworld_frame(gEventObjectPic_Man3, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = {
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Woman7, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = {
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 0),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 1),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 2),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 3),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 4),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 5),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 6),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 7),
+    overworld_frame(gEventObjectPic_Woman5, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = {
@@ -762,6 +762,18 @@ const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = {
     overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8),
 };
 
+const struct SpriteFrameImage gEventObjectPicTable_Man4[] = {
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 0),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 1),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 2),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 3),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 4),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 5),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 6),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 7),
+    overworld_frame(gEventObjectPic_Man4, 2, 4, 8),
+};
+
 const struct SpriteFrameImage gEventObjectPicTable_Man5[] = {
     overworld_frame(gEventObjectPic_Man5, 2, 4, 0),
     overworld_frame(gEventObjectPic_Man5, 2, 4, 1),
@@ -774,18 +786,6 @@ const struct SpriteFrameImage gEventObjectPicTable_Man5[] = {
     overworld_frame(gEventObjectPic_Man5, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Man6[] = {
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Man6, 2, 4, 8),
-};
-
 const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = {
     overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0),
     overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1),
@@ -1122,16 +1122,16 @@ const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = {
     overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Man7[] = {
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 3),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 4),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 5),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 6),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 7),
-    overworld_frame(gEventObjectPic_Man7, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_DevonEmployee[] = {
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 0),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 1),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 2),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 3),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 4),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 5),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 6),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 7),
+    overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = {
@@ -1632,28 +1632,28 @@ const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = {
     overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = {
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 0),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 1),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 2),
-    overworld_frame(gEventObjectPic_Boy5, 2, 4, 2),
+const struct SpriteFrameImage gEventObjectPicTable_GameboyKid[] = {
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2),
+    overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2),
 };
 
-const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = {
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 0),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 1),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 2),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 3),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 4),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 5),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 6),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 7),
-    overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 8),
+const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = {
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7),
+    overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = {