From 45ee5b5c8f2b0052d4c6b1dc9ac6ade4bf635db5 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 11 May 2024 19:09:05 -0400 Subject: [PATCH] Multiple fixes (see commit description) - New Eternatus 32x32 sprite by Gerben BSc - Fixed missing Hero Zamazenta sprite - Fixed missing Single Strike Urshifu sprite - Moved Alcremie Strawberry sprite to respective folder --- graphics/pokemon/alcremie/follow_shiny.pal | 19 ----------- graphics/pokemon/alcremie/follower.png | Bin 695 -> 0 bytes .../{ => strawberry}/follow_normal.pal | 14 ++++---- .../alcremie/strawberry/follow_shiny.pal | 19 +++++++++++ .../pokemon/alcremie/strawberry/follower.png | Bin 0 -> 943 bytes graphics/pokemon/eternatus/follow_normal.pal | 28 ++++++++-------- graphics/pokemon/eternatus/follow_shiny.pal | 28 ++++++++-------- graphics/pokemon/eternatus/follower.png | Bin 3100 -> 1409 bytes graphics/pokemon/urshifu/follow_normal.pal | 30 +++++++++--------- graphics/pokemon/urshifu/follow_shiny.pal | 28 ++++++++-------- graphics/pokemon/urshifu/follower.png | Bin 1066 -> 1168 bytes graphics/pokemon/zamazenta/follow_normal.pal | 30 +++++++++--------- graphics/pokemon/zamazenta/follow_shiny.pal | 30 +++++++++--------- graphics/pokemon/zamazenta/follower.png | Bin 1089 -> 1212 bytes spritesheet_rules.mk | 2 +- src/data/graphics/pokemon.h | 6 ++-- .../object_event_pic_tables_followers.h | 4 +-- .../pokemon/species_info/gen_8_families.h | 24 +++++++++++--- 18 files changed, 139 insertions(+), 123 deletions(-) delete mode 100644 graphics/pokemon/alcremie/follow_shiny.pal delete mode 100644 graphics/pokemon/alcremie/follower.png rename graphics/pokemon/alcremie/{ => strawberry}/follow_normal.pal (62%) create mode 100644 graphics/pokemon/alcremie/strawberry/follow_shiny.pal create mode 100644 graphics/pokemon/alcremie/strawberry/follower.png diff --git a/graphics/pokemon/alcremie/follow_shiny.pal b/graphics/pokemon/alcremie/follow_shiny.pal deleted file mode 100644 index 608abd6465..0000000000 --- a/graphics/pokemon/alcremie/follow_shiny.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -183 121 128 -0 0 0 -253 228 208 -242 138 149 -138 32 57 -254 114 114 -224 175 187 -183 60 60 -16 16 16 -10 10 10 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 diff --git a/graphics/pokemon/alcremie/follower.png b/graphics/pokemon/alcremie/follower.png deleted file mode 100644 index 4b0140bb0480510a2774b86a165caa6456f6c0fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 695 zcmV;o0!aOdP)Px#9#BkFMgRZ*w|Rg7008~u(DI6viXb`ua&q9WySF?%5D*aLezna200KuzL_t(o zh3!{sZ{#otT)?mV|37?yoxQ37&pxgns#{bkD-AHiIF8-h?GvB)#3%l%AY%Tp=FCLz z;5djx) z3YTO7kU*LzRngl}HsDsE9uz~dV@O<&1o~CdH&V7ofWY;YOs|Vr;Qg|c7_b-UTVzuY z1^QuTaPpNv0lfVjaU2_W9A df0zCj#vknz6q&MRg4X~5002ovPDHLkV1gNTHh};D diff --git a/graphics/pokemon/alcremie/follow_normal.pal b/graphics/pokemon/alcremie/strawberry/follow_normal.pal similarity index 62% rename from graphics/pokemon/alcremie/follow_normal.pal rename to graphics/pokemon/alcremie/strawberry/follow_normal.pal index 608abd6465..600580b163 100644 --- a/graphics/pokemon/alcremie/follow_normal.pal +++ b/graphics/pokemon/alcremie/strawberry/follow_normal.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -255 255 255 +34 177 76 183 121 128 0 0 0 253 228 208 @@ -11,9 +11,9 @@ JASC-PAL 224 175 187 183 60 60 16 16 16 -10 10 10 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/strawberry/follow_shiny.pal b/graphics/pokemon/alcremie/strawberry/follow_shiny.pal new file mode 100644 index 0000000000..546ccb9d68 --- /dev/null +++ b/graphics/pokemon/alcremie/strawberry/follow_shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +74 82 74 +0 0 0 +164 172 164 +90 90 98 +139 32 57 +255 115 115 +230 230 230 +180 57 57 +16 16 16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alcremie/strawberry/follower.png b/graphics/pokemon/alcremie/strawberry/follower.png new file mode 100644 index 0000000000000000000000000000000000000000..6387beafd83e33c5c2faea929cf10c8c5439cbd1 GIT binary patch literal 943 zcmV;g15o^lP)&%$5D)+W00000000000000000000$B5+C0009z zNklFW-1!UN&dX+I!x%O+SoUVw;2$As990dPjy&~m89vegsCC6XA(riyCp z$D-rOBS<3$+;G~6D+Q!y+R-^K@Tmo;2~(RcEn?Aegb`pS89_~D5;S@|$$}kCxIk@k z$%NE_XFd%mq+%z-fuya-xIjwaAZKNf_*-Ikj7-pXEt~(C>+D z_qZlQq+skHdhtnRPjCEcx+{=!y+8?MTI*F8@iE82I|X2+Cw+Kdrty66_!F0Q>r7Ex33a!JBh3CpGivPd8>@Vk5Kq5JAM797{ctF5}8 z8?W+xvnBoN#|K;Ob6Lp=Xji2-UVw;?IsWnbK+`6hNBP}T4pw0ltzhg;^Tc!BWTP0K z-c}lB-6k2U5gV`Qb<8$0e{@6pl6mXKo2kK{gA;4K1)ZD8k5Aum+!j(uWX2Oy(V8V~KwdNHR==PC}ofc$$Mm47r}+|T zWIyaLkV@~xrcJ zJYk(Tx9Yr8B33k8*7LZ?#T^V;aW8l_fA?F-$6JlM@S}0gZ_atVre4$!+Fw1fVj#9? Rj%EM=002ovPDHLkV1k|3yb=Ha literal 0 HcmV?d00001 diff --git a/graphics/pokemon/eternatus/follow_normal.pal b/graphics/pokemon/eternatus/follow_normal.pal index 85c1185a32..f140e24cac 100644 --- a/graphics/pokemon/eternatus/follow_normal.pal +++ b/graphics/pokemon/eternatus/follow_normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 +0 252 32 +0 0 0 +4 40 124 +164 28 64 +252 68 120 +32 76 176 +60 0 16 +204 32 80 +228 168 168 +164 28 64 +96 0 28 +252 68 120 +0 0 0 +0 0 0 0 0 0 -61 0 17 -33 77 179 0 0 0 -254 71 122 -7 43 126 -167 28 67 -160 65 104 -107 37 66 -207 117 182 -235 150 211 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 diff --git a/graphics/pokemon/eternatus/follow_shiny.pal b/graphics/pokemon/eternatus/follow_shiny.pal index 85c1185a32..8715d80d87 100644 --- a/graphics/pokemon/eternatus/follow_shiny.pal +++ b/graphics/pokemon/eternatus/follow_shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 +152 208 160 +0 0 0 +104 32 104 +176 24 48 +240 104 112 +168 24 168 +152 32 48 +248 32 80 +248 184 184 +248 32 80 +152 32 48 +232 16 48 +0 0 0 +0 0 0 0 0 0 -61 0 17 -33 77 179 0 0 0 -254 71 122 -7 43 126 -167 28 67 -160 65 104 -107 37 66 -207 117 182 -235 150 211 -11 11 11 -12 12 12 -13 13 13 -14 14 14 -15 15 15 diff --git a/graphics/pokemon/eternatus/follower.png b/graphics/pokemon/eternatus/follower.png index 2a0518d086a2194ff37523bbb95524be971e7fe3..28a3ef1c36a756739d9af617cd70beba8547aab7 100644 GIT binary patch literal 1409 zcmV-{1%CR8P)M@@3~B@tZgAZFk?UkVxVj z-h988nfYes`!gTF|J2As^1n8Z`WOaKLw)V$W^B}`pXcWLDIkPW+!22Dwu~x+vx?yf zc%WuUH{V}D2uG6sZJ;F}5pdWNbziDN6Mo$_WwEx{=0O}qL2 z%?l7PZ+JI0C_BR{|c@B|VH`{*af+D5pv ze(@@!s9SWh1e4MASuPH_PEyOLfJNk4c89G@k+51&77d#r#MF>mQ8=RdBk*3j83U}j zE~}Q64bo7dyNBDApqdE|n+oM+u=g6hmukXzBcry(iFV#9I|>G%$liRX$Wc&jDPl7@ zps#4|=Atn))UlFDKvNFICoG+m4n}IZs^AY}RoyuR?FlX}eCiDTm^WiG37HUH8XXHS zOw}+d#8C38Kd)vsr^;P755%EjO`2{pG+4NNB#@3F`U{6jfaBu9^Xw2Ml2(&bBZwrKIIo24u0<&<;=d? zdL{-3@-wT<>a`mf`ad`^P%sU)Oe1FO$~vP$T+0ij{l(v&JU6~Qwk2_RPDQSpyPx}W za4^FLyXN+1coP<5H#*wZb|eGTGD4NhbZo%46K$~i_;BS)%gXgf_ju2$J9lxgn_emm zAC6oF5L<4urjDPO!?+X3^W0s8_CUh>nltKk-GyB?S;dwt~tt+jvQYZw*L1DnVh(}$#1HIbM>)EU@X$7^E1+xjm z@s8Kcg9+aoG#6_0DIDL||OK+?87Ddt_cgFfD30-zvoPk6dNCrRNt~Mp6Pa zla1kiSoPsuS#)503p3%O<|Q9L|>a%(t6@^!7|< z6O+AogGf4`bozHMBoACmOU)3tCMwAT(>-Vdx<8(co+^7zzQGb|13+IWY4%3!hwqF; zVVQEs_EBV2druDRrc)^pXF)(5@?jAG-Yma!NQGua&7r P00000NkvXXu0mjfAC#68 literal 3100 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 a<1ev)z_0Fa+v5NL002ovPDHLkU;%<^Q7$3? delta 1057 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