diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 7c221ae5..e2261b21 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -186,6 +186,11 @@ const DEX_VAPOREON ; 134 const DEX_JOLTEON ; 135 const DEX_FLAREON ; 136 + const DEX_ESPEON + const DEX_UMBREON + const DEX_LEAFEON + const DEX_GLACEON + const DEX_SYLVEON const DEX_PORYGON ; 137 const DEX_OMANYTE ; 138 const DEX_OMASTAR ; 139 @@ -201,11 +206,5 @@ const DEX_DRAGONITE ; 149 const DEX_MEWTWO ; 150 const DEX_MEW ; 151 - const DEX_RHYPERIOR - const DEX_ESPEON - const DEX_UMBREON - const DEX_LEAFEON - const DEX_GLACEON - const DEX_SYLVEON DEF NUM_POKEMON EQU const_value - 1 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 41df0a27..f63607f5 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -182,6 +182,11 @@ INCLUDE "data/pokemon/base_stats/eevee.asm" INCLUDE "data/pokemon/base_stats/vaporeon.asm" INCLUDE "data/pokemon/base_stats/jolteon.asm" INCLUDE "data/pokemon/base_stats/flareon.asm" +INCLUDE "data/pokemon/base_stats/espeon.asm" +INCLUDE "data/pokemon/base_stats/umbreon.asm" +INCLUDE "data/pokemon/base_stats/leafeon.asm" +INCLUDE "data/pokemon/base_stats/glaceon.asm" +INCLUDE "data/pokemon/base_stats/sylveon.asm" INCLUDE "data/pokemon/base_stats/porygon.asm" INCLUDE "data/pokemon/base_stats/omanyte.asm" INCLUDE "data/pokemon/base_stats/omastar.asm" @@ -197,10 +202,4 @@ INCLUDE "data/pokemon/base_stats/dragonair.asm" INCLUDE "data/pokemon/base_stats/dragonite.asm" INCLUDE "data/pokemon/base_stats/mewtwo.asm" INCLUDE "data/pokemon/base_stats/mew.asm" -INCLUDE "data/pokemon/base_stats/rhyperior.asm" -INCLUDE "data/pokemon/base_stats/espeon.asm" -INCLUDE "data/pokemon/base_stats/umbreon.asm" -INCLUDE "data/pokemon/base_stats/leafeon.asm" -INCLUDE "data/pokemon/base_stats/glaceon.asm" -INCLUDE "data/pokemon/base_stats/sylveon.asm" assert_table_length NUM_POKEMON diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 66df6dc5..02813207 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -203,9 +203,9 @@ CryData:: mon_cry SFX_CRY_00, $00, $00 ; Hinaazu (unfinished) mon_cry SFX_CRY_1F, $40, $01 ; Pudi mon_cry SFX_CRY_05, $FF, $40 ; Betobebii - mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished) - mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished) - mon_cry SFX_CRY_00, $00, $00 ; Rhyperior (test) + mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished from this point onward) + mon_cry SFX_CRY_00, $00, $00 ; Scizor + mon_cry SFX_CRY_00, $00, $00 ; Rhyperior mon_cry SFX_CRY_00, $00, $00 ; Espeon mon_cry SFX_CRY_00, $00, $00 ; Umbreon mon_cry SFX_CRY_00, $00, $00 ; Leafeon diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 0c62a798..a5aa32dd 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1559,42 +1559,42 @@ ScizorDexEntry: RhyperiorDexEntry: db "DRILL@" db 7,10 - dw 6235 + dw 6240 text_far _RhyperiorDexEntry text_end EspeonDexEntry: db "SUN@" db 2,11 - dw 584 + dw 580 text_far _EspeonDexEntry text_end UmbreonDexEntry: db "MOONLIGHT@" db 3,3 - dw 595 + dw 600 text_far _UmbreonDexEntry text_end LeafeonDexEntry: db "VERDANT@" db 3,3 - dw 562 + dw 560 text_far _LeafeonDexEntry text_end GlaceonDexEntry: db "FRESH SNOW@" db 2,7 - dw 571 + dw 570 text_far _GlaceonDexEntry text_end SylveonDexEntry: db "INTERTWINE@" db 3,3 - dw 518 + dw 520 text_far _SylveonDexEntry text_end \ No newline at end of file diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 055cce3c..399c5ef2 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -182,6 +182,11 @@ MonPartyData: nybble ICON_QUADRUPED ; Vaporeon nybble ICON_QUADRUPED ; Jolteon nybble ICON_QUADRUPED ; Flareon + nybble ICON_QUADRUPED ; Espeon + nybble ICON_QUADRUPED ; Umbreon + nybble ICON_QUADRUPED ; Leafeon + nybble ICON_QUADRUPED ; Glaceon + nybble ICON_QUADRUPED ; Sylveon nybble ICON_MON ; Porygon nybble ICON_HELIX ; Omanyte nybble ICON_HELIX ; Omastar @@ -197,10 +202,4 @@ MonPartyData: nybble ICON_SNAKE ; Dragonite nybble ICON_MON ; Mewtwo nybble ICON_MON ; Mew - nybble ICON_MON ; Rhyperior - nybble ICON_QUADRUPED ; Espeon - nybble ICON_QUADRUPED ; Umbreon - nybble ICON_QUADRUPED ; Leafeon - nybble ICON_QUADRUPED ; Glaceon - nybble ICON_QUADRUPED ; Sylveon end_nybble_array NUM_POKEMON diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 2f6583ab..1818c21b 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -449,18 +449,18 @@ _BellossomDexEntry:: dex _RhyperiorDexEntry:: - text "From holes in its" - next "palms, it fires" - next "out Geodude!" + text "Stores rocks in" + next "the holes in its" + next "palms, using its" - page "Its carapace can" - next "withstand a" - next "volcanic eruption" + page "muscles to shoot" + next "them. GEODUDE are" + next "shot occasionally" dex _EspeonDexEntry:: text "It uses the fine" - next "fair that covers" + next "hair that covers" next "its body to sense" page "air currents and" @@ -468,14 +468,14 @@ _EspeonDexEntry:: next "enemy's actions" dex -_UmbreonDexEntry:: - text "On the night of a" - next "full moon, or" - next "when it gets" +_UmbreonDexEntry:: ; Entry alludes to its scrapped Poison type, and I thought it was a neat touch. ~M + text "When this #MON" + next "becomes angry, its" + next "pores secrete a" - page "excited, the" - next "ring patterns on" - next "its body glow" + page "poisonous sweat," + next "which it sprays at" + next "its foe's eyes" dex _LeafeonDexEntry:: @@ -499,13 +499,13 @@ _GlaceonDexEntry:: dex _SylveonDexEntry:: - text "It sends a" - next "soothing aura" - next "from its" + text "This #MON uses" + next "its ribbonlike" + next "feelers to emit" - page "ribbonlike" - next "feelers to calm" - next "nearby fights" + page "a soothing aura" + next "that calms any" + next "hostile emotions" dex _MissingNoDexEntry:: diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 20805d55..8658c1d0 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -183,6 +183,11 @@ MonsterPalettes: db PAL_CYANMON ; VAPOREON db PAL_YELLOWMON ; JOLTEON db PAL_REDMON ; FLAREON + db PAL_YELLOWMON ; ESPEON + db PAL_PURPLEMON ; UMBREON + db PAL_GREENMON ; LEAFEON + db PAL_CYANMON ; GLACEON + db PAL_MEWMON ; SYLVEON db PAL_MEWMON ; PORYGON db PAL_BLUEMON ; OMANYTE db PAL_BLUEMON ; OMASTAR @@ -198,10 +203,4 @@ MonsterPalettes: db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO db PAL_MEWMON ; MEW - db PAL_GREYMON ; RHYPERIOR - db PAL_YELLOWMON ; ESPEON - db PAL_PURPLEMON ; UMBREON - db PAL_GREENMON ; LEAFEON - db PAL_CYANMON ; GLACEON - db PAL_MEWMON ; SYLVEON assert_table_length NUM_POKEMON + 1 diff --git a/gfx/pokemon/front_rg/abra.png b/gfx/pokemon/front_rg/abra.png index bc0cb24b..12045ee3 100644 Binary files a/gfx/pokemon/front_rg/abra.png and b/gfx/pokemon/front_rg/abra.png differ diff --git a/gfx/pokemon/front_rg/aerodactyl.png b/gfx/pokemon/front_rg/aerodactyl.png index 89812b32..4cbfdeeb 100644 Binary files a/gfx/pokemon/front_rg/aerodactyl.png and b/gfx/pokemon/front_rg/aerodactyl.png differ diff --git a/gfx/pokemon/front_rg/alakazam.png b/gfx/pokemon/front_rg/alakazam.png index 3a8b32d1..9c379b6a 100644 Binary files a/gfx/pokemon/front_rg/alakazam.png and b/gfx/pokemon/front_rg/alakazam.png differ diff --git a/gfx/pokemon/front_rg/arbok.png b/gfx/pokemon/front_rg/arbok.png index dab294f5..bd8da001 100644 Binary files a/gfx/pokemon/front_rg/arbok.png and b/gfx/pokemon/front_rg/arbok.png differ diff --git a/gfx/pokemon/front_rg/arcanine.png b/gfx/pokemon/front_rg/arcanine.png index 0149138b..5d25961d 100644 Binary files a/gfx/pokemon/front_rg/arcanine.png and b/gfx/pokemon/front_rg/arcanine.png differ diff --git a/gfx/pokemon/front_rg/articuno.png b/gfx/pokemon/front_rg/articuno.png index 99b6385d..03887988 100644 Binary files a/gfx/pokemon/front_rg/articuno.png and b/gfx/pokemon/front_rg/articuno.png differ diff --git a/gfx/pokemon/front_rg/beedrill.png b/gfx/pokemon/front_rg/beedrill.png index b6f31036..36b4a06f 100644 Binary files a/gfx/pokemon/front_rg/beedrill.png and b/gfx/pokemon/front_rg/beedrill.png differ diff --git a/gfx/pokemon/front_rg/bellsprout.png b/gfx/pokemon/front_rg/bellsprout.png index 380913d5..4099321c 100644 Binary files a/gfx/pokemon/front_rg/bellsprout.png and b/gfx/pokemon/front_rg/bellsprout.png differ diff --git a/gfx/pokemon/front_rg/blastoise.png b/gfx/pokemon/front_rg/blastoise.png index 97bf497b..00480e72 100644 Binary files a/gfx/pokemon/front_rg/blastoise.png and b/gfx/pokemon/front_rg/blastoise.png differ diff --git a/gfx/pokemon/front_rg/bulbasaur.png b/gfx/pokemon/front_rg/bulbasaur.png index 1a4676a1..8eb7345a 100644 Binary files a/gfx/pokemon/front_rg/bulbasaur.png and b/gfx/pokemon/front_rg/bulbasaur.png differ diff --git a/gfx/pokemon/front_rg/butterfree.png b/gfx/pokemon/front_rg/butterfree.png index 0b3044d4..8f1a69aa 100644 Binary files a/gfx/pokemon/front_rg/butterfree.png and b/gfx/pokemon/front_rg/butterfree.png differ diff --git a/gfx/pokemon/front_rg/caterpie.png b/gfx/pokemon/front_rg/caterpie.png index dca52b88..0eef0955 100644 Binary files a/gfx/pokemon/front_rg/caterpie.png and b/gfx/pokemon/front_rg/caterpie.png differ diff --git a/gfx/pokemon/front_rg/chansey.png b/gfx/pokemon/front_rg/chansey.png index fa47540e..f676e4cc 100644 Binary files a/gfx/pokemon/front_rg/chansey.png and b/gfx/pokemon/front_rg/chansey.png differ diff --git a/gfx/pokemon/front_rg/charizard.png b/gfx/pokemon/front_rg/charizard.png index a8b87e05..cc60d904 100644 Binary files a/gfx/pokemon/front_rg/charizard.png and b/gfx/pokemon/front_rg/charizard.png differ diff --git a/gfx/pokemon/front_rg/charmander.png b/gfx/pokemon/front_rg/charmander.png index 153f9381..12d16f01 100644 Binary files a/gfx/pokemon/front_rg/charmander.png and b/gfx/pokemon/front_rg/charmander.png differ diff --git a/gfx/pokemon/front_rg/charmeleon.png b/gfx/pokemon/front_rg/charmeleon.png index f60d1294..a5cff72f 100644 Binary files a/gfx/pokemon/front_rg/charmeleon.png and b/gfx/pokemon/front_rg/charmeleon.png differ diff --git a/gfx/pokemon/front_rg/clefable.png b/gfx/pokemon/front_rg/clefable.png index 8ef6be5f..f9c63969 100644 Binary files a/gfx/pokemon/front_rg/clefable.png and b/gfx/pokemon/front_rg/clefable.png differ diff --git a/gfx/pokemon/front_rg/clefairy.png b/gfx/pokemon/front_rg/clefairy.png index 632844d5..5a7f3721 100644 Binary files a/gfx/pokemon/front_rg/clefairy.png and b/gfx/pokemon/front_rg/clefairy.png differ diff --git a/gfx/pokemon/front_rg/cloyster.png b/gfx/pokemon/front_rg/cloyster.png index b6e16485..2ae6546e 100644 Binary files a/gfx/pokemon/front_rg/cloyster.png and b/gfx/pokemon/front_rg/cloyster.png differ diff --git a/gfx/pokemon/front_rg/dewgong.png b/gfx/pokemon/front_rg/dewgong.png index 823b7125..dee130ed 100644 Binary files a/gfx/pokemon/front_rg/dewgong.png and b/gfx/pokemon/front_rg/dewgong.png differ diff --git a/gfx/pokemon/front_rg/diglett.png b/gfx/pokemon/front_rg/diglett.png index 69b93a90..f92ae5bc 100644 Binary files a/gfx/pokemon/front_rg/diglett.png and b/gfx/pokemon/front_rg/diglett.png differ diff --git a/gfx/pokemon/front_rg/ditto.png b/gfx/pokemon/front_rg/ditto.png index 1a38c474..4485e6ec 100644 Binary files a/gfx/pokemon/front_rg/ditto.png and b/gfx/pokemon/front_rg/ditto.png differ diff --git a/gfx/pokemon/front_rg/dragonair.png b/gfx/pokemon/front_rg/dragonair.png index fe097cfa..b8eaef67 100644 Binary files a/gfx/pokemon/front_rg/dragonair.png and b/gfx/pokemon/front_rg/dragonair.png differ diff --git a/gfx/pokemon/front_rg/dragonite.png b/gfx/pokemon/front_rg/dragonite.png index 49474a4d..a3edb824 100644 Binary files a/gfx/pokemon/front_rg/dragonite.png and b/gfx/pokemon/front_rg/dragonite.png differ diff --git a/gfx/pokemon/front_rg/dratini.png b/gfx/pokemon/front_rg/dratini.png index 9c7e454d..1fcef94f 100644 Binary files a/gfx/pokemon/front_rg/dratini.png and b/gfx/pokemon/front_rg/dratini.png differ diff --git a/gfx/pokemon/front_rg/drowzee.png b/gfx/pokemon/front_rg/drowzee.png index b8cdf0db..cc85510b 100644 Binary files a/gfx/pokemon/front_rg/drowzee.png and b/gfx/pokemon/front_rg/drowzee.png differ diff --git a/gfx/pokemon/front_rg/dugtrio.png b/gfx/pokemon/front_rg/dugtrio.png index 1619ab92..433f95ef 100644 Binary files a/gfx/pokemon/front_rg/dugtrio.png and b/gfx/pokemon/front_rg/dugtrio.png differ diff --git a/gfx/pokemon/front_rg/eevee.png b/gfx/pokemon/front_rg/eevee.png index b8fcab5a..956f8ce0 100644 Binary files a/gfx/pokemon/front_rg/eevee.png and b/gfx/pokemon/front_rg/eevee.png differ diff --git a/gfx/pokemon/front_rg/ekans.png b/gfx/pokemon/front_rg/ekans.png index cd43c69c..48ceba30 100644 Binary files a/gfx/pokemon/front_rg/ekans.png and b/gfx/pokemon/front_rg/ekans.png differ diff --git a/gfx/pokemon/front_rg/electabuzz.png b/gfx/pokemon/front_rg/electabuzz.png index 24791e64..0ddccbe1 100644 Binary files a/gfx/pokemon/front_rg/electabuzz.png and b/gfx/pokemon/front_rg/electabuzz.png differ diff --git a/gfx/pokemon/front_rg/exeggutor.png b/gfx/pokemon/front_rg/exeggutor.png index dc1f7287..3e8d37cb 100644 Binary files a/gfx/pokemon/front_rg/exeggutor.png and b/gfx/pokemon/front_rg/exeggutor.png differ diff --git a/gfx/pokemon/front_rg/farfetchd.png b/gfx/pokemon/front_rg/farfetchd.png index bd97b9e8..9238f944 100644 Binary files a/gfx/pokemon/front_rg/farfetchd.png and b/gfx/pokemon/front_rg/farfetchd.png differ diff --git a/gfx/pokemon/front_rg/flareon.png b/gfx/pokemon/front_rg/flareon.png index 7a39866a..2fb65268 100644 Binary files a/gfx/pokemon/front_rg/flareon.png and b/gfx/pokemon/front_rg/flareon.png differ diff --git a/gfx/pokemon/front_rg/fossilkabutops.png b/gfx/pokemon/front_rg/fossilkabutops.png index d37edb02..dd8d41ea 100644 Binary files a/gfx/pokemon/front_rg/fossilkabutops.png and b/gfx/pokemon/front_rg/fossilkabutops.png differ diff --git a/gfx/pokemon/front_rg/gastly.png b/gfx/pokemon/front_rg/gastly.png index a5c0f406..5afb2f0a 100644 Binary files a/gfx/pokemon/front_rg/gastly.png and b/gfx/pokemon/front_rg/gastly.png differ diff --git a/gfx/pokemon/front_rg/gengar.png b/gfx/pokemon/front_rg/gengar.png index cb31fecf..02a6b3f9 100644 Binary files a/gfx/pokemon/front_rg/gengar.png and b/gfx/pokemon/front_rg/gengar.png differ diff --git a/gfx/pokemon/front_rg/geodude.png b/gfx/pokemon/front_rg/geodude.png index 02b690e9..4202192a 100644 Binary files a/gfx/pokemon/front_rg/geodude.png and b/gfx/pokemon/front_rg/geodude.png differ diff --git a/gfx/pokemon/front_rg/gloom.png b/gfx/pokemon/front_rg/gloom.png index c2fd2aa7..c2ea9ba4 100644 Binary files a/gfx/pokemon/front_rg/gloom.png and b/gfx/pokemon/front_rg/gloom.png differ diff --git a/gfx/pokemon/front_rg/goldeen.png b/gfx/pokemon/front_rg/goldeen.png index bee7de2a..e8cbfddc 100644 Binary files a/gfx/pokemon/front_rg/goldeen.png and b/gfx/pokemon/front_rg/goldeen.png differ diff --git a/gfx/pokemon/front_rg/golduck.png b/gfx/pokemon/front_rg/golduck.png index a0827b54..5448f7c8 100644 Binary files a/gfx/pokemon/front_rg/golduck.png and b/gfx/pokemon/front_rg/golduck.png differ diff --git a/gfx/pokemon/front_rg/golem.png b/gfx/pokemon/front_rg/golem.png index 86ea3c68..e25df63c 100644 Binary files a/gfx/pokemon/front_rg/golem.png and b/gfx/pokemon/front_rg/golem.png differ diff --git a/gfx/pokemon/front_rg/graveler.png b/gfx/pokemon/front_rg/graveler.png index 5e876f0b..0d9da672 100644 Binary files a/gfx/pokemon/front_rg/graveler.png and b/gfx/pokemon/front_rg/graveler.png differ diff --git a/gfx/pokemon/front_rg/grimer.png b/gfx/pokemon/front_rg/grimer.png index cc6931fb..255b10b9 100644 Binary files a/gfx/pokemon/front_rg/grimer.png and b/gfx/pokemon/front_rg/grimer.png differ diff --git a/gfx/pokemon/front_rg/growlithe.png b/gfx/pokemon/front_rg/growlithe.png index 1aafd535..b753bce7 100644 Binary files a/gfx/pokemon/front_rg/growlithe.png and b/gfx/pokemon/front_rg/growlithe.png differ diff --git a/gfx/pokemon/front_rg/gyarados.png b/gfx/pokemon/front_rg/gyarados.png index 4d25aabb..a7ed0c17 100644 Binary files a/gfx/pokemon/front_rg/gyarados.png and b/gfx/pokemon/front_rg/gyarados.png differ diff --git a/gfx/pokemon/front_rg/haunter.png b/gfx/pokemon/front_rg/haunter.png index 531c8a62..4d6c758d 100644 Binary files a/gfx/pokemon/front_rg/haunter.png and b/gfx/pokemon/front_rg/haunter.png differ diff --git a/gfx/pokemon/front_rg/hitmonchan.png b/gfx/pokemon/front_rg/hitmonchan.png index 1774dd18..d8a6ffd3 100644 Binary files a/gfx/pokemon/front_rg/hitmonchan.png and b/gfx/pokemon/front_rg/hitmonchan.png differ diff --git a/gfx/pokemon/front_rg/hitmonlee.png b/gfx/pokemon/front_rg/hitmonlee.png index 04ca9be3..36042c68 100644 Binary files a/gfx/pokemon/front_rg/hitmonlee.png and b/gfx/pokemon/front_rg/hitmonlee.png differ diff --git a/gfx/pokemon/front_rg/horsea.png b/gfx/pokemon/front_rg/horsea.png index 0d11d78c..cd28df8c 100644 Binary files a/gfx/pokemon/front_rg/horsea.png and b/gfx/pokemon/front_rg/horsea.png differ diff --git a/gfx/pokemon/front_rg/hypno.png b/gfx/pokemon/front_rg/hypno.png index f29559c2..0344c195 100644 Binary files a/gfx/pokemon/front_rg/hypno.png and b/gfx/pokemon/front_rg/hypno.png differ diff --git a/gfx/pokemon/front_rg/ivysaur.png b/gfx/pokemon/front_rg/ivysaur.png index 337bc27d..dad10ae0 100644 Binary files a/gfx/pokemon/front_rg/ivysaur.png and b/gfx/pokemon/front_rg/ivysaur.png differ diff --git a/gfx/pokemon/front_rg/jigglypuff.png b/gfx/pokemon/front_rg/jigglypuff.png index 607c429e..27fa3182 100644 Binary files a/gfx/pokemon/front_rg/jigglypuff.png and b/gfx/pokemon/front_rg/jigglypuff.png differ diff --git a/gfx/pokemon/front_rg/jolteon.png b/gfx/pokemon/front_rg/jolteon.png index fab34a30..7ecd6fbb 100644 Binary files a/gfx/pokemon/front_rg/jolteon.png and b/gfx/pokemon/front_rg/jolteon.png differ diff --git a/gfx/pokemon/front_rg/kabuto.png b/gfx/pokemon/front_rg/kabuto.png index b8923ad7..e8e44e15 100644 Binary files a/gfx/pokemon/front_rg/kabuto.png and b/gfx/pokemon/front_rg/kabuto.png differ diff --git a/gfx/pokemon/front_rg/kabutops.png b/gfx/pokemon/front_rg/kabutops.png index 0f33c4d0..39fcb900 100644 Binary files a/gfx/pokemon/front_rg/kabutops.png and b/gfx/pokemon/front_rg/kabutops.png differ diff --git a/gfx/pokemon/front_rg/kakuna.png b/gfx/pokemon/front_rg/kakuna.png index 0cc6eabf..4ba336d4 100644 Binary files a/gfx/pokemon/front_rg/kakuna.png and b/gfx/pokemon/front_rg/kakuna.png differ diff --git a/gfx/pokemon/front_rg/kangaskhan.png b/gfx/pokemon/front_rg/kangaskhan.png index c9d3361d..1c0ba99c 100644 Binary files a/gfx/pokemon/front_rg/kangaskhan.png and b/gfx/pokemon/front_rg/kangaskhan.png differ diff --git a/gfx/pokemon/front_rg/lapras.png b/gfx/pokemon/front_rg/lapras.png index b696b8d9..822c00e9 100644 Binary files a/gfx/pokemon/front_rg/lapras.png and b/gfx/pokemon/front_rg/lapras.png differ diff --git a/gfx/pokemon/front_rg/lickitung.png b/gfx/pokemon/front_rg/lickitung.png index 3deb9b12..050f7d23 100644 Binary files a/gfx/pokemon/front_rg/lickitung.png and b/gfx/pokemon/front_rg/lickitung.png differ diff --git a/gfx/pokemon/front_rg/machamp.png b/gfx/pokemon/front_rg/machamp.png index a6f773a0..c854a2cf 100644 Binary files a/gfx/pokemon/front_rg/machamp.png and b/gfx/pokemon/front_rg/machamp.png differ diff --git a/gfx/pokemon/front_rg/machoke.png b/gfx/pokemon/front_rg/machoke.png index ed637897..317dad96 100644 Binary files a/gfx/pokemon/front_rg/machoke.png and b/gfx/pokemon/front_rg/machoke.png differ diff --git a/gfx/pokemon/front_rg/machop.png b/gfx/pokemon/front_rg/machop.png index a5e20532..18eac7af 100644 Binary files a/gfx/pokemon/front_rg/machop.png and b/gfx/pokemon/front_rg/machop.png differ diff --git a/gfx/pokemon/front_rg/magikarp.png b/gfx/pokemon/front_rg/magikarp.png index 68bc4f8c..e71402f8 100644 Binary files a/gfx/pokemon/front_rg/magikarp.png and b/gfx/pokemon/front_rg/magikarp.png differ diff --git a/gfx/pokemon/front_rg/magnemite.png b/gfx/pokemon/front_rg/magnemite.png index fc807398..f2254bed 100644 Binary files a/gfx/pokemon/front_rg/magnemite.png and b/gfx/pokemon/front_rg/magnemite.png differ diff --git a/gfx/pokemon/front_rg/magneton.png b/gfx/pokemon/front_rg/magneton.png index 51a3f12c..4d0f2cc7 100644 Binary files a/gfx/pokemon/front_rg/magneton.png and b/gfx/pokemon/front_rg/magneton.png differ diff --git a/gfx/pokemon/front_rg/mankey.png b/gfx/pokemon/front_rg/mankey.png index 9ae43757..6eab106d 100644 Binary files a/gfx/pokemon/front_rg/mankey.png and b/gfx/pokemon/front_rg/mankey.png differ diff --git a/gfx/pokemon/front_rg/marowak.png b/gfx/pokemon/front_rg/marowak.png index 8ac6c6ee..b2d18437 100644 Binary files a/gfx/pokemon/front_rg/marowak.png and b/gfx/pokemon/front_rg/marowak.png differ diff --git a/gfx/pokemon/front_rg/meowth.png b/gfx/pokemon/front_rg/meowth.png index d00a08db..e21b749c 100644 Binary files a/gfx/pokemon/front_rg/meowth.png and b/gfx/pokemon/front_rg/meowth.png differ diff --git a/gfx/pokemon/front_rg/metapod.png b/gfx/pokemon/front_rg/metapod.png index 5d7514f4..129dca0f 100644 Binary files a/gfx/pokemon/front_rg/metapod.png and b/gfx/pokemon/front_rg/metapod.png differ diff --git a/gfx/pokemon/front_rg/mew.png b/gfx/pokemon/front_rg/mew.png index 0d9bef36..7e25a96d 100644 Binary files a/gfx/pokemon/front_rg/mew.png and b/gfx/pokemon/front_rg/mew.png differ diff --git a/gfx/pokemon/front_rg/mewtwo.png b/gfx/pokemon/front_rg/mewtwo.png index b41409ca..b7a31296 100644 Binary files a/gfx/pokemon/front_rg/mewtwo.png and b/gfx/pokemon/front_rg/mewtwo.png differ diff --git a/gfx/pokemon/front_rg/moltres.png b/gfx/pokemon/front_rg/moltres.png index 52259f4a..519033f5 100644 Binary files a/gfx/pokemon/front_rg/moltres.png and b/gfx/pokemon/front_rg/moltres.png differ diff --git a/gfx/pokemon/front_rg/muk.png b/gfx/pokemon/front_rg/muk.png index 8816e939..f69b83b7 100644 Binary files a/gfx/pokemon/front_rg/muk.png and b/gfx/pokemon/front_rg/muk.png differ diff --git a/gfx/pokemon/front_rg/nidoking.png b/gfx/pokemon/front_rg/nidoking.png index c181e60c..24330538 100644 Binary files a/gfx/pokemon/front_rg/nidoking.png and b/gfx/pokemon/front_rg/nidoking.png differ diff --git a/gfx/pokemon/front_rg/nidoqueen.png b/gfx/pokemon/front_rg/nidoqueen.png index 86cba6d6..c0043e1b 100644 Binary files a/gfx/pokemon/front_rg/nidoqueen.png and b/gfx/pokemon/front_rg/nidoqueen.png differ diff --git a/gfx/pokemon/front_rg/nidoranf.png b/gfx/pokemon/front_rg/nidoranf.png index 8d99c920..357b74e7 100644 Binary files a/gfx/pokemon/front_rg/nidoranf.png and b/gfx/pokemon/front_rg/nidoranf.png differ diff --git a/gfx/pokemon/front_rg/nidoranm.png b/gfx/pokemon/front_rg/nidoranm.png index 9a93e864..92d0cb49 100644 Binary files a/gfx/pokemon/front_rg/nidoranm.png and b/gfx/pokemon/front_rg/nidoranm.png differ diff --git a/gfx/pokemon/front_rg/ninetales.png b/gfx/pokemon/front_rg/ninetales.png index 128e8e53..2c421cd6 100644 Binary files a/gfx/pokemon/front_rg/ninetales.png and b/gfx/pokemon/front_rg/ninetales.png differ diff --git a/gfx/pokemon/front_rg/oddish.png b/gfx/pokemon/front_rg/oddish.png index 55aa2d09..f4f2535e 100644 Binary files a/gfx/pokemon/front_rg/oddish.png and b/gfx/pokemon/front_rg/oddish.png differ diff --git a/gfx/pokemon/front_rg/omanyte.png b/gfx/pokemon/front_rg/omanyte.png index d042710e..9a9acca7 100644 Binary files a/gfx/pokemon/front_rg/omanyte.png and b/gfx/pokemon/front_rg/omanyte.png differ diff --git a/gfx/pokemon/front_rg/onix.png b/gfx/pokemon/front_rg/onix.png index 3b731ece..44a21a61 100644 Binary files a/gfx/pokemon/front_rg/onix.png and b/gfx/pokemon/front_rg/onix.png differ diff --git a/gfx/pokemon/front_rg/parasect.png b/gfx/pokemon/front_rg/parasect.png index 3d58b8e5..de299c14 100644 Binary files a/gfx/pokemon/front_rg/parasect.png and b/gfx/pokemon/front_rg/parasect.png differ diff --git a/gfx/pokemon/front_rg/persian.png b/gfx/pokemon/front_rg/persian.png index aed4d6dc..a6c359a3 100644 Binary files a/gfx/pokemon/front_rg/persian.png and b/gfx/pokemon/front_rg/persian.png differ diff --git a/gfx/pokemon/front_rg/pidgey.png b/gfx/pokemon/front_rg/pidgey.png index 7636fb67..a4a917b3 100644 Binary files a/gfx/pokemon/front_rg/pidgey.png and b/gfx/pokemon/front_rg/pidgey.png differ diff --git a/gfx/pokemon/front_rg/poliwag.png b/gfx/pokemon/front_rg/poliwag.png index a1ad26c8..04deb5e8 100644 Binary files a/gfx/pokemon/front_rg/poliwag.png and b/gfx/pokemon/front_rg/poliwag.png differ diff --git a/gfx/pokemon/front_rg/poliwhirl.png b/gfx/pokemon/front_rg/poliwhirl.png index d18311d6..a7039145 100644 Binary files a/gfx/pokemon/front_rg/poliwhirl.png and b/gfx/pokemon/front_rg/poliwhirl.png differ diff --git a/gfx/pokemon/front_rg/poliwrath.png b/gfx/pokemon/front_rg/poliwrath.png index 49f07b96..f31d0680 100644 Binary files a/gfx/pokemon/front_rg/poliwrath.png and b/gfx/pokemon/front_rg/poliwrath.png differ diff --git a/gfx/pokemon/front_rg/ponyta.png b/gfx/pokemon/front_rg/ponyta.png index c3a67849..4d8c1bee 100644 Binary files a/gfx/pokemon/front_rg/ponyta.png and b/gfx/pokemon/front_rg/ponyta.png differ diff --git a/gfx/pokemon/front_rg/primeape.png b/gfx/pokemon/front_rg/primeape.png index 42c03f6d..dbca0123 100644 Binary files a/gfx/pokemon/front_rg/primeape.png and b/gfx/pokemon/front_rg/primeape.png differ diff --git a/gfx/pokemon/front_rg/raichu.png b/gfx/pokemon/front_rg/raichu.png index 961d2aeb..a29731e5 100644 Binary files a/gfx/pokemon/front_rg/raichu.png and b/gfx/pokemon/front_rg/raichu.png differ diff --git a/gfx/pokemon/front_rg/rapidash.png b/gfx/pokemon/front_rg/rapidash.png index d118b947..62d47506 100644 Binary files a/gfx/pokemon/front_rg/rapidash.png and b/gfx/pokemon/front_rg/rapidash.png differ diff --git a/gfx/pokemon/front_rg/raticate.png b/gfx/pokemon/front_rg/raticate.png index 895c1006..64340846 100644 Binary files a/gfx/pokemon/front_rg/raticate.png and b/gfx/pokemon/front_rg/raticate.png differ diff --git a/gfx/pokemon/front_rg/rattata.png b/gfx/pokemon/front_rg/rattata.png index 8d114876..896b372f 100644 Binary files a/gfx/pokemon/front_rg/rattata.png and b/gfx/pokemon/front_rg/rattata.png differ diff --git a/gfx/pokemon/front_rg/rhydon.png b/gfx/pokemon/front_rg/rhydon.png index 772e64d8..92406476 100644 Binary files a/gfx/pokemon/front_rg/rhydon.png and b/gfx/pokemon/front_rg/rhydon.png differ diff --git a/gfx/pokemon/front_rg/sandshrew.png b/gfx/pokemon/front_rg/sandshrew.png index e078d6d3..bcf52215 100644 Binary files a/gfx/pokemon/front_rg/sandshrew.png and b/gfx/pokemon/front_rg/sandshrew.png differ diff --git a/gfx/pokemon/front_rg/sandslash.png b/gfx/pokemon/front_rg/sandslash.png index 55320b96..3b212a60 100644 Binary files a/gfx/pokemon/front_rg/sandslash.png and b/gfx/pokemon/front_rg/sandslash.png differ diff --git a/gfx/pokemon/front_rg/scyther.png b/gfx/pokemon/front_rg/scyther.png index de4d89ed..3fe6eeae 100644 Binary files a/gfx/pokemon/front_rg/scyther.png and b/gfx/pokemon/front_rg/scyther.png differ diff --git a/gfx/pokemon/front_rg/seadra.png b/gfx/pokemon/front_rg/seadra.png index 17cdf4ea..bac151c5 100644 Binary files a/gfx/pokemon/front_rg/seadra.png and b/gfx/pokemon/front_rg/seadra.png differ diff --git a/gfx/pokemon/front_rg/seel.png b/gfx/pokemon/front_rg/seel.png index cb2f7f2e..c4b2315a 100644 Binary files a/gfx/pokemon/front_rg/seel.png and b/gfx/pokemon/front_rg/seel.png differ diff --git a/gfx/pokemon/front_rg/shellder.png b/gfx/pokemon/front_rg/shellder.png index b7c41dd2..3be0471f 100644 Binary files a/gfx/pokemon/front_rg/shellder.png and b/gfx/pokemon/front_rg/shellder.png differ diff --git a/gfx/pokemon/front_rg/slowpoke.png b/gfx/pokemon/front_rg/slowpoke.png index d59e9008..fdf701d7 100644 Binary files a/gfx/pokemon/front_rg/slowpoke.png and b/gfx/pokemon/front_rg/slowpoke.png differ diff --git a/gfx/pokemon/front_rg/snorlax.png b/gfx/pokemon/front_rg/snorlax.png index c249327d..5b571a18 100644 Binary files a/gfx/pokemon/front_rg/snorlax.png and b/gfx/pokemon/front_rg/snorlax.png differ diff --git a/gfx/pokemon/front_rg/spearow.png b/gfx/pokemon/front_rg/spearow.png index c1fce869..320e3852 100644 Binary files a/gfx/pokemon/front_rg/spearow.png and b/gfx/pokemon/front_rg/spearow.png differ diff --git a/gfx/pokemon/front_rg/squirtle.png b/gfx/pokemon/front_rg/squirtle.png index 3139cddc..bc0c9979 100644 Binary files a/gfx/pokemon/front_rg/squirtle.png and b/gfx/pokemon/front_rg/squirtle.png differ diff --git a/gfx/pokemon/front_rg/starmie.png b/gfx/pokemon/front_rg/starmie.png index 395fd857..24025ddf 100644 Binary files a/gfx/pokemon/front_rg/starmie.png and b/gfx/pokemon/front_rg/starmie.png differ diff --git a/gfx/pokemon/front_rg/staryu.png b/gfx/pokemon/front_rg/staryu.png index 740089e8..394732e9 100644 Binary files a/gfx/pokemon/front_rg/staryu.png and b/gfx/pokemon/front_rg/staryu.png differ diff --git a/gfx/pokemon/front_rg/tangela.png b/gfx/pokemon/front_rg/tangela.png index a6f6327c..eff9c5a5 100644 Binary files a/gfx/pokemon/front_rg/tangela.png and b/gfx/pokemon/front_rg/tangela.png differ diff --git a/gfx/pokemon/front_rg/tentacool.png b/gfx/pokemon/front_rg/tentacool.png index 59a979c2..14424d1b 100644 Binary files a/gfx/pokemon/front_rg/tentacool.png and b/gfx/pokemon/front_rg/tentacool.png differ diff --git a/gfx/pokemon/front_rg/tentacruel.png b/gfx/pokemon/front_rg/tentacruel.png index aaf4d426..7a26a305 100644 Binary files a/gfx/pokemon/front_rg/tentacruel.png and b/gfx/pokemon/front_rg/tentacruel.png differ diff --git a/gfx/pokemon/front_rg/vaporeon.png b/gfx/pokemon/front_rg/vaporeon.png index 72db05da..48dafce6 100644 Binary files a/gfx/pokemon/front_rg/vaporeon.png and b/gfx/pokemon/front_rg/vaporeon.png differ diff --git a/gfx/pokemon/front_rg/venomoth.png b/gfx/pokemon/front_rg/venomoth.png index e677255e..1c659d92 100644 Binary files a/gfx/pokemon/front_rg/venomoth.png and b/gfx/pokemon/front_rg/venomoth.png differ diff --git a/gfx/pokemon/front_rg/venonat.png b/gfx/pokemon/front_rg/venonat.png index cf2f4df1..edf15889 100644 Binary files a/gfx/pokemon/front_rg/venonat.png and b/gfx/pokemon/front_rg/venonat.png differ diff --git a/gfx/pokemon/front_rg/venusaur.png b/gfx/pokemon/front_rg/venusaur.png index f444a234..dd39184a 100644 Binary files a/gfx/pokemon/front_rg/venusaur.png and b/gfx/pokemon/front_rg/venusaur.png differ diff --git a/gfx/pokemon/front_rg/victreebel.png b/gfx/pokemon/front_rg/victreebel.png index 62193011..29a471c8 100644 Binary files a/gfx/pokemon/front_rg/victreebel.png and b/gfx/pokemon/front_rg/victreebel.png differ diff --git a/gfx/pokemon/front_rg/vileplume.png b/gfx/pokemon/front_rg/vileplume.png index e39d50e0..b40d48ef 100644 Binary files a/gfx/pokemon/front_rg/vileplume.png and b/gfx/pokemon/front_rg/vileplume.png differ diff --git a/gfx/pokemon/front_rg/vulpix.png b/gfx/pokemon/front_rg/vulpix.png index 8b8810ad..b49d5a3a 100644 Binary files a/gfx/pokemon/front_rg/vulpix.png and b/gfx/pokemon/front_rg/vulpix.png differ diff --git a/gfx/pokemon/front_rg/wartortle.png b/gfx/pokemon/front_rg/wartortle.png index 6e65bb7c..bd844562 100644 Binary files a/gfx/pokemon/front_rg/wartortle.png and b/gfx/pokemon/front_rg/wartortle.png differ diff --git a/gfx/pokemon/front_rg/weedle.png b/gfx/pokemon/front_rg/weedle.png index 3efbd49d..445fe8f3 100644 Binary files a/gfx/pokemon/front_rg/weedle.png and b/gfx/pokemon/front_rg/weedle.png differ diff --git a/gfx/pokemon/front_rg/weepinbell.png b/gfx/pokemon/front_rg/weepinbell.png index 18b44783..36b6aed5 100644 Binary files a/gfx/pokemon/front_rg/weepinbell.png and b/gfx/pokemon/front_rg/weepinbell.png differ diff --git a/gfx/pokemon/front_rg/wigglytuff.png b/gfx/pokemon/front_rg/wigglytuff.png index e986affd..85803ee5 100644 Binary files a/gfx/pokemon/front_rg/wigglytuff.png and b/gfx/pokemon/front_rg/wigglytuff.png differ diff --git a/gfx/pokemon/front_rg/zubat.png b/gfx/pokemon/front_rg/zubat.png index 14dc9118..73078725 100644 Binary files a/gfx/pokemon/front_rg/zubat.png and b/gfx/pokemon/front_rg/zubat.png differ