Address review comments

3 files changed, 41 insertions, 39 deletions

diff --git a/data/graphics.s b/data/graphics.s
index dbefceac5..12a709ad0 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -12196,7 +12196,7 @@ gFile_graphics_pokemon_back_pics_unown_exclamation_mark_back_pic:: @ 8E47FD4
 	.incbin "graphics/pokemon/unown/exclamation_mark/back.4bpp.lz"
 
 	.align 2
-gMonIcon_Unown_Exclamation_Mark:: @ 8E4819C
+gMonIcon_Unown_ExclamationMark:: @ 8E4819C
 	.incbin "graphics/pokemon/unown/exclamation_mark/icon.4bpp"
 
 	.align 2
@@ -12208,7 +12208,7 @@ gFile_graphics_pokemon_back_pics_unown_question_mark_back_pic:: @ 8E48758
 	.incbin "graphics/pokemon/unown/question_mark/back.4bpp.lz"
 
 	.align 2
-gMonIcon_Unown_Question_Mark:: @ 8E48958
+gMonIcon_Unown_QuestionMark:: @ 8E48958
 	.incbin "graphics/pokemon/unown/question_mark/icon.4bpp"
 
 	.align 2
@@ -13436,7 +13436,7 @@ gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34
 	.incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz"
 
 	.align 2
-gMonIcon_Question_Mark:: @ 8E76F5C
+gMonIcon_QuestionMark:: @ 8E76F5C
 	.incbin "graphics/pokemon/question_mark/icon.4bpp"
 
 	.align 2
diff --git a/include/graphics.h b/include/graphics.h
index 117498e5b..6565d0e80 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1487,8 +1487,8 @@ extern const u8 gMonIcon_Unown_W[];
 extern const u8 gMonIcon_Unown_X[];
 extern const u8 gMonIcon_Unown_Y[];
 extern const u8 gMonIcon_Unown_Z[];
-extern const u8 gMonIcon_Unown_Exclamation_Mark[];
-extern const u8 gMonIcon_Unown_Question_Mark[];
-extern const u8 gMonIcon_Question_Mark[];
+extern const u8 gMonIcon_Unown_ExclamationMark[];
+extern const u8 gMonIcon_Unown_QuestionMark[];
+extern const u8 gMonIcon_QuestionMark[];
 
 #endif //GUARD_GRAPHICS_H
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 8adfc66b1..571256b3b 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -23,7 +23,7 @@ static void DestroyMonIconInternal(struct Sprite * sprite);
 const u16 gMonIconPalettes[][16] = INCBIN_U16("graphics/pokemon/icon_palettes/icon_palette_0.gbapal", "graphics/pokemon/icon_palettes/icon_palette_1.gbapal", "graphics/pokemon/icon_palettes/icon_palette_2.gbapal");
 
 const u8 *const gMonIconTable[] = {
-    [SPECIES_NONE]        = gMonIcon_Question_Mark,
+    [SPECIES_NONE]        = gMonIcon_QuestionMark,
     [SPECIES_BULBASAUR]   = gMonIcon_Bulbasaur,
     [SPECIES_IVYSAUR]     = gMonIcon_Ivysaur,
     [SPECIES_VENUSAUR]    = gMonIcon_Venusaur,
@@ -275,31 +275,31 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_LUGIA]       = gMonIcon_Lugia,
     [SPECIES_HO_OH]       = gMonIcon_Ho_Oh,
     [SPECIES_CELEBI]      = gMonIcon_Celebi,
-    [SPECIES_OLD_UNOWN_B] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_C] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_D] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_E] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_F] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_G] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_H] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_I] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_J] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_K] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_L] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_M] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_N] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_O] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_P] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_Q] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_R] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_S] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_T] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_U] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_V] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_W] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_X] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_Y] = gMonIcon_Question_Mark,
-    [SPECIES_OLD_UNOWN_Z] = gMonIcon_Question_Mark,
+    [SPECIES_OLD_UNOWN_B] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_C] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_D] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_E] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_F] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_G] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_H] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_I] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_J] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_K] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_L] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_M] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_N] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_O] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_P] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Q] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_R] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_S] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_T] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_U] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_V] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_W] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_X] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Y] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Z] = gMonIcon_QuestionMark,
     [SPECIES_TREECKO]     = gMonIcon_Treecko,
     [SPECIES_GROVYLE]     = gMonIcon_Grovyle,
     [SPECIES_SCEPTILE]    = gMonIcon_Sceptile,
@@ -461,8 +461,8 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_UNOWN_X]     = gMonIcon_Unown_X,
     [SPECIES_UNOWN_Y]     = gMonIcon_Unown_Y,
     [SPECIES_UNOWN_Z]     = gMonIcon_Unown_Z,
-    [SPECIES_UNOWN_EMARK] = gMonIcon_Unown_Exclamation_Mark,
-    [SPECIES_UNOWN_QMARK] = gMonIcon_Unown_Question_Mark
+    [SPECIES_UNOWN_EMARK] = gMonIcon_Unown_ExclamationMark,
+    [SPECIES_UNOWN_QMARK] = gMonIcon_Unown_QuestionMark
 };
 
 const u8 gMonIconPaletteIndices[] = {
@@ -1102,9 +1102,9 @@ u16 MailSpeciesToIconSpecies(u16 species)
     }
 }
 
-const u8* GetMonIconTiles(u16 species, bool32 extra)
+const u8 *GetMonIconTiles(u16 species, bool32 extra)
 {
-    const u8* iconSprite = gMonIconTable[species];
+    const u8 *iconSprite = gMonIconTable[species];
     if (species == SPECIES_DEOXYS && extra == TRUE)
         iconSprite += 0x400;
     return iconSprite;
@@ -1151,6 +1151,7 @@ void FreeMonIconPalettes(void)
     for (i = 0; i < 6; i++)
         FreeSpritePaletteByTag(gMonIconPaletteTable[i].tag);
 }
+
 void SafeFreeMonIconPalette(u16 species)
 {
     u8 palIndex;
@@ -1184,7 +1185,8 @@ void LoadMonIconPalettesAt(u16 offset)
         }
     }
 }
-const u16* GetValidMonIconPalettePtr(u16 species)
+
+const u16 *GetValidMonIconPalettePtr(u16 species)
 {
     if (species > NUM_SPECIES)
         species = SPECIES_NONE;
@@ -1239,7 +1241,7 @@ u8 UpdateMonIconFrame(struct Sprite *sprite)
     return result;
 }
 
-static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate *iconTemplate, s16 x, s16 y, u8 subpriority)
+static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate * iconTemplate, s16 x, s16 y, u8 subpriority)
 {
     u8 spriteId;
 
@@ -1247,7 +1249,7 @@ static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate *iconTemplate,
 
     struct SpriteTemplate spriteTemplate =
     {
-        .tileTag = 0xFFFF,
+        .tileTag = SPRITE_INVALID_TAG,
         .paletteTag = iconTemplate->paletteTag,
         .oam = iconTemplate->oam,
         .anims = iconTemplate->anims,