resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics

graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 172 172
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+32 32 32
+172 172 172
+139 139 139
+222 222 222
+32 32 32