diff --git a/assets/sprites/arbok.png b/assets/sprites/arbok.png new file mode 100644 index 0000000..f4f0fb4 Binary files /dev/null and b/assets/sprites/arbok.png differ diff --git a/assets/sprites/gen8/beedrill.png b/assets/sprites/beedrill.png similarity index 100% rename from assets/sprites/gen8/beedrill.png rename to assets/sprites/beedrill.png diff --git a/assets/sprites/gen8/blastoise.png b/assets/sprites/blastoise.png similarity index 100% rename from assets/sprites/gen8/blastoise.png rename to assets/sprites/blastoise.png diff --git a/assets/sprites/gen8/bulbasaur.png b/assets/sprites/bulbasaur.png similarity index 100% rename from assets/sprites/gen8/bulbasaur.png rename to assets/sprites/bulbasaur.png diff --git a/assets/sprites/gen8/butterfree.png b/assets/sprites/butterfree.png similarity index 100% rename from assets/sprites/gen8/butterfree.png rename to assets/sprites/butterfree.png diff --git a/assets/sprites/gen8/caterpie.png b/assets/sprites/caterpie.png similarity index 100% rename from assets/sprites/gen8/caterpie.png rename to assets/sprites/caterpie.png diff --git a/assets/sprites/gen8/charizard.png b/assets/sprites/charizard.png similarity index 100% rename from assets/sprites/gen8/charizard.png rename to assets/sprites/charizard.png diff --git a/assets/sprites/gen8/charmander.png b/assets/sprites/charmander.png similarity index 100% rename from assets/sprites/gen8/charmander.png rename to assets/sprites/charmander.png diff --git a/assets/sprites/gen8/charmeleon.png b/assets/sprites/charmeleon.png similarity index 100% rename from assets/sprites/gen8/charmeleon.png rename to assets/sprites/charmeleon.png diff --git a/assets/sprites/ekans.png b/assets/sprites/ekans.png new file mode 100644 index 0000000..809ff96 Binary files /dev/null and b/assets/sprites/ekans.png differ diff --git a/assets/sprites/fearow.png b/assets/sprites/fearow.png new file mode 100644 index 0000000..ef6cd1d Binary files /dev/null and b/assets/sprites/fearow.png differ diff --git a/assets/sprites/gen1/beedrill.png b/assets/sprites/gen1/beedrill.png deleted file mode 100644 index d349778..0000000 Binary files a/assets/sprites/gen1/beedrill.png and /dev/null differ diff --git a/assets/sprites/gen1/blastoise.png b/assets/sprites/gen1/blastoise.png deleted file mode 100644 index 05b7020..0000000 Binary files a/assets/sprites/gen1/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen1/bulbasaur.png b/assets/sprites/gen1/bulbasaur.png deleted file mode 100644 index db3c636..0000000 Binary files a/assets/sprites/gen1/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen1/butterfree.png b/assets/sprites/gen1/butterfree.png deleted file mode 100644 index caed397..0000000 Binary files a/assets/sprites/gen1/butterfree.png and /dev/null differ diff --git a/assets/sprites/gen1/caterpie.png b/assets/sprites/gen1/caterpie.png deleted file mode 100644 index 6425f00..0000000 Binary files a/assets/sprites/gen1/caterpie.png and /dev/null differ diff --git a/assets/sprites/gen1/charizard.png b/assets/sprites/gen1/charizard.png deleted file mode 100644 index 2f036cc..0000000 Binary files a/assets/sprites/gen1/charizard.png and /dev/null differ diff --git a/assets/sprites/gen1/charmander.png b/assets/sprites/gen1/charmander.png deleted file mode 100644 index 0217282..0000000 Binary files a/assets/sprites/gen1/charmander.png and /dev/null differ diff --git a/assets/sprites/gen1/charmeleon.png b/assets/sprites/gen1/charmeleon.png deleted file mode 100644 index 2aced31..0000000 Binary files a/assets/sprites/gen1/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen1/ivysaur.png b/assets/sprites/gen1/ivysaur.png deleted file mode 100644 index 27bdd2a..0000000 Binary files a/assets/sprites/gen1/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen1/kakuna.png b/assets/sprites/gen1/kakuna.png deleted file mode 100644 index feabf24..0000000 Binary files a/assets/sprites/gen1/kakuna.png and /dev/null differ diff --git a/assets/sprites/gen1/metapod.png b/assets/sprites/gen1/metapod.png deleted file mode 100644 index bf10d3c..0000000 Binary files a/assets/sprites/gen1/metapod.png and /dev/null differ diff --git a/assets/sprites/gen1/pidgeot.png b/assets/sprites/gen1/pidgeot.png deleted file mode 100644 index 37097cd..0000000 Binary files a/assets/sprites/gen1/pidgeot.png and /dev/null differ diff --git a/assets/sprites/gen1/pidgeotto.png b/assets/sprites/gen1/pidgeotto.png deleted file mode 100644 index 88420c0..0000000 Binary files a/assets/sprites/gen1/pidgeotto.png and /dev/null differ diff --git a/assets/sprites/gen1/pidgey.png b/assets/sprites/gen1/pidgey.png deleted file mode 100644 index 90c1b00..0000000 Binary files a/assets/sprites/gen1/pidgey.png and /dev/null differ diff --git a/assets/sprites/gen1/squirtle.png b/assets/sprites/gen1/squirtle.png deleted file mode 100644 index 67546a1..0000000 Binary files a/assets/sprites/gen1/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen1/venusaur.png b/assets/sprites/gen1/venusaur.png deleted file mode 100644 index 70e7a80..0000000 Binary files a/assets/sprites/gen1/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen1/wartortle.png b/assets/sprites/gen1/wartortle.png deleted file mode 100644 index 29690ce..0000000 Binary files a/assets/sprites/gen1/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen1/weedle.png b/assets/sprites/gen1/weedle.png deleted file mode 100644 index 0289f3b..0000000 Binary files a/assets/sprites/gen1/weedle.png and /dev/null differ diff --git a/assets/sprites/gen2/beedrill.png b/assets/sprites/gen2/beedrill.png deleted file mode 100644 index 58779fa..0000000 Binary files a/assets/sprites/gen2/beedrill.png and /dev/null differ diff --git a/assets/sprites/gen2/blastoise.png b/assets/sprites/gen2/blastoise.png deleted file mode 100644 index 1dec509..0000000 Binary files a/assets/sprites/gen2/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen2/bulbasaur.png b/assets/sprites/gen2/bulbasaur.png deleted file mode 100644 index 2e1a231..0000000 Binary files a/assets/sprites/gen2/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen2/butterfree.png b/assets/sprites/gen2/butterfree.png deleted file mode 100644 index bd55496..0000000 Binary files a/assets/sprites/gen2/butterfree.png and /dev/null differ diff --git a/assets/sprites/gen2/caterpie.png b/assets/sprites/gen2/caterpie.png deleted file mode 100644 index 2100fcd..0000000 Binary files a/assets/sprites/gen2/caterpie.png and /dev/null differ diff --git a/assets/sprites/gen2/charizard.png b/assets/sprites/gen2/charizard.png deleted file mode 100644 index d15ad44..0000000 Binary files a/assets/sprites/gen2/charizard.png and /dev/null differ diff --git a/assets/sprites/gen2/charmander.png b/assets/sprites/gen2/charmander.png deleted file mode 100644 index 0d4fd59..0000000 Binary files a/assets/sprites/gen2/charmander.png and /dev/null differ diff --git a/assets/sprites/gen2/charmeleon.png b/assets/sprites/gen2/charmeleon.png deleted file mode 100644 index 43e05af..0000000 Binary files a/assets/sprites/gen2/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen2/ivysaur.png b/assets/sprites/gen2/ivysaur.png deleted file mode 100644 index 8e651cc..0000000 Binary files a/assets/sprites/gen2/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen2/kakuna.png b/assets/sprites/gen2/kakuna.png deleted file mode 100644 index 9bd85bc..0000000 Binary files a/assets/sprites/gen2/kakuna.png and /dev/null differ diff --git a/assets/sprites/gen2/metapod.png b/assets/sprites/gen2/metapod.png deleted file mode 100644 index ee1eaf1..0000000 Binary files a/assets/sprites/gen2/metapod.png and /dev/null differ diff --git a/assets/sprites/gen2/pidgeot.png b/assets/sprites/gen2/pidgeot.png deleted file mode 100644 index 8220059..0000000 Binary files a/assets/sprites/gen2/pidgeot.png and /dev/null differ diff --git a/assets/sprites/gen2/pidgeotto.png b/assets/sprites/gen2/pidgeotto.png deleted file mode 100644 index 9d6eebd..0000000 Binary files a/assets/sprites/gen2/pidgeotto.png and /dev/null differ diff --git a/assets/sprites/gen2/pidgey.png b/assets/sprites/gen2/pidgey.png deleted file mode 100644 index c05c8da..0000000 Binary files a/assets/sprites/gen2/pidgey.png and /dev/null differ diff --git a/assets/sprites/gen2/squirtle.png b/assets/sprites/gen2/squirtle.png deleted file mode 100644 index fac09bb..0000000 Binary files a/assets/sprites/gen2/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen2/venusaur.png b/assets/sprites/gen2/venusaur.png deleted file mode 100644 index 525f3bc..0000000 Binary files a/assets/sprites/gen2/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen2/wartortle.png b/assets/sprites/gen2/wartortle.png deleted file mode 100644 index 46279c2..0000000 Binary files a/assets/sprites/gen2/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen2/weedle.png b/assets/sprites/gen2/weedle.png deleted file mode 100644 index 48632b2..0000000 Binary files a/assets/sprites/gen2/weedle.png and /dev/null differ diff --git a/assets/sprites/gen3/beedrill.png b/assets/sprites/gen3/beedrill.png deleted file mode 100644 index a37cd8e..0000000 Binary files a/assets/sprites/gen3/beedrill.png and /dev/null differ diff --git a/assets/sprites/gen3/blastoise.png b/assets/sprites/gen3/blastoise.png deleted file mode 100644 index 4026b51..0000000 Binary files a/assets/sprites/gen3/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen3/bulbasaur.png b/assets/sprites/gen3/bulbasaur.png deleted file mode 100644 index 2bcbb42..0000000 Binary files a/assets/sprites/gen3/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen3/butterfree.png b/assets/sprites/gen3/butterfree.png deleted file mode 100644 index aeed4bb..0000000 Binary files a/assets/sprites/gen3/butterfree.png and /dev/null differ diff --git a/assets/sprites/gen3/caterpie.png b/assets/sprites/gen3/caterpie.png deleted file mode 100644 index 7f13d5d..0000000 Binary files a/assets/sprites/gen3/caterpie.png and /dev/null differ diff --git a/assets/sprites/gen3/charizard.png b/assets/sprites/gen3/charizard.png deleted file mode 100644 index d550ced..0000000 Binary files a/assets/sprites/gen3/charizard.png and /dev/null differ diff --git a/assets/sprites/gen3/charmander.png b/assets/sprites/gen3/charmander.png deleted file mode 100644 index a8528cd..0000000 Binary files a/assets/sprites/gen3/charmander.png and /dev/null differ diff --git a/assets/sprites/gen3/charmeleon.png b/assets/sprites/gen3/charmeleon.png deleted file mode 100644 index 08d44a6..0000000 Binary files a/assets/sprites/gen3/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen3/ivysaur.png b/assets/sprites/gen3/ivysaur.png deleted file mode 100644 index 27ea8fe..0000000 Binary files a/assets/sprites/gen3/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen3/kakuna.png b/assets/sprites/gen3/kakuna.png deleted file mode 100644 index 7702641..0000000 Binary files a/assets/sprites/gen3/kakuna.png and /dev/null differ diff --git a/assets/sprites/gen3/metapod.png b/assets/sprites/gen3/metapod.png deleted file mode 100644 index 823710e..0000000 Binary files a/assets/sprites/gen3/metapod.png and /dev/null differ diff --git a/assets/sprites/gen3/pidgeot.png b/assets/sprites/gen3/pidgeot.png deleted file mode 100644 index fe60e95..0000000 Binary files a/assets/sprites/gen3/pidgeot.png and /dev/null differ diff --git a/assets/sprites/gen3/pidgeotto.png b/assets/sprites/gen3/pidgeotto.png deleted file mode 100644 index a7dedb8..0000000 Binary files a/assets/sprites/gen3/pidgeotto.png and /dev/null differ diff --git a/assets/sprites/gen3/pidgey.png b/assets/sprites/gen3/pidgey.png deleted file mode 100644 index 805cdf7..0000000 Binary files a/assets/sprites/gen3/pidgey.png and /dev/null differ diff --git a/assets/sprites/gen3/squirtle.png b/assets/sprites/gen3/squirtle.png deleted file mode 100644 index f2196cb..0000000 Binary files a/assets/sprites/gen3/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen3/venusaur.png b/assets/sprites/gen3/venusaur.png deleted file mode 100644 index 396a441..0000000 Binary files a/assets/sprites/gen3/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen3/wartortle.png b/assets/sprites/gen3/wartortle.png deleted file mode 100644 index c89c08c..0000000 Binary files a/assets/sprites/gen3/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen3/weedle.png b/assets/sprites/gen3/weedle.png deleted file mode 100644 index c7e0299..0000000 Binary files a/assets/sprites/gen3/weedle.png and /dev/null differ diff --git a/assets/sprites/gen4/beedrill.png b/assets/sprites/gen4/beedrill.png deleted file mode 100644 index e77004c..0000000 Binary files a/assets/sprites/gen4/beedrill.png and /dev/null differ diff --git a/assets/sprites/gen4/blastoise.png b/assets/sprites/gen4/blastoise.png deleted file mode 100644 index 8c754fc..0000000 Binary files a/assets/sprites/gen4/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen4/bulbasaur.png b/assets/sprites/gen4/bulbasaur.png deleted file mode 100644 index 6051b8c..0000000 Binary files a/assets/sprites/gen4/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen4/butterfree.png b/assets/sprites/gen4/butterfree.png deleted file mode 100644 index bb43b07..0000000 Binary files a/assets/sprites/gen4/butterfree.png and /dev/null differ diff --git a/assets/sprites/gen4/caterpie.png b/assets/sprites/gen4/caterpie.png deleted file mode 100644 index e81528d..0000000 Binary files a/assets/sprites/gen4/caterpie.png and /dev/null differ diff --git a/assets/sprites/gen4/charizard.png b/assets/sprites/gen4/charizard.png deleted file mode 100644 index b7907e6..0000000 Binary files a/assets/sprites/gen4/charizard.png and /dev/null differ diff --git a/assets/sprites/gen4/charmander.png b/assets/sprites/gen4/charmander.png deleted file mode 100644 index b0947f8..0000000 Binary files a/assets/sprites/gen4/charmander.png and /dev/null differ diff --git a/assets/sprites/gen4/charmeleon.png b/assets/sprites/gen4/charmeleon.png deleted file mode 100644 index cc05ae9..0000000 Binary files a/assets/sprites/gen4/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen4/ivysaur.png b/assets/sprites/gen4/ivysaur.png deleted file mode 100644 index 183171b..0000000 Binary files a/assets/sprites/gen4/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen4/kakuna.png b/assets/sprites/gen4/kakuna.png deleted file mode 100644 index fbc0995..0000000 Binary files a/assets/sprites/gen4/kakuna.png and /dev/null differ diff --git a/assets/sprites/gen4/metapod.png b/assets/sprites/gen4/metapod.png deleted file mode 100644 index d250cb4..0000000 Binary files a/assets/sprites/gen4/metapod.png and /dev/null differ diff --git a/assets/sprites/gen4/pidgeot.png b/assets/sprites/gen4/pidgeot.png deleted file mode 100644 index 08c1f38..0000000 Binary files a/assets/sprites/gen4/pidgeot.png and /dev/null differ diff --git a/assets/sprites/gen4/pidgeotto.png b/assets/sprites/gen4/pidgeotto.png deleted file mode 100644 index e8e9302..0000000 Binary files a/assets/sprites/gen4/pidgeotto.png and /dev/null differ diff --git a/assets/sprites/gen4/pidgey.png b/assets/sprites/gen4/pidgey.png deleted file mode 100644 index 75b69d4..0000000 Binary files a/assets/sprites/gen4/pidgey.png and /dev/null differ diff --git a/assets/sprites/gen4/squirtle.png b/assets/sprites/gen4/squirtle.png deleted file mode 100644 index d321de0..0000000 Binary files a/assets/sprites/gen4/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen4/venusaur.png b/assets/sprites/gen4/venusaur.png deleted file mode 100644 index 5cf28d8..0000000 Binary files a/assets/sprites/gen4/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen4/wartortle.png b/assets/sprites/gen4/wartortle.png deleted file mode 100644 index 39d0411..0000000 Binary files a/assets/sprites/gen4/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen4/weedle.png b/assets/sprites/gen4/weedle.png deleted file mode 100644 index 0368ff4..0000000 Binary files a/assets/sprites/gen4/weedle.png and /dev/null differ diff --git a/assets/sprites/gen5/beedrill.png b/assets/sprites/gen5/beedrill.png deleted file mode 100644 index 332b376..0000000 Binary files a/assets/sprites/gen5/beedrill.png and /dev/null differ diff --git a/assets/sprites/gen5/blastoise.png b/assets/sprites/gen5/blastoise.png deleted file mode 100644 index 976f5f8..0000000 Binary files a/assets/sprites/gen5/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen5/bulbasaur.png b/assets/sprites/gen5/bulbasaur.png deleted file mode 100644 index 75ab750..0000000 Binary files a/assets/sprites/gen5/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen5/butterfree.png b/assets/sprites/gen5/butterfree.png deleted file mode 100644 index df11f37..0000000 Binary files a/assets/sprites/gen5/butterfree.png and /dev/null differ diff --git a/assets/sprites/gen5/caterpie.png b/assets/sprites/gen5/caterpie.png deleted file mode 100644 index 338ecb3..0000000 Binary files a/assets/sprites/gen5/caterpie.png and /dev/null differ diff --git a/assets/sprites/gen5/charizard.png b/assets/sprites/gen5/charizard.png deleted file mode 100644 index c1cccd4..0000000 Binary files a/assets/sprites/gen5/charizard.png and /dev/null differ diff --git a/assets/sprites/gen5/charmander.png b/assets/sprites/gen5/charmander.png deleted file mode 100644 index 11e506f..0000000 Binary files a/assets/sprites/gen5/charmander.png and /dev/null differ diff --git a/assets/sprites/gen5/charmeleon.png b/assets/sprites/gen5/charmeleon.png deleted file mode 100644 index d46e1bd..0000000 Binary files a/assets/sprites/gen5/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen5/ivysaur.png b/assets/sprites/gen5/ivysaur.png deleted file mode 100644 index b02c9d3..0000000 Binary files a/assets/sprites/gen5/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen5/kakuna.png b/assets/sprites/gen5/kakuna.png deleted file mode 100644 index bc9c96a..0000000 Binary files a/assets/sprites/gen5/kakuna.png and /dev/null differ diff --git a/assets/sprites/gen5/metapod.png b/assets/sprites/gen5/metapod.png deleted file mode 100644 index cc04f83..0000000 Binary files a/assets/sprites/gen5/metapod.png and /dev/null differ diff --git a/assets/sprites/gen5/pidgeot.png b/assets/sprites/gen5/pidgeot.png deleted file mode 100644 index b3a2ff3..0000000 Binary files a/assets/sprites/gen5/pidgeot.png and /dev/null differ diff --git a/assets/sprites/gen5/pidgeotto.png b/assets/sprites/gen5/pidgeotto.png deleted file mode 100644 index eeb000f..0000000 Binary files a/assets/sprites/gen5/pidgeotto.png and /dev/null differ diff --git a/assets/sprites/gen5/pidgey.png b/assets/sprites/gen5/pidgey.png deleted file mode 100644 index 11bfc26..0000000 Binary files a/assets/sprites/gen5/pidgey.png and /dev/null differ diff --git a/assets/sprites/gen5/squirtle.png b/assets/sprites/gen5/squirtle.png deleted file mode 100644 index b08fb8e..0000000 Binary files a/assets/sprites/gen5/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen5/venusaur.png b/assets/sprites/gen5/venusaur.png deleted file mode 100644 index 5bab42b..0000000 Binary files a/assets/sprites/gen5/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen5/wartortle.png b/assets/sprites/gen5/wartortle.png deleted file mode 100644 index 6bb4dd5..0000000 Binary files a/assets/sprites/gen5/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen5/weedle.png b/assets/sprites/gen5/weedle.png deleted file mode 100644 index ca4ac86..0000000 Binary files a/assets/sprites/gen5/weedle.png and /dev/null differ diff --git a/assets/sprites/gen6/beedrill.png b/assets/sprites/gen6/beedrill.png deleted file mode 100644 index 4005fc3..0000000 Binary files a/assets/sprites/gen6/beedrill.png and /dev/null differ diff --git a/assets/sprites/gen6/blastoise.png b/assets/sprites/gen6/blastoise.png deleted file mode 100644 index dcb85b8..0000000 Binary files a/assets/sprites/gen6/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen6/bulbasaur.png b/assets/sprites/gen6/bulbasaur.png deleted file mode 100644 index e40a8f4..0000000 Binary files a/assets/sprites/gen6/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen6/butterfree.png b/assets/sprites/gen6/butterfree.png deleted file mode 100644 index 86ebc6b..0000000 Binary files a/assets/sprites/gen6/butterfree.png and /dev/null differ diff --git a/assets/sprites/gen6/caterpie.png b/assets/sprites/gen6/caterpie.png deleted file mode 100644 index 2d6aa7e..0000000 Binary files a/assets/sprites/gen6/caterpie.png and /dev/null differ diff --git a/assets/sprites/gen6/charizard.png b/assets/sprites/gen6/charizard.png deleted file mode 100644 index 67c7e0b..0000000 Binary files a/assets/sprites/gen6/charizard.png and /dev/null differ diff --git a/assets/sprites/gen6/charmander.png b/assets/sprites/gen6/charmander.png deleted file mode 100644 index d9910f1..0000000 Binary files a/assets/sprites/gen6/charmander.png and /dev/null differ diff --git a/assets/sprites/gen6/charmeleon.png b/assets/sprites/gen6/charmeleon.png deleted file mode 100644 index d8d7298..0000000 Binary files a/assets/sprites/gen6/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen6/ivysaur.png b/assets/sprites/gen6/ivysaur.png deleted file mode 100644 index 61566a5..0000000 Binary files a/assets/sprites/gen6/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen6/kakuna.png b/assets/sprites/gen6/kakuna.png deleted file mode 100644 index 8b443a2..0000000 Binary files a/assets/sprites/gen6/kakuna.png and /dev/null differ diff --git a/assets/sprites/gen6/metapod.png b/assets/sprites/gen6/metapod.png deleted file mode 100644 index 212934a..0000000 Binary files a/assets/sprites/gen6/metapod.png and /dev/null differ diff --git a/assets/sprites/gen6/pidgeot.png b/assets/sprites/gen6/pidgeot.png deleted file mode 100644 index 57c9a19..0000000 Binary files a/assets/sprites/gen6/pidgeot.png and /dev/null differ diff --git a/assets/sprites/gen6/pidgeotto.png b/assets/sprites/gen6/pidgeotto.png deleted file mode 100644 index 68dbdf2..0000000 Binary files a/assets/sprites/gen6/pidgeotto.png and /dev/null differ diff --git a/assets/sprites/gen6/pidgey.png b/assets/sprites/gen6/pidgey.png deleted file mode 100644 index 594ee7c..0000000 Binary files a/assets/sprites/gen6/pidgey.png and /dev/null differ diff --git a/assets/sprites/gen6/squirtle.png b/assets/sprites/gen6/squirtle.png deleted file mode 100644 index 44c68df..0000000 Binary files a/assets/sprites/gen6/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen6/venusaur.png b/assets/sprites/gen6/venusaur.png deleted file mode 100644 index d91f705..0000000 Binary files a/assets/sprites/gen6/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen6/wartortle.png b/assets/sprites/gen6/wartortle.png deleted file mode 100644 index 8034a6f..0000000 Binary files a/assets/sprites/gen6/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen6/weedle.png b/assets/sprites/gen6/weedle.png deleted file mode 100644 index b90ff9f..0000000 Binary files a/assets/sprites/gen6/weedle.png and /dev/null differ diff --git a/assets/sprites/gen7/beedrill.png b/assets/sprites/gen7/beedrill.png deleted file mode 100644 index 33aba8b..0000000 Binary files a/assets/sprites/gen7/beedrill.png and /dev/null differ diff --git a/assets/sprites/gen7/blastoise.png b/assets/sprites/gen7/blastoise.png deleted file mode 100644 index 199b28f..0000000 Binary files a/assets/sprites/gen7/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen7/bulbasaur.png b/assets/sprites/gen7/bulbasaur.png deleted file mode 100644 index 4ba0665..0000000 Binary files a/assets/sprites/gen7/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen7/butterfree.png b/assets/sprites/gen7/butterfree.png deleted file mode 100644 index 55652c5..0000000 Binary files a/assets/sprites/gen7/butterfree.png and /dev/null differ diff --git a/assets/sprites/gen7/caterpie.png b/assets/sprites/gen7/caterpie.png deleted file mode 100644 index bdab45a..0000000 Binary files a/assets/sprites/gen7/caterpie.png and /dev/null differ diff --git a/assets/sprites/gen7/charizard.png b/assets/sprites/gen7/charizard.png deleted file mode 100644 index 750a824..0000000 Binary files a/assets/sprites/gen7/charizard.png and /dev/null differ diff --git a/assets/sprites/gen7/charmander.png b/assets/sprites/gen7/charmander.png deleted file mode 100644 index 4687050..0000000 Binary files a/assets/sprites/gen7/charmander.png and /dev/null differ diff --git a/assets/sprites/gen7/charmeleon.png b/assets/sprites/gen7/charmeleon.png deleted file mode 100644 index 0cb097e..0000000 Binary files a/assets/sprites/gen7/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen7/ivysaur.png b/assets/sprites/gen7/ivysaur.png deleted file mode 100644 index b964483..0000000 Binary files a/assets/sprites/gen7/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen7/kakuna.png b/assets/sprites/gen7/kakuna.png deleted file mode 100644 index 611adf3..0000000 Binary files a/assets/sprites/gen7/kakuna.png and /dev/null differ diff --git a/assets/sprites/gen7/metapod.png b/assets/sprites/gen7/metapod.png deleted file mode 100644 index 365019f..0000000 Binary files a/assets/sprites/gen7/metapod.png and /dev/null differ diff --git a/assets/sprites/gen7/pidgeot.png b/assets/sprites/gen7/pidgeot.png deleted file mode 100644 index 4dd9ba8..0000000 Binary files a/assets/sprites/gen7/pidgeot.png and /dev/null differ diff --git a/assets/sprites/gen7/pidgeotto.png b/assets/sprites/gen7/pidgeotto.png deleted file mode 100644 index 5858f6e..0000000 Binary files a/assets/sprites/gen7/pidgeotto.png and /dev/null differ diff --git a/assets/sprites/gen7/pidgey.png b/assets/sprites/gen7/pidgey.png deleted file mode 100644 index fd9ae55..0000000 Binary files a/assets/sprites/gen7/pidgey.png and /dev/null differ diff --git a/assets/sprites/gen7/squirtle.png b/assets/sprites/gen7/squirtle.png deleted file mode 100644 index c0bc619..0000000 Binary files a/assets/sprites/gen7/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen7/venusaur.png b/assets/sprites/gen7/venusaur.png deleted file mode 100644 index fc8f9bc..0000000 Binary files a/assets/sprites/gen7/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen7/wartortle.png b/assets/sprites/gen7/wartortle.png deleted file mode 100644 index 8fb8df4..0000000 Binary files a/assets/sprites/gen7/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen7/weedle.png b/assets/sprites/gen7/weedle.png deleted file mode 100644 index f2d1e93..0000000 Binary files a/assets/sprites/gen7/weedle.png and /dev/null differ diff --git a/assets/sprites/gen9/blastoise.png b/assets/sprites/gen9/blastoise.png deleted file mode 100644 index 4af1923..0000000 Binary files a/assets/sprites/gen9/blastoise.png and /dev/null differ diff --git a/assets/sprites/gen9/bulbasaur.png b/assets/sprites/gen9/bulbasaur.png deleted file mode 100644 index a02045f..0000000 Binary files a/assets/sprites/gen9/bulbasaur.png and /dev/null differ diff --git a/assets/sprites/gen9/charizard.png b/assets/sprites/gen9/charizard.png deleted file mode 100644 index e54de93..0000000 Binary files a/assets/sprites/gen9/charizard.png and /dev/null differ diff --git a/assets/sprites/gen9/charmander.png b/assets/sprites/gen9/charmander.png deleted file mode 100644 index eadcfbb..0000000 Binary files a/assets/sprites/gen9/charmander.png and /dev/null differ diff --git a/assets/sprites/gen9/charmeleon.png b/assets/sprites/gen9/charmeleon.png deleted file mode 100644 index 223dc88..0000000 Binary files a/assets/sprites/gen9/charmeleon.png and /dev/null differ diff --git a/assets/sprites/gen9/ivysaur.png b/assets/sprites/gen9/ivysaur.png deleted file mode 100644 index 973a0c9..0000000 Binary files a/assets/sprites/gen9/ivysaur.png and /dev/null differ diff --git a/assets/sprites/gen9/squirtle.png b/assets/sprites/gen9/squirtle.png deleted file mode 100644 index 02228b1..0000000 Binary files a/assets/sprites/gen9/squirtle.png and /dev/null differ diff --git a/assets/sprites/gen9/venusaur.png b/assets/sprites/gen9/venusaur.png deleted file mode 100644 index dd261e4..0000000 Binary files a/assets/sprites/gen9/venusaur.png and /dev/null differ diff --git a/assets/sprites/gen9/wartortle.png b/assets/sprites/gen9/wartortle.png deleted file mode 100644 index aee0d74..0000000 Binary files a/assets/sprites/gen9/wartortle.png and /dev/null differ diff --git a/assets/sprites/gen8/ivysaur.png b/assets/sprites/ivysaur.png similarity index 100% rename from assets/sprites/gen8/ivysaur.png rename to assets/sprites/ivysaur.png diff --git a/assets/sprites/gen8/kakuna.png b/assets/sprites/kakuna.png similarity index 100% rename from assets/sprites/gen8/kakuna.png rename to assets/sprites/kakuna.png diff --git a/assets/sprites/gen8/metapod.png b/assets/sprites/metapod.png similarity index 100% rename from assets/sprites/gen8/metapod.png rename to assets/sprites/metapod.png diff --git a/assets/sprites/gen8/pidgeot.png b/assets/sprites/pidgeot.png similarity index 100% rename from assets/sprites/gen8/pidgeot.png rename to assets/sprites/pidgeot.png diff --git a/assets/sprites/gen8/pidgeotto.png b/assets/sprites/pidgeotto.png similarity index 100% rename from assets/sprites/gen8/pidgeotto.png rename to assets/sprites/pidgeotto.png diff --git a/assets/sprites/gen8/pidgey.png b/assets/sprites/pidgey.png similarity index 100% rename from assets/sprites/gen8/pidgey.png rename to assets/sprites/pidgey.png diff --git a/assets/sprites/raticate.png b/assets/sprites/raticate.png new file mode 100644 index 0000000..6a491f5 Binary files /dev/null and b/assets/sprites/raticate.png differ diff --git a/assets/sprites/rattata.png b/assets/sprites/rattata.png new file mode 100644 index 0000000..536e473 Binary files /dev/null and b/assets/sprites/rattata.png differ diff --git a/assets/sprites/spearow.png b/assets/sprites/spearow.png new file mode 100644 index 0000000..38f5bdc Binary files /dev/null and b/assets/sprites/spearow.png differ diff --git a/assets/sprites/gen8/squirtle.png b/assets/sprites/squirtle.png similarity index 100% rename from assets/sprites/gen8/squirtle.png rename to assets/sprites/squirtle.png diff --git a/assets/sprites/gen8/venusaur.png b/assets/sprites/venusaur.png similarity index 100% rename from assets/sprites/gen8/venusaur.png rename to assets/sprites/venusaur.png diff --git a/assets/sprites/gen8/wartortle.png b/assets/sprites/wartortle.png similarity index 100% rename from assets/sprites/gen8/wartortle.png rename to assets/sprites/wartortle.png diff --git a/assets/sprites/gen8/weedle.png b/assets/sprites/weedle.png similarity index 100% rename from assets/sprites/gen8/weedle.png rename to assets/sprites/weedle.png diff --git a/lib/pokemon.dart b/lib/pokemon.dart index c2f85ea..7333144 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -121,7 +121,11 @@ enum Pokemon { Beedrill(15, Generation.One, [Type.Bug, Type.Poison], null), Pidgey(16, Generation.One, [Type.Normal, Type.Flying], Evolution(17, 18)), Pidgeotto(17, Generation.One, [Type.Normal, Type.Flying], Evolution(18, 36)), - Pidgeot(18, Generation.One, [Type.Normal, Type.Flying], null); + Pidgeot(18, Generation.One, [Type.Normal, Type.Flying], null), + Rattata(19, Generation.One, [Type.Normal], Evolution(20, 20)), + Raticate(20, Generation.One, [Type.Normal], null), + Spearow(21, Generation.One, [Type.Normal, Type.Flying], Evolution(22, 20)), + Fearow(22, Generation.One, [Type.Normal, Type.Flying], null); final int id; final Generation generation; @@ -130,16 +134,8 @@ enum Pokemon { bool get hasEvolutions => evolution != null; const Pokemon(this.id, this.generation, this.types, this.evolution); - String toSpritePath() { - return '${generation.toSpritePath()}/${name.toLowerCase()}.png'; - } - String toDexPath() { - return 'assets/sprites/gen8/${name.toLowerCase()}.png'; - } - - String toSpriteShinyPath() { - return '${generation.toSpritePath()}/${name.toLowerCase()}_shiny.png'; + return 'assets/sprites/${name.toLowerCase()}.png'; } Widget getTypeWidgets() { diff --git a/pubspec.yaml b/pubspec.yaml index 2c9e1c5..2fe894f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,176 +64,30 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - - assets/sprites/gen1/bulbasaur.png - - assets/sprites/gen2/bulbasaur.png - - assets/sprites/gen3/bulbasaur.png - - assets/sprites/gen4/bulbasaur.png - - assets/sprites/gen5/bulbasaur.png - - assets/sprites/gen6/bulbasaur.png - - assets/sprites/gen7/bulbasaur.png - - assets/sprites/gen8/bulbasaur.png - - assets/sprites/gen9/bulbasaur.png - - - assets/sprites/gen1/ivysaur.png - - assets/sprites/gen2/ivysaur.png - - assets/sprites/gen3/ivysaur.png - - assets/sprites/gen4/ivysaur.png - - assets/sprites/gen5/ivysaur.png - - assets/sprites/gen6/ivysaur.png - - assets/sprites/gen7/ivysaur.png - - assets/sprites/gen8/ivysaur.png - - assets/sprites/gen9/ivysaur.png - - - assets/sprites/gen1/venusaur.png - - assets/sprites/gen2/venusaur.png - - assets/sprites/gen3/venusaur.png - - assets/sprites/gen4/venusaur.png - - assets/sprites/gen5/venusaur.png - - assets/sprites/gen6/venusaur.png - - assets/sprites/gen7/venusaur.png - - assets/sprites/gen8/venusaur.png - - assets/sprites/gen9/venusaur.png - - - assets/sprites/gen1/charmander.png - - assets/sprites/gen2/charmander.png - - assets/sprites/gen3/charmander.png - - assets/sprites/gen4/charmander.png - - assets/sprites/gen5/charmander.png - - assets/sprites/gen6/charmander.png - - assets/sprites/gen7/charmander.png - - assets/sprites/gen8/charmander.png - - assets/sprites/gen9/charmander.png - - - assets/sprites/gen1/charmeleon.png - - assets/sprites/gen2/charmeleon.png - - assets/sprites/gen3/charmeleon.png - - assets/sprites/gen4/charmeleon.png - - assets/sprites/gen5/charmeleon.png - - assets/sprites/gen6/charmeleon.png - - assets/sprites/gen7/charmeleon.png - - assets/sprites/gen8/charmeleon.png - - assets/sprites/gen9/charmeleon.png - - - assets/sprites/gen1/charizard.png - - assets/sprites/gen2/charizard.png - - assets/sprites/gen3/charizard.png - - assets/sprites/gen4/charizard.png - - assets/sprites/gen5/charizard.png - - assets/sprites/gen6/charizard.png - - assets/sprites/gen7/charizard.png - - assets/sprites/gen8/charizard.png - - assets/sprites/gen9/charizard.png - - - assets/sprites/gen1/squirtle.png - - assets/sprites/gen2/squirtle.png - - assets/sprites/gen3/squirtle.png - - assets/sprites/gen4/squirtle.png - - assets/sprites/gen5/squirtle.png - - assets/sprites/gen6/squirtle.png - - assets/sprites/gen7/squirtle.png - - assets/sprites/gen8/squirtle.png - - assets/sprites/gen9/squirtle.png - - - assets/sprites/gen1/wartortle.png - - assets/sprites/gen2/wartortle.png - - assets/sprites/gen3/wartortle.png - - assets/sprites/gen4/wartortle.png - - assets/sprites/gen5/wartortle.png - - assets/sprites/gen6/wartortle.png - - assets/sprites/gen7/wartortle.png - - assets/sprites/gen8/wartortle.png - - assets/sprites/gen9/wartortle.png - - - assets/sprites/gen1/blastoise.png - - assets/sprites/gen2/blastoise.png - - assets/sprites/gen3/blastoise.png - - assets/sprites/gen4/blastoise.png - - assets/sprites/gen5/blastoise.png - - assets/sprites/gen6/blastoise.png - - assets/sprites/gen7/blastoise.png - - assets/sprites/gen8/blastoise.png - - assets/sprites/gen9/blastoise.png - - - assets/sprites/gen1/caterpie.png - - assets/sprites/gen2/caterpie.png - - assets/sprites/gen3/caterpie.png - - assets/sprites/gen4/caterpie.png - - assets/sprites/gen5/caterpie.png - - assets/sprites/gen6/caterpie.png - - assets/sprites/gen7/caterpie.png - - assets/sprites/gen8/caterpie.png - - - assets/sprites/gen1/metapod.png - - assets/sprites/gen2/metapod.png - - assets/sprites/gen3/metapod.png - - assets/sprites/gen4/metapod.png - - assets/sprites/gen5/metapod.png - - assets/sprites/gen6/metapod.png - - assets/sprites/gen7/metapod.png - - assets/sprites/gen8/metapod.png - - - assets/sprites/gen1/butterfree.png - - assets/sprites/gen2/butterfree.png - - assets/sprites/gen3/butterfree.png - - assets/sprites/gen4/butterfree.png - - assets/sprites/gen5/butterfree.png - - assets/sprites/gen6/butterfree.png - - assets/sprites/gen7/butterfree.png - - assets/sprites/gen8/butterfree.png - - - assets/sprites/gen1/weedle.png - - assets/sprites/gen2/weedle.png - - assets/sprites/gen3/weedle.png - - assets/sprites/gen4/weedle.png - - assets/sprites/gen5/weedle.png - - assets/sprites/gen6/weedle.png - - assets/sprites/gen7/weedle.png - - assets/sprites/gen8/weedle.png - - - assets/sprites/gen1/kakuna.png - - assets/sprites/gen2/kakuna.png - - assets/sprites/gen3/kakuna.png - - assets/sprites/gen4/kakuna.png - - assets/sprites/gen5/kakuna.png - - assets/sprites/gen6/kakuna.png - - assets/sprites/gen7/kakuna.png - - assets/sprites/gen8/kakuna.png - - - assets/sprites/gen1/beedrill.png - - assets/sprites/gen2/beedrill.png - - assets/sprites/gen3/beedrill.png - - assets/sprites/gen4/beedrill.png - - assets/sprites/gen5/beedrill.png - - assets/sprites/gen6/beedrill.png - - assets/sprites/gen7/beedrill.png - - assets/sprites/gen8/beedrill.png - - - assets/sprites/gen1/pidgey.png - - assets/sprites/gen2/pidgey.png - - assets/sprites/gen3/pidgey.png - - assets/sprites/gen4/pidgey.png - - assets/sprites/gen5/pidgey.png - - assets/sprites/gen6/pidgey.png - - assets/sprites/gen7/pidgey.png - - assets/sprites/gen8/pidgey.png - - - assets/sprites/gen1/pidgeotto.png - - assets/sprites/gen2/pidgeotto.png - - assets/sprites/gen3/pidgeotto.png - - assets/sprites/gen4/pidgeotto.png - - assets/sprites/gen5/pidgeotto.png - - assets/sprites/gen6/pidgeotto.png - - assets/sprites/gen7/pidgeotto.png - - assets/sprites/gen8/pidgeotto.png - - - assets/sprites/gen1/pidgeot.png - - assets/sprites/gen2/pidgeot.png - - assets/sprites/gen3/pidgeot.png - - assets/sprites/gen4/pidgeot.png - - assets/sprites/gen5/pidgeot.png - - assets/sprites/gen6/pidgeot.png - - assets/sprites/gen7/pidgeot.png - - assets/sprites/gen8/pidgeot.png + - assets/sprites/bulbasaur.png + - assets/sprites/ivysaur.png + - assets/sprites/venusaur.png + - assets/sprites/charmander.png + - assets/sprites/charmeleon.png + - assets/sprites/charizard.png + - assets/sprites/squirtle.png + - assets/sprites/wartortle.png + - assets/sprites/blastoise.png + - assets/sprites/caterpie.png + - assets/sprites/metapod.png + - assets/sprites/butterfree.png + - assets/sprites/weedle.png + - assets/sprites/kakuna.png + - assets/sprites/beedrill.png + - assets/sprites/pidgey.png + - assets/sprites/pidgeotto.png + - assets/sprites/pidgeot.png + - assets/sprites/rattata.png + - assets/sprites/raticate.png + - assets/sprites/spearow.png + - assets/sprites/fearow.png + - assets/sprites/ekans.png + - assets/sprites/arbok.png # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images