combine QuestionMark and DoubleQuestionMark

9 files changed, 108 insertions, 108 deletions

diff --git a/data/graphics/pokemon/back_pic_table.s b/data/graphics/pokemon/back_pic_table.s
index 6ee328537..a9f46cb13 100644
--- a/data/graphics/pokemon/back_pic_table.s
+++ b/data/graphics/pokemon/back_pic_table.s
@@ -253,31 +253,31 @@ gMonBackPicTable: ; 81E97F4
 	obj_tiles gMonBackPic_Lugia, 0x800, 249
 	obj_tiles gMonBackPic_HoOh, 0x800, 250
 	obj_tiles gMonBackPic_Celebi, 0x800, 251
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 252
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 253
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 254
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 255
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 256
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 257
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 258
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 259
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 260
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 261
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 262
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 263
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 264
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 265
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 266
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 267
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 268
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 269
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 270
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 271
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 272
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 273
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 274
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 275
-	obj_tiles gMonBackPic_DoubleQuestionMark, 0x800, 276
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 252
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 253
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 254
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 255
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 256
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 257
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 258
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 259
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 260
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 261
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 262
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 263
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 264
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 265
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 266
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 267
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 268
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 269
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 270
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 271
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 272
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 273
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 274
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 275
+	obj_tiles gMonBackPic_QuestionMark, 0x800, 276
 	obj_tiles gMonBackPic_Treecko, 0x800, 277
 	obj_tiles gMonBackPic_Grovyle, 0x800, 278
 	obj_tiles gMonBackPic_Sceptile, 0x800, 279
diff --git a/data/graphics/pokemon/front_pic_table.s b/data/graphics/pokemon/front_pic_table.s
index d4fdbc449..ef99012a6 100644
--- a/data/graphics/pokemon/front_pic_table.s
+++ b/data/graphics/pokemon/front_pic_table.s
@@ -253,31 +253,31 @@ gMonFrontPicTable: ; 81E8354
 	obj_tiles gMonFrontPic_Lugia, 0x800, 249
 	obj_tiles gMonFrontPic_HoOh, 0x800, 250
 	obj_tiles gMonFrontPic_Celebi, 0x800, 251
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 252
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 253
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 254
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 255
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 256
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 257
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 258
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 259
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 260
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 261
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 262
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 263
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 264
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 265
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 266
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 267
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 268
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 269
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 270
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 271
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 272
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 273
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 274
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 275
-	obj_tiles gMonFrontPic_DoubleQuestionMark, 0x800, 276
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 252
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 253
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 254
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 255
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 256
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 257
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 258
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 259
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 260
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 261
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 262
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 263
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 264
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 265
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 266
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 267
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 268
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 269
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 270
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 271
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 272
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 273
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 274
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 275
+	obj_tiles gMonFrontPic_QuestionMark, 0x800, 276
 	obj_tiles gMonFrontPic_Treecko, 0x800, 277
 	obj_tiles gMonFrontPic_Grovyle, 0x800, 278
 	obj_tiles gMonFrontPic_Sceptile, 0x800, 279
diff --git a/data/graphics/pokemon/graphics.s b/data/graphics/pokemon/graphics.s
index 8e3abcef4..f006ad1ac 100644
--- a/data/graphics/pokemon/graphics.s
+++ b/data/graphics/pokemon/graphics.s
@@ -7530,23 +7530,23 @@ gMonFootprint_Celebi: ; 8DDD698
 
 	.align 2
 
-gMonFrontPic_DoubleQuestionMark: ; 8DDD6B8
-	.incbin "graphics/pokemon/double_question_mark/front.4bpp.lz"
+gMonFrontPic_QuestionMark: ; 8DDD6B8
+	.incbin "graphics/pokemon/question_mark/front.4bpp.lz"
 
 	.align 2
 
-gMonPalette_DoubleQuestionMark: ; 8DDD838
-	.incbin "graphics/pokemon/double_question_mark/normal.gbapal.lz"
+gMonPalette_QuestionMark: ; 8DDD838
+	.incbin "graphics/pokemon/question_mark/normal.gbapal.lz"
 
 	.align 2
 
-gMonBackPic_DoubleQuestionMark: ; 8DDD84C
-	.incbin "graphics/pokemon/double_question_mark/back.4bpp.lz"
+gMonBackPic_QuestionMark: ; 8DDD84C
+	.incbin "graphics/pokemon/question_mark/back.4bpp.lz"
 
 	.align 2
 
-gMonShinyPalette_DoubleQuestionMark: ; 8DDD9D0
-	.incbin "graphics/pokemon/double_question_mark/shiny.gbapal.lz"
+gMonShinyPalette_QuestionMark: ; 8DDD9D0
+	.incbin "graphics/pokemon/question_mark/shiny.gbapal.lz"
 
 	.align 2
 
diff --git a/data/graphics/pokemon/palette_table.s b/data/graphics/pokemon/palette_table.s
index 1dc5abf5d..be1960a7b 100644
--- a/data/graphics/pokemon/palette_table.s
+++ b/data/graphics/pokemon/palette_table.s
@@ -253,31 +253,31 @@ gMonPaletteTable: ; 81EA5B4
 	obj_pal gMonPalette_Lugia, 249
 	obj_pal gMonPalette_HoOh, 250
 	obj_pal gMonPalette_Celebi, 251
-	obj_pal gMonPalette_DoubleQuestionMark, 252
-	obj_pal gMonPalette_DoubleQuestionMark, 253
-	obj_pal gMonPalette_DoubleQuestionMark, 254
-	obj_pal gMonPalette_DoubleQuestionMark, 255
-	obj_pal gMonPalette_DoubleQuestionMark, 256
-	obj_pal gMonPalette_DoubleQuestionMark, 257
-	obj_pal gMonPalette_DoubleQuestionMark, 258
-	obj_pal gMonPalette_DoubleQuestionMark, 259
-	obj_pal gMonPalette_DoubleQuestionMark, 260
-	obj_pal gMonPalette_DoubleQuestionMark, 261
-	obj_pal gMonPalette_DoubleQuestionMark, 262
-	obj_pal gMonPalette_DoubleQuestionMark, 263
-	obj_pal gMonPalette_DoubleQuestionMark, 264
-	obj_pal gMonPalette_DoubleQuestionMark, 265
-	obj_pal gMonPalette_DoubleQuestionMark, 266
-	obj_pal gMonPalette_DoubleQuestionMark, 267
-	obj_pal gMonPalette_DoubleQuestionMark, 268
-	obj_pal gMonPalette_DoubleQuestionMark, 269
-	obj_pal gMonPalette_DoubleQuestionMark, 270
-	obj_pal gMonPalette_DoubleQuestionMark, 271
-	obj_pal gMonPalette_DoubleQuestionMark, 272
-	obj_pal gMonPalette_DoubleQuestionMark, 273
-	obj_pal gMonPalette_DoubleQuestionMark, 274
-	obj_pal gMonPalette_DoubleQuestionMark, 275
-	obj_pal gMonPalette_DoubleQuestionMark, 276
+	obj_pal gMonPalette_QuestionMark, 252
+	obj_pal gMonPalette_QuestionMark, 253
+	obj_pal gMonPalette_QuestionMark, 254
+	obj_pal gMonPalette_QuestionMark, 255
+	obj_pal gMonPalette_QuestionMark, 256
+	obj_pal gMonPalette_QuestionMark, 257
+	obj_pal gMonPalette_QuestionMark, 258
+	obj_pal gMonPalette_QuestionMark, 259
+	obj_pal gMonPalette_QuestionMark, 260
+	obj_pal gMonPalette_QuestionMark, 261
+	obj_pal gMonPalette_QuestionMark, 262
+	obj_pal gMonPalette_QuestionMark, 263
+	obj_pal gMonPalette_QuestionMark, 264
+	obj_pal gMonPalette_QuestionMark, 265
+	obj_pal gMonPalette_QuestionMark, 266
+	obj_pal gMonPalette_QuestionMark, 267
+	obj_pal gMonPalette_QuestionMark, 268
+	obj_pal gMonPalette_QuestionMark, 269
+	obj_pal gMonPalette_QuestionMark, 270
+	obj_pal gMonPalette_QuestionMark, 271
+	obj_pal gMonPalette_QuestionMark, 272
+	obj_pal gMonPalette_QuestionMark, 273
+	obj_pal gMonPalette_QuestionMark, 274
+	obj_pal gMonPalette_QuestionMark, 275
+	obj_pal gMonPalette_QuestionMark, 276
 	obj_pal gMonPalette_Treecko, 277
 	obj_pal gMonPalette_Grovyle, 278
 	obj_pal gMonPalette_Sceptile, 279
diff --git a/data/graphics/pokemon/shiny_palette_table.s b/data/graphics/pokemon/shiny_palette_table.s
index 4dee52357..71efe769f 100644
--- a/data/graphics/pokemon/shiny_palette_table.s
+++ b/data/graphics/pokemon/shiny_palette_table.s
@@ -253,31 +253,31 @@ gMonShinyPaletteTable: ; 81EB374
 	obj_pal gMonShinyPalette_Lugia, 749
 	obj_pal gMonShinyPalette_HoOh, 750
 	obj_pal gMonShinyPalette_Celebi, 751
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 752
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 753
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 754
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 755
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 756
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 757
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 758
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 759
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 760
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 761
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 762
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 763
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 764
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 765
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 766
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 767
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 768
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 769
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 770
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 771
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 772
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 773
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 774
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 775
-	obj_pal gMonShinyPalette_DoubleQuestionMark, 776
+	obj_pal gMonShinyPalette_QuestionMark, 752
+	obj_pal gMonShinyPalette_QuestionMark, 753
+	obj_pal gMonShinyPalette_QuestionMark, 754
+	obj_pal gMonShinyPalette_QuestionMark, 755
+	obj_pal gMonShinyPalette_QuestionMark, 756
+	obj_pal gMonShinyPalette_QuestionMark, 757
+	obj_pal gMonShinyPalette_QuestionMark, 758
+	obj_pal gMonShinyPalette_QuestionMark, 759
+	obj_pal gMonShinyPalette_QuestionMark, 760
+	obj_pal gMonShinyPalette_QuestionMark, 761
+	obj_pal gMonShinyPalette_QuestionMark, 762
+	obj_pal gMonShinyPalette_QuestionMark, 763
+	obj_pal gMonShinyPalette_QuestionMark, 764
+	obj_pal gMonShinyPalette_QuestionMark, 765
+	obj_pal gMonShinyPalette_QuestionMark, 766
+	obj_pal gMonShinyPalette_QuestionMark, 767
+	obj_pal gMonShinyPalette_QuestionMark, 768
+	obj_pal gMonShinyPalette_QuestionMark, 769
+	obj_pal gMonShinyPalette_QuestionMark, 770
+	obj_pal gMonShinyPalette_QuestionMark, 771
+	obj_pal gMonShinyPalette_QuestionMark, 772
+	obj_pal gMonShinyPalette_QuestionMark, 773
+	obj_pal gMonShinyPalette_QuestionMark, 774
+	obj_pal gMonShinyPalette_QuestionMark, 775
+	obj_pal gMonShinyPalette_QuestionMark, 776
 	obj_pal gMonShinyPalette_Treecko, 777
 	obj_pal gMonShinyPalette_Grovyle, 778
 	obj_pal gMonShinyPalette_Sceptile, 779
diff --git a/graphics/pokemon/double_question_mark/back.png b/graphics/pokemon/question_mark/back.png
index 14eb6e139..14eb6e139 100644
--- a/graphics/pokemon/double_question_mark/back.png
+++ b/graphics/pokemon/question_mark/back.png
diff --git a/graphics/pokemon/double_question_mark/front.png b/graphics/pokemon/question_mark/front.png
index f23b08476..f23b08476 100644
--- a/graphics/pokemon/double_question_mark/front.png
+++ b/graphics/pokemon/question_mark/front.png
diff --git a/graphics/pokemon/double_question_mark/normal.pal b/graphics/pokemon/question_mark/normal.pal
index 67be6bbf4..67be6bbf4 100644
--- a/graphics/pokemon/double_question_mark/normal.pal
+++ b/graphics/pokemon/question_mark/normal.pal
diff --git a/graphics/pokemon/double_question_mark/shiny.pal b/graphics/pokemon/question_mark/shiny.pal
index 67be6bbf4..67be6bbf4 100644
--- a/graphics/pokemon/double_question_mark/shiny.pal
+++ b/graphics/pokemon/question_mark/shiny.pal