Name gObjectEventPal_xxx objects

2 files changed, 37 insertions, 34 deletions

diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 7863a5954..c161ebe73 100644
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -1,4 +1,4 @@
-const u16 gUnknown_835B968[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal");
+const u16 gObjectEventPal_8[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal");
 const u16 gUnknown_835B988[] = INCBIN_U16("graphics/object_events/palettes/unk_835B988.gbapal");
 const u16 gObjectEventPaletteNull1[16] = {};
 const u16 gObjectEventPaletteNull2[16] = {};
@@ -18,8 +18,8 @@ const u16 gObjectEventPic_RedNormal[] = INCBIN_U16("graphics/object_events/pics/
 const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/red_surf_run.4bpp");
 const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp");
 const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp");
-const u16 gUnknown_835E968[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal");
-const u16 gUnknown_835E988[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal");
+const u16 gObjectEventPal_9[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal");
+const u16 gObjectEventPal_10[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal");
 const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp");
 const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp");
 const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp");
@@ -45,14 +45,14 @@ const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/peopl
 const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp");
 const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp");
 const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp");
-const u16 gUnknown_836D828[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal");
-const u16 gUnknown_836D848[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal");
-const u16 gUnknown_836D868[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal");
-const u16 gUnknown_836D888[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal");
-const u16 gUnknown_836D8A8[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal");
-const u16 gUnknown_836D8C8[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal");
-const u16 gUnknown_836D8E8[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal");
-const u16 gUnknown_836D908[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal");
+const u16 gObjectEventPal_0[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal");
+const u16 gObjectEventPal_1[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal");
+const u16 gObjectEventPal_2[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal");
+const u16 gObjectEventPal_3[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal");
+const u16 gObjectEventPal_4[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal");
+const u16 gObjectEventPal_5[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal");
+const u16 gObjectEventPal_6[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal");
+const u16 gObjectEventPal_7[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal");
 const u16 gObjectEventPic_LittleBoy[] = INCBIN_U16("graphics/object_events/pics/people/little_boy.4bpp");
 const u16 gObjectEventPic_LittleGirl[] = INCBIN_U16("graphics/object_events/pics/people/little_girl.4bpp");
 const u16 gObjectEventPic_SittingBoy[] = INCBIN_U16("graphics/object_events/pics/people/sitting_boy.4bpp");
@@ -175,17 +175,17 @@ const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/mi
 const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp");
 const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp");
 const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp");
-const u16 gUnknown_8394EA8[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal");
+const u16 gObjectEventPal_20[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal");
 const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp");
 const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp");
-const u16 gUnknown_83952C8[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal");
+const u16 gObjectEventPal_21[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal");
 const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp");
-const u16 gUnknown_8395AE8[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal");
+const u16 gObjectEventPal_11[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal");
 const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp");
 const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp");
 const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp");
-const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal");
-const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal");
+const u16 gObjectEventPal_12[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal");
+const u16 gObjectEventPal_13[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal");
 const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effects/pics/shadow_small.4bpp");
 const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp");
 const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp");
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index fcd0623c9..fa5232e8e 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -495,24 +495,24 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] =
 #include "data/object_events/object_event_graphics_info.h"
 
 static const struct SpritePalette sObjectEventSpritePalettes[] = {
-    {gUnknown_836D828, OBJ_EVENT_PAL_TAG_0},
-    {gUnknown_836D848, OBJ_EVENT_PAL_TAG_1},
-    {gUnknown_836D868, OBJ_EVENT_PAL_TAG_2},
-    {gUnknown_836D888, OBJ_EVENT_PAL_TAG_3},
-    {gUnknown_836D8A8, OBJ_EVENT_PAL_TAG_4},
-    {gUnknown_836D8C8, OBJ_EVENT_PAL_TAG_5},
-    {gUnknown_836D8E8, OBJ_EVENT_PAL_TAG_6},
-    {gUnknown_836D908, OBJ_EVENT_PAL_TAG_7},
-    {gUnknown_835B968, OBJ_EVENT_PAL_TAG_8},
-    {gUnknown_835E968, OBJ_EVENT_PAL_TAG_9},
-    {gUnknown_835E988, OBJ_EVENT_PAL_TAG_10},
-    {gUnknown_8398008, OBJ_EVENT_PAL_TAG_12},
-    {gUnknown_8398028, OBJ_EVENT_PAL_TAG_13},
-    {gUnknown_835B968, OBJ_EVENT_PAL_TAG_17},
-    {gUnknown_835E968, OBJ_EVENT_PAL_TAG_18},
-    {gUnknown_8394EA8, OBJ_EVENT_PAL_TAG_20},
-    {gUnknown_8395AE8, OBJ_EVENT_PAL_TAG_11},
-    {gUnknown_83952C8, OBJ_EVENT_PAL_TAG_21},
+    {gObjectEventPal_0,  OBJ_EVENT_PAL_TAG_0},
+    {gObjectEventPal_1,  OBJ_EVENT_PAL_TAG_1},
+    {gObjectEventPal_2,  OBJ_EVENT_PAL_TAG_2},
+    {gObjectEventPal_3,  OBJ_EVENT_PAL_TAG_3},
+    {gObjectEventPal_4,  OBJ_EVENT_PAL_TAG_4},
+    {gObjectEventPal_5,  OBJ_EVENT_PAL_TAG_5},
+    {gObjectEventPal_6,  OBJ_EVENT_PAL_TAG_6},
+    {gObjectEventPal_7,  OBJ_EVENT_PAL_TAG_7},
+    {gObjectEventPal_8,  OBJ_EVENT_PAL_TAG_8},
+    {gObjectEventPal_9,  OBJ_EVENT_PAL_TAG_9},
+    {gObjectEventPal_10, OBJ_EVENT_PAL_TAG_10},
+    {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12},
+    {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13},
+    {gObjectEventPal_8,  OBJ_EVENT_PAL_TAG_17},
+    {gObjectEventPal_9,  OBJ_EVENT_PAL_TAG_18},
+    {gObjectEventPal_20, OBJ_EVENT_PAL_TAG_20},
+    {gObjectEventPal_11, OBJ_EVENT_PAL_TAG_11},
+    {gObjectEventPal_21, OBJ_EVENT_PAL_TAG_21},
     {},
 };
 
@@ -521,6 +521,9 @@ const u16 gPlayerReflectionPaletteTags[] = {
     OBJ_EVENT_PAL_TAG_9,
     OBJ_EVENT_PAL_TAG_9,
     OBJ_EVENT_PAL_TAG_9,
+};
+
+const u16 gUnusedPlayerReflectionPaletteTags[] = {
     OBJ_EVENT_PAL_TAG_18,
     OBJ_EVENT_PAL_TAG_18,
     OBJ_EVENT_PAL_TAG_18,