pics -> pokemon (follow pokecrystal convention)

56 files changed, 54 insertions, 54 deletions

diff --git a/gfx/pics/annon_pics.asm b/gfx/pics/annon_pics.asm
deleted file mode 100644
index eccb89f..0000000
--- a/gfx/pics/annon_pics.asm
+++ /dev/null
@@ -1,52 +0,0 @@
-AnnonAPicFront:: INCBIN "gfx/pics/annon_a/front.pic"

-AnnonAPicBack::  INCBIN "gfx/pics/annon_a/back.pic"

-AnnonBPicFront:: INCBIN "gfx/pics/annon_b/front.pic"

-AnnonBPicBack::  INCBIN "gfx/pics/annon_b/back.pic"

-AnnonCPicFront:: INCBIN "gfx/pics/annon_c/front.pic"

-AnnonCPicBack::  INCBIN "gfx/pics/annon_c/back.pic"

-AnnonDPicFront:: INCBIN "gfx/pics/annon_d/front.pic"

-AnnonDPicBack::  INCBIN "gfx/pics/annon_d/back.pic"

-AnnonEPicFront:: INCBIN "gfx/pics/annon_e/front.pic"

-AnnonEPicBack::  INCBIN "gfx/pics/annon_e/back.pic"

-AnnonFPicFront:: INCBIN "gfx/pics/annon_f/front.pic"

-AnnonFPicBack::  INCBIN "gfx/pics/annon_f/back.pic"

-AnnonGPicFront:: INCBIN "gfx/pics/annon_g/front.pic"

-AnnonGPicBack::  INCBIN "gfx/pics/annon_g/back.pic"

-AnnonHPicFront:: INCBIN "gfx/pics/annon_h/front.pic"

-AnnonHPicBack::  INCBIN "gfx/pics/annon_h/back.pic"

-AnnonIPicFront:: INCBIN "gfx/pics/annon_i/front.pic"

-AnnonIPicBack::  INCBIN "gfx/pics/annon_i/back.pic"

-AnnonJPicFront:: INCBIN "gfx/pics/annon_j/front.pic"

-AnnonJPicBack::  INCBIN "gfx/pics/annon_j/back.pic"

-AnnonKPicFront:: INCBIN "gfx/pics/annon_k/front.pic"

-AnnonKPicBack::  INCBIN "gfx/pics/annon_k/back.pic"

-AnnonLPicFront:: INCBIN "gfx/pics/annon_l/front.pic"

-AnnonLPicBack::  INCBIN "gfx/pics/annon_l/back.pic"

-AnnonMPicFront:: INCBIN "gfx/pics/annon_m/front.pic"

-AnnonMPicBack::  INCBIN "gfx/pics/annon_m/back.pic"

-AnnonNPicFront:: INCBIN "gfx/pics/annon_n/front.pic"

-AnnonNPicBack::  INCBIN "gfx/pics/annon_n/back.pic"

-AnnonOPicFront:: INCBIN "gfx/pics/annon_o/front.pic"

-AnnonOPicBack::  INCBIN "gfx/pics/annon_o/back.pic"

-AnnonPPicFront:: INCBIN "gfx/pics/annon_p/front.pic"

-AnnonPPicBack::  INCBIN "gfx/pics/annon_p/back.pic"

-AnnonQPicFront:: INCBIN "gfx/pics/annon_q/front.pic"

-AnnonQPicBack::  INCBIN "gfx/pics/annon_q/back.pic"

-AnnonRPicFront:: INCBIN "gfx/pics/annon_r/front.pic"

-AnnonRPicBack::  INCBIN "gfx/pics/annon_r/back.pic"

-AnnonSPicFront:: INCBIN "gfx/pics/annon_s/front.pic"

-AnnonSPicBack::  INCBIN "gfx/pics/annon_s/back.pic"

-AnnonTPicFront:: INCBIN "gfx/pics/annon_t/front.pic"

-AnnonTPicBack::  INCBIN "gfx/pics/annon_t/back.pic"

-AnnonUPicFront:: INCBIN "gfx/pics/annon_u/front.pic"

-AnnonUPicBack::  INCBIN "gfx/pics/annon_u/back.pic"

-AnnonVPicFront:: INCBIN "gfx/pics/annon_v/front.pic"

-AnnonVPicBack::  INCBIN "gfx/pics/annon_v/back.pic"

-AnnonWPicFront:: INCBIN "gfx/pics/annon_w/front.pic"

-AnnonWPicBack::  INCBIN "gfx/pics/annon_w/back.pic"

-AnnonXPicFront:: INCBIN "gfx/pics/annon_x/front.pic"

-AnnonXPicBack::  INCBIN "gfx/pics/annon_x/back.pic"

-AnnonYPicFront:: INCBIN "gfx/pics/annon_y/front.pic"

-AnnonYPicBack::  INCBIN "gfx/pics/annon_y/back.pic"

-AnnonZPicFront:: INCBIN "gfx/pics/annon_z/front.pic"

-AnnonZPicBack::  INCBIN "gfx/pics/annon_z/back.pic"

diff --git a/gfx/pics/annon_a/back.png b/gfx/pokemon/annon_a/back.png
index 79b438b..79b438b 100644
--- a/gfx/pics/annon_a/back.png
+++ b/gfx/pokemon/annon_a/back.png
diff --git a/gfx/pics/annon_a/front.png b/gfx/pokemon/annon_a/front.png
index bb5c989..bb5c989 100644
--- a/gfx/pics/annon_a/front.png
+++ b/gfx/pokemon/annon_a/front.png
diff --git a/gfx/pics/annon_b/back.png b/gfx/pokemon/annon_b/back.png
index 9f99b92..9f99b92 100644
--- a/gfx/pics/annon_b/back.png
+++ b/gfx/pokemon/annon_b/back.png
diff --git a/gfx/pics/annon_b/front.png b/gfx/pokemon/annon_b/front.png
index d822e74..d822e74 100644
--- a/gfx/pics/annon_b/front.png
+++ b/gfx/pokemon/annon_b/front.png
diff --git a/gfx/pics/annon_c/back.png b/gfx/pokemon/annon_c/back.png
index d9c29f6..d9c29f6 100644
--- a/gfx/pics/annon_c/back.png
+++ b/gfx/pokemon/annon_c/back.png
diff --git a/gfx/pics/annon_c/front.png b/gfx/pokemon/annon_c/front.png
index 412679b..412679b 100644
--- a/gfx/pics/annon_c/front.png
+++ b/gfx/pokemon/annon_c/front.png
diff --git a/gfx/pics/annon_d/back.png b/gfx/pokemon/annon_d/back.png
index d9d180e..d9d180e 100644
--- a/gfx/pics/annon_d/back.png
+++ b/gfx/pokemon/annon_d/back.png
diff --git a/gfx/pics/annon_d/front.png b/gfx/pokemon/annon_d/front.png
index 6d74d0e..6d74d0e 100644
--- a/gfx/pics/annon_d/front.png
+++ b/gfx/pokemon/annon_d/front.png
diff --git a/gfx/pics/annon_e/back.png b/gfx/pokemon/annon_e/back.png
index 64c2bee..64c2bee 100644
--- a/gfx/pics/annon_e/back.png
+++ b/gfx/pokemon/annon_e/back.png
diff --git a/gfx/pics/annon_e/front.png b/gfx/pokemon/annon_e/front.png
index 835f305..835f305 100644
--- a/gfx/pics/annon_e/front.png
+++ b/gfx/pokemon/annon_e/front.png
diff --git a/gfx/pics/annon_f/back.png b/gfx/pokemon/annon_f/back.png
index c027eb2..c027eb2 100644
--- a/gfx/pics/annon_f/back.png
+++ b/gfx/pokemon/annon_f/back.png
diff --git a/gfx/pics/annon_f/front.png b/gfx/pokemon/annon_f/front.png
index 3491e31..3491e31 100644
--- a/gfx/pics/annon_f/front.png
+++ b/gfx/pokemon/annon_f/front.png
diff --git a/gfx/pics/annon_g/back.png b/gfx/pokemon/annon_g/back.png
index 6716c14..6716c14 100644
--- a/gfx/pics/annon_g/back.png
+++ b/gfx/pokemon/annon_g/back.png
diff --git a/gfx/pics/annon_g/front.png b/gfx/pokemon/annon_g/front.png
index 1261e8f..1261e8f 100644
--- a/gfx/pics/annon_g/front.png
+++ b/gfx/pokemon/annon_g/front.png
diff --git a/gfx/pics/annon_h/back.png b/gfx/pokemon/annon_h/back.png
index ea8f1b7..ea8f1b7 100644
--- a/gfx/pics/annon_h/back.png
+++ b/gfx/pokemon/annon_h/back.png
diff --git a/gfx/pics/annon_h/front.png b/gfx/pokemon/annon_h/front.png
index de79d6b..de79d6b 100644
--- a/gfx/pics/annon_h/front.png
+++ b/gfx/pokemon/annon_h/front.png
diff --git a/gfx/pics/annon_i/back.png b/gfx/pokemon/annon_i/back.png
index af33c07..af33c07 100644
--- a/gfx/pics/annon_i/back.png
+++ b/gfx/pokemon/annon_i/back.png
diff --git a/gfx/pics/annon_i/front.png b/gfx/pokemon/annon_i/front.png
index ed15548..ed15548 100644
--- a/gfx/pics/annon_i/front.png
+++ b/gfx/pokemon/annon_i/front.png
diff --git a/gfx/pics/annon_j/back.png b/gfx/pokemon/annon_j/back.png
index 6434e3d..6434e3d 100644
--- a/gfx/pics/annon_j/back.png
+++ b/gfx/pokemon/annon_j/back.png
diff --git a/gfx/pics/annon_j/front.png b/gfx/pokemon/annon_j/front.png
index 3ee4ee2..3ee4ee2 100644
--- a/gfx/pics/annon_j/front.png
+++ b/gfx/pokemon/annon_j/front.png
diff --git a/gfx/pics/annon_k/back.png b/gfx/pokemon/annon_k/back.png
index f91c8b8..f91c8b8 100644
--- a/gfx/pics/annon_k/back.png
+++ b/gfx/pokemon/annon_k/back.png
diff --git a/gfx/pics/annon_k/front.png b/gfx/pokemon/annon_k/front.png
index 5409634..5409634 100644
--- a/gfx/pics/annon_k/front.png
+++ b/gfx/pokemon/annon_k/front.png
diff --git a/gfx/pics/annon_l/back.png b/gfx/pokemon/annon_l/back.png
index c2a4d20..c2a4d20 100644
--- a/gfx/pics/annon_l/back.png
+++ b/gfx/pokemon/annon_l/back.png
diff --git a/gfx/pics/annon_l/front.png b/gfx/pokemon/annon_l/front.png
index 454dd07..454dd07 100644
--- a/gfx/pics/annon_l/front.png
+++ b/gfx/pokemon/annon_l/front.png
diff --git a/gfx/pics/annon_m/back.png b/gfx/pokemon/annon_m/back.png
index e89eada..e89eada 100644
--- a/gfx/pics/annon_m/back.png
+++ b/gfx/pokemon/annon_m/back.png
diff --git a/gfx/pics/annon_m/front.png b/gfx/pokemon/annon_m/front.png
index de83d07..de83d07 100644
--- a/gfx/pics/annon_m/front.png
+++ b/gfx/pokemon/annon_m/front.png
diff --git a/gfx/pics/annon_n/back.png b/gfx/pokemon/annon_n/back.png
index d414079..d414079 100644
--- a/gfx/pics/annon_n/back.png
+++ b/gfx/pokemon/annon_n/back.png
diff --git a/gfx/pics/annon_n/front.png b/gfx/pokemon/annon_n/front.png
index ecc562f..ecc562f 100644
--- a/gfx/pics/annon_n/front.png
+++ b/gfx/pokemon/annon_n/front.png
diff --git a/gfx/pics/annon_o/back.png b/gfx/pokemon/annon_o/back.png
index 4a88cd0..4a88cd0 100644
--- a/gfx/pics/annon_o/back.png
+++ b/gfx/pokemon/annon_o/back.png
diff --git a/gfx/pics/annon_o/front.png b/gfx/pokemon/annon_o/front.png
index 3d1e2ec..3d1e2ec 100644
--- a/gfx/pics/annon_o/front.png
+++ b/gfx/pokemon/annon_o/front.png
diff --git a/gfx/pics/annon_p/back.png b/gfx/pokemon/annon_p/back.png
index d2fa452..d2fa452 100644
--- a/gfx/pics/annon_p/back.png
+++ b/gfx/pokemon/annon_p/back.png
diff --git a/gfx/pics/annon_p/front.png b/gfx/pokemon/annon_p/front.png
index 05d5fb3..05d5fb3 100644
--- a/gfx/pics/annon_p/front.png
+++ b/gfx/pokemon/annon_p/front.png
diff --git a/gfx/pics/annon_pic_ptrs.asm b/gfx/pokemon/annon_pic_ptrs.asm
index 45e5873..45e5873 100644
--- a/gfx/pics/annon_pic_ptrs.asm
+++ b/gfx/pokemon/annon_pic_ptrs.asm
diff --git a/gfx/pokemon/annon_pics.asm b/gfx/pokemon/annon_pics.asm
new file mode 100644
index 0000000..2f92fbe
--- /dev/null
+++ b/gfx/pokemon/annon_pics.asm
@@ -0,0 +1,52 @@
+AnnonAPicFront:: INCBIN "gfx/pokemon/annon_a/front.pic"

+AnnonAPicBack::  INCBIN "gfx/pokemon/annon_a/back.pic"

+AnnonBPicFront:: INCBIN "gfx/pokemon/annon_b/front.pic"

+AnnonBPicBack::  INCBIN "gfx/pokemon/annon_b/back.pic"

+AnnonCPicFront:: INCBIN "gfx/pokemon/annon_c/front.pic"

+AnnonCPicBack::  INCBIN "gfx/pokemon/annon_c/back.pic"

+AnnonDPicFront:: INCBIN "gfx/pokemon/annon_d/front.pic"

+AnnonDPicBack::  INCBIN "gfx/pokemon/annon_d/back.pic"

+AnnonEPicFront:: INCBIN "gfx/pokemon/annon_e/front.pic"

+AnnonEPicBack::  INCBIN "gfx/pokemon/annon_e/back.pic"

+AnnonFPicFront:: INCBIN "gfx/pokemon/annon_f/front.pic"

+AnnonFPicBack::  INCBIN "gfx/pokemon/annon_f/back.pic"

+AnnonGPicFront:: INCBIN "gfx/pokemon/annon_g/front.pic"

+AnnonGPicBack::  INCBIN "gfx/pokemon/annon_g/back.pic"

+AnnonHPicFront:: INCBIN "gfx/pokemon/annon_h/front.pic"

+AnnonHPicBack::  INCBIN "gfx/pokemon/annon_h/back.pic"

+AnnonIPicFront:: INCBIN "gfx/pokemon/annon_i/front.pic"

+AnnonIPicBack::  INCBIN "gfx/pokemon/annon_i/back.pic"

+AnnonJPicFront:: INCBIN "gfx/pokemon/annon_j/front.pic"

+AnnonJPicBack::  INCBIN "gfx/pokemon/annon_j/back.pic"

+AnnonKPicFront:: INCBIN "gfx/pokemon/annon_k/front.pic"

+AnnonKPicBack::  INCBIN "gfx/pokemon/annon_k/back.pic"

+AnnonLPicFront:: INCBIN "gfx/pokemon/annon_l/front.pic"

+AnnonLPicBack::  INCBIN "gfx/pokemon/annon_l/back.pic"

+AnnonMPicFront:: INCBIN "gfx/pokemon/annon_m/front.pic"

+AnnonMPicBack::  INCBIN "gfx/pokemon/annon_m/back.pic"

+AnnonNPicFront:: INCBIN "gfx/pokemon/annon_n/front.pic"

+AnnonNPicBack::  INCBIN "gfx/pokemon/annon_n/back.pic"

+AnnonOPicFront:: INCBIN "gfx/pokemon/annon_o/front.pic"

+AnnonOPicBack::  INCBIN "gfx/pokemon/annon_o/back.pic"

+AnnonPPicFront:: INCBIN "gfx/pokemon/annon_p/front.pic"

+AnnonPPicBack::  INCBIN "gfx/pokemon/annon_p/back.pic"

+AnnonQPicFront:: INCBIN "gfx/pokemon/annon_q/front.pic"

+AnnonQPicBack::  INCBIN "gfx/pokemon/annon_q/back.pic"

+AnnonRPicFront:: INCBIN "gfx/pokemon/annon_r/front.pic"

+AnnonRPicBack::  INCBIN "gfx/pokemon/annon_r/back.pic"

+AnnonSPicFront:: INCBIN "gfx/pokemon/annon_s/front.pic"

+AnnonSPicBack::  INCBIN "gfx/pokemon/annon_s/back.pic"

+AnnonTPicFront:: INCBIN "gfx/pokemon/annon_t/front.pic"

+AnnonTPicBack::  INCBIN "gfx/pokemon/annon_t/back.pic"

+AnnonUPicFront:: INCBIN "gfx/pokemon/annon_u/front.pic"

+AnnonUPicBack::  INCBIN "gfx/pokemon/annon_u/back.pic"

+AnnonVPicFront:: INCBIN "gfx/pokemon/annon_v/front.pic"

+AnnonVPicBack::  INCBIN "gfx/pokemon/annon_v/back.pic"

+AnnonWPicFront:: INCBIN "gfx/pokemon/annon_w/front.pic"

+AnnonWPicBack::  INCBIN "gfx/pokemon/annon_w/back.pic"

+AnnonXPicFront:: INCBIN "gfx/pokemon/annon_x/front.pic"

+AnnonXPicBack::  INCBIN "gfx/pokemon/annon_x/back.pic"

+AnnonYPicFront:: INCBIN "gfx/pokemon/annon_y/front.pic"

+AnnonYPicBack::  INCBIN "gfx/pokemon/annon_y/back.pic"

+AnnonZPicFront:: INCBIN "gfx/pokemon/annon_z/front.pic"

+AnnonZPicBack::  INCBIN "gfx/pokemon/annon_z/back.pic"

diff --git a/gfx/pics/annon_q/back.png b/gfx/pokemon/annon_q/back.png
index 3c0f8ea..3c0f8ea 100644
--- a/gfx/pics/annon_q/back.png
+++ b/gfx/pokemon/annon_q/back.png
diff --git a/gfx/pics/annon_q/front.png b/gfx/pokemon/annon_q/front.png
index bc40ddf..bc40ddf 100644
--- a/gfx/pics/annon_q/front.png
+++ b/gfx/pokemon/annon_q/front.png
diff --git a/gfx/pics/annon_r/back.png b/gfx/pokemon/annon_r/back.png
index 7912c33..7912c33 100644
--- a/gfx/pics/annon_r/back.png
+++ b/gfx/pokemon/annon_r/back.png
diff --git a/gfx/pics/annon_r/front.png b/gfx/pokemon/annon_r/front.png
index d052cfe..d052cfe 100644
--- a/gfx/pics/annon_r/front.png
+++ b/gfx/pokemon/annon_r/front.png
diff --git a/gfx/pics/annon_s/back.png b/gfx/pokemon/annon_s/back.png
index e05fb48..e05fb48 100644
--- a/gfx/pics/annon_s/back.png
+++ b/gfx/pokemon/annon_s/back.png
diff --git a/gfx/pics/annon_s/front.png b/gfx/pokemon/annon_s/front.png
index 402f67f..402f67f 100644
--- a/gfx/pics/annon_s/front.png
+++ b/gfx/pokemon/annon_s/front.png
diff --git a/gfx/pics/annon_t/back.png b/gfx/pokemon/annon_t/back.png
index f127e10..f127e10 100644
--- a/gfx/pics/annon_t/back.png
+++ b/gfx/pokemon/annon_t/back.png
diff --git a/gfx/pics/annon_t/front.png b/gfx/pokemon/annon_t/front.png
index a746580..a746580 100644
--- a/gfx/pics/annon_t/front.png
+++ b/gfx/pokemon/annon_t/front.png
diff --git a/gfx/pics/annon_u/back.png b/gfx/pokemon/annon_u/back.png
index 83ddda5..83ddda5 100644
--- a/gfx/pics/annon_u/back.png
+++ b/gfx/pokemon/annon_u/back.png
diff --git a/gfx/pics/annon_u/front.png b/gfx/pokemon/annon_u/front.png
index de82481..de82481 100644
--- a/gfx/pics/annon_u/front.png
+++ b/gfx/pokemon/annon_u/front.png
diff --git a/gfx/pics/annon_v/back.png b/gfx/pokemon/annon_v/back.png
index 992e911..992e911 100644
--- a/gfx/pics/annon_v/back.png
+++ b/gfx/pokemon/annon_v/back.png
diff --git a/gfx/pics/annon_v/front.png b/gfx/pokemon/annon_v/front.png
index 10ecedf..10ecedf 100644
--- a/gfx/pics/annon_v/front.png
+++ b/gfx/pokemon/annon_v/front.png
diff --git a/gfx/pics/annon_w/back.png b/gfx/pokemon/annon_w/back.png
index 3867fcd..3867fcd 100644
--- a/gfx/pics/annon_w/back.png
+++ b/gfx/pokemon/annon_w/back.png
diff --git a/gfx/pics/annon_w/front.png b/gfx/pokemon/annon_w/front.png
index 0ac1d79..0ac1d79 100644
--- a/gfx/pics/annon_w/front.png
+++ b/gfx/pokemon/annon_w/front.png
diff --git a/gfx/pics/annon_x/back.png b/gfx/pokemon/annon_x/back.png
index 6769885..6769885 100644
--- a/gfx/pics/annon_x/back.png
+++ b/gfx/pokemon/annon_x/back.png
diff --git a/gfx/pics/annon_x/front.png b/gfx/pokemon/annon_x/front.png
index 61dc930..61dc930 100644
--- a/gfx/pics/annon_x/front.png
+++ b/gfx/pokemon/annon_x/front.png
diff --git a/gfx/pics/annon_y/back.png b/gfx/pokemon/annon_y/back.png
index d7093b9..d7093b9 100644
--- a/gfx/pics/annon_y/back.png
+++ b/gfx/pokemon/annon_y/back.png
diff --git a/gfx/pics/annon_y/front.png b/gfx/pokemon/annon_y/front.png
index 24510ed..24510ed 100644
--- a/gfx/pics/annon_y/front.png
+++ b/gfx/pokemon/annon_y/front.png
diff --git a/gfx/pics/annon_z/back.png b/gfx/pokemon/annon_z/back.png
index 26fb6cf..26fb6cf 100644
--- a/gfx/pics/annon_z/back.png
+++ b/gfx/pokemon/annon_z/back.png
diff --git a/gfx/pics/annon_z/front.png b/gfx/pokemon/annon_z/front.png
index 461350b..461350b 100644
--- a/gfx/pics/annon_z/front.png
+++ b/gfx/pokemon/annon_z/front.png
diff --git a/main.asm b/main.asm
index c0633f6..7fbe350 100644
--- a/main.asm
+++ b/main.asm
@@ -32,5 +32,5 @@ MainMenuStrings: ; 01:5428
 ; 01:5457
 
 SECTION "Annon Pic Ptrs and Pics", ROMX[$4d6a], BANK[$1f]
-INCLUDE "gfx/pics/annon_pic_ptrs.asm"
-INCLUDE "gfx/pics/annon_pics.asm"
+INCLUDE "gfx/pokemon/annon_pic_ptrs.asm"
+INCLUDE "gfx/pokemon/annon_pics.asm"