summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2018-05-30 12:23:53 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2018-05-30 12:23:53 -0400
commit3a45d7ce1286034c0af12f79348bfea9f49a2e13 (patch)
tree38b32e1fa8902b8bae6d9c0e355a45f699bb0ae7
parent3c6e9ccabc31a60aaa0563009aaeb16ff5bacb03 (diff)
Split up icon graphics; add missing files
-rw-r--r--gfx/icons/annon.pngbin0 -> 195 bytes
-rw-r--r--gfx/icons/barrierd.pngbin0 -> 249 bytes
-rw-r--r--gfx/icons/beedle.pngbin0 -> 257 bytes
-rw-r--r--gfx/icons/biriridama.pngbin0 -> 222 bytes
-rw-r--r--gfx/icons/butterfree.pngbin0 -> 273 bytes
-rw-r--r--gfx/icons/digda.pngbin0 -> 212 bytes
-rw-r--r--gfx/icons/fushigidane.pngbin0 -> 254 bytes
-rw-r--r--gfx/icons/gangar.pngbin0 -> 224 bytes
-rw-r--r--gfx/icons/hitodeman.pngbin0 -> 252 bytes
-rw-r--r--gfx/icons/hitokage.pngbin0 -> 245 bytes
-rw-r--r--gfx/icons/isitsubute.pngbin0 -> 253 bytes
-rw-r--r--gfx/icons/iwark.pngbin0 -> 230 bytes
-rw-r--r--gfx/icons/kabigon.pngbin0 -> 234 bytes
-rw-r--r--gfx/icons/kentauros.pngbin0 -> 249 bytes
-rw-r--r--gfx/icons/koiking.pngbin0 -> 211 bytes
-rw-r--r--gfx/icons/laplace.pngbin0 -> 255 bytes
-rw-r--r--gfx/icons/lokon.pngbin0 -> 273 bytes
-rw-r--r--gfx/icons/menokurage.pngbin0 -> 251 bytes
-rw-r--r--gfx/icons/metamon.pngbin0 -> 248 bytes
-rw-r--r--gfx/icons/mon_icons.pngbin2202 -> 0 bytes
-rw-r--r--gfx/icons/mushi.pngbin0 -> 261 bytes
-rw-r--r--gfx/icons/nazonokusa.pngbin0 -> 240 bytes
-rw-r--r--gfx/icons/nyoromo.pngbin0 -> 184 bytes
-rw-r--r--gfx/icons/pikachu.pngbin0 -> 254 bytes
-rw-r--r--gfx/icons/pippi.pngbin0 -> 254 bytes
-rw-r--r--gfx/icons/poppo.pngbin0 -> 265 bytes
-rw-r--r--gfx/icons/purin.pngbin0 -> 243 bytes
-rw-r--r--gfx/icons/shellder.pngbin0 -> 253 bytes
-rw-r--r--gfx/icons/sidon.pngbin0 -> 265 bytes
-rw-r--r--gfx/icons/tamago.pngbin0 -> 234 bytes
-rw-r--r--gfx/icons/wanriky.pngbin0 -> 255 bytes
-rw-r--r--gfx/icons/zenigame.pngbin0 -> 267 bytes
-rw-r--r--gfx/icons/zubat.pngbin0 -> 234 bytes
-rw-r--r--gfx/overworld/happy.pngbin0 -> 125 bytes
-rw-r--r--gfx/overworld/question.pngbin0 -> 124 bytes
-rw-r--r--gfx/overworld/shock.pngbin0 -> 110 bytes
-rw-r--r--gfx/title/fire.pngbin0 -> 163 bytes
-rw-r--r--gfx/title/notes.pngbin0 -> 138 bytes
-rw-r--r--main.asm65
39 files changed, 64 insertions, 1 deletions
diff --git a/gfx/icons/annon.png b/gfx/icons/annon.png
new file mode 100644
index 0000000..6ba6515
--- /dev/null
+++ b/gfx/icons/annon.png
Binary files differ
diff --git a/gfx/icons/barrierd.png b/gfx/icons/barrierd.png
new file mode 100644
index 0000000..54784f4
--- /dev/null
+++ b/gfx/icons/barrierd.png
Binary files differ
diff --git a/gfx/icons/beedle.png b/gfx/icons/beedle.png
new file mode 100644
index 0000000..bbaa3d6
--- /dev/null
+++ b/gfx/icons/beedle.png
Binary files differ
diff --git a/gfx/icons/biriridama.png b/gfx/icons/biriridama.png
new file mode 100644
index 0000000..8b30886
--- /dev/null
+++ b/gfx/icons/biriridama.png
Binary files differ
diff --git a/gfx/icons/butterfree.png b/gfx/icons/butterfree.png
new file mode 100644
index 0000000..adc781a
--- /dev/null
+++ b/gfx/icons/butterfree.png
Binary files differ
diff --git a/gfx/icons/digda.png b/gfx/icons/digda.png
new file mode 100644
index 0000000..336c4b8
--- /dev/null
+++ b/gfx/icons/digda.png
Binary files differ
diff --git a/gfx/icons/fushigidane.png b/gfx/icons/fushigidane.png
new file mode 100644
index 0000000..74cee15
--- /dev/null
+++ b/gfx/icons/fushigidane.png
Binary files differ
diff --git a/gfx/icons/gangar.png b/gfx/icons/gangar.png
new file mode 100644
index 0000000..59c3e7f
--- /dev/null
+++ b/gfx/icons/gangar.png
Binary files differ
diff --git a/gfx/icons/hitodeman.png b/gfx/icons/hitodeman.png
new file mode 100644
index 0000000..97eef67
--- /dev/null
+++ b/gfx/icons/hitodeman.png
Binary files differ
diff --git a/gfx/icons/hitokage.png b/gfx/icons/hitokage.png
new file mode 100644
index 0000000..3f83cba
--- /dev/null
+++ b/gfx/icons/hitokage.png
Binary files differ
diff --git a/gfx/icons/isitsubute.png b/gfx/icons/isitsubute.png
new file mode 100644
index 0000000..e8def42
--- /dev/null
+++ b/gfx/icons/isitsubute.png
Binary files differ
diff --git a/gfx/icons/iwark.png b/gfx/icons/iwark.png
new file mode 100644
index 0000000..14e8c3a
--- /dev/null
+++ b/gfx/icons/iwark.png
Binary files differ
diff --git a/gfx/icons/kabigon.png b/gfx/icons/kabigon.png
new file mode 100644
index 0000000..f6d7e43
--- /dev/null
+++ b/gfx/icons/kabigon.png
Binary files differ
diff --git a/gfx/icons/kentauros.png b/gfx/icons/kentauros.png
new file mode 100644
index 0000000..d76634c
--- /dev/null
+++ b/gfx/icons/kentauros.png
Binary files differ
diff --git a/gfx/icons/koiking.png b/gfx/icons/koiking.png
new file mode 100644
index 0000000..3624402
--- /dev/null
+++ b/gfx/icons/koiking.png
Binary files differ
diff --git a/gfx/icons/laplace.png b/gfx/icons/laplace.png
new file mode 100644
index 0000000..489fd85
--- /dev/null
+++ b/gfx/icons/laplace.png
Binary files differ
diff --git a/gfx/icons/lokon.png b/gfx/icons/lokon.png
new file mode 100644
index 0000000..c04d832
--- /dev/null
+++ b/gfx/icons/lokon.png
Binary files differ
diff --git a/gfx/icons/menokurage.png b/gfx/icons/menokurage.png
new file mode 100644
index 0000000..761bc3f
--- /dev/null
+++ b/gfx/icons/menokurage.png
Binary files differ
diff --git a/gfx/icons/metamon.png b/gfx/icons/metamon.png
new file mode 100644
index 0000000..a72faee
--- /dev/null
+++ b/gfx/icons/metamon.png
Binary files differ
diff --git a/gfx/icons/mon_icons.png b/gfx/icons/mon_icons.png
deleted file mode 100644
index 24f970d..0000000
--- a/gfx/icons/mon_icons.png
+++ /dev/null
Binary files differ
diff --git a/gfx/icons/mushi.png b/gfx/icons/mushi.png
new file mode 100644
index 0000000..89574d5
--- /dev/null
+++ b/gfx/icons/mushi.png
Binary files differ
diff --git a/gfx/icons/nazonokusa.png b/gfx/icons/nazonokusa.png
new file mode 100644
index 0000000..7c36012
--- /dev/null
+++ b/gfx/icons/nazonokusa.png
Binary files differ
diff --git a/gfx/icons/nyoromo.png b/gfx/icons/nyoromo.png
new file mode 100644
index 0000000..1de70d9
--- /dev/null
+++ b/gfx/icons/nyoromo.png
Binary files differ
diff --git a/gfx/icons/pikachu.png b/gfx/icons/pikachu.png
new file mode 100644
index 0000000..7b703a4
--- /dev/null
+++ b/gfx/icons/pikachu.png
Binary files differ
diff --git a/gfx/icons/pippi.png b/gfx/icons/pippi.png
new file mode 100644
index 0000000..bb8454b
--- /dev/null
+++ b/gfx/icons/pippi.png
Binary files differ
diff --git a/gfx/icons/poppo.png b/gfx/icons/poppo.png
new file mode 100644
index 0000000..7b025e6
--- /dev/null
+++ b/gfx/icons/poppo.png
Binary files differ
diff --git a/gfx/icons/purin.png b/gfx/icons/purin.png
new file mode 100644
index 0000000..63e226b
--- /dev/null
+++ b/gfx/icons/purin.png
Binary files differ
diff --git a/gfx/icons/shellder.png b/gfx/icons/shellder.png
new file mode 100644
index 0000000..a3af25b
--- /dev/null
+++ b/gfx/icons/shellder.png
Binary files differ
diff --git a/gfx/icons/sidon.png b/gfx/icons/sidon.png
new file mode 100644
index 0000000..ac54c6f
--- /dev/null
+++ b/gfx/icons/sidon.png
Binary files differ
diff --git a/gfx/icons/tamago.png b/gfx/icons/tamago.png
new file mode 100644
index 0000000..364fadf
--- /dev/null
+++ b/gfx/icons/tamago.png
Binary files differ
diff --git a/gfx/icons/wanriky.png b/gfx/icons/wanriky.png
new file mode 100644
index 0000000..21a8bde
--- /dev/null
+++ b/gfx/icons/wanriky.png
Binary files differ
diff --git a/gfx/icons/zenigame.png b/gfx/icons/zenigame.png
new file mode 100644
index 0000000..09a8e41
--- /dev/null
+++ b/gfx/icons/zenigame.png
Binary files differ
diff --git a/gfx/icons/zubat.png b/gfx/icons/zubat.png
new file mode 100644
index 0000000..eb75b00
--- /dev/null
+++ b/gfx/icons/zubat.png
Binary files differ
diff --git a/gfx/overworld/happy.png b/gfx/overworld/happy.png
new file mode 100644
index 0000000..dd65f4d
--- /dev/null
+++ b/gfx/overworld/happy.png
Binary files differ
diff --git a/gfx/overworld/question.png b/gfx/overworld/question.png
new file mode 100644
index 0000000..ef1d770
--- /dev/null
+++ b/gfx/overworld/question.png
Binary files differ
diff --git a/gfx/overworld/shock.png b/gfx/overworld/shock.png
new file mode 100644
index 0000000..f15cf50
--- /dev/null
+++ b/gfx/overworld/shock.png
Binary files differ
diff --git a/gfx/title/fire.png b/gfx/title/fire.png
new file mode 100644
index 0000000..ba81d01
--- /dev/null
+++ b/gfx/title/fire.png
Binary files differ
diff --git a/gfx/title/notes.png b/gfx/title/notes.png
new file mode 100644
index 0000000..287a8b9
--- /dev/null
+++ b/gfx/title/notes.png
Binary files differ
diff --git a/main.asm b/main.asm
index 2ada8ec..190ec77 100644
--- a/main.asm
+++ b/main.asm
@@ -127,7 +127,70 @@ SECTION "Attack Animation GFX", ROMX[$4000], BANK[$21]
INCBIN "gfx/battle_anims/attack_animations.2bpp"
SECTION "Pokemon Party Sprites", ROMX[$60CC], BANK[$23]
-INCBIN "gfx/icons/mon_icons.2bpp"
+NyoromoIcon::
+INCBIN "gfx/icons/nyoromo.2bpp"
+PurinIcon::
+INCBIN "gfx/icons/purin.2bpp"
+DigdaIcon::
+INCBIN "gfx/icons/digda.2bpp"
+PikachuIcon::
+INCBIN "gfx/icons/pikachu.2bpp"
+HitodemanIcon::
+INCBIN "gfx/icons/hitodeman.2bpp"
+KoikingIcon::
+INCBIN "gfx/icons/koiking.2bpp"
+PoppoIcon::
+INCBIN "gfx/icons/poppo.2bpp"
+SidonIcon::
+INCBIN "gfx/icons/sidon.2bpp"
+PippiIcon::
+INCBIN "gfx/icons/pippi.2bpp"
+NazonokusaIcon::
+INCBIN "gfx/icons/nazonokusa.2bpp"
+MushiIcon::
+INCBIN "gfx/icons/mushi.2bpp"
+GangarIcon::
+INCBIN "gfx/icons/gangar.2bpp"
+LaplaceIcon::
+INCBIN "gfx/icons/laplace.2bpp"
+BarrierdIcon::
+INCBIN "gfx/icons/barrierd.2bpp"
+LokonIcon::
+INCBIN "gfx/icons/lokon.2bpp"
+KentaurosIcon::
+INCBIN "gfx/icons/kentauros.2bpp"
+ShellderIcon::
+INCBIN "gfx/icons/shellder.2bpp"
+MetamonIcon::
+INCBIN "gfx/icons/metamon.2bpp"
+IwarkIcon::
+INCBIN "gfx/icons/iwark.2bpp"
+BiriridamaIcon::
+INCBIN "gfx/icons/biriridama.2bpp"
+ZenigameIcon::
+INCBIN "gfx/icons/zenigame.2bpp"
+FushigidaneIcon::
+INCBIN "gfx/icons/fushigidane.2bpp"
+HitokageIcon::
+INCBIN "gfx/icons/hitokage.2bpp"
+BeedleIcon::
+INCBIN "gfx/icons/beedle.2bpp"
+AnnonIcon::
+INCBIN "gfx/icons/annon.2bpp"
+IsitsubuteIcon::
+INCBIN "gfx/icons/isitsubute.2bpp"
+WanrikyIcon::
+INCBIN "gfx/icons/wanriky.2bpp"
+TamagoIcon::
+INCBIN "gfx/icons/tamago.2bpp"
+MenokurageIcon::
+INCBIN "gfx/icons/menokurage.2bpp"
+ButterfreeIcon::
+INCBIN "gfx/icons/butterfree.2bpp"
+ZubatIcon::
+INCBIN "gfx/icons/zubat.2bpp"
+KabigonIcon::
+INCBIN "gfx/icons/kabigon.2bpp"
SECTION "Slot Machine GFX", ROMX[$4FDB], BANK[$24]
SlotMachineGFX::