From 518f34a5eb726d0faf34d872d230ffa6ced8a0a2 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sun, 30 Apr 2023 13:41:07 +0100 Subject: [PATCH] New Umbreon sprite Based off Silver's, also with updated palettes to reflect the modern design. --- constants/hide_show_constants.asm | 22 ++++++------ constants/pokemon_constants.asm | 58 +++++++++++++++--------------- data/pokemon/palettes.asm | 4 +-- gfx/pokemon/front/umbreon.png | Bin 411 -> 747 bytes 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 7ead6692..44fef29d 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -36,7 +36,7 @@ DEF SHOW EQU $15 const HS_SAFFRON_CITY_F ; 18 const HS_SAFFRON_CITY_UP_GRADE ; 19 const HS_ROUTE_2_ITEM_1 ; 1A X - const HS_ROUTE_2_ITEM_2 ; 1B X + const HS_ROUTE_2_ITEM_2 ; 1B X const HS_ROUTE_4_ITEM ; 1C X const HS_ROUTE_9_ITEM ; 1D X const HS_ROUTE_12_SNORLAX ; 1E @@ -49,7 +49,7 @@ DEF SHOW EQU $15 const HS_NUGGET_BRIDGE_GUY ; 25 const HS_ROUTE_24_ITEM ; 26 X const HS_ROUTE_25_ITEM ; 27 X - const HS_CACTUS ; 28 X + const HS_CACTUS ; 28 X const HS_BRUNSWICK_ZAPDOS_G ; 29 X const HS_DAISY_SITTING ; 2A const HS_DAISY_WALKING ; 2B @@ -115,7 +115,7 @@ DEF SHOW EQU $15 const HS_BILL_POKEMON ; 67 const HS_BILL_1 ; 68 const HS_BILL_2 ; 69 - const HS_BILLS_NIDORINO ; 6A + const HS_BILLS_NIDORINO ; 6A const HS_VIRIDIAN_FOREST_ITEM_1 ; 6B X const HS_VIRIDIAN_FOREST_ITEM_2 ; 6C X const HS_VIRIDIAN_FOREST_ITEM_3 ; 6D X @@ -129,7 +129,7 @@ DEF SHOW EQU $15 const HS_MT_MOON_B2F_FOSSIL_2 ; 75 const HS_MT_MOON_B2F_ITEM_1 ; 76 X const HS_MT_MOON_B2F_ITEM_2 ; 77 X - const HS_MT_MOON_CRATER_GUARD ; 78 + const HS_MT_MOON_CRATER_GUARD ; 78 const HS_SS_ANNE_2F_RIVAL ; 79 const HS_SS_ANNE_1F_ROOMS_ITEM ; 7A X const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 7B X @@ -137,7 +137,7 @@ DEF SHOW EQU $15 const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7D X const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7E X const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 7F X - const HS_WUGTRIO ; 80 X + const HS_WUGTRIO ; 80 X const HS_VICTORY_ROAD_3F_ITEM_1 ; 81 X const HS_VICTORY_ROAD_3F_ITEM_2 ; 82 X const HS_VICTORY_ROAD_3F_BOULDER ; 83 @@ -199,8 +199,8 @@ DEF SHOW EQU $15 const HS_SILPH_CO_11F_2 ; BB const HS_SILPH_CO_11F_3 ; BC const HS_OMEGA ; BD - const HS_DRAGONITE ; BE - const HS_MOLTRES ; BF + const HS_DRAGONITE ; BE + const HS_MOLTRES ; BF const HS_POKEMON_MANSION_2F_ITEM ; C0 X const HS_POKEMON_MANSION_3F_ITEM_1 ; C1 X const HS_POKEMON_MANSION_3F_ITEM_2 ; C2 X @@ -209,7 +209,7 @@ DEF SHOW EQU $15 const HS_POKEMON_MANSION_B1F_ITEM_3 ; C5 X const HS_POKEMON_MANSION_B1F_ITEM_4 ; C6 X const HS_POKEMON_MANSION_B1F_ITEM_5 ; C7 X - const HS_MANSION_GUARD ; C8 + const HS_MANSION_GUARD ; C8 const HS_SAFARI_ZONE_EAST_ITEM_1 ; C9 X const HS_SAFARI_ZONE_EAST_ITEM_2 ; CA X const HS_SAFARI_ZONE_EAST_ITEM_3 ; CB X @@ -247,9 +247,9 @@ DEF SHOW EQU $15 const HS_MEW ; EB const HS_POKEMON_MANSION_B2F_ITEM_1 ; EC const HS_POKEMON_MANSION_B2F_ITEM_2 ; ED - const HS_ROUTE_1_OAK ; EE - const HS_YUJIROU ; EF - const HS_YUJIROU_REMATCH ; F0 + const HS_ROUTE_1_OAK ; EE + const HS_YUJIROU ; EF + const HS_YUJIROU_REMATCH ; F0 const HS_MT_MOON_CRATER_ITEM_1 ; F1 const HS_MT_MOON_CRATER_ITEM_2 ; F2 const HS_MT_MOON_CRATER_ITEM_3 ; F3 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 7ec465b1..3778aec5 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -58,7 +58,7 @@ const GOLEM ; $31 const BARUNDA ; $32 (new) const MAGMAR ; $33 - const BUU ; $34 (new) + const BUU ; $34 (new) const ELECTABUZZ ; $35 const MAGNETON ; $36 const KOFFING ; $37 @@ -188,9 +188,9 @@ const WARTORTLE ; $B3 const CHARIZARD ; $B4 const TOTARTLE ; $B5 (new) - const ARTICUNO_G ; $B6 (new) - const ZAPDOS_G ; $FD (new) - const MOLTRES_G ; $FE (new) + const ARTICUNO_G ; $B6 (new) + const ZAPDOS_G ; $FD (new) + const MOLTRES_G ; $FE (new) const ODDISH ; $B9 const GLOOM ; $BA const VILEPLUME ; $BB @@ -208,11 +208,11 @@ const LICKILICKY ; $C7 const TANGROWTH ; $C8 const KLEAVOR ; $C9 - const TSUBOMITTO ; $CA - const STEELIX ; $CB - const BLISSEY ; $CC - const HITMONTOP ; $CD - const CROBAT ; $CE + const TSUBOMITTO ; $CA + const STEELIX ; $CB + const BLISSEY ; $CC + const HITMONTOP ; $CD + const CROBAT ; $CE const ANIMON ; $CF const BELLOSSOM ; $D0 const PORYGON2 ; $D1 @@ -237,27 +237,27 @@ const PERRSERKER ; $E4 const SIRFETCHD ; $E5 const MR_RIME ; $E6 - const MELTAN ; $E7 - const MELMETAL ; $E8 - const ARCANINE_H ; $E9 - const ELECTRODE_H ; $EA - const RATICATE_A ; $EB + const MELTAN ; $E7 + const MELMETAL ; $E8 + const ARCANINE_H ; $E9 + const ELECTRODE_H ; $EA + const RATICATE_A ; $EB const RAICHU_A ; $EC - const SANDSLASH_A ; $ED - const NINETALES_A ; $EE - const DUGTRIO_A ; $EF - const PERSIAN_A ; $F0 - const GOLEM_A ; $F1 - const RAPIDASH_G ; $F2 - const SLOWBRO_G ; $F3 - const SLOWKING_G ; $F4 - const MUK_A ; $F5 - const EXEGGUTOR_A ; $F6 - const MAROWAK_A ; $F7 - const WEEZING_G ; $F8 - const TAUROS_P ; $F9 - const TAUROS_PA ; $FA - const TAUROS_PB ; $FB + const SANDSLASH_A ; $ED + const NINETALES_A ; $EE + const DUGTRIO_A ; $EF + const PERSIAN_A ; $F0 + const GOLEM_A ; $F1 + const RAPIDASH_G ; $F2 + const SLOWBRO_G ; $F3 + const SLOWKING_G ; $F4 + const MUK_A ; $F5 + const EXEGGUTOR_A ; $F6 + const MAROWAK_A ; $F7 + const WEEZING_G ; $F8 + const TAUROS_P ; $F9 + const TAUROS_PA ; $FA + const TAUROS_PB ; $FB const FOSSIL_KABUTOPS ; $FC (was B6) const FOSSIL_AERODACTYL ; $FD (was B7) const MON_GHOST ; $FE (was B8) diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 61ac10ac..f090f833 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -18,8 +18,8 @@ MonsterPalettes: db PAL_CYANMON ; VAPOREON db PAL_YELLOWMON ; JOLTEON db PAL_REDMON ; FLAREON - db PAL_YELLOWMON ; ESPEON - db PAL_PURPLEMON ; UMBREON + db PAL_PURPLEMON ; ESPEON + db PAL_YELLOWMON ; UMBREON db PAL_GREENMON ; LEAFEON db PAL_CYANMON ; GLACEON db PAL_FUCHSIA ; SYLVEON diff --git a/gfx/pokemon/front/umbreon.png b/gfx/pokemon/front/umbreon.png index fb23b1f078712789a6c568ef9db400ec592396eb..9e2a04210914ea6a82b4abd473e6c0b4c57c0538 100644 GIT binary patch literal 747 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^&spSnR2fBV}$cV}lSwBP(NbD+2><0|Ow*S-oWcyxgp zqEaI~(|mmyw18|523AHP24*0O5eOL=r5He72C^8u7^UItAVv+S8el*%2_w`4)q#Kq z5QFr9Y5AbrK^jK#e`aVHSH`g#M;@<^{i&9FbPLvx7ZmznNCJcfW3C}cmBI@M$Al9gAUCl)!bN#5($*|xVT zeA>)pxiv0I9PgPIv8rwJSNv~oUZj{OTJ!t=@|FHxebynppt$gK^>bP0l+XkK>P_xJ delta 385 zcmV-{0e=4L1)BqqBYy#6Nkl)D6>X3q%X$N-v26SU! zWnn;NU}1{I%F>5m;VBa602^jUB9;0884OA#5_6XiS_u)!A3r&Fu`h;Qd+-nPlQkH> zgyBvPOK9%oaS2H+Q$c~8`^6~42aQXH+_ZS6@oP?Rp=0qxh<`hj5U#}|Cv&L5w}?V( zl}jNau$WC~;^k8IX>Tt+W%dnPywP`$5(OF#BX(^nYy`nb8rHO|0s?{&3y4sHGFxQ0 z)3^lS@k!<2XuL~s8FO`TzEQ6jHNBxZ_894*yr6k^#Q27I=mJ-Yk&VSYA&D6IHO7EQ ziWN%{k}xQsZhD18Gbs{S-EIQCxLsh$G20qt;Zyp|juIt438&@WD2NVlCjAn!2TXKO zAoE%g>OW@&{Ycc9jsmq`A)}MXSp}|m!>N#V{oHXY