gfx, main.asm: add annon front and back pics

Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>

58 files changed, 113 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 24b3f3a..a6d0b07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,10 @@
 *.rtc
 
 *.o
+# converted image data
 *.2bpp
 *.1bpp
+*.pic
 *.pcm
 *.map
 pokegold-spaceworld.sym
diff --git a/data/pokemon/base_stats/annon.asm b/data/pokemon/base_stats/annon.asm
index 388ad63..9c32103 100644
--- a/data/pokemon/base_stats/annon.asm
+++ b/data/pokemon/base_stats/annon.asm
@@ -10,7 +10,7 @@
 	db GENDER_50_50 ; gender ratio
 	db 100, 4, 70 ; unknown
 	dn 5, 5 ; sprite dimensions
-	dw $4d6a, $4d6c ; sprites
+	dw UnownPicPtrsFront, dw UnownPicPtrsBack ; sprites
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
diff --git a/gfx/pics/annon_a/back.png b/gfx/pics/annon_a/back.png
new file mode 100644
index 0000000..79b438b
--- /dev/null
+++ b/gfx/pics/annon_a/back.png
diff --git a/gfx/pics/annon_a/front.png b/gfx/pics/annon_a/front.png
new file mode 100644
index 0000000..bb5c989
--- /dev/null
+++ b/gfx/pics/annon_a/front.png
diff --git a/gfx/pics/annon_b/back.png b/gfx/pics/annon_b/back.png
new file mode 100644
index 0000000..9f99b92
--- /dev/null
+++ b/gfx/pics/annon_b/back.png
diff --git a/gfx/pics/annon_b/front.png b/gfx/pics/annon_b/front.png
new file mode 100644
index 0000000..d822e74
--- /dev/null
+++ b/gfx/pics/annon_b/front.png
diff --git a/gfx/pics/annon_c/back.png b/gfx/pics/annon_c/back.png
new file mode 100644
index 0000000..d9c29f6
--- /dev/null
+++ b/gfx/pics/annon_c/back.png
diff --git a/gfx/pics/annon_c/front.png b/gfx/pics/annon_c/front.png
new file mode 100644
index 0000000..412679b
--- /dev/null
+++ b/gfx/pics/annon_c/front.png
diff --git a/gfx/pics/annon_d/back.png b/gfx/pics/annon_d/back.png
new file mode 100644
index 0000000..d9d180e
--- /dev/null
+++ b/gfx/pics/annon_d/back.png
diff --git a/gfx/pics/annon_d/front.png b/gfx/pics/annon_d/front.png
new file mode 100644
index 0000000..6d74d0e
--- /dev/null
+++ b/gfx/pics/annon_d/front.png
diff --git a/gfx/pics/annon_e/back.png b/gfx/pics/annon_e/back.png
new file mode 100644
index 0000000..64c2bee
--- /dev/null
+++ b/gfx/pics/annon_e/back.png
diff --git a/gfx/pics/annon_e/front.png b/gfx/pics/annon_e/front.png
new file mode 100644
index 0000000..835f305
--- /dev/null
+++ b/gfx/pics/annon_e/front.png
diff --git a/gfx/pics/annon_f/back.png b/gfx/pics/annon_f/back.png
new file mode 100644
index 0000000..c027eb2
--- /dev/null
+++ b/gfx/pics/annon_f/back.png
diff --git a/gfx/pics/annon_f/front.png b/gfx/pics/annon_f/front.png
new file mode 100644
index 0000000..3491e31
--- /dev/null
+++ b/gfx/pics/annon_f/front.png
diff --git a/gfx/pics/annon_g/back.png b/gfx/pics/annon_g/back.png
new file mode 100644
index 0000000..6716c14
--- /dev/null
+++ b/gfx/pics/annon_g/back.png
diff --git a/gfx/pics/annon_g/front.png b/gfx/pics/annon_g/front.png
new file mode 100644
index 0000000..1261e8f
--- /dev/null
+++ b/gfx/pics/annon_g/front.png
diff --git a/gfx/pics/annon_h/back.png b/gfx/pics/annon_h/back.png
new file mode 100644
index 0000000..ea8f1b7
--- /dev/null
+++ b/gfx/pics/annon_h/back.png
diff --git a/gfx/pics/annon_h/front.png b/gfx/pics/annon_h/front.png
new file mode 100644
index 0000000..de79d6b
--- /dev/null
+++ b/gfx/pics/annon_h/front.png
diff --git a/gfx/pics/annon_i/back.png b/gfx/pics/annon_i/back.png
new file mode 100644
index 0000000..af33c07
--- /dev/null
+++ b/gfx/pics/annon_i/back.png
diff --git a/gfx/pics/annon_i/front.png b/gfx/pics/annon_i/front.png
new file mode 100644
index 0000000..ed15548
--- /dev/null
+++ b/gfx/pics/annon_i/front.png
diff --git a/gfx/pics/annon_j/back.png b/gfx/pics/annon_j/back.png
new file mode 100644
index 0000000..6434e3d
--- /dev/null
+++ b/gfx/pics/annon_j/back.png
diff --git a/gfx/pics/annon_j/front.png b/gfx/pics/annon_j/front.png
new file mode 100644
index 0000000..3ee4ee2
--- /dev/null
+++ b/gfx/pics/annon_j/front.png
diff --git a/gfx/pics/annon_k/back.png b/gfx/pics/annon_k/back.png
new file mode 100644
index 0000000..f91c8b8
--- /dev/null
+++ b/gfx/pics/annon_k/back.png
diff --git a/gfx/pics/annon_k/front.png b/gfx/pics/annon_k/front.png
new file mode 100644
index 0000000..5409634
--- /dev/null
+++ b/gfx/pics/annon_k/front.png
diff --git a/gfx/pics/annon_l/back.png b/gfx/pics/annon_l/back.png
new file mode 100644
index 0000000..c2a4d20
--- /dev/null
+++ b/gfx/pics/annon_l/back.png
diff --git a/gfx/pics/annon_l/front.png b/gfx/pics/annon_l/front.png
new file mode 100644
index 0000000..454dd07
--- /dev/null
+++ b/gfx/pics/annon_l/front.png
diff --git a/gfx/pics/annon_m/back.png b/gfx/pics/annon_m/back.png
new file mode 100644
index 0000000..e89eada
--- /dev/null
+++ b/gfx/pics/annon_m/back.png
diff --git a/gfx/pics/annon_m/front.png b/gfx/pics/annon_m/front.png
new file mode 100644
index 0000000..de83d07
--- /dev/null
+++ b/gfx/pics/annon_m/front.png
diff --git a/gfx/pics/annon_n/back.png b/gfx/pics/annon_n/back.png
new file mode 100644
index 0000000..d414079
--- /dev/null
+++ b/gfx/pics/annon_n/back.png
diff --git a/gfx/pics/annon_n/front.png b/gfx/pics/annon_n/front.png
new file mode 100644
index 0000000..ecc562f
--- /dev/null
+++ b/gfx/pics/annon_n/front.png
diff --git a/gfx/pics/annon_o/back.png b/gfx/pics/annon_o/back.png
new file mode 100644
index 0000000..4a88cd0
--- /dev/null
+++ b/gfx/pics/annon_o/back.png
diff --git a/gfx/pics/annon_o/front.png b/gfx/pics/annon_o/front.png
new file mode 100644
index 0000000..3d1e2ec
--- /dev/null
+++ b/gfx/pics/annon_o/front.png
diff --git a/gfx/pics/annon_p/back.png b/gfx/pics/annon_p/back.png
new file mode 100644
index 0000000..d2fa452
--- /dev/null
+++ b/gfx/pics/annon_p/back.png
diff --git a/gfx/pics/annon_p/front.png b/gfx/pics/annon_p/front.png
new file mode 100644
index 0000000..05d5fb3
--- /dev/null
+++ b/gfx/pics/annon_p/front.png
diff --git a/gfx/pics/annon_pic_ptrs.asm b/gfx/pics/annon_pic_ptrs.asm
new file mode 100644
index 0000000..45e5873
--- /dev/null
+++ b/gfx/pics/annon_pic_ptrs.asm
@@ -0,0 +1,55 @@
+AnnonPicPtrs::

+AnnonPicPtrsFront::

+	dw AnnonAPicFront

+AnnonPicPtrsBack::

+	dw AnnonAPicBack

+	dw AnnonBPicFront

+	dw AnnonBPicBack

+	dw AnnonCPicFront

+	dw AnnonCPicBack

+	dw AnnonDPicFront

+	dw AnnonDPicBack

+	dw AnnonEPicFront

+	dw AnnonEPicBack

+	dw AnnonFPicFront

+	dw AnnonFPicBack

+	dw AnnonGPicFront

+	dw AnnonGPicBack

+	dw AnnonHPicFront

+	dw AnnonHPicBack

+	dw AnnonIPicFront

+	dw AnnonIPicBack

+	dw AnnonJPicFront

+	dw AnnonJPicBack

+	dw AnnonKPicFront

+	dw AnnonKPicBack

+	dw AnnonLPicFront

+	dw AnnonLPicBack

+	dw AnnonMPicFront

+	dw AnnonMPicBack

+	dw AnnonNPicFront

+	dw AnnonNPicBack

+	dw AnnonOPicFront

+	dw AnnonOPicBack

+	dw AnnonPPicFront

+	dw AnnonPPicBack

+	dw AnnonQPicFront

+	dw AnnonQPicBack

+	dw AnnonRPicFront

+	dw AnnonRPicBack

+	dw AnnonSPicFront

+	dw AnnonSPicBack

+	dw AnnonTPicFront

+	dw AnnonTPicBack

+	dw AnnonUPicFront

+	dw AnnonUPicBack

+	dw AnnonVPicFront

+	dw AnnonVPicBack

+	dw AnnonWPicFront

+	dw AnnonWPicBack

+	dw AnnonXPicFront

+	dw AnnonXPicBack

+	dw AnnonYPicFront

+	dw AnnonYPicBack

+	dw AnnonZPicFront

+	dw AnnonYPicBack  ; typo in original list

diff --git a/gfx/pics/annon_pics.asm b/gfx/pics/annon_pics.asm
new file mode 100644
index 0000000..eccb89f
--- /dev/null
+++ b/gfx/pics/annon_pics.asm
@@ -0,0 +1,52 @@
+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_q/back.png b/gfx/pics/annon_q/back.png
new file mode 100644
index 0000000..3c0f8ea
--- /dev/null
+++ b/gfx/pics/annon_q/back.png
diff --git a/gfx/pics/annon_q/front.png b/gfx/pics/annon_q/front.png
new file mode 100644
index 0000000..bc40ddf
--- /dev/null
+++ b/gfx/pics/annon_q/front.png
diff --git a/gfx/pics/annon_r/back.png b/gfx/pics/annon_r/back.png
new file mode 100644
index 0000000..7912c33
--- /dev/null
+++ b/gfx/pics/annon_r/back.png
diff --git a/gfx/pics/annon_r/front.png b/gfx/pics/annon_r/front.png
new file mode 100644
index 0000000..d052cfe
--- /dev/null
+++ b/gfx/pics/annon_r/front.png
diff --git a/gfx/pics/annon_s/back.png b/gfx/pics/annon_s/back.png
new file mode 100644
index 0000000..e05fb48
--- /dev/null
+++ b/gfx/pics/annon_s/back.png
diff --git a/gfx/pics/annon_s/front.png b/gfx/pics/annon_s/front.png
new file mode 100644
index 0000000..402f67f
--- /dev/null
+++ b/gfx/pics/annon_s/front.png
diff --git a/gfx/pics/annon_t/back.png b/gfx/pics/annon_t/back.png
new file mode 100644
index 0000000..f127e10
--- /dev/null
+++ b/gfx/pics/annon_t/back.png
diff --git a/gfx/pics/annon_t/front.png b/gfx/pics/annon_t/front.png
new file mode 100644
index 0000000..a746580
--- /dev/null
+++ b/gfx/pics/annon_t/front.png
diff --git a/gfx/pics/annon_u/back.png b/gfx/pics/annon_u/back.png
new file mode 100644
index 0000000..83ddda5
--- /dev/null
+++ b/gfx/pics/annon_u/back.png
diff --git a/gfx/pics/annon_u/front.png b/gfx/pics/annon_u/front.png
new file mode 100644
index 0000000..de82481
--- /dev/null
+++ b/gfx/pics/annon_u/front.png
diff --git a/gfx/pics/annon_v/back.png b/gfx/pics/annon_v/back.png
new file mode 100644
index 0000000..992e911
--- /dev/null
+++ b/gfx/pics/annon_v/back.png
diff --git a/gfx/pics/annon_v/front.png b/gfx/pics/annon_v/front.png
new file mode 100644
index 0000000..10ecedf
--- /dev/null
+++ b/gfx/pics/annon_v/front.png
diff --git a/gfx/pics/annon_w/back.png b/gfx/pics/annon_w/back.png
new file mode 100644
index 0000000..3867fcd
--- /dev/null
+++ b/gfx/pics/annon_w/back.png
diff --git a/gfx/pics/annon_w/front.png b/gfx/pics/annon_w/front.png
new file mode 100644
index 0000000..0ac1d79
--- /dev/null
+++ b/gfx/pics/annon_w/front.png
diff --git a/gfx/pics/annon_x/back.png b/gfx/pics/annon_x/back.png
new file mode 100644
index 0000000..6769885
--- /dev/null
+++ b/gfx/pics/annon_x/back.png
diff --git a/gfx/pics/annon_x/front.png b/gfx/pics/annon_x/front.png
new file mode 100644
index 0000000..61dc930
--- /dev/null
+++ b/gfx/pics/annon_x/front.png
diff --git a/gfx/pics/annon_y/back.png b/gfx/pics/annon_y/back.png
new file mode 100644
index 0000000..d7093b9
--- /dev/null
+++ b/gfx/pics/annon_y/back.png
diff --git a/gfx/pics/annon_y/front.png b/gfx/pics/annon_y/front.png
new file mode 100644
index 0000000..24510ed
--- /dev/null
+++ b/gfx/pics/annon_y/front.png
diff --git a/gfx/pics/annon_z/back.png b/gfx/pics/annon_z/back.png
new file mode 100644
index 0000000..26fb6cf
--- /dev/null
+++ b/gfx/pics/annon_z/back.png
diff --git a/gfx/pics/annon_z/front.png b/gfx/pics/annon_z/front.png
new file mode 100644
index 0000000..461350b
--- /dev/null
+++ b/gfx/pics/annon_z/front.png
diff --git a/main.asm b/main.asm
index 13c95de..4346ec4 100644
--- a/main.asm
+++ b/main.asm
@@ -32,3 +32,6 @@ MainMenuStrings: ; 01:5428
     db "じかんセット@"
 ; 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"
diff --git a/shim.sym b/shim.sym
index ebdcf56..f536db6 100644
--- a/shim.sym
+++ b/shim.sym
@@ -96,8 +96,6 @@
 
 14:6D75 PokemonNames
 
-1F:4D6A UnownPicPtrs ; [front ptr (2b)][back ptr (2b)]
-
 21:4000 MoveEffectGfx
 
 23:4349 OverworldFadeOut