Sync Unown and qmark mon folders with pokefirered

125 files changed, 122 insertions, 122 deletions

diff --git a/graphics/pokemon/circled_question_mark/anim_front.png b/graphics/pokemon/question_mark/circled/anim_front.png
index 9eb27931e..9eb27931e 100644
--- a/graphics/pokemon/circled_question_mark/anim_front.png
+++ b/graphics/pokemon/question_mark/circled/anim_front.png
diff --git a/graphics/pokemon/circled_question_mark/back.png b/graphics/pokemon/question_mark/circled/back.png
index 3056402db..3056402db 100644
--- a/graphics/pokemon/circled_question_mark/back.png
+++ b/graphics/pokemon/question_mark/circled/back.png
diff --git a/graphics/pokemon/circled_question_mark/front.png b/graphics/pokemon/question_mark/circled/front.png
index 3056402db..3056402db 100644
--- a/graphics/pokemon/circled_question_mark/front.png
+++ b/graphics/pokemon/question_mark/circled/front.png
diff --git a/graphics/pokemon/circled_question_mark/normal.pal b/graphics/pokemon/question_mark/circled/normal.pal
index 681f1cefe..681f1cefe 100644
--- a/graphics/pokemon/circled_question_mark/normal.pal
+++ b/graphics/pokemon/question_mark/circled/normal.pal
diff --git a/graphics/pokemon/circled_question_mark/shiny.pal b/graphics/pokemon/question_mark/circled/shiny.pal
index aa8d08dc3..aa8d08dc3 100644
--- a/graphics/pokemon/circled_question_mark/shiny.pal
+++ b/graphics/pokemon/question_mark/circled/shiny.pal
diff --git a/graphics/pokemon/double_question_mark/anim_front.png b/graphics/pokemon/question_mark/double/anim_front.png
index 6afe02dee..6afe02dee 100644
--- a/graphics/pokemon/double_question_mark/anim_front.png
+++ b/graphics/pokemon/question_mark/double/anim_front.png
diff --git a/graphics/pokemon/double_question_mark/back.png b/graphics/pokemon/question_mark/double/back.png
index 14eb6e139..14eb6e139 100644
--- a/graphics/pokemon/double_question_mark/back.png
+++ b/graphics/pokemon/question_mark/double/back.png
diff --git a/graphics/pokemon/double_question_mark/front.png b/graphics/pokemon/question_mark/double/front.png
index f23b08476..f23b08476 100644
--- a/graphics/pokemon/double_question_mark/front.png
+++ b/graphics/pokemon/question_mark/double/front.png
diff --git a/graphics/pokemon/double_question_mark/normal.pal b/graphics/pokemon/question_mark/double/normal.pal
index 67be6bbf4..67be6bbf4 100644
--- a/graphics/pokemon/double_question_mark/normal.pal
+++ b/graphics/pokemon/question_mark/double/normal.pal
diff --git a/graphics/pokemon/double_question_mark/shiny.pal b/graphics/pokemon/question_mark/double/shiny.pal
index 67be6bbf4..67be6bbf4 100644
--- a/graphics/pokemon/double_question_mark/shiny.pal
+++ b/graphics/pokemon/question_mark/double/shiny.pal
diff --git a/graphics/pokemon/unown/anim_front_a.png b/graphics/pokemon/unown/a/anim_front.png
index 065d82a47..065d82a47 100644
--- a/graphics/pokemon/unown/anim_front_a.png
+++ b/graphics/pokemon/unown/a/anim_front.png
diff --git a/graphics/pokemon/unown/back_a.png b/graphics/pokemon/unown/a/back.png
index b90973023..b90973023 100644
--- a/graphics/pokemon/unown/back_a.png
+++ b/graphics/pokemon/unown/a/back.png
diff --git a/graphics/pokemon/unown/front_a.png b/graphics/pokemon/unown/a/front.png
index 697de36dc..697de36dc 100644
--- a/graphics/pokemon/unown/front_a.png
+++ b/graphics/pokemon/unown/a/front.png
diff --git a/graphics/pokemon/unown/icon_a.png b/graphics/pokemon/unown/a/icon.png
index cd9056ab2..cd9056ab2 100644
--- a/graphics/pokemon/unown/icon_a.png
+++ b/graphics/pokemon/unown/a/icon.png
diff --git a/graphics/pokemon/unown/anim_front_b.png b/graphics/pokemon/unown/b/anim_front.png
index bedc98634..bedc98634 100644
--- a/graphics/pokemon/unown/anim_front_b.png
+++ b/graphics/pokemon/unown/b/anim_front.png
diff --git a/graphics/pokemon/unown/back_b.png b/graphics/pokemon/unown/b/back.png
index b398754ca..b398754ca 100644
--- a/graphics/pokemon/unown/back_b.png
+++ b/graphics/pokemon/unown/b/back.png
diff --git a/graphics/pokemon/unown/front_b.png b/graphics/pokemon/unown/b/front.png
index fbe2e4623..fbe2e4623 100644
--- a/graphics/pokemon/unown/front_b.png
+++ b/graphics/pokemon/unown/b/front.png
diff --git a/graphics/pokemon/unown/icon_b.png b/graphics/pokemon/unown/b/icon.png
index 47654aba5..47654aba5 100644
--- a/graphics/pokemon/unown/icon_b.png
+++ b/graphics/pokemon/unown/b/icon.png
diff --git a/graphics/pokemon/unown/anim_front_c.png b/graphics/pokemon/unown/c/anim_front.png
index 6699bbbb5..6699bbbb5 100644
--- a/graphics/pokemon/unown/anim_front_c.png
+++ b/graphics/pokemon/unown/c/anim_front.png
diff --git a/graphics/pokemon/unown/back_c.png b/graphics/pokemon/unown/c/back.png
index b9bccf4c5..b9bccf4c5 100644
--- a/graphics/pokemon/unown/back_c.png
+++ b/graphics/pokemon/unown/c/back.png
diff --git a/graphics/pokemon/unown/front_c.png b/graphics/pokemon/unown/c/front.png
index c5ef1c457..c5ef1c457 100644
--- a/graphics/pokemon/unown/front_c.png
+++ b/graphics/pokemon/unown/c/front.png
diff --git a/graphics/pokemon/unown/icon_c.png b/graphics/pokemon/unown/c/icon.png
index 7b8721a7d..7b8721a7d 100644
--- a/graphics/pokemon/unown/icon_c.png
+++ b/graphics/pokemon/unown/c/icon.png
diff --git a/graphics/pokemon/unown/anim_front_d.png b/graphics/pokemon/unown/d/anim_front.png
index 7491a13fb..7491a13fb 100644
--- a/graphics/pokemon/unown/anim_front_d.png
+++ b/graphics/pokemon/unown/d/anim_front.png
diff --git a/graphics/pokemon/unown/back_d.png b/graphics/pokemon/unown/d/back.png
index 1b3f19b09..1b3f19b09 100644
--- a/graphics/pokemon/unown/back_d.png
+++ b/graphics/pokemon/unown/d/back.png
diff --git a/graphics/pokemon/unown/front_d.png b/graphics/pokemon/unown/d/front.png
index c39b26120..c39b26120 100644
--- a/graphics/pokemon/unown/front_d.png
+++ b/graphics/pokemon/unown/d/front.png
diff --git a/graphics/pokemon/unown/icon_d.png b/graphics/pokemon/unown/d/icon.png
index db6b0cf8a..db6b0cf8a 100644
--- a/graphics/pokemon/unown/icon_d.png
+++ b/graphics/pokemon/unown/d/icon.png
diff --git a/graphics/pokemon/unown/anim_front_e.png b/graphics/pokemon/unown/e/anim_front.png
index a761cdd95..a761cdd95 100644
--- a/graphics/pokemon/unown/anim_front_e.png
+++ b/graphics/pokemon/unown/e/anim_front.png
diff --git a/graphics/pokemon/unown/back_e.png b/graphics/pokemon/unown/e/back.png
index 1baaf759f..1baaf759f 100644
--- a/graphics/pokemon/unown/back_e.png
+++ b/graphics/pokemon/unown/e/back.png
diff --git a/graphics/pokemon/unown/front_e.png b/graphics/pokemon/unown/e/front.png
index 81e3f9c93..81e3f9c93 100644
--- a/graphics/pokemon/unown/front_e.png
+++ b/graphics/pokemon/unown/e/front.png
diff --git a/graphics/pokemon/unown/icon_e.png b/graphics/pokemon/unown/e/icon.png
index 6addb828e..6addb828e 100644
--- a/graphics/pokemon/unown/icon_e.png
+++ b/graphics/pokemon/unown/e/icon.png
diff --git a/graphics/pokemon/unown/anim_front_exclamation_mark.png b/graphics/pokemon/unown/exclamation_mark/anim_front.png
index 96c436e8c..96c436e8c 100644
--- a/graphics/pokemon/unown/anim_front_exclamation_mark.png
+++ b/graphics/pokemon/unown/exclamation_mark/anim_front.png
diff --git a/graphics/pokemon/unown/back_exclamation_mark.png b/graphics/pokemon/unown/exclamation_mark/back.png
index cb05b906d..cb05b906d 100644
--- a/graphics/pokemon/unown/back_exclamation_mark.png
+++ b/graphics/pokemon/unown/exclamation_mark/back.png
diff --git a/graphics/pokemon/unown/front_exclamation_mark.png b/graphics/pokemon/unown/exclamation_mark/front.png
index 86f329f92..86f329f92 100644
--- a/graphics/pokemon/unown/front_exclamation_mark.png
+++ b/graphics/pokemon/unown/exclamation_mark/front.png
diff --git a/graphics/pokemon/unown/icon_exclamation_mark.png b/graphics/pokemon/unown/exclamation_mark/icon.png
index beeea4ae1..beeea4ae1 100644
--- a/graphics/pokemon/unown/icon_exclamation_mark.png
+++ b/graphics/pokemon/unown/exclamation_mark/icon.png
diff --git a/graphics/pokemon/unown/anim_front_f.png b/graphics/pokemon/unown/f/anim_front.png
index 1c9685659..1c9685659 100644
--- a/graphics/pokemon/unown/anim_front_f.png
+++ b/graphics/pokemon/unown/f/anim_front.png
diff --git a/graphics/pokemon/unown/back_f.png b/graphics/pokemon/unown/f/back.png
index 30be252f9..30be252f9 100644
--- a/graphics/pokemon/unown/back_f.png
+++ b/graphics/pokemon/unown/f/back.png
diff --git a/graphics/pokemon/unown/front_f.png b/graphics/pokemon/unown/f/front.png
index 8e61eb768..8e61eb768 100644
--- a/graphics/pokemon/unown/front_f.png
+++ b/graphics/pokemon/unown/f/front.png
diff --git a/graphics/pokemon/unown/icon_f.png b/graphics/pokemon/unown/f/icon.png
index 3c45017b1..3c45017b1 100644
--- a/graphics/pokemon/unown/icon_f.png
+++ b/graphics/pokemon/unown/f/icon.png
diff --git a/graphics/pokemon/unown/anim_front_g.png b/graphics/pokemon/unown/g/anim_front.png
index 028bd4cad..028bd4cad 100644
--- a/graphics/pokemon/unown/anim_front_g.png
+++ b/graphics/pokemon/unown/g/anim_front.png
diff --git a/graphics/pokemon/unown/back_g.png b/graphics/pokemon/unown/g/back.png
index ec5e708bf..ec5e708bf 100644
--- a/graphics/pokemon/unown/back_g.png
+++ b/graphics/pokemon/unown/g/back.png
diff --git a/graphics/pokemon/unown/front_g.png b/graphics/pokemon/unown/g/front.png
index 4f665124a..4f665124a 100644
--- a/graphics/pokemon/unown/front_g.png
+++ b/graphics/pokemon/unown/g/front.png
diff --git a/graphics/pokemon/unown/icon_g.png b/graphics/pokemon/unown/g/icon.png
index ab00f8ad2..ab00f8ad2 100644
--- a/graphics/pokemon/unown/icon_g.png
+++ b/graphics/pokemon/unown/g/icon.png
diff --git a/graphics/pokemon/unown/anim_front_h.png b/graphics/pokemon/unown/h/anim_front.png
index 686e70d4b..686e70d4b 100644
--- a/graphics/pokemon/unown/anim_front_h.png
+++ b/graphics/pokemon/unown/h/anim_front.png
diff --git a/graphics/pokemon/unown/back_h.png b/graphics/pokemon/unown/h/back.png
index 992e34e21..992e34e21 100644
--- a/graphics/pokemon/unown/back_h.png
+++ b/graphics/pokemon/unown/h/back.png
diff --git a/graphics/pokemon/unown/front_h.png b/graphics/pokemon/unown/h/front.png
index f8ab66963..f8ab66963 100644
--- a/graphics/pokemon/unown/front_h.png
+++ b/graphics/pokemon/unown/h/front.png
diff --git a/graphics/pokemon/unown/icon_h.png b/graphics/pokemon/unown/h/icon.png
index bd4fd96bf..bd4fd96bf 100644
--- a/graphics/pokemon/unown/icon_h.png
+++ b/graphics/pokemon/unown/h/icon.png
diff --git a/graphics/pokemon/unown/anim_front_i.png b/graphics/pokemon/unown/i/anim_front.png
index 04a748fa0..04a748fa0 100644
--- a/graphics/pokemon/unown/anim_front_i.png
+++ b/graphics/pokemon/unown/i/anim_front.png
diff --git a/graphics/pokemon/unown/back_i.png b/graphics/pokemon/unown/i/back.png
index 5640fd5e0..5640fd5e0 100644
--- a/graphics/pokemon/unown/back_i.png
+++ b/graphics/pokemon/unown/i/back.png
diff --git a/graphics/pokemon/unown/front_i.png b/graphics/pokemon/unown/i/front.png
index ebc8a51a9..ebc8a51a9 100644
--- a/graphics/pokemon/unown/front_i.png
+++ b/graphics/pokemon/unown/i/front.png
diff --git a/graphics/pokemon/unown/icon_i.png b/graphics/pokemon/unown/i/icon.png
index 6973196bb..6973196bb 100644
--- a/graphics/pokemon/unown/icon_i.png
+++ b/graphics/pokemon/unown/i/icon.png
diff --git a/graphics/pokemon/unown/anim_front_j.png b/graphics/pokemon/unown/j/anim_front.png
index e2906d253..e2906d253 100644
--- a/graphics/pokemon/unown/anim_front_j.png
+++ b/graphics/pokemon/unown/j/anim_front.png
diff --git a/graphics/pokemon/unown/back_j.png b/graphics/pokemon/unown/j/back.png
index 619ebb75b..619ebb75b 100644
--- a/graphics/pokemon/unown/back_j.png
+++ b/graphics/pokemon/unown/j/back.png
diff --git a/graphics/pokemon/unown/front_j.png b/graphics/pokemon/unown/j/front.png
index 4c1f4ed2e..4c1f4ed2e 100644
--- a/graphics/pokemon/unown/front_j.png
+++ b/graphics/pokemon/unown/j/front.png
diff --git a/graphics/pokemon/unown/icon_j.png b/graphics/pokemon/unown/j/icon.png
index b85a45a71..b85a45a71 100644
--- a/graphics/pokemon/unown/icon_j.png
+++ b/graphics/pokemon/unown/j/icon.png
diff --git a/graphics/pokemon/unown/anim_front_k.png b/graphics/pokemon/unown/k/anim_front.png
index b83ef195f..b83ef195f 100644
--- a/graphics/pokemon/unown/anim_front_k.png
+++ b/graphics/pokemon/unown/k/anim_front.png
diff --git a/graphics/pokemon/unown/back_k.png b/graphics/pokemon/unown/k/back.png
index 46ac175bc..46ac175bc 100644
--- a/graphics/pokemon/unown/back_k.png
+++ b/graphics/pokemon/unown/k/back.png
diff --git a/graphics/pokemon/unown/front_k.png b/graphics/pokemon/unown/k/front.png
index 8ccce125e..8ccce125e 100644
--- a/graphics/pokemon/unown/front_k.png
+++ b/graphics/pokemon/unown/k/front.png
diff --git a/graphics/pokemon/unown/icon_k.png b/graphics/pokemon/unown/k/icon.png
index 81bcb385e..81bcb385e 100644
--- a/graphics/pokemon/unown/icon_k.png
+++ b/graphics/pokemon/unown/k/icon.png
diff --git a/graphics/pokemon/unown/anim_front_l.png b/graphics/pokemon/unown/l/anim_front.png
index 9d8b23af4..9d8b23af4 100644
--- a/graphics/pokemon/unown/anim_front_l.png
+++ b/graphics/pokemon/unown/l/anim_front.png
diff --git a/graphics/pokemon/unown/back_l.png b/graphics/pokemon/unown/l/back.png
index da0c6c5f5..da0c6c5f5 100644
--- a/graphics/pokemon/unown/back_l.png
+++ b/graphics/pokemon/unown/l/back.png
diff --git a/graphics/pokemon/unown/front_l.png b/graphics/pokemon/unown/l/front.png
index 6bb837167..6bb837167 100644
--- a/graphics/pokemon/unown/front_l.png
+++ b/graphics/pokemon/unown/l/front.png
diff --git a/graphics/pokemon/unown/icon_l.png b/graphics/pokemon/unown/l/icon.png
index 5f6fb9db8..5f6fb9db8 100644
--- a/graphics/pokemon/unown/icon_l.png
+++ b/graphics/pokemon/unown/l/icon.png
diff --git a/graphics/pokemon/unown/anim_front_m.png b/graphics/pokemon/unown/m/anim_front.png
index ee9c7c7a8..ee9c7c7a8 100644
--- a/graphics/pokemon/unown/anim_front_m.png
+++ b/graphics/pokemon/unown/m/anim_front.png
diff --git a/graphics/pokemon/unown/back_m.png b/graphics/pokemon/unown/m/back.png
index 37dd0a97f..37dd0a97f 100644
--- a/graphics/pokemon/unown/back_m.png
+++ b/graphics/pokemon/unown/m/back.png
diff --git a/graphics/pokemon/unown/front_m.png b/graphics/pokemon/unown/m/front.png
index 981c7f801..981c7f801 100644
--- a/graphics/pokemon/unown/front_m.png
+++ b/graphics/pokemon/unown/m/front.png
diff --git a/graphics/pokemon/unown/icon_m.png b/graphics/pokemon/unown/m/icon.png
index c9b8d0fb4..c9b8d0fb4 100644
--- a/graphics/pokemon/unown/icon_m.png
+++ b/graphics/pokemon/unown/m/icon.png
diff --git a/graphics/pokemon/unown/anim_front_n.png b/graphics/pokemon/unown/n/anim_front.png
index 47cac4516..47cac4516 100644
--- a/graphics/pokemon/unown/anim_front_n.png
+++ b/graphics/pokemon/unown/n/anim_front.png
diff --git a/graphics/pokemon/unown/back_n.png b/graphics/pokemon/unown/n/back.png
index 17163be73..17163be73 100644
--- a/graphics/pokemon/unown/back_n.png
+++ b/graphics/pokemon/unown/n/back.png
diff --git a/graphics/pokemon/unown/front_n.png b/graphics/pokemon/unown/n/front.png
index cff797db4..cff797db4 100644
--- a/graphics/pokemon/unown/front_n.png
+++ b/graphics/pokemon/unown/n/front.png
diff --git a/graphics/pokemon/unown/icon_n.png b/graphics/pokemon/unown/n/icon.png
index b1e5c5abb..b1e5c5abb 100644
--- a/graphics/pokemon/unown/icon_n.png
+++ b/graphics/pokemon/unown/n/icon.png
diff --git a/graphics/pokemon/unown/anim_front_o.png b/graphics/pokemon/unown/o/anim_front.png
index b32cdb325..b32cdb325 100644
--- a/graphics/pokemon/unown/anim_front_o.png
+++ b/graphics/pokemon/unown/o/anim_front.png
diff --git a/graphics/pokemon/unown/back_o.png b/graphics/pokemon/unown/o/back.png
index 7260da757..7260da757 100644
--- a/graphics/pokemon/unown/back_o.png
+++ b/graphics/pokemon/unown/o/back.png
diff --git a/graphics/pokemon/unown/front_o.png b/graphics/pokemon/unown/o/front.png
index 8b8e81295..8b8e81295 100644
--- a/graphics/pokemon/unown/front_o.png
+++ b/graphics/pokemon/unown/o/front.png
diff --git a/graphics/pokemon/unown/icon_o.png b/graphics/pokemon/unown/o/icon.png
index 14a88d062..14a88d062 100644
--- a/graphics/pokemon/unown/icon_o.png
+++ b/graphics/pokemon/unown/o/icon.png
diff --git a/graphics/pokemon/unown/anim_front_p.png b/graphics/pokemon/unown/p/anim_front.png
index 01aa0329c..01aa0329c 100644
--- a/graphics/pokemon/unown/anim_front_p.png
+++ b/graphics/pokemon/unown/p/anim_front.png
diff --git a/graphics/pokemon/unown/back_p.png b/graphics/pokemon/unown/p/back.png
index e275a3a96..e275a3a96 100644
--- a/graphics/pokemon/unown/back_p.png
+++ b/graphics/pokemon/unown/p/back.png
diff --git a/graphics/pokemon/unown/front_p.png b/graphics/pokemon/unown/p/front.png
index 99a7c98e2..99a7c98e2 100644
--- a/graphics/pokemon/unown/front_p.png
+++ b/graphics/pokemon/unown/p/front.png
diff --git a/graphics/pokemon/unown/icon_p.png b/graphics/pokemon/unown/p/icon.png
index 7a7afb8de..7a7afb8de 100644
--- a/graphics/pokemon/unown/icon_p.png
+++ b/graphics/pokemon/unown/p/icon.png
diff --git a/graphics/pokemon/unown/anim_front_q.png b/graphics/pokemon/unown/q/anim_front.png
index 18c930e69..18c930e69 100644
--- a/graphics/pokemon/unown/anim_front_q.png
+++ b/graphics/pokemon/unown/q/anim_front.png
diff --git a/graphics/pokemon/unown/back_q.png b/graphics/pokemon/unown/q/back.png
index 08d5a0d0a..08d5a0d0a 100644
--- a/graphics/pokemon/unown/back_q.png
+++ b/graphics/pokemon/unown/q/back.png
diff --git a/graphics/pokemon/unown/front_q.png b/graphics/pokemon/unown/q/front.png
index fe94c27fa..fe94c27fa 100644
--- a/graphics/pokemon/unown/front_q.png
+++ b/graphics/pokemon/unown/q/front.png
diff --git a/graphics/pokemon/unown/icon_q.png b/graphics/pokemon/unown/q/icon.png
index 2270f8373..2270f8373 100644
--- a/graphics/pokemon/unown/icon_q.png
+++ b/graphics/pokemon/unown/q/icon.png
diff --git a/graphics/pokemon/unown/anim_front_question_mark.png b/graphics/pokemon/unown/question_mark/anim_front.png
index 8a2f8bb6c..8a2f8bb6c 100644
--- a/graphics/pokemon/unown/anim_front_question_mark.png
+++ b/graphics/pokemon/unown/question_mark/anim_front.png
diff --git a/graphics/pokemon/unown/back_question_mark.png b/graphics/pokemon/unown/question_mark/back.png
index 3d9ae3ee3..3d9ae3ee3 100644
--- a/graphics/pokemon/unown/back_question_mark.png
+++ b/graphics/pokemon/unown/question_mark/back.png
diff --git a/graphics/pokemon/unown/front_question_mark.png b/graphics/pokemon/unown/question_mark/front.png
index ee0ad284c..ee0ad284c 100644
--- a/graphics/pokemon/unown/front_question_mark.png
+++ b/graphics/pokemon/unown/question_mark/front.png
diff --git a/graphics/pokemon/unown/icon_question_mark.png b/graphics/pokemon/unown/question_mark/icon.png
index a9bb50930..a9bb50930 100644
--- a/graphics/pokemon/unown/icon_question_mark.png
+++ b/graphics/pokemon/unown/question_mark/icon.png
diff --git a/graphics/pokemon/unown/anim_front_r.png b/graphics/pokemon/unown/r/anim_front.png
index 0b861d277..0b861d277 100644
--- a/graphics/pokemon/unown/anim_front_r.png
+++ b/graphics/pokemon/unown/r/anim_front.png
diff --git a/graphics/pokemon/unown/back_r.png b/graphics/pokemon/unown/r/back.png
index 9ea2bd6f7..9ea2bd6f7 100644
--- a/graphics/pokemon/unown/back_r.png
+++ b/graphics/pokemon/unown/r/back.png
diff --git a/graphics/pokemon/unown/front_r.png b/graphics/pokemon/unown/r/front.png
index 4e2a40007..4e2a40007 100644
--- a/graphics/pokemon/unown/front_r.png
+++ b/graphics/pokemon/unown/r/front.png
diff --git a/graphics/pokemon/unown/icon_r.png b/graphics/pokemon/unown/r/icon.png
index 6ba4d5764..6ba4d5764 100644
--- a/graphics/pokemon/unown/icon_r.png
+++ b/graphics/pokemon/unown/r/icon.png
diff --git a/graphics/pokemon/unown/anim_front_s.png b/graphics/pokemon/unown/s/anim_front.png
index 17016ac1c..17016ac1c 100644
--- a/graphics/pokemon/unown/anim_front_s.png
+++ b/graphics/pokemon/unown/s/anim_front.png
diff --git a/graphics/pokemon/unown/back_s.png b/graphics/pokemon/unown/s/back.png
index c85571503..c85571503 100644
--- a/graphics/pokemon/unown/back_s.png
+++ b/graphics/pokemon/unown/s/back.png
diff --git a/graphics/pokemon/unown/front_s.png b/graphics/pokemon/unown/s/front.png
index a144e27f5..a144e27f5 100644
--- a/graphics/pokemon/unown/front_s.png
+++ b/graphics/pokemon/unown/s/front.png
diff --git a/graphics/pokemon/unown/icon_s.png b/graphics/pokemon/unown/s/icon.png
index 44f17718b..44f17718b 100644
--- a/graphics/pokemon/unown/icon_s.png
+++ b/graphics/pokemon/unown/s/icon.png
diff --git a/graphics/pokemon/unown/anim_front_t.png b/graphics/pokemon/unown/t/anim_front.png
index 556ab78ce..556ab78ce 100644
--- a/graphics/pokemon/unown/anim_front_t.png
+++ b/graphics/pokemon/unown/t/anim_front.png
diff --git a/graphics/pokemon/unown/back_t.png b/graphics/pokemon/unown/t/back.png
index f840953b8..f840953b8 100644
--- a/graphics/pokemon/unown/back_t.png
+++ b/graphics/pokemon/unown/t/back.png
diff --git a/graphics/pokemon/unown/front_t.png b/graphics/pokemon/unown/t/front.png
index 4d5fa8b98..4d5fa8b98 100644
--- a/graphics/pokemon/unown/front_t.png
+++ b/graphics/pokemon/unown/t/front.png
diff --git a/graphics/pokemon/unown/icon_t.png b/graphics/pokemon/unown/t/icon.png
index 9023b7366..9023b7366 100644
--- a/graphics/pokemon/unown/icon_t.png
+++ b/graphics/pokemon/unown/t/icon.png
diff --git a/graphics/pokemon/unown/anim_front_u.png b/graphics/pokemon/unown/u/anim_front.png
index cea47fd5b..cea47fd5b 100644
--- a/graphics/pokemon/unown/anim_front_u.png
+++ b/graphics/pokemon/unown/u/anim_front.png
diff --git a/graphics/pokemon/unown/back_u.png b/graphics/pokemon/unown/u/back.png
index 8d99bd088..8d99bd088 100644
--- a/graphics/pokemon/unown/back_u.png
+++ b/graphics/pokemon/unown/u/back.png
diff --git a/graphics/pokemon/unown/front_u.png b/graphics/pokemon/unown/u/front.png
index 39503f01c..39503f01c 100644
--- a/graphics/pokemon/unown/front_u.png
+++ b/graphics/pokemon/unown/u/front.png
diff --git a/graphics/pokemon/unown/icon_u.png b/graphics/pokemon/unown/u/icon.png
index 3d315ebf2..3d315ebf2 100644
--- a/graphics/pokemon/unown/icon_u.png
+++ b/graphics/pokemon/unown/u/icon.png
diff --git a/graphics/pokemon/unown/anim_front_v.png b/graphics/pokemon/unown/v/anim_front.png
index d073949e5..d073949e5 100644
--- a/graphics/pokemon/unown/anim_front_v.png
+++ b/graphics/pokemon/unown/v/anim_front.png
diff --git a/graphics/pokemon/unown/back_v.png b/graphics/pokemon/unown/v/back.png
index 41e215720..41e215720 100644
--- a/graphics/pokemon/unown/back_v.png
+++ b/graphics/pokemon/unown/v/back.png
diff --git a/graphics/pokemon/unown/front_v.png b/graphics/pokemon/unown/v/front.png
index f014289bd..f014289bd 100644
--- a/graphics/pokemon/unown/front_v.png
+++ b/graphics/pokemon/unown/v/front.png
diff --git a/graphics/pokemon/unown/icon_v.png b/graphics/pokemon/unown/v/icon.png
index f973a3d85..f973a3d85 100644
--- a/graphics/pokemon/unown/icon_v.png
+++ b/graphics/pokemon/unown/v/icon.png
diff --git a/graphics/pokemon/unown/anim_front_w.png b/graphics/pokemon/unown/w/anim_front.png
index d34a16f05..d34a16f05 100644
--- a/graphics/pokemon/unown/anim_front_w.png
+++ b/graphics/pokemon/unown/w/anim_front.png
diff --git a/graphics/pokemon/unown/back_w.png b/graphics/pokemon/unown/w/back.png
index 3d42e4eb2..3d42e4eb2 100644
--- a/graphics/pokemon/unown/back_w.png
+++ b/graphics/pokemon/unown/w/back.png
diff --git a/graphics/pokemon/unown/front_w.png b/graphics/pokemon/unown/w/front.png
index 829804ebf..829804ebf 100644
--- a/graphics/pokemon/unown/front_w.png
+++ b/graphics/pokemon/unown/w/front.png
diff --git a/graphics/pokemon/unown/icon_w.png b/graphics/pokemon/unown/w/icon.png
index aabb0663e..aabb0663e 100644
--- a/graphics/pokemon/unown/icon_w.png
+++ b/graphics/pokemon/unown/w/icon.png
diff --git a/graphics/pokemon/unown/anim_front_x.png b/graphics/pokemon/unown/x/anim_front.png
index a75ab916c..a75ab916c 100644
--- a/graphics/pokemon/unown/anim_front_x.png
+++ b/graphics/pokemon/unown/x/anim_front.png
diff --git a/graphics/pokemon/unown/back_x.png b/graphics/pokemon/unown/x/back.png
index a21d5a9c3..a21d5a9c3 100644
--- a/graphics/pokemon/unown/back_x.png
+++ b/graphics/pokemon/unown/x/back.png
diff --git a/graphics/pokemon/unown/front_x.png b/graphics/pokemon/unown/x/front.png
index 053e2ee08..053e2ee08 100644
--- a/graphics/pokemon/unown/front_x.png
+++ b/graphics/pokemon/unown/x/front.png
diff --git a/graphics/pokemon/unown/icon_x.png b/graphics/pokemon/unown/x/icon.png
index b5be9e10b..b5be9e10b 100644
--- a/graphics/pokemon/unown/icon_x.png
+++ b/graphics/pokemon/unown/x/icon.png
diff --git a/graphics/pokemon/unown/anim_front_y.png b/graphics/pokemon/unown/y/anim_front.png
index 8b5221943..8b5221943 100644
--- a/graphics/pokemon/unown/anim_front_y.png
+++ b/graphics/pokemon/unown/y/anim_front.png
diff --git a/graphics/pokemon/unown/back_y.png b/graphics/pokemon/unown/y/back.png
index 3ccca08e8..3ccca08e8 100644
--- a/graphics/pokemon/unown/back_y.png
+++ b/graphics/pokemon/unown/y/back.png
diff --git a/graphics/pokemon/unown/front_y.png b/graphics/pokemon/unown/y/front.png
index d8f40e27e..d8f40e27e 100644
--- a/graphics/pokemon/unown/front_y.png
+++ b/graphics/pokemon/unown/y/front.png
diff --git a/graphics/pokemon/unown/icon_y.png b/graphics/pokemon/unown/y/icon.png
index 8923810aa..8923810aa 100644
--- a/graphics/pokemon/unown/icon_y.png
+++ b/graphics/pokemon/unown/y/icon.png
diff --git a/graphics/pokemon/unown/anim_front_z.png b/graphics/pokemon/unown/z/anim_front.png
index 3080f7347..3080f7347 100644
--- a/graphics/pokemon/unown/anim_front_z.png
+++ b/graphics/pokemon/unown/z/anim_front.png
diff --git a/graphics/pokemon/unown/back_z.png b/graphics/pokemon/unown/z/back.png
index e1f528a2b..e1f528a2b 100644
--- a/graphics/pokemon/unown/back_z.png
+++ b/graphics/pokemon/unown/z/back.png
diff --git a/graphics/pokemon/unown/front_z.png b/graphics/pokemon/unown/z/front.png
index 054eacb6d..054eacb6d 100644
--- a/graphics/pokemon/unown/front_z.png
+++ b/graphics/pokemon/unown/z/front.png
diff --git a/graphics/pokemon/unown/icon_z.png b/graphics/pokemon/unown/z/icon.png
index a14f73696..a14f73696 100644
--- a/graphics/pokemon/unown/icon_z.png
+++ b/graphics/pokemon/unown/z/icon.png
diff --git a/src/anim_mon_front_pics.c b/src/anim_mon_front_pics.c
index d764e10ac..e36cf3492 100644
--- a/src/anim_mon_front_pics.c
+++ b/src/anim_mon_front_pics.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/anim_front.4bpp.lz");
+const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/anim_front.4bpp.lz");
 
 const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz");
@@ -203,7 +203,7 @@ const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_fro
 const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/anim_front.4bpp.lz");
-const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/anim_front_a.4bpp.lz");
+const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/a/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/anim_front.4bpp.lz");
@@ -255,7 +255,7 @@ const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/anim_front.4
 const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/anim_front.4bpp.lz");
+const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/anim_front.4bpp.lz");
 
 const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_front.4bpp.lz");
@@ -395,30 +395,30 @@ const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_f
 
 const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/anim_front_b.4bpp.lz");
-const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/anim_front_c.4bpp.lz");
-const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/anim_front_d.4bpp.lz");
-const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/anim_front_e.4bpp.lz");
-const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/anim_front_f.4bpp.lz");
-const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/anim_front_g.4bpp.lz");
-const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/anim_front_h.4bpp.lz");
-const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/anim_front_i.4bpp.lz");
-const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_j.4bpp.lz");
-const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/anim_front_k.4bpp.lz");
-const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/anim_front_l.4bpp.lz");
-const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/anim_front_m.4bpp.lz");
-const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/anim_front_n.4bpp.lz");
-const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/anim_front_o.4bpp.lz");
-const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/anim_front_p.4bpp.lz");
-const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_q.4bpp.lz");
-const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/anim_front_r.4bpp.lz");
-const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/anim_front_s.4bpp.lz");
-const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/anim_front_t.4bpp.lz");
-const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/anim_front_u.4bpp.lz");
-const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/anim_front_v.4bpp.lz");
-const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/anim_front_w.4bpp.lz");
-const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/anim_front_x.4bpp.lz");
-const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/anim_front_y.4bpp.lz");
-const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_z.4bpp.lz");
-const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_exclamation_mark.4bpp.lz");
-const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_question_mark.4bpp.lz");
+const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/e/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/f/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/g/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/h/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/i/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/j/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/k/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/l/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/m/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/n/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/o/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/p/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/q/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/r/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/s/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/t/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/u/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/v/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/w/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/x/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/anim_front.4bpp.lz");
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 45e34030f..fd4d8b95d 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -1398,11 +1398,11 @@ const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavu
 const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/icon.4bpp");
 const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/footprint.1bpp");
 
-const u32 gMonStillFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/front_a.4bpp.lz");
+const u32 gMonStillFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/a/front.4bpp.lz");
 const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/normal.gbapal.lz");
-const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/back_a.4bpp.lz");
+const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/a/back.4bpp.lz");
 const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/shiny.gbapal.lz");
-const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/unown/icon_a.4bpp");
+const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/unown/a/icon.4bpp");
 const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/unown/footprint.1bpp");
 
 const u32 gMonStillFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/front.4bpp.lz");
@@ -1754,10 +1754,10 @@ const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/shiny.
 const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/icon.4bpp");
 const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/footprint.1bpp");
 
-const u32 gMonStillFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/front.4bpp.lz");
-const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/normal.gbapal.lz");
-const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/back.4bpp.lz");
-const u32 gMonShinyPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/shiny.gbapal.lz");
+const u32 gMonStillFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/front.4bpp.lz");
+const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/normal.gbapal.lz");
+const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/back.4bpp.lz");
+const u32 gMonShinyPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/shiny.gbapal.lz");
 
 const u32 gMonStillFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/front.4bpp.lz");
 const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/normal.gbapal.lz");
@@ -2714,110 +2714,110 @@ const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footpri
 const u32 gMonStillFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/front.4bpp.lz");
 const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz");
 
-const u32 gMonStillFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/front_b.4bpp.lz");
-const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/back_b.4bpp.lz");
-const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/icon_b.4bpp");
+const u32 gMonStillFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/front.4bpp.lz");
+const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/back.4bpp.lz");
+const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/b/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/front_c.4bpp.lz");
-const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/back_c.4bpp.lz");
-const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/icon_c.4bpp");
+const u32 gMonStillFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/front.4bpp.lz");
+const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/back.4bpp.lz");
+const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/c/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/front_d.4bpp.lz");
-const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/back_d.4bpp.lz");
-const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/icon_d.4bpp");
+const u32 gMonStillFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/front.4bpp.lz");
+const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/back.4bpp.lz");
+const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/d/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/front_e.4bpp.lz");
-const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/back_e.4bpp.lz");
-const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/unown/icon_e.4bpp");
+const u32 gMonStillFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/e/front.4bpp.lz");
+const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/e/back.4bpp.lz");
+const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/unown/e/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/front_f.4bpp.lz");
-const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/back_f.4bpp.lz");
-const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/unown/icon_f.4bpp");
+const u32 gMonStillFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/f/front.4bpp.lz");
+const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/f/back.4bpp.lz");
+const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/unown/f/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/front_g.4bpp.lz");
-const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/back_g.4bpp.lz");
-const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/unown/icon_g.4bpp");
+const u32 gMonStillFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/g/front.4bpp.lz");
+const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/g/back.4bpp.lz");
+const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/unown/g/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/front_h.4bpp.lz");
-const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/back_h.4bpp.lz");
-const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/unown/icon_h.4bpp");
+const u32 gMonStillFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/h/front.4bpp.lz");
+const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/h/back.4bpp.lz");
+const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/unown/h/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/front_i.4bpp.lz");
-const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/back_i.4bpp.lz");
-const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/unown/icon_i.4bpp");
+const u32 gMonStillFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/i/front.4bpp.lz");
+const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/i/back.4bpp.lz");
+const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/unown/i/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/front_j.4bpp.lz");
-const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/back_j.4bpp.lz");
-const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/unown/icon_j.4bpp");
+const u32 gMonStillFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/j/front.4bpp.lz");
+const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/j/back.4bpp.lz");
+const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/unown/j/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/front_k.4bpp.lz");
-const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/back_k.4bpp.lz");
-const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/unown/icon_k.4bpp");
+const u32 gMonStillFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/k/front.4bpp.lz");
+const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/k/back.4bpp.lz");
+const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/unown/k/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/front_l.4bpp.lz");
-const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/back_l.4bpp.lz");
-const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/unown/icon_l.4bpp");
+const u32 gMonStillFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/l/front.4bpp.lz");
+const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/l/back.4bpp.lz");
+const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/unown/l/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/front_m.4bpp.lz");
-const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/back_m.4bpp.lz");
-const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/unown/icon_m.4bpp");
+const u32 gMonStillFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/m/front.4bpp.lz");
+const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/m/back.4bpp.lz");
+const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/unown/m/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/front_n.4bpp.lz");
-const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/back_n.4bpp.lz");
-const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/unown/icon_n.4bpp");
+const u32 gMonStillFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/n/front.4bpp.lz");
+const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/n/back.4bpp.lz");
+const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/unown/n/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/front_o.4bpp.lz");
-const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/back_o.4bpp.lz");
-const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/unown/icon_o.4bpp");
+const u32 gMonStillFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/o/front.4bpp.lz");
+const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/o/back.4bpp.lz");
+const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/unown/o/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/front_p.4bpp.lz");
-const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/back_p.4bpp.lz");
-const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/unown/icon_p.4bpp");
+const u32 gMonStillFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/p/front.4bpp.lz");
+const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/p/back.4bpp.lz");
+const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/unown/p/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/front_q.4bpp.lz");
-const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/back_q.4bpp.lz");
-const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/unown/icon_q.4bpp");
+const u32 gMonStillFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/q/front.4bpp.lz");
+const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/q/back.4bpp.lz");
+const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/unown/q/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/front_r.4bpp.lz");
-const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/back_r.4bpp.lz");
-const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/unown/icon_r.4bpp");
+const u32 gMonStillFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/r/front.4bpp.lz");
+const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/r/back.4bpp.lz");
+const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/unown/r/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/front_s.4bpp.lz");
-const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/back_s.4bpp.lz");
-const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/unown/icon_s.4bpp");
+const u32 gMonStillFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/s/front.4bpp.lz");
+const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/s/back.4bpp.lz");
+const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/unown/s/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/front_t.4bpp.lz");
-const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/back_t.4bpp.lz");
-const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/unown/icon_t.4bpp");
+const u32 gMonStillFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/t/front.4bpp.lz");
+const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/t/back.4bpp.lz");
+const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/unown/t/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/front_u.4bpp.lz");
-const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/back_u.4bpp.lz");
-const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/unown/icon_u.4bpp");
+const u32 gMonStillFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/u/front.4bpp.lz");
+const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/u/back.4bpp.lz");
+const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/unown/u/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/front_v.4bpp.lz");
-const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/back_v.4bpp.lz");
-const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/unown/icon_v.4bpp");
+const u32 gMonStillFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/v/front.4bpp.lz");
+const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/v/back.4bpp.lz");
+const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/unown/v/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/front_w.4bpp.lz");
-const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/back_w.4bpp.lz");
-const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/unown/icon_w.4bpp");
+const u32 gMonStillFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/w/front.4bpp.lz");
+const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/w/back.4bpp.lz");
+const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/unown/w/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/front_x.4bpp.lz");
-const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/back_x.4bpp.lz");
-const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/unown/icon_x.4bpp");
+const u32 gMonStillFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/x/front.4bpp.lz");
+const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/x/back.4bpp.lz");
+const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/unown/x/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/front_y.4bpp.lz");
-const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/back_y.4bpp.lz");
-const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/unown/icon_y.4bpp");
+const u32 gMonStillFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/front.4bpp.lz");
+const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/back.4bpp.lz");
+const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/unown/y/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/front_z.4bpp.lz");
-const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/back_z.4bpp.lz");
-const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/unown/icon_z.4bpp");
+const u32 gMonStillFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/front.4bpp.lz");
+const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/back.4bpp.lz");
+const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/unown/z/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/front_exclamation_mark.4bpp.lz");
-const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/back_exclamation_mark.4bpp.lz");
-const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/icon_exclamation_mark.4bpp");
+const u32 gMonStillFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/front.4bpp.lz");
+const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/back.4bpp.lz");
+const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/exclamation_mark/icon.4bpp");
 
-const u32 gMonStillFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/front_question_mark.4bpp.lz");
-const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/back_question_mark.4bpp.lz");
-const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/icon_question_mark.4bpp");
+const u32 gMonStillFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/front.4bpp.lz");
+const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/back.4bpp.lz");
+const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/question_mark/icon.4bpp");
diff --git a/src/graphics.c b/src/graphics.c
index ab44f26ec..c21db9abf 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -4,10 +4,10 @@ const u32 gBattleTextboxTiles[] = INCBIN_U32("graphics/battle_interface/textbox.
 const u32 gBattleTextboxPalette[] = INCBIN_U32("graphics/battle_interface/textbox.gbapal.lz");
 const u32 gBattleTextboxTilemap[] = INCBIN_U32("graphics/battle_interface/textbox_map.bin.lz");
 
-const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/front.4bpp.lz");
-const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/back.4bpp.lz");
-const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/normal.gbapal.lz");
-const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/shiny.gbapal.lz");
+const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/front.4bpp.lz");
+const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/back.4bpp.lz");
+const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz");
+const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/shiny.gbapal.lz");
 
 const u32 gUnusedGfx_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.4bpp.lz"); // japanese table and bunch of stuff
 const u32 gUnusedTimemap_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.bin.lz");